From 4b0f6c4c9fad96a10c21aae41716f2dfce35536c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Wed, 20 Jan 2010 20:59:11 +0100
Subject: [PATCH] ItEr44S10CUGravacionModelosUnidadesTraballoItEr43S12: Adding
 type column for clarifying which type the template is

---
 .../business/templates/entities/OrderElementTemplate.java  | 5 +++++
 .../templates/entities/OrderLineGroupTemplate.java         | 6 ++++++
 .../business/templates/entities/OrderLineTemplate.java     | 7 +++++++
 .../business/templates/entities/OrderTemplate.java         | 7 +++++++
 navalplanner-webapp/src/main/webapp/templates/_list.zul    | 2 ++
 5 files changed, 27 insertions(+)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java
index 97c8ea51f..0f612dc7a 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderElementTemplate.java
@@ -229,6 +229,11 @@ public abstract class OrderElementTemplate extends BaseEntity implements
         return infoComponent;
     }
 
+    /**
+     * @return a description of the type or template this object is
+     */
+    public abstract String getType();
+
     public abstract List<OrderElementTemplate> getChildrenTemplates();
 
     @Min(0)
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineGroupTemplate.java b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineGroupTemplate.java
index 0a08941f5..e31053b90 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineGroupTemplate.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineGroupTemplate.java
@@ -24,6 +24,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.hibernate.validator.Valid;
+import org.navalplanner.business.i18n.I18nHelper;
 import org.navalplanner.business.orders.entities.OrderElement;
 import org.navalplanner.business.orders.entities.OrderLineGroup;
 import org.navalplanner.business.trees.ITreeParentNode;
@@ -190,4 +191,9 @@ public class OrderLineGroupTemplate extends OrderElementTemplate implements
         return setupGroupParts(result);
     }
 
+    @Override
+    public String getType() {
+        return I18nHelper._("Group");
+    }
+
 }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java
index 469bdaff4..277e2e351 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderLineTemplate.java
@@ -19,6 +19,8 @@
  */
 package org.navalplanner.business.templates.entities;
 
+import static org.navalplanner.business.i18n.I18nHelper._;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -80,4 +82,9 @@ public class OrderLineTemplate extends OrderElementTemplate {
         return setupElementParts(line);
     }
 
+    @Override
+    public String getType() {
+        return _("Line");
+    }
+
 }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java
index 64cbd15a2..2094bbc86 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java
@@ -19,6 +19,8 @@
  */
 package org.navalplanner.business.templates.entities;
 
+import static org.navalplanner.business.i18n.I18nHelper._;
+
 import java.util.Date;
 
 import org.hibernate.validator.NotNull;
@@ -58,4 +60,9 @@ public class OrderTemplate extends OrderLineGroupTemplate {
         return new LocalDate().toDateTimeAtStartOfDay().toDate();
     }
 
+    @Override
+    public String getType() {
+        return _("Order");
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/webapp/templates/_list.zul b/navalplanner-webapp/src/main/webapp/templates/_list.zul
index a687a5b7d..e2c0aa9a3 100644
--- a/navalplanner-webapp/src/main/webapp/templates/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/templates/_list.zul
@@ -21,6 +21,7 @@
     <grid id="listing" model="@{templateController.templates}" mold="paging"
         pageSize="10" fixedLayout="true">
         <columns>
+            <column label="${i18n:_('Type')}" sort="auto(type)" />
             <column label="${i18n:_('Code')}" sort="auto(code)" />
             <column label="${i18n:_('Name')}" sort="auto(name)" />
             <column label="${i18n:_('Days from Beginning to Start')}"
@@ -33,6 +34,7 @@
         </columns>
         <rows>
             <row self="@{each='template'}" value="@{template}">
+                <label value="@{template.type}" />
                 <label value="@{template.code}" />
                 <label value="@{template.name}" />
                 <label value="@{template.startAsDaysFromBeginning}" />