Bug #1369: Fix problems with dates from template in new project pop-up

FEA: ItEr76S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2012-06-27 12:22:02 +02:00
parent be9408b444
commit 760a61d3f1

View file

@ -257,12 +257,23 @@ public class ProjectDetailsController extends GenericForwardComposer {
}
public void calculateProjectDates(OrderTemplate template) {
initDate.setValue(new LocalDate().plusDays(template.getStartAsDaysFromBeginning()).toDateTimeAtStartOfDay().toDate());
LocalDate initLocalDate = new LocalDate()
.plusDays(template.getStartAsDaysFromBeginning());
Date initDate = initLocalDate.toDateTimeAtStartOfDay().toDate();
getOrder().setInitDate(initDate);
this.initDate.setValue(initDate);
if (template.getDeadlineAsDaysFromBeginning() != null ) {
deadline.setValue( new LocalDate(initDate.getValue()).plusDays(template.getDeadlineAsDaysFromBeginning()).toDateTimeAtStartOfDay().toDate());
LocalDate deadlineLocalDate = initLocalDate.plusDays(template
.getDeadlineAsDaysFromBeginning());
Date deadline = deadlineLocalDate.toDateTimeAtStartOfDay().toDate();
getOrder().setDeadline(deadline);
this.deadline.setValue(deadline);
} else {
deadline.setText("");
getOrder().setDeadline(null);
this.deadline.setValue(null);
}
}
public OrderTemplate getTemplate() {