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

Bug #1522: Use delivery date as deadline when subcontracting tasks

Browse source 
FEA: ItEr76S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2012-07-26 12:22:04 +02:00
parent f9a3e30694
commit 9b1fc4d75b
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractServiceREST.java
View file

@ -332,17 +332,19 @@ public class SubcontractServiceREST implements ISubcontractService {
order.setCustomerReference(subcontractedTaskDataDTO.subcontractedCode); order.setCustomerReference(subcontractedTaskDataDTO.subcontractedCode);
order.setWorkBudget(subcontractedTaskDataDTO.subcontractPrice); order.setWorkBudget(subcontractedTaskDataDTO.subcontractPrice);
if (subcontractedTaskDataDTO.deliverDate != null) {
Date deliveryDate = DateConverter
.toDate(subcontractedTaskDataDTO.deliverDate);
DeadlineCommunication deadlineCommunication = DeadlineCommunication
.create(new Date(), deliveryDate);
order.getDeliveringDates().add(deadlineCommunication);
order.setDeadline(deliveryDate);
}
synchronizeWithSchedule(order, synchronizeWithSchedule(order,
TaskSource.persistTaskSources(taskSourceDAO)); TaskSource.persistTaskSources(taskSourceDAO));
order.writeSchedulingDataChanges(); order.writeSchedulingDataChanges();
if (subcontractedTaskDataDTO.deliverDate != null) {
DeadlineCommunication deadlineCommunication = DeadlineCommunication
.create(new Date(), DateConverter
.toDate(subcontractedTaskDataDTO.deliverDate));
order.getDeliveringDates().add(deadlineCommunication);
}
order.validate(); order.validate();
orderElementDAO.save(order); orderElementDAO.save(order);