diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/boundusers/api/TaskDTO.java b/libreplan-webapp/src/main/java/org/libreplan/ws/boundusers/api/TaskDTO.java index fd2790293..f0548bd06 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/boundusers/api/TaskDTO.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/boundusers/api/TaskDTO.java @@ -41,6 +41,9 @@ public class TaskDTO { @XmlAttribute public String code; + @XmlAttribute(name = "project-code") + public String projectCode; + @XmlAttribute(name = "project-name") public String projectName; @@ -61,12 +64,13 @@ public class TaskDTO { public TaskDTO() {} - public TaskDTO(String name, String code, String projectName, - XMLGregorianCalendar startDate, XMLGregorianCalendar endDate, - BigDecimal progressValue, XMLGregorianCalendar progressDate, - String effort) { + public TaskDTO(String name, String code, String projectCode, + String projectName, XMLGregorianCalendar startDate, + XMLGregorianCalendar endDate, BigDecimal progressValue, + XMLGregorianCalendar progressDate, String effort) { this.name = name; this.code = code; + this.projectCode = projectCode; this.projectName = projectName; this.startDate = startDate; this.endDate = endDate; diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/boundusers/impl/TaskConverter.java b/libreplan-webapp/src/main/java/org/libreplan/ws/boundusers/impl/TaskConverter.java index 6feac7ca4..00b98b15c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/boundusers/impl/TaskConverter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/boundusers/impl/TaskConverter.java @@ -55,7 +55,7 @@ public final class TaskConverter { } return new TaskDTO(task.getName(), orderElement.getCode(), orderElement - .getOrder().getName(), + .getOrder().getCode(), orderElement.getOrder().getName(), DateConverter.toXMLGregorianCalendar(task.getStartDate()), DateConverter.toXMLGregorianCalendar(task.getEndDate()), progressValue,