From f0bfc9e3858ddc5fbc350cc1cc511c4f281948ab Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Wed, 3 Feb 2010 14:17:32 +0100
Subject: [PATCH]  ItEr46S08CUMarcarUnidadeTraballoExportableItEr45S08:
 Changing visual aspect of subcontracted tasks before save.

---
 .../src/main/java/org/zkoss/ganttz/TaskComponent.java    | 8 ++++++++
 .../web/planner/allocation/ResourceAllocationModel.java  | 8 --------
 .../web/planner/order/SubcontractController.java         | 3 ---
 .../web/planner/taskedition/EditTaskController.java      | 9 +++++++++
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java
index 881d63e49..e2dc44249 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java
@@ -204,6 +204,10 @@ public class TaskComponent extends Div implements AfterCompose {
             @Override
             public void reloadResourcesTextRequested() {
                 smartUpdate("resourcesText", getResourcesText());
+                String cssClass = isSubcontracted() ? "box subcontracted-task"
+                        : "box standard-task";
+                response("setClass", new AuInvoke(TaskComponent.this,
+                        "setClass", cssClass));
             }
         };
         this.task.addReloadListener(reloadResourcesTextRequested);
@@ -482,4 +486,8 @@ public class TaskComponent extends Div implements AfterCompose {
         return task.getResourcesText();
     }
 
+    public boolean isSubcontracted() {
+        return task.isSubcontracted();
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
index 98bc54ad9..88e685e2d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
@@ -166,7 +166,6 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
                 return null;
             }
         });
-        askForReloads();
     }
 
     @Override
@@ -179,7 +178,6 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
                 return null;
             }
         });
-        askForReloads();
     }
 
     private void stepsBeforeDoingAllocation() {
@@ -196,12 +194,6 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
                 previousLength);
     }
 
-    private void askForReloads() {
-        org.zkoss.ganttz.data.Task ganttTask = context.getTask();
-        ganttTask.reloadResourcesText();
-        context.reloadCharts();
-    }
-
     @Override
     @Transactional(readOnly = true)
     public <T> T onAllocationContext(
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java
index e998afc10..c093599ee 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractController.java
@@ -85,9 +85,6 @@ public class SubcontractController extends GenericForwardComposer {
 
         if (status == Messagebox.YES) {
             subcontractModel.confirm();
-            if (context != null) {
-                context.reloadCharts();
-            }
         }
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java
index 303e6b0a4..9b1fed80d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java
@@ -174,6 +174,8 @@ public class EditTaskController extends GenericForwardComposer {
             editTaskTabbox.setSelectedPanelApi(subcontractTabpanel);
             subcontractController.accept();
 
+            askForReloads();
+
             taskElement = null;
             context = null;
 
@@ -183,6 +185,13 @@ public class EditTaskController extends GenericForwardComposer {
         }
     }
 
+    private void askForReloads() {
+        if (context != null) {
+            context.getTask().reloadResourcesText();
+            context.reloadCharts();
+        }
+    }
+
     public void cancel() {
         taskPropertiesController.cancel();
         subcontractController.cancel();