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

Bug #1489: Build UpdateDeliveringDate requests placing the client code in the

Browse source 
correct place.

FEA: ItEr76S04BugFixing
This commit is contained in:
Jacobo Aragunde Pérez 2012-07-11 13:07:25 +02:00
parent 2d5273b1a6
commit 6603e8dd92
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksModel.java
View file

@ -212,7 +212,7 @@ public class SubcontractedTasksModel implements ISubcontractedTasksModel {
private void makeSubcontractRequestRequest_UpdateDeliverDate(SubcontractedTaskData subcontractedTaskData)
throws ConnectionProblemsException, UnrecoverableErrorServiceException {
UpdateDeliveringDateDTO updateDeliveringDateDTO = SubcontractedTaskDataConverter
.toUpdateDeliveringDateDTO(subcontractedTaskData);
.toUpdateDeliveringDateDTO(getCompanyCode(), subcontractedTaskData);
ExternalCompany externalCompany = subcontractedTaskData
.getExternalCompany();
@ -384,7 +384,7 @@ public class SubcontractedTasksModel implements ISubcontractedTasksModel {
public String exportXML_UpdateSubcontractor(SubcontractedTaskData subcontractedTaskData){
subcontractedTaskDataDAO.reattachUnmodifiedEntity(subcontractedTaskData);
UpdateDeliveringDateDTO updateDeliveringDateDTO = SubcontractedTaskDataConverter
.toUpdateDeliveringDateDTO(subcontractedTaskData);
.toUpdateDeliveringDateDTO(getCompanyCode(), subcontractedTaskData);
StringWriter xml = new StringWriter();
try {

6
libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/SubcontractedTaskDataConverter.java
View file

@ -51,15 +51,15 @@ public final class SubcontractedTaskDataConverter {
toXmlDate(getDeliverDate(subcontractedTaskData)));
}
public final static UpdateDeliveringDateDTO toUpdateDeliveringDateDTO(SubcontractedTaskData subTaskData){
public final static UpdateDeliveringDateDTO toUpdateDeliveringDateDTO(
String companyCode, SubcontractedTaskData subTaskData) {
String customerReference = subTaskData.getSubcontractedCode();
XMLGregorianCalendar deliverDate = toXmlDate(getDeliverDate(subTaskData));
if(!subTaskData.getRequiredDeliveringDates().isEmpty()){
deliverDate = toXmlDate(subTaskData.getRequiredDeliveringDates().first().getSubcontractorDeliverDate());
}
String companyNif = subTaskData.getExternalCompany().getNif();
String externalCode = subTaskData.getTask().getOrderElement().getCode();
return new UpdateDeliveringDateDTO(customerReference, externalCode, companyNif,deliverDate);
return new UpdateDeliveringDateDTO(customerReference, externalCode, companyCode, deliverDate);
}
private final static XMLGregorianCalendar toXmlDate(Date date) {