RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug #1373: When creating new projects from template the explicitly filled start date and deadline values are used

Browse source 
FEA: ItEr76S04BugFixing
This commit is contained in:
Lorenzo Tilve Álvaro 2012-02-15 11:41:20 +01:00
parent fa916f6bec
commit a42d5c48cc
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderTemplate.java
View file

@ -58,16 +58,11 @@ public class OrderTemplate extends OrderLineGroupTemplate {
order.setVersionForScenario(currentScenario, OrderVersion
.createInitialVersion(currentScenario));
order.useSchedulingDataFor(currentScenario);
order.setInitDate(today());
order.setCalendar(calendar);
order.initializeTemplate(this);
return setupGroupParts(setupSchedulingStateType(order));
}
private Date today() {
return new LocalDate().toDateTimeAtStartOfDay().toDate();
}
@Override
public String getType() {
return _("Project");

13
libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
View file

@ -377,6 +377,7 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
loadNeededDataForConversation();
this.planningState = planningStateCreator.createOn(desktop,
Order.create());
planningState.getOrder().setInitDate(new Date());
initializeOrder();
initializeCalendar();
}
@ -385,7 +386,6 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
Order order = planningState.getOrder();
this.orderElementTreeModel = new OrderElementTreeModel(
order);
order.setInitDate(new Date());
setDefaultCode();
order.setCodeAutogenerated(true);
}
@ -400,16 +400,15 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
loadNeededDataForConversation();
Order newOrder = createOrderFrom((OrderTemplate) templateDAO
.findExistingEntity(template.getId()));
newOrder.setName(getOrder().getName());
if (!getOrder().isCodeAutogenerated()) {
newOrder.setCodeAutogenerated();
newOrder.setCode(getOrder().getCode());
}
newOrder.setCustomer(((Order) getOrder()).getCustomer());
newOrder.setCalendar(getCalendar());
newOrder.setInitDate(getOrder().getInitDate());
if (getOrder().getDeadline() != null) {
newOrder.setDeadline(getOrder().getDeadline());
}
newOrder.setCustomer(((Order) getOrder()).getCustomer());
newOrder.setCalendar(getCalendar());
planningState = planningStateCreator.createOn(desktop, newOrder);
forceLoadAdvanceAssignmentsAndMeasurements(planningState.getOrder());