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

ItEr44S18RFGravacionDatosHistoricosResponsabilidadesTraballoUnidadesPlanificacion: Setting up link to template when creating an order element from a template

Browse source
This commit is contained in:
Óscar González Fernández 2010-01-22 21:07:08 +01:00
parent 9471822a35
commit 442107f1ca
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java
View file

@ -237,6 +237,16 @@ public abstract class OrderElement extends BaseEntity implements
schedulingStateType = type;
}
public void initializeTemplate(OrderElementTemplate template) {
if (!isNewObject()) {
throw new IllegalStateException();
}
if (this.template != null) {
throw new IllegalStateException("already initialized");
}
this.template = template;
}
public boolean isSchedulingPoint() {
return getSchedulingState().getType() == Type.SCHEDULING_POINT;
}

15
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
View file

@ -378,7 +378,15 @@ public class OrderModel implements IOrderModel {
}
private Order createOrderFrom(OrderTemplate template) {
return template.createElement();
return (Order) createOrderElementFrom(null, template);
}
private OrderElement createOrderElementFrom(OrderLineGroup parent,
OrderElementTemplate template) {
OrderElement result = parent != null ? template.createElement(parent)
: template.createElement();
result.initializeTemplate(template);
return result;
}
private void setDefaultOrderCode() throws ConcurrentModificationException {
@ -395,9 +403,8 @@ public class OrderModel implements IOrderModel {
public OrderElement createFrom(OrderLineGroup parent,
OrderElementTemplate template) {
loadNeededDataForConversation();
OrderElementTemplate templateReloaded = templateDAO
.findExistingEntity(template.getId());
OrderElement result = templateReloaded.createElement(parent);
OrderElement result = createOrderElementFrom(parent, templateDAO
.findExistingEntity(template.getId()));
if (isCodeAutogenerated()) {
setAllCodeToNull(result);
}