From b66af392e7d9ab5f8ffc65fef28749acd633fe85 Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Fri, 23 Mar 2012 16:48:24 +0000
Subject: [PATCH] set the fields "Subcontracting date" and "Subcontracting
 communication date" in the subcontractor pop-up in read only mode.

FEA: ItEr75S32AnA15S04UpdateDeliveringDateInSubcontracting
---
 .../SubcontractedTasksController.java         |  4 ++--
 .../taskpanels/_tabPanelSubcontract.zul       | 24 +++++++------------
 .../webapp/subcontract/subcontractedTasks.zul |  4 ++--
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java
index 8e5288203..3face18da 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java
@@ -5,7 +5,7 @@
  *                         Desenvolvemento Tecnolóxico de Galicia
  * Copyright (C) 2010-2011 Igalia, S.L.
  *
- * Copyright (C) 2011 WirelessGalicia, S.L.
+ * Copyright (C) 2011-2012 WirelessGalicia, S.L.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -62,8 +62,8 @@ import org.zkoss.zul.api.Window;
 
 /**
  * Controller for operations related with subcontracted tasks.
- *
  * @author Manuel Rego Casasnovas <mrego@igalia.com>
+ * @author Susana Montes Pedreira <smontes@wirelessgalicia.com>
  */
 @org.springframework.stereotype.Component
 @Scope(BeanDefinition.SCOPE_PROTOTYPE)
diff --git a/libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul b/libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul
index cec798c01..c830abe53 100644
--- a/libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul
+++ b/libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul
@@ -41,24 +41,16 @@
             </row>
 
             <row>
-                <label value="${i18n:_('Subcontratation date')}" />
-                <hbox>
-                    <datebox value="@{subController.subcontractedTaskData.subcontratationDate}"
-                        disabled="true" visible="@{subController.notSent}"/>
-                    <label value="@{subController.subcontractedTaskData.subcontratationDate,
-                       converter='org.libreplan.web.common.typeconverters.DateConverter'}"
-                       visible="@{subController.sent}"/>
-                </hbox>
+                <label value="${i18n:_('Subcontracting date')}" />
+                <label value="@{subController.subcontractedTaskData.subcontratationDate,
+                   converter='org.libreplan.web.common.typeconverters.DateConverter'}"
+                   visible="@{subController.sent}"/>
             </row>
             <row>
-                <label value="${i18n:_('Subcontract communication date')}" />
-                <hbox>
-                    <datebox value="@{subController.subcontractedTaskData.subcontractCommunicationDate}"
-                        disabled="true" visible="@{subController.notSent}"/>
-                    <label value="@{subController.subcontractedTaskData.subcontractCommunicationDate,
-                       converter='org.libreplan.web.common.typeconverters.DateConverter'}"
-                       visible="@{subController.sent}"/>
-                </hbox>
+                <label value="${i18n:_('Subcontracting communication date')}" />
+                <label value="@{subController.subcontractedTaskData.subcontractCommunicationDate,
+                   converter='org.libreplan.web.common.typeconverters.DateConverter'}"
+                   visible="@{subController.sent}"/>
             </row>
             <row>
                 <label value="${i18n:_('Work description')}" />
diff --git a/libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul b/libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul
index 63da8260a..3bcb1cae6 100644
--- a/libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul
+++ b/libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul
@@ -40,8 +40,8 @@
         rowRenderer="@{controller.subcontractedTasksRenderer}"
         mold="paging" pageSize="10" fixedLayout="true">
         <columns>
-            <column label="${i18n:_('Subcontratation')}"
-                    tooltiptext="${i18n:_('Subcontratation date')}" sort="auto(subcontratationdate)" />
+            <column label="${i18n:_('Subcontracting date')}"
+                    tooltiptext="${i18n:_('Subcontracting date')}" sort="auto(subcontratationDate)" />
             <column label="${i18n:_('Communication')}" sort="auto(communicationdate)"
                 tooltiptext="${i18n:_('Communication date')}" />
             <column label="${i18n:_('Company')}" tooltiptext="${i18n:_('External company')}" sort="auto(externalcompany)" />