ItEr57S14AdaptacionAsignacionConsolidacion: Disables movement on Gantt diagram.

Disables movement on Gantt diagram of the tasks which have got consolidations.

ganttzk/src/main/java/org/zkoss/ganttz/CommandOnTaskContextualized.java

@@ -83,7 +83,7 @@ public class CommandOnTaskContextualized<T> {
         return new ItemAction<TaskComponent>() {
             @Override
             public void onEvent(TaskComponent choosen, Event event) {
-                doAction(choosen.getTask());
+                doAction(choosen);
             }
         };
     }

ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java

@@ -180,6 +180,10 @@ public class DefaultFundamentalProperties implements ITaskFundamentalProperties
         return true;
     }
 
+    public boolean hasConsolidations() {
+        return false;
+    }
+
     @Override
     public String getAssignedStatus() {
         return "unassigned";

ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java

@@ -82,6 +82,8 @@ public interface ITaskFundamentalProperties {
 
     public boolean isLimitingAndHasDayAssignments();
 
+    public boolean hasConsolidations();
+
     public boolean canBeExplicitlyResized();
 
     public String getAssignedStatus();

ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java

@@ -365,6 +365,10 @@ public abstract class Task implements ITaskFundamentalProperties {
         return fundamentalProperties.isLimitingAndHasDayAssignments();
     }
 
+    public boolean hasConsolidations() {
+        return fundamentalProperties.hasConsolidations();
+    }
+
     public boolean canBeExplicitlyResized() {
         return fundamentalProperties.canBeExplicitlyResized();
     }

ganttzk/src/main/java/org/zkoss/ganttz/data/TaskLeaf.java

@@ -54,7 +54,7 @@ public class TaskLeaf extends Task {
 
     @Override
     public boolean canBeExplicitlyMoved() {
-        return !(isSubcontracted() || isLimitingAndHasDayAssignments());
+        return !(isSubcontracted() || isLimitingAndHasDayAssignments() || hasConsolidations());
     }
 
 }

navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java

@@ -608,4 +608,7 @@ public class Task extends TaskElement {
 
     }
 
+    public boolean hasConsolidations() {
+        return ((consolidation != null) && (!consolidation.isEmpty()));
+    }
 }

navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java

@@ -417,6 +417,11 @@ public abstract class TaskElement extends BaseEntity {
         return false;
     }
 
+    public boolean hasConsolidations() {
+        // Just Task could be consolidated
+        return false;
+    }
+
     public TaskElement getTopMost() {
         TaskElement result = this;
         while (result.getParent() != null) {

navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/CalculatedConsolidation.java

@@ -103,4 +103,9 @@ public class CalculatedConsolidation extends Consolidation {
         return true;
     }
 
+    @Override
+    public boolean isEmpty() {
+        return consolidatedValues.isEmpty();
+    }
+
 }

navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/Consolidation.java

@@ -34,6 +34,8 @@ public abstract class Consolidation extends BaseEntity {
 
     public abstract boolean isCalculated();
 
+    public abstract boolean isEmpty();
+
     private Task task;
 
     protected Consolidation() {

navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/consolidations/NonCalculatedConsolidation.java

@@ -104,4 +104,8 @@ public class NonCalculatedConsolidation extends Consolidation {
         return false;
     }
 
+    @Override
+    public boolean isEmpty() {
+        return consolidatedValues.isEmpty();
+    }
 }

navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java

@@ -571,6 +571,10 @@ public class TaskElementAdapter implements ITaskElementAdapter {
             return taskElement.isLimitingAndHasDayAssignments();
         }
 
+        public boolean hasConsolidations() {
+            return taskElement.hasConsolidations();
+        }
+
         private void stepsBeforePossibleReallocation() {
             taskDAO.reattach(taskElement);
             reattachAllResourcesForTask();

navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java

@@ -937,6 +937,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
         if (each.getCalendar() != null) {
             BaseCalendarModel.forceLoadBaseCalendar(each.getCalendar());
         }
+        each.hasConsolidations();
     }
 
     /**

navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java

@@ -47,6 +47,7 @@ import org.navalplanner.web.planner.taskedition.TaskPropertiesController.Resourc
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
+import org.zkoss.ganttz.TaskComponent;
 import org.zkoss.ganttz.extensions.IContextWithPlannerTask;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
@@ -304,6 +305,10 @@ public class EditTaskController extends GenericForwardComposer {
         if (context != null) {
             context.getTask().reloadResourcesText();
             context.reloadCharts();
+
+            if (context.getRelativeTo() instanceof TaskComponent) {
+                ((TaskComponent) context.getRelativeTo()).invalidate();
+            }
         }
     }