IS_Trebic/isspst
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.bukova.info/repos/git/isspst

Browse Source
This commit is contained in:
František Přibyl
2014-07-09 10:19:31 +02:00
parent b633309b74 7519f4d04b
commit 51a0de2d53
12 changed files with 256 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/WEB-INF/locales/columns.properties
+5
View File
@@ -23,6 +23,11 @@ zipCode=PSČ
#Budova
code=Kód
name=Název
rooms=Místnosti
#Místnost
shortcut=Zkratka
number=Číslo
floor=Podlaží
#Uživatel
accountNonExpired=Platný
src/main/webapp/WEB-INF/locales/zk-label.properties
+4
View File
@@ -48,9 +48,13 @@ BuildingsFormTitle=Budova
BuildingsFormCode=Kód
BuildingsFormName=Název
BuildingsFormDescription=Popis
BuildingsFormAddRoom=Přidat místnost
BuildingsFormRemove=Odstranit
BuildingsGridColumnCode=Kód
BuildingsGridColumnName=Název
BuildingsGridColumnDescription=Popis
BuildingsGridRooms=Místnosti:
AgendaRooms=Místnosti
src/main/webapp/admin/workgroups/workgroups.zul
+1 -1
View File
@@ -67,7 +67,7 @@
<rows>
<template name="model" var="member">
<row visible="@load(member.role eq each)">
<label value="@load(member.member.fullName)"/>
<hbox><image src="/img/user-small-red.png"/><label value="@load(member.member.fullName)"/></hbox>
</row>
</template>
</rows>
src/main/webapp/app/navigation.zul
+1 -1
View File
@@ -33,7 +33,7 @@
<menuitem label="${labels.AgendaServices}" href="/lists/service" disabled="${not sec:isAllGranted('PERM_READ_SERVICES')}"/>
<menuitem label="${labels.AgendaMUnits}" href="/lists/munits" disabled="${not sec:isAllGranted('PERM_READ_MUNITS')}" width="120px"/>
<menuitem label="${labels.AgendaBuildings}" href="/lists/buildings" disabled="${not sec:isAllGranted('PERM_READ_BUILDINGS')}" />
<menuitem label="${labels.AgendaRooms}" href="/lists/rooms" disabled="${not sec:isAllGranted('PERM_READ_ROOMS')}" />
<!-- <menuitem label="${labels.AgendaRooms}" href="/lists/rooms" disabled="${not sec:isAllGranted('PERM_READ_ROOMS')}" /> -->
</menubar>
</tabpanel>
<tabpanel>
src/main/webapp/lists/buildings/building.zul
+70 -45
View File
@@ -5,54 +5,79 @@
<caption zclass="form-caption" label="${labels.AgendaBuildings}" />
<include src="/app/toolbar.zul" />
<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)">
<listhead menupopup="auto">
<listheader label="${labels.BuildingsGridColumnCode}" sort="czech(code)" width="10%" />
<listheader label="${labels.BuildingsGridColumnName}" sort="czech(name)" width="30%" />
<listheader label="${labels.BuildingsGridColumnDescription}" sort="czech(description)" width="60%" />
</listhead>
<auxhead sclass="category-center" visible="@load(vm.filter)">
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.code)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
<hbox width="100%">
<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)" hflex="4">
<listhead menupopup="auto">
<listheader label="${labels.BuildingsGridColumnCode}" sort="czech(code)" width="10%" />
<listheader label="${labels.BuildingsGridColumnName}" sort="czech(name)" width="30%" />
<listheader label="${labels.BuildingsGridColumnDescription}" sort="czech(description)" width="60%" />
</listhead>
<auxhead sclass="category-center" visible="@load(vm.filter)">
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.code)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
</div>
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
</auxheader>
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.name)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
</div>
</div>
</div>
</auxheader>
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.name)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
</auxheader>
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.description)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
</div>
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
</div>
</div>
</auxheader>
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.description)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
</div>
</div>
</auxheader>
</auxhead>
<template name="model">
<listitem>
<listcell label="@load(each.code)" />
<listcell label="@load(each.name)" />
<listcell label="@load(each.description)" />
</listitem>
</template>
</listbox>
</auxheader>
</auxhead>
<template name="model">
<listitem>
<listcell label="@load(each.code)" />
<listcell label="@load(each.name)" />
<listcell label="@load(each.description)" />
</listitem>
</template>
</listbox>
<vbox>
<label value="${labels.BuildingsGridRooms}"/>
<grid model="@load(vm.dataBean.rooms)" hflex="6">
<columns menupopup="auto">
<column label="${labels.code}"/>
<column label="${labels.name}"/>
<column label="${labels.shortcut}"/>
<column label="${labels.number}"/>
<column label="${labels.floor}"/>
</columns>
<rows>
<template name="model">
<row>
<label value="@bind(each.code)"/>
<label value="@bind(each.name)"/>
<label value="@bind(each.shortcut)"/>
<label value="@bind(each.number)"/>
<label value="@bind(each.floor)"/>
</row>
</template>
</rows>
</grid>
</vbox>
</hbox>
</window>
</zk>
src/main/webapp/lists/buildings/buildingForm.zul
+23 -1
View File
@@ -1,6 +1,7 @@
<?page title="${labels.BuildingsFormTitle}" contentType="text/html;charset=UTF-8"?>
<zk>
<window id="editWin" closable="true" border="normal" position="center" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('info.bukova.isspst.ui.buildings.BuildingForm')">
<window id="editWin" closable="true" border="normal" position="center" apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.buildings.BuildingForm')" width="750px">
<caption src="/img/building.png" zclass="form-caption" label="${labels.BuildingsFormTitle}" />
<vlayout>
<grid hflex="min">
@@ -29,6 +30,27 @@
</row>
</rows>
</grid>
<button image="/img/item-add.png" label="${labels.BuildingsFormAddRoom}" onClick="@command('addRoom')"/>
<listbox model="@load(vm.dataBean.rooms)">
<listhead>
<listheader label="${labels.code}"/>
<listheader label="${labels.name}"/>
<listheader label="${labels.shortcut}"/>
<listheader label="${labels.number}"/>
<listheader label="${labels.floor}"/>
<listheader/>
</listhead>
<template name="model">
<listitem>
<listcell><textbox inplace="true" value="@bind(each.code)"/></listcell>
<listcell><textbox inplace="true" value="@bind(each.name)"/></listcell>
<listcell><textbox inplace="true" value="@bind(each.shortcut)"/></listcell>
<listcell><textbox inplace="true" value="@bind(each.number)"/></listcell>
<listcell><textbox inplace="true" value="@bind(each.floor)"/></listcell>
<listcell><button image="/img/item-remove.png" label="${labels.BuildingsFormRemove}" onClick="@command('removeRoom', room=each)"/></listcell>
</listitem>
</template>
</listbox>
<include src="/app/formButtons.zul" />
</vlayout>
</window>