From c4acadced6aa107f09b81d6b9358de48ba7db9bd Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Mon, 7 Sep 2009 01:06:18 +0200
Subject: [PATCH]  ItEr24S08CUAsignacionGrupoRecursosAPlanificacionItEr23S10:
 [FixBug] Added Cancel operation

---
 .../navalplanner/business/planner/entities/Task.java |  4 ++++
 .../web/planner/IResourceAllocationModel.java        |  5 +++++
 .../web/planner/ResourceAllocationController.java    | 12 +++++++++++-
 .../web/planner/ResourceAllocationModel.java         |  5 +++++
 .../src/main/webapp/planner/order.zul                |  2 +-
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java
index 26109c63d..3da0db04e 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java
@@ -79,6 +79,10 @@ public class Task extends TaskElement {
         resourceAllocations.remove(resourceAllocation);
     }
 
+    public void clearResourceAllocations() {
+        resourceAllocations.clear();
+    }
+
     public Boolean getFixedDuration() {
         return fixedDuration;
     }
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 3910ca8ea..475d860dd 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
@@ -137,4 +137,9 @@ public interface IResourceAllocationModel {
      */
     void updateGenericPercentages(BigDecimal totalPercentage);
 
+    /**
+     * Cancel operation
+     */
+    void cancel();
+
 }
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 7cc5087f3..b1f7c3c7e 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
@@ -63,8 +63,8 @@ public class ResourceAllocationController extends GenericForwardComposer {
     @Override
     public void doAfterCompose(Component comp) throws Exception {
         super.doAfterCompose(comp);
-        messagesForUser = new MessagesForUser(messagesContainer);
         this.window = (Window) comp;
+        messagesForUser = new MessagesForUser(messagesContainer);
     }
 
     /**
@@ -216,6 +216,16 @@ public class ResourceAllocationController extends GenericForwardComposer {
         return resourceAllocationRenderer;
     }
 
+    public void cancel() {
+        clear();
+        self.setVisible(false);
+        resourceAllocationModel.cancel();
+    }
+
+    private void clear() {
+        genericResourceAllocationPercentage.setValue(null);
+    }
+
     /**
      *
      * Renders a {@link SpecificResourceAllocation} item
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 a95de78b4..cbf6d823c 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
@@ -301,4 +301,9 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
         ganttTask.setEndDate(task.getEndDate());
     }
 
+    @Override
+    public void cancel() {
+        task.clearResourceAllocations();
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/webapp/planner/order.zul b/navalplanner-webapp/src/main/webapp/planner/order.zul
index 3e403c6ab..a7efd801f 100644
--- a/navalplanner-webapp/src/main/webapp/planner/order.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/order.zul
@@ -107,7 +107,7 @@
 
         <hbox>
             <button label="${i18n:_('Save')}" />
-            <button label="${i18n:_('Cancel')}" />
+            <button label="${i18n:_('Cancel')}" onClick="allocationController.cancel()" />
             <button label="${i18n:_('Search resources...')}"
                 onClick="allocationController.showSearchResources()" />
             <button label="${i18n:_('Advance allocation')}" />