RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr59S04ValidacionEProbasFuncionaisItEr58S04: [Bug #477] Fixing Bug.

Browse source 
Disable movement on Gantt diagram of the tasks which have got consolidations.
This commit is contained in:
Susana Montes Pedreira 2010-06-14 13:11:31 +02:00 • committed by Javier Moran Rua
parent f561bd04da
commit 9547736896
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java
View file

@ -331,7 +331,8 @@ public class TaskComponent extends Div implements AfterCompose {
}
public boolean isMovingTasksEnabled() {
return disabilityConfiguration.isMovingTasksEnabled()
return (disabilityConfiguration != null)
&& disabilityConfiguration.isMovingTasksEnabled()
&& task.canBeExplicitlyMoved();
}
@ -415,7 +416,7 @@ public class TaskComponent extends Div implements AfterCompose {
updateProperties();
}
private void updateProperties() {
public void updateProperties() {
if (!isInPage()) {
return;
}

9
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationController.java
View file

@ -31,6 +31,7 @@ import org.navalplanner.web.common.Util;
import org.navalplanner.web.planner.order.PlanningState;
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.SuspendNotAllowedException;
@ -55,6 +56,8 @@ public class AdvanceConsolidationController extends GenericForwardComposer {
private Window window;
private IContextWithPlannerTask<TaskElement> context;
@Override
public void doAfterCompose(Component comp) throws Exception {
super.doAfterCompose(comp);
@ -64,6 +67,8 @@ public class AdvanceConsolidationController extends GenericForwardComposer {
public void showWindow(IContextWithPlannerTask<TaskElement> context,
org.navalplanner.business.planner.entities.Task task,
PlanningState planningState) {
this.context = context;
advanceConsolidationModel.initAdvancesFor(task, context, planningState);
try {
@ -83,6 +88,10 @@ public class AdvanceConsolidationController extends GenericForwardComposer {
public void accept() {
advanceConsolidationModel.accept();
if (context.getRelativeTo() instanceof TaskComponent) {
((TaskComponent) context.getRelativeTo()).invalidate();
((TaskComponent) context.getRelativeTo()).updateProperties();
}
close();
}

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

@ -47,7 +47,6 @@ 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;
@ -274,10 +273,6 @@ public class EditTaskController extends GenericForwardComposer {
if (context != null) {
context.getTask().reloadResourcesText();
context.reloadCharts();
if (context.getRelativeTo() instanceof TaskComponent) {
((TaskComponent) context.getRelativeTo()).invalidate();
}
}
}