From b6ed83337e501567ada45b20e8422ee2565b753f Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Sat, 26 Dec 2009 10:33:34 +0100
Subject: [PATCH]  ItEr40S05ValidacionEProbasFuncionaisItEr39S05: [Bug #209]
 Modify material in general view has no effect

---
 .../org/navalplanner/web/materials/MaterialsController.java | 2 +-
 .../java/org/navalplanner/web/materials/MaterialsModel.java | 6 +++++-
 navalplanner-webapp/src/main/webapp/materials/materials.zul | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java
index 6b3976134..52339be45 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java
@@ -104,7 +104,7 @@ public class MaterialsController extends
                 for (Iterator i = rows.getChildren().iterator(); i.hasNext(); ) {
                     final Row row = (Row) i.next();
                     final Material material = (Material) row.getValue();
-                    Button btnDelete = (Button) row.getChildren().get(5);
+                    Button btnDelete = (Button) row.getChildren().get(6);
                     if (!material.isNewObject()) {
                         btnDelete.setDisabled(true);
                         btnDelete.setImage("/common/img/ico_borrar_out.png");
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java
index 47f1e5c76..2708a99b5 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsModel.java
@@ -202,7 +202,11 @@ public class MaterialsModel implements IMaterialsModel {
     @Override
     @Transactional(readOnly = true)
     public Collection<? extends Material> getMaterials() {
-        return materialDAO.getAll();
+        List<Material> result = new ArrayList<Material>();
+        for (MaterialCategory each: materialCategories.asList()) {
+            result.addAll(each.getMaterials());
+        }
+        return result;
     }
 
 }
diff --git a/navalplanner-webapp/src/main/webapp/materials/materials.zul b/navalplanner-webapp/src/main/webapp/materials/materials.zul
index 21b06caae..dd2e3edd4 100644
--- a/navalplanner-webapp/src/main/webapp/materials/materials.zul
+++ b/navalplanner-webapp/src/main/webapp/materials/materials.zul
@@ -90,17 +90,19 @@
                                             <newdatasortablecolumn label="${i18n:_('Description')}" />
                                             <newdatasortablecolumn label="${i18n:_('Unit price')}" />
                                             <newdatasortablecolumn label="${i18n:_('Unit type')}" />
+                                            <newdatasortablecolumn label="${i18n:_('Category')}" />
                                             <newdatasortablecolumn label="${i18n:_('Disabled')}" />
                                             <newdatasortablecolumn label="" />
                                         </columns>
                                         <rows>
-                                            <row self="@{each='material'}" value="@{material}">
+                                            <row self="@{each='material'}" value="@{material}" >
                                                 <textbox id="code" value="@{material.code}"
                                                     constraint="no empty:${i18n:_('cannot be null or empty')}" />
                                                 <textbox value="@{material.description}" />
                                                 <doublebox value="@{material.defaultUnitPrice}" />
                                                 <listbox mold="select" model="@{unitTypes}"
                                                     selectedItem="@{material.unitType}"/>
+                                                <label value="@{material.category.name}" />
                                                 <checkbox checked="@{material.disabled}" />
                                                 <button sclass="icono"
                                                     image="/common/img/ico_borrar1.png"