From d3361ac0c9ff81feaa5711a8642b19d9899b9b04 Mon Sep 17 00:00:00 2001
From: Alba Carro <alba.carro@gmail.com>
Date: Sun, 2 Sep 2012 13:43:43 +0200
Subject: [PATCH] Adds functionality to import the deadline

FEA: ItEr77S05BasicProjectImport
---
 .../org/libreplan/importers/MPXJProjectFileConversor.java   | 6 ++++++
 .../src/main/java/org/libreplan/importers/OrderDTO.java     | 5 +++++
 .../main/java/org/libreplan/importers/OrderElementDTO.java  | 5 +++++
 .../java/org/libreplan/importers/OrderImporterMPXJ.java     | 4 ++++
 4 files changed, 20 insertions(+)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/MPXJProjectFileConversor.java b/libreplan-webapp/src/main/java/org/libreplan/importers/MPXJProjectFileConversor.java
index cb40d6480..1c44aa216 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/importers/MPXJProjectFileConversor.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/importers/MPXJProjectFileConversor.java
@@ -114,6 +114,10 @@ public class MPXJProjectFileConversor {
 
         importData.startDate = header.getStartDate();
 
+        // MPXJ don't provide a deadline for the project so we take the finish
+        // date
+        importData.deadline = header.getFinishDate();
+
         for (Task task : file.getChildTasks()) {
             // Projects are represented as a level 0 task with all
             // real task as its children. Ignore all other top level tasks.
@@ -209,6 +213,8 @@ public class MPXJProjectFileConversor {
 
         importTask.totalHours = durationToIntHours(task.getDuration(), header);
 
+        importTask.deadline = task.getDeadline();
+
         return importTask;
 
     }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/OrderDTO.java b/libreplan-webapp/src/main/java/org/libreplan/importers/OrderDTO.java
index 2fcbfd45a..202af4148 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/importers/OrderDTO.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/importers/OrderDTO.java
@@ -43,6 +43,11 @@ public class OrderDTO {
      */
     public Date startDate;
 
+    /**
+     * Deadline of the project
+     */
+    public Date deadline;
+
     /**
      * Order created with this data
      */
diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/OrderElementDTO.java b/libreplan-webapp/src/main/java/org/libreplan/importers/OrderElementDTO.java
index 69ca72cf6..157b443a8 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/importers/OrderElementDTO.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/importers/OrderElementDTO.java
@@ -49,6 +49,11 @@ public class OrderElementDTO {
      */
     public Date endDate;
 
+    /**
+     * end date of the task
+     */
+    public Date deadline;
+
     /**
      * Order created with this data
      */
diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/OrderImporterMPXJ.java b/libreplan-webapp/src/main/java/org/libreplan/importers/OrderImporterMPXJ.java
index 27273db03..0e4dceebb 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/importers/OrderImporterMPXJ.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/importers/OrderImporterMPXJ.java
@@ -183,6 +183,8 @@ public class OrderImporterMPXJ implements IOrderImporter {
 
         orderElement.setInitDate(project.startDate);
 
+        orderElement.setDeadline(project.deadline);
+
         ((Order) orderElement).calculateAndSetTotalHours();
 
         project.order = (Order) orderElement;
@@ -242,6 +244,8 @@ public class OrderImporterMPXJ implements IOrderImporter {
 
         orderElement.setName(task.name);
 
+        orderElement.setDeadline(task.deadline);
+
         task.orderElement = orderElement;
 
         return orderElement;