Merge branch 'master' of https://git.bukova.info/repos/git/isspst
Conflicts: src/main/java/info/bukova/isspst/data/Requirement.java
This commit is contained in:
@@ -16,11 +16,22 @@ RequirementsFormReqDate=Datum požadavku
|
||||
RequirementsFormCenter=Středisko
|
||||
RequirementsFormDescription=Popis
|
||||
RequirementsFormDeliveryDate=Datum dodání
|
||||
RequirementsFormFrom=Z
|
||||
RequirementsFormTo=Do
|
||||
RequirementsFormPurpose=Účel cesty
|
||||
RequirementsGridNumberSerie=Číslo
|
||||
RequirementsGridReqDate=Datum požadavku
|
||||
RequirementsGridCenter=Středisko
|
||||
RequirementsGridDescription=Popis
|
||||
RequirementsGridDeliveryDate=Datum dodání
|
||||
RequirementsGridFrom=Z
|
||||
RequirementsGridTo=Do
|
||||
RequirementsGridWorkgroup=Komise
|
||||
RequirementsGridOwnedBy=Vytvořil
|
||||
RequirementsGridMy=Moje
|
||||
RequirementsGridMyCentres=Má střediska
|
||||
RequirementsGridMyWorkgroups=Mé komise
|
||||
RequirementsGridAll=Vše
|
||||
|
||||
RequirementItemCode=Kód
|
||||
RequirementItemName=Text
|
||||
|
||||
@@ -1,46 +1,46 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<beans xmlns="http://www.springframework.org/schema/beans"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
|
||||
|
||||
<bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
|
||||
<property name="host" value="${mail.host}"/>
|
||||
<property name="port" value="${mail.port}"/>
|
||||
<property name="username" value="${mail.username}"/>
|
||||
<property name="password" value="${mail.password}"/>
|
||||
<property name="defaultEncoding" value="UTF-8"/>
|
||||
<property name="javaMailProperties">
|
||||
<props>
|
||||
<prop key="mail.smtp.auth">${mail.useauth}</prop>
|
||||
<prop key="mail.smtp.starttls.enable">${mail.usessl}</prop>
|
||||
</props>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="mailer" class="info.bukova.isspst.mail.MailerWithAttachement">
|
||||
<constructor-arg ref="mailSender"/>
|
||||
<property name="from" value="${mail.from}"/>
|
||||
</bean>
|
||||
|
||||
<bean id="simpleMailer" class="info.bukova.isspst.mail.SimpleMailer">
|
||||
<constructor-arg ref="mailSender"/>
|
||||
<property name="from" value="${mail.from}"/>
|
||||
</bean>
|
||||
|
||||
<bean id="messageBuilder" class="info.bukova.isspst.mail.EntityMessageBuilder"/>
|
||||
|
||||
<!-- <bean id="mailer" class="info.bukova.rsfaktura.services.mail.ThreadMailer"> -->
|
||||
<!-- <constructor-arg ref="attachementMailer"/> -->
|
||||
<!-- </bean> -->
|
||||
|
||||
<!-- <bean id="attachementMailer" class="info.bukova.rsfaktura.services.mail.AttachementMailer"> -->
|
||||
<!-- <constructor-arg ref="tmpStorage"/> -->
|
||||
<!-- <property name="from" value="josef.rokos@gmail.com"/> -->
|
||||
<!-- <property name="sender" ref="mailSender"/> -->
|
||||
<!-- </bean> -->
|
||||
|
||||
<!-- <bean id="messageBuilder" class="info.bukova.rsfaktura.services.mail.MailMessageBuilder"> -->
|
||||
<!-- <constructor-arg ref="tmpStorage"/> -->
|
||||
<!-- </bean> -->
|
||||
|
||||
</beans>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<beans xmlns="http://www.springframework.org/schema/beans"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
|
||||
|
||||
<bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
|
||||
<property name="host" value="${mail.host}"/>
|
||||
<property name="port" value="${mail.port}"/>
|
||||
<property name="username" value="${mail.username}"/>
|
||||
<property name="password" value="${mail.password}"/>
|
||||
<property name="defaultEncoding" value="UTF-8"/>
|
||||
<property name="javaMailProperties">
|
||||
<props>
|
||||
<prop key="mail.smtp.auth">${mail.useauth}</prop>
|
||||
<prop key="mail.smtp.starttls.enable">${mail.usessl}</prop>
|
||||
</props>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="mailer" class="info.bukova.isspst.mail.MailerWithAttachement">
|
||||
<constructor-arg ref="mailSender"/>
|
||||
<property name="from" value="${mail.from}"/>
|
||||
</bean>
|
||||
|
||||
<bean id="simpleMailer" class="info.bukova.isspst.mail.SimpleMailer">
|
||||
<constructor-arg ref="mailSender"/>
|
||||
<property name="from" value="${mail.from}"/>
|
||||
</bean>
|
||||
|
||||
<bean id="messageBuilder" class="info.bukova.isspst.mail.EntityMessageBuilder"/>
|
||||
|
||||
<!-- <bean id="mailer" class="info.bukova.rsfaktura.services.mail.ThreadMailer"> -->
|
||||
<!-- <constructor-arg ref="attachementMailer"/> -->
|
||||
<!-- </bean> -->
|
||||
|
||||
<!-- <bean id="attachementMailer" class="info.bukova.rsfaktura.services.mail.AttachementMailer"> -->
|
||||
<!-- <constructor-arg ref="tmpStorage"/> -->
|
||||
<!-- <property name="from" value="josef.rokos@gmail.com"/> -->
|
||||
<!-- <property name="sender" ref="mailSender"/> -->
|
||||
<!-- </bean> -->
|
||||
|
||||
<!-- <bean id="messageBuilder" class="info.bukova.rsfaktura.services.mail.MailMessageBuilder"> -->
|
||||
<!-- <constructor-arg ref="tmpStorage"/> -->
|
||||
<!-- </bean> -->
|
||||
|
||||
</beans>
|
||||
|
||||
@@ -70,7 +70,9 @@
|
||||
<property name="permissionEvaluator" ref="permissionEvaluator" />
|
||||
</bean>
|
||||
|
||||
<bean id="permissionEvaluator" class="info.bukova.isspst.security.IsspstPermissionEvaluator"/>
|
||||
<bean id="permissionEvaluator" class="info.bukova.isspst.security.IsspstPermissionEvaluator">
|
||||
<property name="workgroupService" ref="workgroupServiceNoTx"/>
|
||||
</bean>
|
||||
|
||||
<security:http auto-config="true" use-expressions="true">
|
||||
<security:intercept-url pattern="/app/**" access="hasAnyRole('ROLE_USER', 'ROLE_ADMIN')"/>
|
||||
@@ -161,6 +163,10 @@
|
||||
<property name="sessionFactory" ref="sessionFactory"/>
|
||||
</bean>
|
||||
|
||||
<bean id="tripReqDao" class="info.bukova.isspst.dao.jpa.TripRequirementDaoJPA">
|
||||
<property name="sessionFactory" ref="sessionFactory"/>
|
||||
</bean>
|
||||
|
||||
<!-- Business logic -->
|
||||
<bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
|
||||
|
||||
@@ -223,6 +229,10 @@
|
||||
<property name="validator" ref="validator"/>
|
||||
</bean>
|
||||
|
||||
<bean id="workgroupServiceNoTx" class="info.bukova.isspst.services.workgroups.WorkgroupServiceImpl">
|
||||
<property name="dao" ref="commissionDao"/>
|
||||
</bean>
|
||||
|
||||
<bean id="reqTypeService" class="info.bukova.isspst.services.requirement.RequirementTypeServiceImpl">
|
||||
<property name="dao" ref="reqTypeDao"/>
|
||||
<property name="validator" ref="validator"/>
|
||||
@@ -266,4 +276,10 @@
|
||||
<property name="xmlContext" ref="xmlCtxSettings" />
|
||||
</bean>
|
||||
|
||||
<bean id="tripRequirementService" class="info.bukova.isspst.services.requirement.TripRequirementServiceImpl">
|
||||
<property name="dao" ref="tripReqDao"/>
|
||||
<property name="validator" ref="validator"/>
|
||||
<property name="numberSeriesService" ref="numericSeriesService"/>
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
<tabs>
|
||||
<tab id="requirements" label="${labels.MenuRequirements}" selected="@load(vm.requirements)"/>
|
||||
<tab id="orders" label="${labels.MenuOrders}" selected="@load(vm.orders)"/>
|
||||
<tab id="trips" label="Služební cesty" selected="@load(vm.trips)"/>
|
||||
<tab id="lists" label="${labels.MenuLists}" selected="@load(vm.lists)"/>
|
||||
<tab id="settings" label="${labels.MenuSettings}" selected="@load(vm.settings)"/>
|
||||
<tab id="admin" label="${labels.MenuAdministration}" selected="@load(vm.admin)"/>
|
||||
@@ -26,6 +27,12 @@
|
||||
<menuitem label="${labels.AgendaOrdersHistory}" href="/orders/history" />
|
||||
</menubar>
|
||||
</tabpanel>
|
||||
<tabpanel>
|
||||
<menubar orient="vertical">
|
||||
<menuitem label="Požadavky" href="/trips/requirement" />
|
||||
<menuitem label="${labels.AgendaOrdersHistory}"/>
|
||||
</menubar>
|
||||
</tabpanel>
|
||||
<tabpanel>
|
||||
<menubar orient="vertical">
|
||||
<menuitem label="${labels.AgendaSuppliers}" href="/lists/addressbook" disabled="${not sec:isAllGranted('PERM_READ_ADDRESSBOOK')}"/>
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
<?page title="req toolbar" contentType="text/html;charset=UTF-8"?>
|
||||
<zk>
|
||||
<toolbar>
|
||||
<toolbarbutton image="/img/edit.png" tooltiptext="${labels.ToolbarRecEdit}" id="btnEdit" onClick="@command('edit')" disabled="@load(empty vmSub.dataBean ? 'true' : 'false')"/>
|
||||
<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')" />
|
||||
</toolbar>
|
||||
</zk>
|
||||
@@ -0,0 +1,10 @@
|
||||
<?page title="${labels.AgendaActRequirements}" contentType="text/html;charset=UTF-8"?>
|
||||
<zk>
|
||||
|
||||
<zscript>
|
||||
String gridZul = "requirements.zul";
|
||||
</zscript>
|
||||
|
||||
<include src="../../app/template.zhtml"/>
|
||||
|
||||
</zk>
|
||||
@@ -0,0 +1,610 @@
|
||||
<?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.TripRequirementList')">
|
||||
<caption
|
||||
zclass="form-caption"
|
||||
label="${labels.AgendaActRequirements}" />
|
||||
|
||||
<tabbox>
|
||||
<tabs>
|
||||
<tab label="${labels.RequirementsGridMy}"/>
|
||||
<tab label="${labels.RequirementsGridMyCentres}" disabled="@load(not vm.showCentre)"/>
|
||||
<tab label="${labels.RequirementsGridMyWorkgroups}" disabled="@load(not vm.showWorkgroup)"/>
|
||||
<tab label="${labels.RequirementsGridAll}" disabled="@load(not vm.showAll)"/>
|
||||
</tabs>
|
||||
|
||||
<tabpanels>
|
||||
<tabpanel>
|
||||
<include src="/app/toolbar.zul" />
|
||||
<listbox
|
||||
model="@load(vm.dataList)"
|
||||
selectedItem="@bind(vm.dataBean)">
|
||||
<listhead menupopup="auto">
|
||||
<listheader
|
||||
label="${labels.RequirementsGridNumberSerie}"
|
||||
sort="czech(numser)"
|
||||
width="10%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridReqDate}"
|
||||
sort="auto(reqDate)"
|
||||
width="13%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridCenter}"
|
||||
sort="auto(centre)"
|
||||
width="10%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridFrom}"
|
||||
sort="czech(from)"
|
||||
width="40%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridTo}"
|
||||
sort="czech(to)"
|
||||
width="40%" />
|
||||
</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.numser)"
|
||||
instant="true"
|
||||
onChange="@command('doFilter')"
|
||||
sclass="find-grid-textbox" />
|
||||
</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">
|
||||
<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.centre)"
|
||||
model="@load(vm.myCentres)"
|
||||
onChange="@command('doFilter')">
|
||||
<template name="model">
|
||||
<comboitem label="@load(each.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.from)"
|
||||
instant="true"
|
||||
onChange="@command('doFilter')"
|
||||
sclass="find-grid-textbox" />
|
||||
</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.to)"
|
||||
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>
|
||||
</auxhead>
|
||||
<template name="model">
|
||||
<listitem>
|
||||
<listcell label="@load(each.numser)" />
|
||||
<listcell label="@load(each.reqDate) @converter('formatedDate', format=labels.DateFormat)" />
|
||||
<listcell label="@load(each.centre.fullName)" />
|
||||
<listcell label="@load(each.from)" />
|
||||
<listcell label="@load(each.to)"/>
|
||||
</listitem>
|
||||
</template>
|
||||
</listbox>
|
||||
</tabpanel>
|
||||
|
||||
<tabpanel apply="org.zkoss.bind.BindComposer"
|
||||
viewModel="@id('vmSub') @init('info.bukova.isspst.ui.requirement.TripRequirementListCentre')">
|
||||
<include src="/requirements/toolbar.zul"/>
|
||||
|
||||
<listbox
|
||||
model="@load(vmSub.dataList)"
|
||||
selectedItem="@bind(vmSub.dataBean)">
|
||||
<listhead menupopup="auto">
|
||||
<listheader
|
||||
label="${labels.RequirementsGridNumberSerie}"
|
||||
sort="czech(numser)"
|
||||
width="10%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridReqDate}"
|
||||
sort="auto(reqDate)"
|
||||
width="13%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridCenter}"
|
||||
sort="auto(centre)"
|
||||
width="10%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridFrom}"
|
||||
sort="auto(from)"
|
||||
width="40%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridTo}"
|
||||
sort="czech(to)"
|
||||
width="40%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridOwnedBy}"
|
||||
sort="auto(ownedBy)"
|
||||
width="20%" />
|
||||
</listhead>
|
||||
<auxhead
|
||||
sclass="category-center"
|
||||
visible="@load(vmSub.filter)">
|
||||
<auxheader>
|
||||
<div sclass="find-grid-cell">
|
||||
<div sclass="find-grid-divtextbox">
|
||||
<textbox
|
||||
value="@bind(vmSub.filterTemplate.numser)"
|
||||
instant="true"
|
||||
onChange="@command('doFilter')"
|
||||
sclass="find-grid-textbox" />
|
||||
</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">
|
||||
<datebox
|
||||
value="@bind(vmSub.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(vmSub.filterTemplate.centre)"
|
||||
model="@load(vmSub.myCentres)"
|
||||
onChange="@command('doFilter')">
|
||||
<template name="model">
|
||||
<comboitem label="@load(each.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(vmSub.filterTemplate.from)"
|
||||
instant="true"
|
||||
onChange="@command('doFilter')"
|
||||
sclass="find-grid-textbox" />
|
||||
</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(vmSub.filterTemplate.to)"
|
||||
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">
|
||||
<div sclass="find-grid-divtextbox">
|
||||
<textbox
|
||||
value="@bind(vmSub.filterTemplate.ownedBy.lastName)"
|
||||
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>
|
||||
</auxhead>
|
||||
<template name="model">
|
||||
<listitem>
|
||||
<listcell label="@load(each.numser)" />
|
||||
<listcell label="@load(each.reqDate) @converter('formatedDate', format=labels.DateFormat)" />
|
||||
<listcell label="@load(each.centre.fullName)" />
|
||||
<listcell label="@load(each.from)" />
|
||||
<listcell label="@load(each.to)"/>
|
||||
<listcell label="@load(each.ownedBy)"/>
|
||||
</listitem>
|
||||
</template>
|
||||
</listbox>
|
||||
</tabpanel>
|
||||
|
||||
<tabpanel apply="org.zkoss.bind.BindComposer"
|
||||
viewModel="@id('vmSub') @init('info.bukova.isspst.ui.requirement.TripRequirementListWorkgroup')">
|
||||
<include src="/requirements/toolbar.zul"/>
|
||||
<listbox
|
||||
model="@load(vmSub.dataList)"
|
||||
selectedItem="@bind(vmSub.dataBean)">
|
||||
<listhead menupopup="auto">
|
||||
<listheader
|
||||
label="${labels.RequirementsGridNumberSerie}"
|
||||
sort="czech(numser)"
|
||||
width="10%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridReqDate}"
|
||||
sort="auto(reqDate)"
|
||||
width="13%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridCenter}"
|
||||
sort="auto(centre)"
|
||||
width="10%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridWorkgroup}"
|
||||
sort="auto(workgroup)"
|
||||
width="10%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridFrom}"
|
||||
sort="czech(from)"
|
||||
width="30%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridTo}"
|
||||
sort="czech(to)"
|
||||
width="30%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridOwnedBy}"
|
||||
sort="auto(ownedBy)"
|
||||
width="20%" />
|
||||
</listhead>
|
||||
<auxhead
|
||||
sclass="category-center"
|
||||
visible="@load(vmSub.filter)">
|
||||
<auxheader>
|
||||
<div sclass="find-grid-cell">
|
||||
<div sclass="find-grid-divtextbox">
|
||||
<textbox
|
||||
value="@bind(vmSub.filterTemplate.numser)"
|
||||
instant="true"
|
||||
onChange="@command('doFilter')"
|
||||
sclass="find-grid-textbox" />
|
||||
</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">
|
||||
<datebox
|
||||
value="@bind(vmSub.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(vmSub.filterTemplate.centre)"
|
||||
model="@load(vmSub.myCentres)"
|
||||
onChange="@command('doFilter')">
|
||||
<template name="model">
|
||||
<comboitem label="@load(each.fullName)" />
|
||||
</template>
|
||||
</combobox>
|
||||
<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(vmSub.filterTemplate.workgroup)"
|
||||
model="@load(vmSub.myWorkgroups)"
|
||||
onChange="@command('doFilter')">
|
||||
<template name="model">
|
||||
<comboitem label="@load(each.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(vmSub.filterTemplate.from)"
|
||||
instant="true"
|
||||
onChange="@command('doFilter')"
|
||||
sclass="find-grid-textbox" />
|
||||
</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(vmSub.filterTemplate.to)"
|
||||
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">
|
||||
<div sclass="find-grid-divtextbox">
|
||||
<textbox
|
||||
value="@bind(vmSub.filterTemplate.ownedBy.lastName)"
|
||||
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>
|
||||
</auxhead>
|
||||
<template name="model">
|
||||
<listitem>
|
||||
<listcell label="@load(each.numser)" />
|
||||
<listcell label="@load(each.reqDate) @converter('formatedDate', format=labels.DateFormat)" />
|
||||
<listcell label="@load(each.centre.fullName)" />
|
||||
<listcell label="@load(each.workgroup.fullName)"/>
|
||||
<listcell label="@load(each.from)" />
|
||||
<listcell label="@load(each.to)"/>
|
||||
<listcell label="@load(each.ownedBy)"/>
|
||||
</listitem>
|
||||
</template>
|
||||
</listbox>
|
||||
</tabpanel>
|
||||
|
||||
<tabpanel apply="org.zkoss.bind.BindComposer"
|
||||
viewModel="@id('vmSub') @init('info.bukova.isspst.ui.requirement.TripRequirementListAll')">
|
||||
<include src="/requirements/toolbar.zul"/>
|
||||
<listbox
|
||||
model="@load(vmSub.dataList)"
|
||||
selectedItem="@bind(vmSub.dataBean)">
|
||||
<listhead menupopup="auto">
|
||||
<listheader
|
||||
label="${labels.RequirementsGridNumberSerie}"
|
||||
sort="czech(numser)"
|
||||
width="10%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridReqDate}"
|
||||
sort="auto(reqDate)"
|
||||
width="13%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridCenter}"
|
||||
sort="auto(centre)"
|
||||
width="10%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridWorkgroup}"
|
||||
sort="auto(workgroup)"
|
||||
width="10%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridFrom}"
|
||||
sort="czech(from)"
|
||||
width="30%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridTo}"
|
||||
sort="czech(to)"
|
||||
width="30%" />
|
||||
<listheader
|
||||
label="${labels.RequirementsGridOwnedBy}"
|
||||
sort="auto(ownedBy)"
|
||||
width="20%" />
|
||||
</listhead>
|
||||
<auxhead
|
||||
sclass="category-center"
|
||||
visible="@load(vmSub.filter)">
|
||||
<auxheader>
|
||||
<div sclass="find-grid-cell">
|
||||
<div sclass="find-grid-divtextbox">
|
||||
<textbox
|
||||
value="@bind(vmSub.filterTemplate.numser)"
|
||||
instant="true"
|
||||
onChange="@command('doFilter')"
|
||||
sclass="find-grid-textbox" />
|
||||
</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">
|
||||
<datebox
|
||||
value="@bind(vmSub.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(vmSub.filterTemplate.centre)"
|
||||
model="@load(vmSub.allCentres)"
|
||||
onChange="@command('doFilter')">
|
||||
<template name="model">
|
||||
<comboitem label="@load(each.fullName)" />
|
||||
</template>
|
||||
</combobox>
|
||||
<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(vmSub.filterTemplate.workgroup)"
|
||||
model="@load(vmSub.allWorkgroups)"
|
||||
onChange="@command('doFilter')">
|
||||
<template name="model">
|
||||
<comboitem label="@load(each.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(vmSub.filterTemplate.from)"
|
||||
instant="true"
|
||||
onChange="@command('doFilter')"
|
||||
sclass="find-grid-textbox" />
|
||||
</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(vmSub.filterTemplate.to)"
|
||||
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">
|
||||
<div sclass="find-grid-divtextbox">
|
||||
<textbox
|
||||
value="@bind(vmSub.filterTemplate.ownedBy.lastName)"
|
||||
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>
|
||||
</auxhead>
|
||||
<template name="model">
|
||||
<listitem>
|
||||
<listcell label="@load(each.numser)" />
|
||||
<listcell label="@load(each.reqDate) @converter('formatedDate', format=labels.DateFormat)" />
|
||||
<listcell label="@load(each.centre.fullName)" />
|
||||
<listcell label="@load(each.workgroup.fullName)"/>
|
||||
<listcell label="@load(each.from)" />
|
||||
<listcell label="@load(each.to)"/>
|
||||
<listcell label="@load(each.ownedBy)"/>
|
||||
</listitem>
|
||||
</template>
|
||||
</listbox>
|
||||
</tabpanel>
|
||||
</tabpanels>
|
||||
</tabbox>
|
||||
|
||||
|
||||
|
||||
</window>
|
||||
</zk>
|
||||
@@ -0,0 +1,90 @@
|
||||
<?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.TripRequirementForm')">
|
||||
<caption
|
||||
src="/img/reqact.png"
|
||||
zclass="form-caption"
|
||||
label="${labels.RequirementsFormTitle}" />
|
||||
<vlayout>
|
||||
<grid hflex="min">
|
||||
<columns>
|
||||
<column
|
||||
align="right"
|
||||
hflex="min" />
|
||||
<column />
|
||||
</columns>
|
||||
<rows>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormNumberSerie} :</cell>
|
||||
<cell>
|
||||
<textbox
|
||||
id="numser"
|
||||
constraint="@load(vm.constriant)"
|
||||
width="200px"
|
||||
value="@bind(vm.dataBean.numser)"
|
||||
readonly="true" />
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormReqDate} :</cell>
|
||||
<cell>
|
||||
<datebox
|
||||
id="reqDate"
|
||||
width="200px"
|
||||
value="@bind(vm.dataBean.reqDate)"
|
||||
format="${labels.DateFormat}" />
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormCenter} :</cell>
|
||||
<cell>
|
||||
<combobox
|
||||
model="@load(vm.centres)"
|
||||
readonly="true"
|
||||
selectedItem="@bind(vm.dataBean.centre)">
|
||||
<template name="model">
|
||||
<comboitem label="@load(each.fullName)" />
|
||||
</template>
|
||||
</combobox>
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormFrom} :</cell>
|
||||
<cell>
|
||||
<textbox
|
||||
id="from"
|
||||
width="300px"
|
||||
value="@bind(vm.dataBean.from)" />
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormTo} :</cell>
|
||||
<cell>
|
||||
<textbox
|
||||
id="to"
|
||||
width="300px"
|
||||
value="@bind(vm.dataBean.to)" />
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormPurpose} :</cell>
|
||||
<cell>
|
||||
<textbox
|
||||
id="description"
|
||||
width="300px"
|
||||
value="@bind(vm.dataBean.description)" />
|
||||
</cell>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
|
||||
<include src="/app/formButtons.zul" />
|
||||
</vlayout>
|
||||
</window>
|
||||
</zk>
|
||||
Reference in New Issue
Block a user