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

Disable tasks movement for tasks updated from timesheets

Browse source 
Mark updatedFromTimesheets is reseted before adapting the planing in order to
move the tasks if needed.

FEA: ItEr77S12AdaptPlanningAccordingTimesheets
This commit is contained in:
Manuel Rego Casasnovas 2012-11-12 13:33:40 +01:00
parent 2c98e99d63
commit 62d9221e6f
6 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -308,4 +308,9 @@ public class DefaultFundamentalProperties implements ITaskFundamentalProperties
return false;
}
@Override
public boolean isUpdatedFromTimesheets() {
return false;
}
}

2
ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java
View file

@ -125,4 +125,6 @@ public interface ITaskFundamentalProperties {
public boolean isRoot();
boolean isUpdatedFromTimesheets();
}

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

@ -548,4 +548,9 @@ public abstract class Task implements ITaskFundamentalProperties {
getBeginDate());
}
@Override
public boolean isUpdatedFromTimesheets() {
return fundamentalProperties.isUpdatedFromTimesheets();
}
}

2
ganttzk/src/main/java/org/zkoss/ganttz/data/TaskLeaf.java
View file

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

5
libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java
View file

@ -1223,6 +1223,11 @@ _(
return taskElement.isRoot();
}
@Override
public boolean isUpdatedFromTimesheets() {
return taskElement.isUpdatedFromTimesheets();
}
}
@Override

8
libreplan-webapp/src/main/java/org/libreplan/web/planner/adaptplanning/AdaptPlanningCommand.java
View file

@ -63,10 +63,11 @@ public class AdaptPlanningCommand implements IAdaptPlanningCommand {
.getAllChildren();
for (TaskElement taskElement : taskElements) {
OrderElement orderElement = taskElement.getOrderElement();
taskElement.setUpdatedFromTimesheets(orderElement
.hasTimesheetsReportingHours());
// Reset status to allow move the task if needed while adapting the
// planning
taskElement.setUpdatedFromTimesheets(false);
if (taskElement.isUpdatedFromTimesheets()) {
if (orderElement.hasTimesheetsReportingHours()) {
setStartDateAndConstraint(taskElement, orderElement
.getSumChargedEffort().getFirstTimesheetDate());
Date lastTimesheetDate = orderElement.getSumChargedEffort()
@ -80,6 +81,7 @@ public class AdaptPlanningCommand implements IAdaptPlanningCommand {
removeTimesheetsProgressIfAny(orderElement);
}
taskElement.setUpdatedFromTimesheets(true);
updateTask(context, taskElement);
}
}