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

update the end date of the subcontracted task according to the end date

Browse source 
communication sent by the subcontractor.

FEA: ItEr76S21UpdateEndDateToCustomer
This commit is contained in:
Susana Montes Pedreira 2012-06-15 18:39:21 +01:00
parent 6e9b96b77a
commit 5386c1eec5
3 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -325,7 +325,7 @@ public class SubcontractController extends GenericForwardComposer {
if (lastEndDateReported != null) {
if (lastEndDateReported.equals(endDateFromSubcontractor)) {
Date newEndDate = lastEndDateReported.getEndDate();
Date endDateTask = taskEditFormComposer.getTaskDTO().deadlineDate;
Date endDateTask = taskEditFormComposer.getTaskDTO().endDate;
if (endDateTask != null) {
return (newEndDate.compareTo(endDateTask) != 0);
}
@ -338,8 +338,9 @@ public class SubcontractController extends GenericForwardComposer {
}
public void updateTaskEnd(Date date) {
this.subcontractModel.setEndDate(date);
if (taskEditFormComposer != null) {
taskEditFormComposer.getTaskDTO().deadlineDate = date;
taskEditFormComposer.getTaskDTO().endDate = date;
}
refressGridEndDates();
}

27
libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java
View file

@ -99,8 +99,6 @@ public class TaskPropertiesController extends GenericForwardComposer {
private Datebox endDateBox;
private Datebox deadLineDateBox;
private Combobox startConstraintTypes;
private Datebox startConstraintDate;
@ -115,6 +113,8 @@ public class TaskPropertiesController extends GenericForwardComposer {
private ResourceAllocationTypeEnum originalState;
private boolean disabledConstraintsAndAllocations = false;
public void init(final EditTaskController editTaskController,
IContextWithPlannerTask<TaskElement> context,
TaskElement taskElement) {
@ -134,15 +134,16 @@ public class TaskPropertiesController extends GenericForwardComposer {
originalState = getResourceAllocationType(currentTaskElement);
setOldState(originalState);
boolean disabled = currentTaskElement
disabledConstraintsAndAllocations = currentTaskElement
.isSubcontractedAndWasAlreadySent()
|| currentTaskElement.isLimitingAndHasDayAssignments();
if (!disabled && (currentTaskElement.isTask())) {
disabled = ((Task) currentTaskElement).isManualAnyAllocation();
if (!disabledConstraintsAndAllocations && (currentTaskElement.isTask())) {
disabledConstraintsAndAllocations = ((Task) currentTaskElement)
.isManualAnyAllocation();
}
startConstraintTypes.setDisabled(disabled);
startConstraintDate.setDisabled(disabled);
lbResourceAllocationType.setDisabled(disabled);
startConstraintTypes.setDisabled(disabledConstraintsAndAllocations);
startConstraintDate.setDisabled(disabledConstraintsAndAllocations);
lbResourceAllocationType.setDisabled(disabledConstraintsAndAllocations);
if (context != null) {
taskEditFormComposer.init(context.getRelativeTo(), context.getTask());
@ -414,7 +415,11 @@ public class TaskPropertiesController extends GenericForwardComposer {
ok = saveConstraintChanges();
}
if (ok) {
taskEditFormComposer.acceptWithoutCopyingDates();
if (disabledConstraintsAndAllocations) {
taskEditFormComposer.accept();
} else {
taskEditFormComposer.acceptWithoutCopyingDates();
}
}
}
@ -692,8 +697,8 @@ public class TaskPropertiesController extends GenericForwardComposer {
return taskEditFormComposer;
}
public void refreshTaskDeadline() {
Util.reloadBindings(deadLineDateBox);
public void refreshTaskEndDate() {
Util.reloadBindings(endDateBox);
}
public String getMoneyFormat() {

2
libreplan-webapp/src/main/webapp/planner/editTask.zul
View file

@ -63,7 +63,7 @@
<tabbox id="editTaskTabbox">
<tabs>
<tab id="taskPropertiesTab" label="${i18n:_('Task properties')}"
onSelect = "propertiesController.refreshTaskDeadline();"/>
onSelect = "propertiesController.refreshTaskEndDate();"/>
<tab id="resourceAllocationTab" label="${i18n:_('Non limiting resource allocation')}" />
<tab id="limitingResourceAllocationTab" label="${i18n:_('Limiting resource allocation')}" />
<tab id="subcontractTab" label="${i18n:_('Subcontract')}"