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

Avoid update task end date when subcontracting a task

Browse source 
Somehow related to bug #1521 but a different problem.

FEA: ItEr76S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2012-07-26 17:21:40 +02:00
parent 9b1fc4d75b
commit 7d917c2170
3 changed files with 10 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libreplan-webapp/src/main/java/org/libreplan/web/planner/order/ISubcontractModel.java
View file

@ -58,7 +58,6 @@ public interface ISubcontractModel {
boolean hasResourceAllocations();
Date getEndDate();
void setEndDate(Date endDate);
void removeSubcontractedTaskData();

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

@ -127,14 +127,6 @@ public class SubcontractController extends GenericForwardComposer {
}
}
public Date getEndDate() {
return subcontractModel.getEndDate();
}
public void setEndDate(Date endDate) {
subcontractModel.setEndDate(endDate);
}
public void removeSubcontractedTaskData() {
subcontractModel.removeSubcontractedTaskData();
}

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

@ -36,6 +36,7 @@ import org.libreplan.business.planner.entities.SubcontractState;
import org.libreplan.business.planner.entities.SubcontractedTaskData;
import org.libreplan.business.planner.entities.SubcontractorDeliverDate;
import org.libreplan.business.planner.entities.Task;
import org.libreplan.business.workingday.IntraDayDate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
@ -58,8 +59,8 @@ public class SubcontractModel implements ISubcontractModel {
*/
private Task task;
private org.zkoss.ganttz.data.Task ganttTask;
private Date startDate;
private Date endDate;
private IntraDayDate startDate;
private IntraDayDate endDate;
private SubcontractedTaskData subcontractedTaskData;
private SubcontractedTaskData currentSubcontractedTaskData;
@ -74,8 +75,8 @@ public class SubcontractModel implements ISubcontractModel {
@Transactional(readOnly = true)
public void init(Task task, org.zkoss.ganttz.data.Task ganttTask) {
this.task = task;
this.startDate = task.getStartDate();
this.endDate = task.getEndDate();
this.startDate = task.getIntraDayStartDate();
this.endDate = task.getIntraDayEndDate();
this.ganttTask = ganttTask;
@ -90,7 +91,7 @@ public class SubcontractModel implements ISubcontractModel {
this.addDeliverDate(task.getDeadline().toDateMidnight()
.toDate());
} else {
this.addDeliverDate(getEndDate());
this.addDeliverDate(task.getEndDate());
}
} else {
subcontractedTaskDataDAO.reattach(subcontractedTaskData);
@ -152,8 +153,8 @@ public class SubcontractModel implements ISubcontractModel {
}
private void recalculateTaskLength() {
task.setStartDate(startDate);
task.setEndDate(endDate);
task.setIntraDayStartDate(startDate);
task.setIntraDayEndDate(endDate);
ganttTask.enforceDependenciesDueToPositionPotentiallyModified();
}
@ -188,14 +189,10 @@ public class SubcontractModel implements ISubcontractModel {
return false;
}
@Override
public Date getEndDate() {
return endDate;
}
@Override
public void setEndDate(Date endDate) {
this.endDate = endDate;
this.endDate = IntraDayDate.startOfDay(LocalDate
.fromDateFields(endDate));
}
@Override