From 0e1dfa94c49eedf4c8d09776654e0200bcd552d5 Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Wed, 16 Sep 2009 19:51:39 +0200
Subject: [PATCH]  ItEr26S13AltaEtiquetasTipoEtiqueta: List labels

---
 .../business/labels/daos/ILabelDAO.java       |  4 +++
 .../business/labels/daos/LabelDAO.java        |  7 +++++
 .../web/labels/ILabelTypeModel.java           |  7 +++++
 .../web/labels/LabelTypeCRUDController.java   |  5 ++++
 .../web/labels/LabelTypeModel.java            | 21 ++++++++++++++-
 .../src/main/webapp/labels/_editLabelType.zul | 26 ++++++++++++++++---
 6 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/ILabelDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/ILabelDAO.java
index d5d7dc32a..bf7812389 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/ILabelDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/ILabelDAO.java
@@ -1,5 +1,7 @@
 package org.navalplanner.business.labels.daos;
 
+import java.util.List;
+
 import org.navalplanner.business.common.daos.IGenericDAO;
 import org.navalplanner.business.labels.entities.Label;
 
@@ -8,4 +10,6 @@ import org.navalplanner.business.labels.entities.Label;
  */
 public interface ILabelDAO extends IGenericDAO<Label, Long> {
 
+    List<Label> getAll();
+
 }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/LabelDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/LabelDAO.java
index 50f84babb..39cdba47a 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/LabelDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/labels/daos/LabelDAO.java
@@ -1,5 +1,7 @@
 package org.navalplanner.business.labels.daos;
 
+import java.util.List;
+
 import org.navalplanner.business.common.daos.GenericDAOHibernate;
 import org.navalplanner.business.labels.entities.Label;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -16,4 +18,9 @@ import org.springframework.stereotype.Repository;
 public class LabelDAO extends GenericDAOHibernate<Label, Long> implements
         ILabelDAO {
 
+    @Override
+    public List<Label> getAll() {
+        return list(Label.class);
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/ILabelTypeModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/ILabelTypeModel.java
index 874ab9477..81cb0d049 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/ILabelTypeModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/ILabelTypeModel.java
@@ -3,6 +3,7 @@ package org.navalplanner.web.labels;
 import java.util.List;
 
 import org.navalplanner.business.common.exceptions.ValidationException;
+import org.navalplanner.business.labels.entities.Label;
 import org.navalplanner.business.labels.entities.LabelType;
 
 /**
@@ -48,4 +49,10 @@ public interface ILabelTypeModel {
      */
     void initEdit(LabelType labelType);
 
+    /**
+     *
+     * @return
+     */
+    List<Label> getLabels();
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java
index 1af269032..c0fe97b6d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java
@@ -6,6 +6,7 @@ import java.util.List;
 
 import org.hibernate.validator.InvalidValue;
 import org.navalplanner.business.common.exceptions.ValidationException;
+import org.navalplanner.business.labels.entities.Label;
 import org.navalplanner.business.labels.entities.LabelType;
 import org.navalplanner.web.common.IMessagesForUser;
 import org.navalplanner.web.common.Level;
@@ -77,6 +78,10 @@ public class LabelTypeCRUDController extends GenericForwardComposer {
         return labelTypeModel.getLabelType();
     }
 
+    public List<Label> getLabels() {
+        return labelTypeModel.getLabels();
+    }
+
     /**
      * Prepare form for Create
      */
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java
index cf642b6ea..120cb78a1 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeModel.java
@@ -9,7 +9,9 @@ import org.hibernate.validator.ClassValidator;
 import org.hibernate.validator.InvalidValue;
 import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
 import org.navalplanner.business.common.exceptions.ValidationException;
+import org.navalplanner.business.labels.daos.ILabelDAO;
 import org.navalplanner.business.labels.daos.ILabelTypeDAO;
+import org.navalplanner.business.labels.entities.Label;
 import org.navalplanner.business.labels.entities.LabelType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -28,6 +30,9 @@ public class LabelTypeModel implements ILabelTypeModel {
     @Autowired
     private ILabelTypeDAO labelTypeDAO;
 
+    @Autowired
+    private ILabelDAO labelDAO;
+
     private LabelType labelType;
 
     private ClassValidator<LabelType> validator = new ClassValidator<LabelType>(
@@ -94,10 +99,24 @@ public class LabelTypeModel implements ILabelTypeModel {
 
     private LabelType getFromDB(Long id) {
         try {
-            return labelType = labelTypeDAO.find(id);
+            LabelType labelType = labelTypeDAO.find(id);
+            reattachLabels(labelType);
+            return labelType;
         } catch (InstanceNotFoundException e) {
             throw new RuntimeException(e);
         }
     }
 
+    private void reattachLabels(LabelType labelType) {
+        for (Label label : labelType.getLabels()) {
+            label.getName();
+        }
+    }
+
+    @Override
+    @Transactional(readOnly = true)
+    public List<Label> getLabels() {
+        return labelDAO.getAll();
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul b/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
index a223cb7d9..d5711972c 100644
--- a/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
+++ b/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
@@ -4,9 +4,27 @@
             <label value="${i18n:_('Name')}"/>
             <textbox id="name" value="@{controller.labelType.name}"/>
         </hbox>
-        <hbox>
-            <button label="${i18n:_('Save')}" onClick="controller.save()"/>
-            <button label="${i18n:_('Cancel')}" onClick="controller.cancel()"/>
-        </hbox>
     </vbox>
+    <panel title="${i18n:_('Label list')}" border="normal"
+        style="margin: 10px 0px">
+        <panelchildren>
+            <button label="${i18n:_('New label')}" />
+            <listbox rows="10"
+                model="@{controller.labels}">
+                <listhead>
+                    <listheader label="${i18n:_('Name')}" />
+                </listhead>
+                <listitem self="@{each='label'}" value="@{label}">
+                    <listcell>
+                        <textbox value="@{label.name}" />
+                    </listcell>
+                </listitem>
+            </listbox>
+        </panelchildren>
+    </panel>
+    <hbox>
+        <button label="${i18n:_('Save')}" onClick="controller.save()" />
+        <button label="${i18n:_('Cancel')}"
+            onClick="controller.cancel()" />
+    </hbox>
 </window>