From a4f19c2deca480e5792c600160f9686046776736 Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Mon, 7 Sep 2009 01:06:19 +0200
Subject: [PATCH]  ItEr24S08CUAsignacionGrupoRecursosAPlanificacionItEr23S10:
 [FixBug] Added Save task button

---
 .../web/planner/IResourceAllocationModel.java |  5 ++++
 .../planner/ResourceAllocationController.java | 29 ++++++++++++++++---
 .../web/planner/ResourceAllocationModel.java  |  6 ++++
 .../src/main/webapp/planner/order.zul         |  2 +-
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IResourceAllocationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IResourceAllocationModel.java
index 475d860dd..523ee915a 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IResourceAllocationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IResourceAllocationModel.java
@@ -142,4 +142,9 @@ public interface IResourceAllocationModel {
      */
     void cancel();
 
+    /**
+     * Save task
+     */
+    void save();
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ResourceAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ResourceAllocationController.java
index b1f7c3c7e..446490e4c 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ResourceAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ResourceAllocationController.java
@@ -77,9 +77,9 @@ public class ResourceAllocationController extends GenericForwardComposer {
         resourceAllocationModel.setTask(task);
         resourceAllocationModel.setGanttTask(ganttTask);
 
-        // Add generic resources to resources list
+        updateGenericResourceAllocationPercentage();
+        // Add new generic resources to resources list
         addGenericResources();
-
         Util.reloadBindings(window);
         try {
             window.doModal();
@@ -90,6 +90,17 @@ public class ResourceAllocationController extends GenericForwardComposer {
         }
     }
 
+    /**
+     * GenericResourceAllocationPercentage initial value is the sum of all
+     * {@link ResourceAllocation} percentages
+     */
+    private void updateGenericResourceAllocationPercentage() {
+        BigDecimal genericPercentage = resourceAllocationModel
+                .getSumPercentageResourceAllocations();
+        genericResourceAllocationPercentage.setValue(genericPercentage
+                .scaleByPowerOfTen(2).setScale(2, BigDecimal.ROUND_HALF_EVEN));
+    }
+
     /**
      * Check how many {@link ResourceAllocation} object can be assigned to this
      * {@link Task} and add them to {@link ResourceAllocation} list
@@ -217,13 +228,23 @@ public class ResourceAllocationController extends GenericForwardComposer {
     }
 
     public void cancel() {
-        clear();
-        self.setVisible(false);
+        close();
         resourceAllocationModel.cancel();
     }
 
+    private void close() {
+        self.setVisible(false);
+        clear();
+    }
+
     private void clear() {
         genericResourceAllocationPercentage.setValue(null);
+        resourcesList.getItems().clear();
+    }
+
+    public void save() {
+        resourceAllocationModel.save();
+        close();
     }
 
     /**
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ResourceAllocationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ResourceAllocationModel.java
index cbf6d823c..11caccc9c 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ResourceAllocationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ResourceAllocationModel.java
@@ -306,4 +306,10 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
         task.clearResourceAllocations();
     }
 
+    @Override
+    @Transactional
+    public void save() {
+        taskElementDAO.save(task);
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/webapp/planner/order.zul b/navalplanner-webapp/src/main/webapp/planner/order.zul
index a7efd801f..75009bf85 100644
--- a/navalplanner-webapp/src/main/webapp/planner/order.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/order.zul
@@ -106,7 +106,7 @@
         </listbox>
 
         <hbox>
-            <button label="${i18n:_('Save')}" />
+            <button label="${i18n:_('Save')}" onClick="allocationController.save()" />
             <button label="${i18n:_('Cancel')}" onClick="allocationController.cancel()" />
             <button label="${i18n:_('Search resources...')}"
                 onClick="allocationController.showSearchResources()" />