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

ItEr29S05RFControlAvancesIncompatiblesEnUnidadesTraballoItEr28S05: Rebuilt appearance of orderelement details edit tab

Browse source
This commit is contained in:
Lorenzo Tilve 2009-10-12 01:15:26 +02:00 • committed by Javier Moran Rua
parent 19fd4315c6
commit e2dbc4c2c8
3 changed files with 57 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
View file

@ -229,7 +229,6 @@ public class OrderElementController extends GenericForwardComposer {
((Intbox) window.getFellow("totalHours")).setDisabled(true);
// Hide not needed buttons
window.getFellow("manageCriterions").setVisible(false);
window.getFellow("addHoursGroup").setVisible(false);
window.getFellow("deleteHoursGroup").setVisible(false);
} else {
@ -237,7 +236,6 @@ public class OrderElementController extends GenericForwardComposer {
((Intbox) window.getFellow("totalHours")).setDisabled(false);
// Show needed buttons
window.getFellow("manageCriterions").setVisible(true);
window.getFellow("addHoursGroup").setVisible(true);
window.getFellow("deleteHoursGroup").setVisible(true);
@ -265,9 +263,9 @@ public class OrderElementController extends GenericForwardComposer {
});
}
// selectCriterions Vbox is always hidden
reloadSelectedCriterionTypes();
window.getFellow("selectCriterions").setVisible(false);
window.getFellow("selectCriterions").setVisible(true);
window.getFellow("hoursGroupsListbox").invalidate();

5
navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
View file

@ -331,6 +331,11 @@ button.z-button {
.z-textbox,.z-decimalbox,.z-intbox,.z-longbox,
.z-doublebox, .z-datebox, .z-datebox-inp, .z-datebox-focus .z-datebox-inp {
font-family: Tahoma, Arial, Helvetica, sans-serif;
}
.leftpanelgap .z-textbox,.leftpanelgap .z-decimalbox,.leftpanelgap .z-intbox,
.leftpanelgap .z-longbox,.leftpanelgap .z-doublebox,.leftpanelgap .z-datebox,
.leftpanelgap .z-datebox-inp,.leftpanelgap .z-datebox-focus .z-datebox-inp {
font-size: 11px;
}

86
navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
View file

@ -31,28 +31,29 @@
</tabs>
<tabpanels>
<tabpanel>
<vbox>
<grid fixedLayout="true">
<columns>
<column width="200px" />
<column />
</columns>
<label value="${arg.title}" />
<hbox>
<label value="${i18n:_('Order element name')}" />
<textbox id="name"
value="@{orderElementController.orderElement.name,
save-when='backButton.onClick'}" />
<label value="${i18n:_('Code ')}" />
<rows>
<row>
<label value="${i18n:_('Order element name')}" />
<textbox id="name"
value="@{orderElementController.orderElement.name,save-when='backButton.onClick'}" constraint="no empty" width="500px"/>
</row>
<row>
<label value="${i18n:_('Code ')}" />
<textbox id="code"
value="@{orderElementController.orderElement.code,
save-when='backButton.onClick'}" />
</hbox>
save-when='backButton.onClick'}" constraint="no empty" width="150px"/>
</row>
<hbox>
<row>
<label value="${i18n:_('Starting date')}" />
<datebox id="initDate"
<hbox><datebox id="initDate"
value="@{orderElementController.orderElement.initDate,
save-when='backButton.onClick'}" />
<checkbox id="mandatoryInit"
@ -60,9 +61,10 @@
save-when='backButton.onClick'" />
<label value="${i18n:_('Mandatory')}" />
</hbox>
<hbox>
</row>
<row>
<label value="${i18n:_('Ending date')}" />
<hbox>
<datebox id="endDate"
value="@{orderElementController.orderElement.endDate,
save-when='backButton.onClick'}" />
@ -71,35 +73,50 @@
save-when='backButton.onClick'}" />
<label value="${i18n:_('Mandatory')}" />
</hbox>
</row>
<hbox>
<row>
<label value="${i18n:_('Total hours')}" />
<intbox id="totalHours"
value="@{orderElementController.orderElement.workHours}" />
</row>
<row>
<label value="${i18n:_('Description')}" />
<textbox id="description" rows="3"
value="@{orderElementController.orderElement.description,
save-when='backButton.onClick'}" width="600px" />
</row>
</rows>
</grid>
<panel title="${i18n:_('Hours group')}">
<panelchildren>
<hbox>
<button id="addHoursGroup" label="${i18n:_('Add new hours group')}"
onClick="orderElementController.addHoursGroup();" />
<button id="deleteHoursGroup" label="${i18n:_('Delete hours group')}"
onClick="orderElementController.deleteHoursGroups();" />
</hbox>
<listbox id="hoursGroupsListbox" multiple="true"
model="@{orderElementController.hoursGroups}"
itemRenderer="@{orderElementController.renderer}">
<listhead sizable="true">
itemRenderer="@{orderElementController.renderer}" rows="3">
<listhead sizable="false">
<listheader label="${i18n:_('Hours')}" />
<listheader label="${i18n:_('%')}" />
</listhead>
</listbox>
<hbox>
<button id="addHoursGroup" label="${i18n:_('Add hours group')}"
onClick="orderElementController.addHoursGroup();" />
<button id="deleteHoursGroup" label="${i18n:_('Delete hours group')}"
onClick="orderElementController.deleteHoursGroups();" />
<button id="manageCriterions" label="${i18n:_('Manage criterions')}"
onClick="orderElementController.manageCriterions();" />
</hbox>
</panelchildren>
</panel>
<panel title="${i18n:_('Manage criterions')}">
<panelchildren>
<vbox id="selectCriterions">
<label value="${i18n:_('Manage criterions')}" />
<twowayselector
assignedObjects="@{orderElementController.selectedCriterionTypes,
access='both'}"
@ -111,17 +128,14 @@
</vbox>
<textbox id="description" rows="4"
value="@{orderElementController.orderElement.description,
save-when='backButton.onClick'}" />
<hbox>
<button id="backButton"
onClick="orderElementController.back();"
label="${arg.back_button_label}" />
</hbox>
</panelchildren>
</vbox>
</panel>
</tabpanel>
<tabpanel>
<listOrderElementHours/>