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

Bug #1494: Deadline field disabled for subcontracted tasks, it corresponds to

Browse source 
delivery date.

FEA: ItEr76S04BugFixing
This commit is contained in:
Jacobo Aragunde Pérez 2012-07-13 10:44:32 +02:00
parent 1a60df1110
commit c370dccc65
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java
View file

@ -141,6 +141,8 @@ public class SubcontractModel implements ISubcontractModel {
}
task.removeAllSatisfiedResourceAllocations();
task.setDeadline(new LocalDate(currentSubcontractedTaskData
.getLastRequiredDeliverDate()));
Task.convertOnStartInFixedDate(task);
}

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

@ -99,6 +99,8 @@ public class TaskPropertiesController extends GenericForwardComposer {
private Datebox endDateBox;
private Datebox deadLineDateBox;
private Combobox startConstraintTypes;
private Datebox startConstraintDate;
@ -144,6 +146,7 @@ public class TaskPropertiesController extends GenericForwardComposer {
startConstraintTypes.setDisabled(disabledConstraintsAndAllocations);
startConstraintDate.setDisabled(disabledConstraintsAndAllocations);
lbResourceAllocationType.setDisabled(disabledConstraintsAndAllocations);
deadLineDateBox.setDisabled(currentTaskElement.isSubcontracted());
if (context != null) {
taskEditFormComposer.init(context.getRelativeTo(), context.getTask());