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

ItEr26S10CUCreacionProxectoPlanificacionItEr25S11: Applied interface fixes to worker edition window

Browse source
This commit is contained in:
Lorenzo Tilve 2009-09-16 19:05:23 +02:00 • committed by Javier Moran Rua
parent 6ab644b3ed
commit cf697cb775
4 changed files with 65 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -184,3 +184,8 @@ table {
.z-window-embedded-hl {
display:none;
}
.subtitulo {
color:#007bbe;
font-weight:bold;
}

8
navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul
View file

@ -4,8 +4,8 @@
<window id="${arg.top_id}" title="${arg.title}">
<tabbox>
<tabs>
<tab label="${i18n:_('Edit')}"></tab>
<tab label="${i18n:_('Places')}"></tab>
<tab label="${i18n:_('Personal data')}"></tab>
<tab label="${i18n:_('Locations')}"></tab>
<tab label="${i18n:_('Work record')}"></tab>
<tab label="${i18n:_('Calendar')}"></tab>
</tabs>
@ -13,8 +13,8 @@
<tabpanel>
<grid fixedLayout="false">
<columns>
<column label="${i18n:_('Type')}" />
<column label="${i18n:_('Content')}" />
<column width="200px" />
<column />
</columns>
<rows>
<row>

104
navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul
View file

@ -1,52 +1,58 @@
<vbox id="localizationsContainer" style="padding: 10px">
<hbox>
<vbox id="localizationsContainer">
<hbox>
<vbox>
<label class="subtitulo" value="${i18n:_('Assigned locations')}" />
<listbox id="activeSatisfactions" mold="paging"
model="@{controller.localizations.activeSatisfactions}"
pageSize="5" multiple="true" checkmark="true">
<listhead>
<listheader label="${i18n:_('Grup')}"
sort="auto(criterion.name)"></listheader>
<listheader label="${i18n:_('Starting date')}"
sort="auto(startDate)" />
</listhead>
<listitem self="@{each='satisfaction'}" value="@{satisfaction}">
<listcell label="@{satisfaction.criterion.name}"></listcell>
<listcell label="@{satisfaction.startDate}"></listcell>
</listitem>
</listbox>
</vbox>
<vbox>
<button id="unassignButton" label="${i18n:_('&gt;&gt;')}"></button>
<button id="assignButton" label="${i18n:_('&lt;&lt;')}"></button>
</vbox>
<label class="titulo" value="${i18n:_('Assigned locations')}" />
<listbox id="activeSatisfactions" mold="paging" model="@{controller.localizations.activeSatisfactions}"
pageSize="5" multiple="true" checkmark="true">
<listhead>
<listheader label="${i18n:_('Grup')}" sort="auto(criterion.name)"></listheader>
<listheader label="${i18n:_('Starting date')}" sort="auto(startDate)" />
</listhead>
<listitem self="@{each='satisfaction'}" value="@{satisfaction}">
<listcell label="@{satisfaction.criterion.name}"></listcell>
<listcell label="@{satisfaction.startDate}"></listcell>
</listitem>
</listbox>
<vbox>
<label class="subtitulo" value="${i18n:_('Non-assigned locations')}" />
<listbox id="criterionsNotAssigned" mold="paging"
model="@{controller.localizations.criterionsNotAssigned}"
pageSize="5" multiple="true" checkmark="true">
<listhead>
<listheader label="${i18n:_('Group')}"
sort="auto(name)"></listheader>
</listhead>
<listitem self="@{each='criterion'}" value="@{criterion}">
<listcell label="@{criterion.name}"></listcell>
</listitem>
</listbox>
</vbox>
</hbox>
<vbox>
<button id="unassignButton" label="${i18n:_('&gt;&gt;')}"></button>
<button id="assignButton" label="${i18n:_('&lt;&lt;')}"></button>
</vbox>
<label class="titulo" value="${i18n:_('Non-assigned locations')}" />
<listbox id="criterionsNotAssigned" mold="paging" model="@{controller.localizations.criterionsNotAssigned}"
pageSize="5" multiple="true" checkmark="true">
<listhead>
<listheader label="${i18n:_('Group')}" sort="auto(name)"></listheader>
</listhead>
<listitem self="@{each='criterion'}" value="@{criterion}">
<listcell label="@{criterion.name}"></listcell>
</listitem>
</listbox>
</hbox>
<label class="titulo" value="${i18n:_('Log')}" />
<grid id="listing" model="@{controller.localizations.localizationsHistory}"
mold="paging" pageSize="5">
<columns>
<column label="${i18n:_('Group')}" sort="auto(criterion.name)" />
<column label="${i18n:_('Starting date')}" sort="auto(startDate)" />
<column label="${i18n:_('Ending date')}" sort="auto(endDate)" />
</columns>
<rows>
<row self="@{each='satisfaction'}">
<label value="@{satisfaction.criterion.name}" />
<label value="@{satisfaction.startDate}" />
<label value="@{satisfaction.endDate}" />
</row>
</rows>
</grid>
</vbox>
<label class="subtitulo" value="${i18n:_('Log')}" />
<grid id="listing" model="@{controller.localizations.localizationsHistory}"
mold="paging" pageSize="5">
<columns>
<column label="${i18n:_('Group')}" sort="auto(criterion.name)" />
<column label="${i18n:_('Starting date')}" sort="auto(startDate)" />
<column label="${i18n:_('Ending date')}" sort="auto(endDate)" />
</columns>
<rows>
<row self="@{each='satisfaction'}">
<label value="@{satisfaction.criterion.name}" />
<label value="@{satisfaction.startDate}" />
<label value="@{satisfaction.endDate}" />
</row>
</rows>
</grid>
</vbox>

2
navalplanner-webapp/src/main/webapp/resources/worker/worker.zul
View file

@ -19,7 +19,7 @@
<list top_id="listWindow" />
<edition top_id="createWindow" title="${i18n:_('Create')}"
save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
<edition top_id="editWindow" title="${i18n:_('Edit personal data')}"
<edition top_id="editWindow" title="${i18n:_('Edit worker')}"
save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
<workRelationships top_id="workRelationshipsWindow" title="${i18n:_('Work relationships')}"
save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />