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

ItEr43S12CUGravacionModelosUnidadesTraballoItEr42S17: Adding LabelsOnConversation support to OrderTemplatesModel

Browse source
This commit is contained in:
Óscar González Fernández 2010-01-12 19:39:25 +01:00
parent ca432e50a9
commit c7eb35bc87
2 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
navalplanner-webapp/src/main/java/org/navalplanner/web/templates/IOrderTemplatesModel.java
View file

@ -21,6 +21,7 @@ package org.navalplanner.web.templates;
import java.util.List;
import org.navalplanner.business.labels.entities.Label;
import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.business.templates.entities.OrderElementTemplate;
import org.navalplanner.web.tree.EntitiesTree;
@ -44,4 +45,8 @@ public interface IOrderTemplatesModel {
EntitiesTree<OrderElementTemplate> getTemplatesTreeModel();
boolean isTemplateTreeDisabled();
public void addLabelToConversation(Label label);
List<Label> getLabels();
}

26
navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java
View file

@ -23,10 +23,13 @@ import java.util.List;
import org.navalplanner.business.common.IAdHocTransactionService;
import org.navalplanner.business.common.IOnTransaction;
import org.navalplanner.business.labels.daos.ILabelDAO;
import org.navalplanner.business.labels.entities.Label;
import org.navalplanner.business.orders.daos.IOrderElementDAO;
import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.business.templates.daos.IOrderElementTemplateDAO;
import org.navalplanner.business.templates.entities.OrderElementTemplate;
import org.navalplanner.web.orders.labels.LabelsOnConversation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
@ -47,6 +50,9 @@ public class OrderTemplatesModel implements IOrderTemplatesModel {
@Autowired
private IOrderElementTemplateDAO dao;
@Autowired
private ILabelDAO labelDAO;
@Autowired
private IAdHocTransactionService transaction;
@ -54,6 +60,15 @@ public class OrderTemplatesModel implements IOrderTemplatesModel {
private TemplatesTree treeModel;
private LabelsOnConversation labelsOnConversation;
private LabelsOnConversation getLabelsOnConversation() {
if (labelsOnConversation == null) {
labelsOnConversation = new LabelsOnConversation(labelDAO);
}
return labelsOnConversation;
}
@Override
public List<OrderElementTemplate> getRootTemplates() {
return dao.getRootTemplates();
@ -99,6 +114,7 @@ public class OrderTemplatesModel implements IOrderTemplatesModel {
@Transactional(readOnly = true)
public void initEdit(OrderElementTemplate template) {
this.template = dao.findExistingEntity(template.getId());
getLabelsOnConversation().initializeLabels();
treeModel = new TemplatesTree(this.template);
}
@ -112,4 +128,14 @@ public class OrderTemplatesModel implements IOrderTemplatesModel {
return template != null && template.isLeaf();
}
@Override
public void addLabelToConversation(Label label) {
getLabelsOnConversation().addLabel(label);
}
@Override
public List<Label> getLabels() {
return getLabelsOnConversation().getLabels();
}
}