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

set the fields "Subcontracting date" and "Subcontracting communication

Browse source 
date" in the subcontractor pop-up in read only mode.

FEA: ItEr75S32AnA15S04UpdateDeliveringDateInSubcontracting
This commit is contained in:
Susana Montes Pedreira 2012-03-23 16:48:24 +00:00
parent 6a6b52e98a
commit b66af392e7
3 changed files with 12 additions and 20 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/SubcontractedTasksController.java
View file

@ -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)

24
libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul
View file

@ -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')}" />

4
libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul
View file

@ -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)" />