Merge branch 'master' of https://git.bukova.info/repos/git/isspst
Conflicts: src/main/webapp/WEB-INF/spring/mail-services.xml
This commit is contained in:
@@ -10,7 +10,17 @@ MenuUser=Uživatel
|
||||
|
||||
AgendaActRequirements=Aktuální požadavky
|
||||
AgendaRequirementsHistory=Ukončené požadavky
|
||||
RequirementsFormTitle="Požadavek"
|
||||
RequirementsFormTitle=Požadavek
|
||||
RequirementsFormNumberSerie=Číslo
|
||||
RequirementsFormReqDate=Datum požadavku
|
||||
RequirementsFormCenter=Středisko
|
||||
RequirementsFormDescription=Popis
|
||||
RequirementsFormDeliveryDate=Datum dodání
|
||||
RequirementsGridNumberSerie=Číslo
|
||||
RequirementsGridReqDate=Datum požadavku
|
||||
RequirementsGridCenter=Středisko
|
||||
RequirementsGridDescription=Popis
|
||||
RequirementsGridDeliveryDate=Datum dodání
|
||||
|
||||
AgendaMyOrders=Aktuální
|
||||
AgendaOrdersHistory=Ukončené
|
||||
@@ -166,4 +176,8 @@ DbValidationError=Chyba validace
|
||||
|
||||
true=Ano
|
||||
false=Ne
|
||||
|
||||
DateFormat=dd. MM. yyyy
|
||||
|
||||
AddItem=Přidat položku...
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
<property name="hibernateProperties">
|
||||
<props>
|
||||
<prop key="hibernate.dialect">${jdbc.dialect}</prop>
|
||||
<prop key="hibernate.show_sql">true</prop>
|
||||
<prop key="hibernate.show_sql">false</prop>
|
||||
<prop key="hibernate.hbm2ddl.auto">update</prop>
|
||||
</props>
|
||||
</property>
|
||||
@@ -223,7 +223,7 @@
|
||||
<property name="validator" ref="validator"/>
|
||||
</bean>
|
||||
|
||||
<bean id="reqTypeService" class="info.bukova.isspst.services.requirements.RequirementTypeServiceImpl">
|
||||
<bean id="reqTypeService" class="info.bukova.isspst.services.requirement.RequirementTypeServiceImpl">
|
||||
<property name="dao" ref="reqTypeDao"/>
|
||||
<property name="validator" ref="validator"/>
|
||||
</bean>
|
||||
@@ -231,6 +231,7 @@
|
||||
<bean id="requirementService" class="info.bukova.isspst.services.requirement.RequirementServiceImpl">
|
||||
<property name="dao" ref="requirementDao" />
|
||||
<property name="validator" ref="validator" />
|
||||
<property name="numberSeriesService" ref="numericSeriesService" />
|
||||
</bean>
|
||||
|
||||
<bean id="numericSeriesService" class="info.bukova.isspst.services.numberseries.NumberSeriesServiceImpl">
|
||||
|
||||
@@ -1,43 +1,28 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!DOCTYPE zk.xml>
|
||||
<zk>
|
||||
<!-- [Optional]
|
||||
Uncomment if you want to defines the application's name
|
||||
|
||||
<preference>
|
||||
<name>org.zkoss.zk.ui.WebApp.name</name>
|
||||
<value>rsfaktura</value>
|
||||
</preference>
|
||||
-->
|
||||
|
||||
<!-- [Optional] Uncomment if you want to defines the application's name <preference> <name>org.zkoss.zk.ui.WebApp.name</name> <value>rsfaktura</value> </preference> -->
|
||||
<client-config>
|
||||
<debug-js>true</debug-js>
|
||||
</client-config>
|
||||
<library-property>
|
||||
<name>org.zkoss.web.classWebResource.cache</name>
|
||||
<value>false</value>
|
||||
</library-property>
|
||||
|
||||
<system-config>
|
||||
<label-location>/WEB-INF/locales/zk-label.properties</label-location>
|
||||
<label-location>/WEB-INF/locales/columns.properties</label-location>
|
||||
<label-location>/WEB-INF/locales/validators.properties</label-location>
|
||||
</system-config>
|
||||
|
||||
<debug-js>true</debug-js>
|
||||
</client-config>
|
||||
<library-property>
|
||||
<name>org.zkoss.web.classWebResource.cache</name>
|
||||
<value>false</value>
|
||||
</library-property>
|
||||
<system-config>
|
||||
<label-location>/WEB-INF/locales/zk-label.properties</label-location>
|
||||
<label-location>/WEB-INF/locales/columns.properties</label-location>
|
||||
<label-location>/WEB-INF/locales/validators.properties</label-location>
|
||||
</system-config>
|
||||
<language-config>
|
||||
<addon-uri>/WEB-INF/lang-addons/mapa-lang-addon.xml</addon-uri>
|
||||
<addon-uri>/WEB-INF/lang-addons/ckez-bind-lang-addon.xml</addon-uri>
|
||||
<addon-uri>/WEB-INF/lang-addons/CzechSortListheader.xml</addon-uri>
|
||||
</language-config>
|
||||
|
||||
<addon-uri>/WEB-INF/lang-addons/mapa-lang-addon.xml</addon-uri>
|
||||
<addon-uri>/WEB-INF/lang-addons/ckez-bind-lang-addon.xml</addon-uri>
|
||||
<addon-uri>/WEB-INF/lang-addons/CzechSortListheader.xml</addon-uri>
|
||||
</language-config>
|
||||
<desktop-config>
|
||||
<theme-uri>/css/zk-modify.css</theme-uri>
|
||||
<theme-uri>/css/form.css</theme-uri>
|
||||
<theme-uri>/css/page.css</theme-uri>
|
||||
</desktop-config>
|
||||
|
||||
<!-- <library-property>
|
||||
<name>org.zkoss.zul.progressbox.position</name>
|
||||
<value>center</value>
|
||||
</library-property> -->
|
||||
</zk>
|
||||
<!-- <library-property> <name>org.zkoss.zul.progressbox.position</name> <value>center</value> </library-property> -->
|
||||
</zk>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
@@ -1,22 +1,50 @@
|
||||
<?page title="${labels.AgendaActRequirements}" contentType="text/html;charset=UTF-8"?>
|
||||
<zk>
|
||||
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
|
||||
<window border="normal" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.RequirementList')">
|
||||
<caption zclass="form-caption" label="${labels.AgendaActRequirements}" />
|
||||
<window
|
||||
border="normal"
|
||||
apply="org.zkoss.bind.BindComposer"
|
||||
viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.RequirementList')">
|
||||
<caption
|
||||
zclass="form-caption"
|
||||
label="${labels.AgendaActRequirements}" />
|
||||
<include src="/app/toolbar.zul" />
|
||||
|
||||
<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)">
|
||||
<listbox
|
||||
model="@load(vm.dataList)"
|
||||
selectedItem="@bind(vm.dataBean)">
|
||||
<listhead menupopup="auto">
|
||||
<listheader label="${labels.BuildingsGridColumnCode}" sort="czech(numser)" width="10%" />
|
||||
<listheader label="${labels.BuildingsGridColumnName}" sort="auto(reqDate)" width="30%" />
|
||||
<listheader label="${labels.BuildingsGridColumnDescription}" sort="czech(description)" width="60%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridNumberSerie}"
|
||||
sort="czech(numser)"
|
||||
width="7%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridReqDate}"
|
||||
sort="auto(reqDate)"
|
||||
width="13%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridCenter}"
|
||||
sort="czech(description)"
|
||||
width="10%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridDescription}"
|
||||
sort="czech(description)"
|
||||
width="70%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridDeliveryDate}"
|
||||
sort="auto(reqDate)"
|
||||
width="13%" />
|
||||
</listhead>
|
||||
|
||||
<auxhead sclass="category-center" visible="@load(vm.filter)">
|
||||
<auxhead
|
||||
sclass="category-center"
|
||||
visible="@load(vm.filter)">
|
||||
<auxheader>
|
||||
<div sclass="find-grid-cell">
|
||||
<div sclass="find-grid-divtextbox">
|
||||
<textbox value="@bind(vm.filterTemplate.numser)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
|
||||
<textbox
|
||||
value="@bind(vm.filterTemplate.numser)"
|
||||
instant="true"
|
||||
onChange="@command('doFilter')"
|
||||
sclass="find-grid-textbox" />
|
||||
</div>
|
||||
<div sclass="find-grid-img">
|
||||
<image src="/img/funnel.png" />
|
||||
@@ -26,7 +54,42 @@
|
||||
<auxheader>
|
||||
<div sclass="find-grid-cell">
|
||||
<div sclass="find-grid-divtextbox">
|
||||
<datebox value="@bind(vm.filterTemplate.reqDate)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
|
||||
<datebox
|
||||
value="@bind(vm.filterTemplate.reqDate)"
|
||||
format="${labels.DateFormat}"
|
||||
instant="true"
|
||||
onChange="@command('doFilter')"
|
||||
sclass="find-grid-textbox"
|
||||
width="100%" />
|
||||
</div>
|
||||
<div sclass="find-grid-img">
|
||||
<image src="/img/funnel.png" />
|
||||
</div>
|
||||
</div>
|
||||
</auxheader>
|
||||
<auxheader>
|
||||
<div sclass="find-grid-cell">
|
||||
<combobox
|
||||
readonly="true"
|
||||
width="100%"
|
||||
selectedItem="@bind(vm.filterTemplate.workgroup)">
|
||||
<template name="modelW">
|
||||
<comboitem label="@load(each.workgroup.fullName)" />
|
||||
</template>
|
||||
</combobox>
|
||||
<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" />
|
||||
@@ -36,7 +99,13 @@
|
||||
<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" />
|
||||
<datebox
|
||||
value="@bind(vm.filterTemplate.deliveryDate)"
|
||||
format="${labels.DateFormat}"
|
||||
instant="true"
|
||||
onChange="@command('doFilter')"
|
||||
sclass="find-grid-textbox"
|
||||
width="100%" />
|
||||
</div>
|
||||
<div sclass="find-grid-img">
|
||||
<image src="/img/funnel.png" />
|
||||
@@ -44,15 +113,15 @@
|
||||
</div>
|
||||
</auxheader>
|
||||
</auxhead>
|
||||
|
||||
<template name="model">
|
||||
<listitem>
|
||||
<listcell label="@load(each.numser)" />
|
||||
<listcell label="@load(each.reqDate)" />
|
||||
<listcell label="@load(each.reqDate) @converter('formatedDate', format=labels.DateFormat)" />
|
||||
<listcell label="@load(each.workgroup.fullName)" />
|
||||
<listcell label="@load(each.description)" />
|
||||
<listcell label="@load(each.deliveryDate) @converter('formatedDate', format=labels.DateFormat)" />
|
||||
</listitem>
|
||||
</template>
|
||||
</listbox>
|
||||
|
||||
</window>
|
||||
</zk>
|
||||
@@ -1,34 +1,87 @@
|
||||
<?page title="${labels.RequirementsFormTitle}" 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.requirement.RequirementForm')">
|
||||
<caption src="/img/reqact.png" zclass="form-caption" label="RequirementsFormTitle" />
|
||||
<window
|
||||
id="editWin"
|
||||
closable="true"
|
||||
border="normal"
|
||||
position="center"
|
||||
apply="org.zkoss.bind.BindComposer"
|
||||
viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.RequirementForm')">
|
||||
<caption
|
||||
src="/img/reqact.png"
|
||||
zclass="form-caption"
|
||||
label="${labels.RequirementsFormTitle}" />
|
||||
<vlayout>
|
||||
<grid hflex="min">
|
||||
<columns>
|
||||
<column align="right" hflex="min" />
|
||||
<column
|
||||
align="right"
|
||||
hflex="min" />
|
||||
<column />
|
||||
</columns>
|
||||
<rows>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.BuildingsFormCode} :</cell>
|
||||
<cell sclass="row-title">${labels.RequirementsFormNumberSerie} :</cell>
|
||||
<cell>
|
||||
<textbox id="code" constraint="@load(vm.constriant)" width="200px" value="@bind(vm.dataBean.numser)" />
|
||||
<textbox
|
||||
id="numser"
|
||||
constraint="@load(vm.constriant)"
|
||||
width="200px"
|
||||
value="@bind(vm.dataBean.numser)"
|
||||
readonly="true" />
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.BuildingsFormName} :</cell>
|
||||
<cell sclass="row-title">${labels.RequirementsFormReqDate} :</cell>
|
||||
<cell>
|
||||
<datebox id="name" width="200px" value="@bind(vm.dataBean.reqDate)" />
|
||||
<datebox
|
||||
id="reqDate"
|
||||
width="200px"
|
||||
value="@bind(vm.dataBean.reqDate)"
|
||||
format="${labels.DateFormat}" />
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.BuildingsFormDescription} :</cell>
|
||||
<cell sclass="row-title">${labels.RequirementsFormCenter} :</cell>
|
||||
<cell>
|
||||
<textbox id="description" width="300px" value="@bind(vm.dataBean.description)" />
|
||||
<combobox
|
||||
model="@load(vm.centres)"
|
||||
readonly="true"
|
||||
selectedItem="@bind(vm.dataBean.workgroup)">
|
||||
<template name="model">
|
||||
<comboitem label="@load(each.fullName)" />
|
||||
</template>
|
||||
</combobox>
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormDescription} :</cell>
|
||||
<cell>
|
||||
<textbox
|
||||
id="description"
|
||||
width="300px"
|
||||
value="@bind(vm.dataBean.description)" />
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormDeliveryDate} :</cell>
|
||||
<cell>
|
||||
<datebox
|
||||
id="deliveryDate"
|
||||
width="200px"
|
||||
value="@bind(vm.dataBean.deliveryDate)"
|
||||
format="${labels.DateFormat}" />
|
||||
</cell>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
<hbox>
|
||||
<button
|
||||
image="/img/item-add.png"
|
||||
label="${labels.AddItem}"
|
||||
onClick="@command('addItem')"
|
||||
sclass="nicebutton" />
|
||||
</hbox>
|
||||
<include src="/app/formButtons.zul" />
|
||||
</vlayout>
|
||||
</window>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?page title="${labels.AgendaWorkflow}" contentType="text/html;charset=UTF-8"?>
|
||||
<zk>
|
||||
<window border="normal" apply="org.zkoss.bind.BindComposer"
|
||||
viewModel="@id('vm') @init('info.bukova.isspst.ui.requirements.RequirementTypesVM')">
|
||||
viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.RequirementTypesVM')">
|
||||
<caption zclass="form-caption" label="${labels.AgendaWorkflow}" />
|
||||
<vbox>
|
||||
<hbox>
|
||||
|
||||
Reference in New Issue
Block a user