From f6200b56bc883ab80b8296b58f1ddd0c1b43ed84 Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Thu, 22 Mar 2012 08:29:44 +0000
Subject: [PATCH] Change the value format of the last progress in sent
 communications from subcontractors.

FEA: ItEr75S30SubcontractorIncommingCommunicationsLists
---
 .../planner/entities/SubcontractorCommunicationValue.java   | 4 ++--
 .../main/webapp/subcontract/subcontractorCommunications.zul | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunicationValue.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunicationValue.java
index 371556358..0278e4828 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunicationValue.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorCommunicationValue.java
@@ -99,7 +99,7 @@ public class SubcontractorCommunicationValue implements INewObject {
     @Override
     public String toString() {
         String datetime = (date == null) ? "" : new SimpleDateFormat(
-                "dd/MM/yyyy HH:mm").format(date);
-        return progress.toString() + " - " + datetime;
+                "dd/MM/yyyy").format(date);
+        return progress.toString() + "% - " + datetime;
     }
 }
diff --git a/libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul b/libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul
index 0da5ac6f9..3f22956cb 100644
--- a/libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul
+++ b/libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul
@@ -64,13 +64,13 @@
     <popup id="pp">
         <grid id="listingValues" width="300px" fixedLayout="true">
 			<columns>
-                <column label="${i18n:_('Date')}" width="150px" sort="auto(date)" sortDirection="descending"/>
-                <column label="${i18n:_('Progress')}" width="150px" sort="auto(progress)" sortDirection="descending"/>
+                <column label="${i18n:_('Progress %')}" width="150px"/>
+                <column label="${i18n:_('Date')}" width="150px"/>
             </columns>
             <rows>
                 <row self="@{each='value'}" value="@{value}">
-                    <label value="@{value.date,converter='org.libreplan.web.common.typeconverters.DateConverter'}" />
                     <label value="@{value.progress}"/>
+                    <label value="@{value.date,converter='org.libreplan.web.common.typeconverters.DateConverter'}" />
                 </row>
             </rows>
         </grid>