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

Implementovano prepinani ciselnych rad podle obdobi.

Browse Source 
closes #262
This commit is contained in:
pepa
2016-01-22 14:24:58 +01:00
parent d2aa1cbd9a
commit 012ad06358
46 changed files with 1061 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/WEB-INF/locales/zk-label.properties
+13
View File
@@ -431,3 +431,16 @@ ContextMenu = Volby v kontextovém menu
ErrMaterialOrServiceDescription=Zadejte popis požadavku.
SeasonsSeason = Období
SeasonsNewSeason = Nové období
SeasonsDescription = Popis
SeasonsValidFrom = Platí od
SeasonsValidTo = Platí do
SeasonsActive = Aktivní
SeasonsActivate = Aktivovat
SeasonsActiveNumSeries = Číselné řady pro aktivní období:
SeasonsAgenda = Agenda
SeasonsPrefix = Prefix
SeasonsNewSeasonDialog = Opravdu chcete založit nové období?
Active_season_not_set = Není nastaveno žádné aktivní období.
src/main/webapp/WEB-INF/spring/root-context.xml
+12
View File
@@ -191,6 +191,10 @@
<bean id="sessionData" class="info.bukova.isspst.SessionData" scope="session">
<aop:scoped-proxy/>
</bean>
<bean id="hqlFilter" class="info.bukova.isspst.services.HqlDataFilter" scope="request">
<aop:scoped-proxy/>
</bean>
<!-- DAO -->
<bean id="queryDao" class="info.bukova.isspst.dao.jpa.QueryDaoJPA">
@@ -280,6 +284,10 @@
<bean id="signedDocumentDao" class="info.bukova.isspst.dao.jpa.SignedDocumentDaoJPA">
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
<bean id="seasonDao" class="info.bukova.isspst.dao.jpa.SeasonDaoJPA">
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
<!-- Business logic -->
<bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
@@ -466,4 +474,8 @@
<bean id="signedDocumentService" class="info.bukova.isspst.services.signeddocs.SignedDocumentServiceImpl">
<property name="dao" ref="signedDocumentDao"/>
</bean>
<bean id="seasonService" class="info.bukova.isspst.services.settings.SeasonServiceImpl">
<property name="dao" ref="seasonDao"/>
</bean>
</beans>
src/main/webapp/app/toolbar.zul
+9
View File
@@ -6,5 +6,14 @@
<toolbarbutton image="/img/delete.png" tooltiptext="${labels.ToolbarRecDelete}" id="btnDelete" onClick="@command('delete')" disabled="@load(not vm.ableToDelete)" />
<toolbarbutton image="/img/funnel.png" tooltiptext="${labels.ToolbarRecFilter}" id="btnFilter" onClick="@command('filter')" />
<toolbarbutton image="/img/print.png" tooltiptext="${labels.ToolbarPrint}" id="btnPrint" onClick="@command('onPrint')" />
<label value="${labels.SeasonsSeason}" visible="@load(vm.seasonFilter)"/>
<combobox model="@load(vm.seasons)"
selectedItem="@bind(vm.selSeason)"
onChange="@command('filterSeason')"
visible="@load(vm.seasonFilter)">
<template name="model">
<comboitem label="@load(each.description)" style="@load(each.active ? 'font-weight: bold' : '')"/>
</template>
</combobox>
</toolbar>
</zk>
src/main/webapp/main/invoicing/shared/invoicingGrid.zul
+1 -1
View File
@@ -189,7 +189,7 @@
<listcell label="@load(each.requirement.sumTotal) @converter(vm.standardBigDecimalConverter)" />
<listcell
label="@load(each.totalInvoiced) @converter(vm.standardBigDecimalConverter)"
style="@load(vm.dataBean.totalInvoiced gt vm.dataBean.requirement.sumTotal ? ' color: red;' : '' )" />
style="@load(each.totalInvoiced gt each.requirement.sumTotal ? ' color: red;' : '' )" />
</listitem>
</template>
</listbox>
src/main/webapp/main/orders/requirements/reqListMyAll.zul
+2
View File
@@ -5,6 +5,8 @@
itemRenderer="@load(vm.requirementsItemRenderer)"
selectedItem="@bind(vm.dataBean)"
model="@load(vm.dataList)"
mold="paging"
autopaging="true"
onAfterRender="@command('afterRender')"
selectedIndex="@bind(vm.selIndex)">
<listhead menupopup="auto">
src/main/webapp/main/orders/requirements/reqListMyCenters.zul
+2
View File
@@ -4,6 +4,8 @@
hflex="7"
itemRenderer="@load(vm.requirementsItemRenderer)"
selectedItem="@bind(vm.dataBean)"
mold="paging"
autopaging="true"
model="@load(vm.dataList)"
onAfterRender="@command('afterRender')"
selectedIndex="@bind(vm.selIndex)">
src/main/webapp/main/orders/requirements/reqListMyWorkgroups.zul
+2
View File
@@ -4,6 +4,8 @@
hflex="7"
itemRenderer="@load(vm.requirementsItemRenderer)"
selectedItem="@bind(vm.dataBean)"
mold="paging"
autopaging="true"
model="@load(vm.dataList)"
onAfterRender="@command('afterRender')"
selectedIndex="@bind(vm.selIndex)">
src/main/webapp/main/toolbar.zul
+9
View File
@@ -5,5 +5,14 @@
<toolbarbutton image="/img/delete.png" tooltiptext="${labels.ToolbarRecDelete}" id="btnDelete" onClick="@command('delete')" disabled="@load(not vm.ableToDelete)" />
<toolbarbutton image="/img/funnel.png" tooltiptext="${labels.ToolbarRecFilter}" id="btnFilter" onClick="@command('filter')" />
<toolbarbutton image="/img/print.png" tooltiptext="${labels.ToolbarPrint}" id="btnPrint" onClick="@command('onPrint')" />
<label value="${labels.SeasonsSeason}" visible="@load(vm.seasonFilter)"/>
<combobox model="@load(vm.seasons)"
selectedItem="@bind(vm.selSeason)"
onChange="@command('filterSeason')"
visible="@load(vm.seasonFilter)">
<template name="model">
<comboitem label="@load(each.description)" style="@load(each.active ? 'font-weight: bold' : '')"/>
</template>
</combobox>
</toolbar>
</zk>
src/main/webapp/main/trips/bill/tripBillGridInt.zul
+2
View File
@@ -10,6 +10,8 @@
vflex="1"
hflex="7"
model="@load(vm.dataList)"
mold="paging"
autopaging="true"
selectedItem="@bind(vm.dataBean)"
itemRenderer="@load(vm.itemRenderer)"
onAfterRender="@command('afterRender')"
src/main/webapp/main/trips/requirements/reqListMy.zul
-1
View File
@@ -2,7 +2,6 @@
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<window
vflex="1"
border="normal"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.TripRequirementList')">
<include src="/app/toolbar.zul" />
src/main/webapp/main/trips/requirements/reqListMyAll.zul
+2 -1
View File
@@ -4,7 +4,6 @@
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<window
vflex="1"
border="normal"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.TripRequirementListAll')">
<include src="/main/toolbar.zul" />
@@ -12,6 +11,8 @@
<listbox
model="@load(vm.dataList)"
selectedItem="@bind(vm.dataBean)"
mold="paging"
autopaging="true"
hflex="7"
onAfterRender="@command('afterRender')"
selectedIndex="@bind(vm.selIndex)"
src/main/webapp/main/trips/requirements/reqListMyCenters.zul
+2 -1
View File
@@ -2,7 +2,6 @@
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<window
vflex="1"
border="normal"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.TripRequirementListCentre')">
<include src="/main/toolbar.zul" />
@@ -10,6 +9,8 @@
<listbox
model="@load(vm.dataList)"
selectedItem="@bind(vm.dataBean)"
mold="paging"
autopaging="true"
hflex="7"
onAfterRender="@command('afterRender')"
selectedIndex="@bind(vm.selIndex)"
src/main/webapp/main/trips/requirements/reqListMyWorkgroups.zul
+2 -1
View File
@@ -2,7 +2,6 @@
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<window
vflex="1"
border="normal"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.TripRequirementListWorkgroup')">
<include src="/main/toolbar.zul" />
@@ -10,6 +9,8 @@
<listbox
model="@load(vm.dataList)"
selectedItem="@bind(vm.dataBean)"
mold="paging"
autopaging="true"
hflex="7"
onAfterRender="@command('afterRender')"
selectedIndex="@bind(vm.selIndex)"
src/main/webapp/settings/seasons.zul
+62
View File
@@ -0,0 +1,62 @@
<?page title="${labels.TravelOrdersFormTitle}" contentType="text/html;charset=UTF-8"?>
<zk xmlns="http://www.zkoss.org/2005/zul"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.zkoss.org/2005/zul http://www.zkoss.org/2005/zul/zul.xsd">
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<window id="editWin"
border="normal"
closable="true"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.settings.SeasonsVM')"
width="750px"
height="600px">
<caption
src="/img/global-setting-032.png"
zclass="form-caption"
label="${labels.SeasonsSeason}" />
<vbox>
<button label="${labels.SeasonsNewSeason}" onClick="@command('addSeason')" sclass="nicebutton"/>
<listbox model="@load(vm.seasons)">
<listhead>
<listheader label="${labels.SeasonsDescription}"/>
<listheader label="${labels.SeasonsValidFrom}"/>
<listheader label="${labels.SeasonsValidTo}"/>
<listheader label="${labels.SeasonsActive}"/>
</listhead>
<template name="model">
<listitem>
<listcell>
<textbox value="@bind(each.description)" inplace="true"/>
</listcell>
<listcell label="@load(each.validFrom)"/>
<listcell label="@load(each.validTo)"/>
<listcell>
<button label="${labels.SeasonsActivate}" onClick="@command('activate', season=each)" disabled="@load(each.active)" sclass="nicebutton"/>
</listcell>
</listitem>
</template>
</listbox>
<label value="${labels.SeasonsActiveNumSeries}"/>
<listbox model="@load(vm.numSeries)">
<listhead>
<listheader label="${labels.SeasonsAgenda}"/>
<listheader label="${labels.SeasonsPrefix}"/>
<listheader/>
</listhead>
<template name="model">
<listitem>
<listcell label="@load(vm.moduleMap[each.module].name)"/>
<listcell>
<textbox value="@bind(each.prefix)" inplace="true"/>
</listcell>
<listcell label="@load(each.number)"/>
</listitem>
</template>
</listbox>
<include src="/app/formButtons.zul" />
</vbox>
</window>
</zk>