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

ItEr45S08CUMarcarUnidadeTraballoExportableItEr44S13: Converting in START_ON_FIXED_DATE tasks that are subcontracted.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2010-01-28 16:54:17 +01:00 • committed by Javier Moran Rua
parent 89bae2e9e5
commit 99f14c1335
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractModel.java
View file

@ -27,8 +27,10 @@ import org.navalplanner.business.common.exceptions.ValidationException;
import org.navalplanner.business.externalcompanies.daos.IExternalCompanyDAO;
import org.navalplanner.business.externalcompanies.entities.ExternalCompany;
import org.navalplanner.business.planner.daos.ISubcontractedTaskDataDAO;
import org.navalplanner.business.planner.entities.StartConstraintType;
import org.navalplanner.business.planner.entities.SubcontractedTaskData;
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.planner.entities.TaskStartConstraint;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
@ -105,12 +107,22 @@ public class SubcontractModel implements ISubcontractModel {
}
task.removeAllResourceAllocations();
convertOnStartOnFixedDate(task);
}
recalculateTaskLength();
}
}
private void convertOnStartOnFixedDate(Task task) {
TaskStartConstraint taskConstraint = task.getStartConstraint();
if (taskConstraint.isValid(StartConstraintType.START_IN_FIXED_DATE,
task.getStartDate())) {
taskConstraint.update(StartConstraintType.START_IN_FIXED_DATE, task
.getStartDate());
}
}
private void recalculateTaskLength() {
Date previousStartDate = ganttTask.getBeginDate();
long previousLength = ganttTask.getLengthMilliseconds();

6
navalplanner-webapp/src/main/webapp/planner/order.zul
View file

@ -89,10 +89,12 @@
<row id="startConstraint">
<label value="${i18n:_('Constraint')}" />
<vbox>
<combobox id="startConstraintTypes">
<combobox id="startConstraintTypes"
disabled="@{editController.isSubcontractedAndIsTask}">
</combobox>
<datebox id="startConstraintDate" constraint ="no empty"
value="@{editController.startConstraintDate}" />
value="@{editController.startConstraintDate}"
disabled="@{editController.isSubcontractedAndIsTask}" />
</vbox>
</row>
<row id="subcontract" visible="@{editController.isTask}">