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

Do globálního nastavení byla přidaná sekce pro nastavení cestovních

Browse Source 
náhrad. 
refs #112
This commit is contained in:
Josef Rokos
2014-08-06 09:27:15 +02:00
parent 0a4ba55b82
commit 7f1f214b5d
7 changed files with 141 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/WEB-INF/locales/zk-label.properties
+3
View File
@@ -157,6 +157,9 @@ BankCode=Kód banky
AccountNumber=Číslo účtu
TravelOrders=Cestovní příkazy
GlobalSettingsVehicles=Dopravní prostředky
GlobalSettingsRefunds=Náhrady
GlobalSettingsFreeMealsCount=Počet jídel zdarma
GlobalSettingsHours=Hodin
CentresForRequirements=Střediska, pro která lze vkládat požadavky
WorkgroupMembership=Členství v komisích
src/main/webapp/WEB-INF/spring/root-context.xml
+5
View File
@@ -275,6 +275,11 @@
<prop key="org.exolab.castor.xml.introspector.primitive.nodetype">element</prop>
</props>
</property>
<property name="mappingLocations">
<list>
<value>info/bukova/isspst/services/settings/mappingSettings.xml</value>
</list>
</property>
</bean>
<bean id="unmarshallerSettings" class="org.castor.spring.xml.CastorUnmarshallerFactoryBean">
src/main/webapp/settings/global/travelOrders.zul
+57 -20
View File
@@ -1,23 +1,60 @@
<?page title="travel orders" contentType="text/html;charset=UTF-8"?>
<zk>
<vbox>
<label value="Dopravní prostředky:"/>
<button label="${labels.AddItem}" onClick="@command('addVehicle')"/>
<grid model="@load(vm.settings.vehicles)">
<columns>
<column label="${labels.code}"/>
<column label="${labels.name}"/>
<column/>
</columns>
<rows>
<template name="model">
<row>
<textbox inplace="true" value="@bind(each.code)"/>
<textbox inplace="true" value="@bind(each.description)"/>
<button label="${labels.RemoveItem}" onClick="@command('removeVehicle', vehicle=each)"/>
</row>
</template>
</rows>
</grid>
</vbox>
<tabbox>
<tabs>
<tab label="${labels.GlobalSettingsRefunds}"/>
<tab label="${labels.GlobalSettingsVehicles}"/>
</tabs>
<tabpanels>
<tabpanel>
<grid model="@load(vm.refundsHours)">
<auxhead>
<auxheader colspan="1"/>
<auxheader label="${labels.GlobalSettingsFreeMealsCount}" colspan="4"/>
</auxhead>
<columns>
<column label="${labels.GlobalSettingsHours}"/>
<column label="0"/>
<column label="1"/>
<column label="2"/>
<column label="3"/>
</columns>
<rows>
<template name="model">
<row>
<label value="@load(each)"/>
<textbox value="@bind(vm.settings.refunds[each][0])" inplace="true"/>
<textbox value="@bind(vm.settings.refunds[each][1])" inplace="true"/>
<textbox value="@bind(vm.settings.refunds[each][2])" inplace="true"/>
<textbox value="@bind(vm.settings.refunds[each][3])" inplace="true"/>
</row>
</template>
</rows>
</grid>
</tabpanel>
<tabpanel>
<vbox>
<button label="${labels.AddItem}" onClick="@command('addVehicle')" sclass="nicebutton"/>
<grid model="@load(vm.settings.vehicles)">
<columns>
<column label="${labels.code}"/>
<column label="${labels.name}"/>
<column/>
</columns>
<rows>
<template name="model">
<row>
<textbox inplace="true" value="@bind(each.code)"/>
<textbox inplace="true" value="@bind(each.description)"/>
<button label="${labels.RemoveItem}" onClick="@command('removeVehicle', vehicle=each)"/>
</row>
</template>
</rows>
</grid>
</vbox>
</tabpanel>
</tabpanels>
</tabbox>
</zk>