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

Merge branch 'Verze_1.0'

Browse Source 
Conflicts:
	src/main/java/info/bukova/isspst/AppInitListener.java
	src/main/java/info/bukova/isspst/Constants.java
	src/main/java/info/bukova/isspst/data/Order.java
	src/main/java/info/bukova/isspst/data/OrderItem.java
	src/main/java/info/bukova/isspst/data/RequirementBase.java
	src/main/java/info/bukova/isspst/data/RequirementItem.java
	src/main/java/info/bukova/isspst/ui/settings/NumberSeriesVM.java
This commit is contained in:
František Přibyl
2015-01-19 13:29:41 +01:00
parent ee2539000c d37076cd27
commit 61a4b3ba82
78 changed files with 818 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/WEB-INF/spring/root-context.xml
+9 -1
View File
@@ -187,6 +187,10 @@
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
<bean id="dbInfoDao" class="info.bukova.isspst.dao.jpa.DbInfoDaoJPA">
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
<bean id="userDao" class="info.bukova.isspst.dao.jpa.UserDaoJPA">
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
@@ -262,6 +266,10 @@
<!-- Business logic -->
<bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
<bean id="dbInfoService" class="info.bukova.isspst.services.dbinfo.DbInfoServiceImpl">
<property name="dao" ref="dbInfoDao" />
</bean>
<bean id="userService" class="info.bukova.isspst.services.users.UserServiceImpl">
<constructor-arg name="marshaller" ref="marshallerUsrSettings"/>
<constructor-arg name="unmarshaller" ref="unmarshallerUsrSettings"/>
@@ -377,7 +385,7 @@
<property name="dao" ref="serviceItemDao" />
<property name="validator" ref="validator" />
</bean>
<bean id="settingsService" class="info.bukova.isspst.services.settings.GlobalSettingServiceImpl">
<constructor-arg name="marshaller" ref="marshallerSettings"/>
<constructor-arg name="unmarshaller" ref="unmarshallerSettings"/>
src/main/webapp/admin/users/userForm.zul
+25 -7
View File
@@ -34,6 +34,7 @@
value="@bind(vm.dataBean.username)"
instant="true"
disabled="@load(vm.editRec)"
maxlength="@load(vm.lengthText)"
onChange="@command('checkLogin')" />
<label
value="Login je obsazený"
@@ -42,21 +43,28 @@
</row>
<row>
<label value="${labels.UsersFormFirstName}" />
<textbox value="@bind(vm.dataBean.firstName)" />
<textbox
value="@bind(vm.dataBean.firstName)"
maxlength="@load(vm.lengthText)" />
</row>
<row>
<label value="${labels.UsersFormSureName}" />
<textbox value="@bind(vm.dataBean.lastName)" />
<textbox
value="@bind(vm.dataBean.lastName)"
maxlength="@load(vm.lengthText)" />
</row>
<row>
<label value="${labels.UsersFormPersonalID}" />
<textbox
value="@bind(vm.dataBean.personalNumber)"
maxlength="@load(vm.lengthText)"
width="90px" />
</row>
<row>
<label value="${labels.UsersFormEmail}" />
<textbox value="@bind(vm.dataBean.email)" />
<textbox
value="@bind(vm.dataBean.email)"
maxlength="@load(vm.lengthText)" />
</row>
<row>
<label value="" />
@@ -70,6 +78,7 @@
id="idUserPasswordOriginal"
value="@save(vm.password, before='save')"
type="password"
maxlength="@load(vm.lengthText)"
instant="true" />
</row>
<row>
@@ -78,6 +87,7 @@
id="idUserPasswordDuplicate"
value="@save(vm.retPasswd, before='save')"
type="password"
maxlength="@load(vm.lengthText)"
instant="true" />
</row>
<row>
@@ -110,19 +120,27 @@
<rows>
<row>
<label value="${labels.SuppliersFormStreet}"/>
<textbox value="@bind(vm.dataBean.address.street)"/>
<textbox
value="@bind(vm.dataBean.address.street)"
maxlength="@load(vm.lengthText)" />
</row>
<row>
<label value="${labels.SuppliersFormNo}"/>
<textbox value="@bind(vm.dataBean.address.houseNumber)"/>
<textbox
value="@bind(vm.dataBean.address.houseNumber)"
maxlength="@load(vm.lengthText)" />
</row>
<row>
<label value="${labels.SuppliersFormZIP}"/>
<textbox value="@bind(vm.dataBean.address.zipCode)"/>
<textbox
value="@bind(vm.dataBean.address.zipCode)"
maxlength="@load(vm.lengthText)" />
</row>
<row>
<label value="${labels.SuppliersFormCity}"/>
<textbox value="@bind(vm.dataBean.address.city)"/>
<textbox
value="@bind(vm.dataBean.address.city)"
maxlength="@load(vm.lengthText)" />
</row>
</rows>
</grid>
src/main/webapp/admin/users/users.zul
+24 -4
View File
@@ -24,7 +24,12 @@
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.username)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
<textbox
value="@bind(vm.filterTemplate.username)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
@@ -34,7 +39,12 @@
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.personalNumber)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
<textbox
value="@bind(vm.filterTemplate.personalNumber)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
@@ -44,7 +54,12 @@
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.firstName)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
<textbox
value="@bind(vm.filterTemplate.firstName)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
@@ -54,7 +69,12 @@
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.lastName)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
<textbox
value="@bind(vm.filterTemplate.lastName)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
src/main/webapp/admin/workgroups/workgroupForm.zul
+23 -4
View File
@@ -13,13 +13,22 @@
<row>
<cell sclass="row-title">${labels.code} :</cell>
<cell>
<textbox id="code" constraint="@load(vm.constriant)" width="200px" value="@bind(vm.dataBean.code)" />
<textbox
id="code"
constraint="@load(vm.constriant)"
width="200px"
maxlength="@load(vm.lengthText)"
value="@bind(vm.dataBean.code)" />
</cell>
</row>
<row>
<cell sclass="row-title">${labels.name} :</cell>
<cell>
<textbox id="name" width="200px" value="@bind(vm.dataBean.name)" />
<textbox
id="name"
width="200px"
maxlength="@load(vm.lengthText)"
value="@bind(vm.dataBean.name)" />
</cell>
</row>
<row>
@@ -30,7 +39,12 @@
<row>
<cell sclass="row-title">${labels.WorkgroupFormOrderLimit} :</cell>
<cell>
<textbox id="limit" width="200px" value="@bind(vm.dataBean.limit) @converter(vm.bdConverter)" disabled="@load(vm.centre)"/>
<textbox
id="limit"
width="200px"
value="@bind(vm.dataBean.limit) @converter(vm.bdConverter)"
maxlength="@load(vm.lengthText)"
disabled="@load(vm.centre)" />
</cell>
</row>
</rows>
@@ -38,7 +52,12 @@
<label value="Přetáhněte myší:"/>
<hlayout>
<vbox>
<textbox value="@bind(vm.findUser)" onChange="@command('find')" instant="true" width="300px"/>
<textbox
value="@bind(vm.findUser)"
onChange="@command('find')"
instant="true"
maxlength="@load(vm.lengthText)"
width="300px" />
<listbox id="users" model="@bind(vm.users)" height="380px" width="300px" multiple="true"
droppable="true" onDrop="@command('addMember', event=event)" selectedItems="@bind(vm.selectedUsers)">
<listhead>
src/main/webapp/admin/workgroups/workgroups.zul
+2
View File
@@ -40,6 +40,7 @@
value="@bind(vm.filterTemplate.code)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -54,6 +55,7 @@
value="@bind(vm.filterTemplate.name)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
src/main/webapp/app/mailForm.zul
+12 -2
View File
@@ -13,7 +13,12 @@ viewModel="@id('vm') @init('info.bukova.isspst.ui.mail.MailForm')" width="800px"
<comboitem label="${labels.MailSuppliers}"/>
</combobox>
</hbox>
<textbox value="@bind(vm.findAddress)" instant="true" onChange="@command('find')" width="100%"/>
<textbox
value="@bind(vm.findAddress)"
instant="true"
onChange="@command('find')"
maxlength="@load(vm.lengthText)"
width="100%" />
<listbox model="@load(vm.users)"
visible="@load(vm.adbType eq 0)"
multiple="true"
@@ -54,7 +59,12 @@ viewModel="@id('vm') @init('info.bukova.isspst.ui.mail.MailForm')" width="800px"
</columns>
<rows>
<row>
<label value="${labels.MailFor}"/> <textbox value="@bind(vm.to)" width="100%" droppable="true" onDrop="@command('addTo')"/>
<label value="${labels.MailFor}"/>
<textbox
value="@bind(vm.to)"
width="100%"
droppable="true"
onDrop="@command('addTo')" />
</row>
<row>
<label value="${labels.MailCc}"/> <textbox value="@bind(vm.cc)" width="100%" droppable="true" onDrop="@command('addCc')"/>
src/main/webapp/app/passwd.zul
+21 -3
View File
@@ -13,9 +13,27 @@
<column/>
</columns>
<rows>
<row><label value="Staré heslo:"/><textbox type="password" value="@bind(vm.oldPw)"/></row>
<row><label value="Nové heslo:"/><textbox type="password" value="@bind(vm.newPw)"/></row>
<row><label value="Nové heslo znovu:"/><textbox type="password" value="@bind(vm.retPw)"/></row>
<row>
<label value="Staré heslo:" />
<textbox
type="password"
maxlength="@load(vm.lengthText)"
value="@bind(vm.oldPw)" />
</row>
<row>
<label value="Nové heslo:" />
<textbox
type="password"
maxlength="@load(vm.lengthText)"
value="@bind(vm.newPw)" />
</row>
<row>
<label value="Nové heslo znovu:" />
<textbox
type="password"
maxlength="@load(vm.lengthText)"
value="@bind(vm.retPw)" />
</row>
</rows>
</grid>
<button image="/img/save.png" label="Uložit" onClick="@command('save', window=passwd)" sclass="nicebutton" /><button image="~./zul/img/misc/drag-disallow.png" label="Zrušit" onClick="passwd.detach()" sclass="nicebutton"/>
src/main/webapp/app/reporting/colSelect.zul
+4 -1
View File
@@ -4,7 +4,10 @@
viewModel="@id('vmOpt') @init('info.bukova.isspst.ui.reporting.ColSelectVM')">
<caption label="${labels.ReportOptions}"></caption>
<hbox>
<label value="${labels.ReportTitle}"/> <textbox value="@bind(vmOpt.reportDefinition.reportTitle)"/>
<label value="${labels.ReportTitle}"/>
<textbox
value="@bind(vmOpt.reportDefinition.reportTitle)"
maxlength="@load(vm.lengthText)" />
</hbox>
<vbox children="@load(vmOpt.columns.checks)">
<template name="children">
src/main/webapp/lists/addressbook/address.zul
+43 -11
View File
@@ -12,32 +12,52 @@
<rows>
<row>
<label value="${labels.SuppliersFormCompany}" />
<textbox id="company" value="@bind(fx.company)" instant="true" width="320px" />
<textbox
id="company"
value="@bind(fx.company)"
instant="true"
maxlength="@load(vm.lengthText)"
width="320px" />
<button image="/img/search.png" label="${labels.SuppliersFormFindInARES}" onClick="@command('searchAres')" sclass="nicebutton" disabled="@load((fx.ic == 0) &amp;&amp; (empty fx.company))" />
</row>
<row>
<label value="${labels.SuppliersFormIC}" />
<textbox value="@bind(fx.ic)" instant="true" />
<textbox
value="@bind(fx.ic)"
maxlength="@load(vm.lengthText)"
instant="true" />
</row>
<row>
<label value="${labels.SuppliersFormDIC}" />
<textbox value="@bind(fx.dic)" />
<textbox
value="@bind(fx.dic)"
maxlength="@load(vm.lengthText)" />
</row>
<row>
<label value="${labels.SuppliersFormDepartment}" />
<textbox value="@bind(fx.department)" />
<textbox
value="@bind(fx.department)"
maxlength="@load(vm.lengthText)" />
</row>
<row>
<label value="${labels.SuppliersFormContact}" />
<textbox value="@bind(fx.contactName)" />
<textbox
value="@bind(fx.contactName)"
maxlength="@load(vm.lengthText)" />
</row>
<row>
<label value="${labels.SuppliersFormStreet}" />
<textbox value="@bind(fx.street)" width="320px" />
<textbox
value="@bind(fx.street)"
maxlength="@load(vm.lengthText)"
width="320px" />
</row>
<row>
<label value="${labels.SuppliersFormNo}" />
<textbox value="@bind(fx.houseNumber)" width="80px" />
<textbox
value="@bind(fx.houseNumber)"
maxlength="@load(vm.lengthText)"
width="80px" />
</row>
<row>
<label value="${labels.SuppliersFormCity}" />
@@ -45,19 +65,31 @@
</row>
<row>
<label value="${labels.SuppliersFormZIP}" />
<textbox value="@bind(fx.zipCode)" />
<textbox
value="@bind(fx.zipCode)"
maxlength="@load(vm.lengthText)" />
</row>
<row>
<label value="${labels.SuppliersFormPhone}" />
<textbox value="@bind(fx.phone)" />
<textbox
value="@bind(fx.phone)"
maxlength="@load(vm.lengthText)" />
</row>
<row>
<label value="${labels.SuppliersFormEmail}" />
<textbox id="email" value="@bind(fx.email)" width="320px" />
<textbox
id="email"
value="@bind(fx.email)"
maxlength="@load(vm.lengthText)"
width="320px" />
</row>
<row>
<label value="${labels.SuppliersFormWWW}" />
<textbox id="web" value="@bind(fx.web)" width="320px" />
<textbox
id="web"
value="@bind(fx.web)"
maxlength="@load(vm.lengthText)"
width="320px" />
</row>
</rows>
</grid>
src/main/webapp/lists/addressbook/addressbook.zul
+36 -6
View File
@@ -26,7 +26,12 @@
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.company)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
<textbox
value="@bind(vm.filterTemplate.company)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
@@ -36,7 +41,12 @@
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.ic)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
<textbox
value="@bind(vm.filterTemplate.ic)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
@@ -46,7 +56,12 @@
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.contactName)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
<textbox
value="@bind(vm.filterTemplate.contactName)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
@@ -56,7 +71,12 @@
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.street)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
<textbox
value="@bind(vm.filterTemplate.street)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
@@ -66,7 +86,12 @@
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.houseNumber)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
<textbox
value="@bind(vm.filterTemplate.houseNumber)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
@@ -76,7 +101,12 @@
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.city)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
<textbox
value="@bind(vm.filterTemplate.city)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
src/main/webapp/lists/buildings/building.zul
+3
View File
@@ -41,6 +41,7 @@
value="@bind(vm.filterTemplate.code)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -55,6 +56,7 @@
value="@bind(vm.filterTemplate.name)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -69,6 +71,7 @@
value="@bind(vm.filterTemplate.description)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
src/main/webapp/lists/buildings/buildingForm.zul
+8
View File
@@ -28,6 +28,7 @@
id="code"
constraint="@load(vm.constriant)"
width="200px"
maxlength="@load(vm.lengthText)"
value="@bind(vm.dataBean.code)" />
</cell>
</row>
@@ -37,6 +38,7 @@
<textbox
id="name"
width="200px"
maxlength="@load(vm.lengthText)"
value="@bind(vm.dataBean.name)" />
</cell>
</row>
@@ -46,6 +48,7 @@
<textbox
id="description"
width="300px"
maxlength="@load(vm.lengthDescription)"
value="@bind(vm.dataBean.description)" />
</cell>
</row>
@@ -69,26 +72,31 @@
<listcell>
<textbox
inplace="true"
maxlength="@load(vm.lengthText)"
value="@bind(each.code)" />
</listcell>
<listcell>
<textbox
inplace="true"
maxlength="@load(vm.lengthText)"
value="@bind(each.name)" />
</listcell>
<listcell>
<textbox
inplace="true"
maxlength="@load(vm.lengthText)"
value="@bind(each.shortcut)" />
</listcell>
<listcell>
<textbox
inplace="true"
maxlength="@load(vm.lengthText)"
value="@bind(each.number)" />
</listcell>
<listcell>
<textbox
inplace="true"
maxlength="@load(vm.lengthText)"
value="@bind(each.floor)" />
</listcell>
<listcell>
src/main/webapp/lists/material/material.zul
+3
View File
@@ -43,6 +43,7 @@
value="@bind(vm.filterTemplate.code)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -57,6 +58,7 @@
value="@bind(vm.filterTemplate.name)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -90,6 +92,7 @@
value="@bind(vm.filterTemplate.description)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthDescription)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
src/main/webapp/lists/material/materialForm.zul
+3
View File
@@ -27,6 +27,7 @@
id="code"
constraint="@load(vm.constriant)"
width="200px"
maxlength="@load(vm.lengthText)"
value="@bind(vm.dataBean.code)" />
</cell>
</row>
@@ -36,6 +37,7 @@
<textbox
id="name"
width="200px"
maxlength="@load(vm.lengthText)"
value="@bind(vm.dataBean.name)" />
</cell>
</row>
@@ -58,6 +60,7 @@
<textbox
id="description"
width="300px"
maxlength="@load(vm.lengthDescription)"
value="@bind(vm.dataBean.description)" />
</cell>
</row>
src/main/webapp/lists/munits/munitsForm.zul
+2
View File
@@ -26,6 +26,7 @@
<textbox
id="name"
width="200px"
maxlength="@load(vm.lengthText)"
value="@bind(vm.dataBean.name)" />
</cell>
</row>
@@ -35,6 +36,7 @@
<textbox
id="description"
width="300px"
maxlength="@load(vm.lengthDescription)"
value="@bind(vm.dataBean.description)" />
</cell>
</row>
src/main/webapp/lists/munits/munitsGrid.zul
+2
View File
@@ -35,6 +35,7 @@
value="@bind(vm.filterTemplate.name)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -49,6 +50,7 @@
value="@bind(vm.filterTemplate.description)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthDescription)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
src/main/webapp/lists/service/service.zul
+3
View File
@@ -40,6 +40,7 @@
value="@bind(vm.filterTemplate.code)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -54,6 +55,7 @@
value="@bind(vm.filterTemplate.name)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -68,6 +70,7 @@
value="@bind(vm.filterTemplate.description)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthDescription)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
src/main/webapp/lists/service/serviceForm.zul
+3
View File
@@ -27,6 +27,7 @@
id="code"
constraint="@load(vm.constriant)"
width="200px"
maxlength="@load(vm.lengthText)"
value="@bind(vm.dataBean.code)" />
</cell>
</row>
@@ -36,6 +37,7 @@
<textbox
id="name"
width="200px"
maxlength="@load(vm.lengthText)"
value="@bind(vm.dataBean.name)" />
</cell>
</row>
@@ -45,6 +47,7 @@
<textbox
id="description"
width="300px"
maxlength="@load(vm.lengthDescription)"
value="@bind(vm.dataBean.description)" />
</cell>
</row>
src/main/webapp/main/invoicing/invoicingForm.zul
+7 -1
View File
@@ -52,6 +52,7 @@
value="@bind(each.invoiceNumber)"
sclass="grid-textbox-max"
inplace="true"
maxlength="@load(vm.lengthText)"
onFocus="@command('onFocus', item=each)"/>
</listcell>
<listcell>
@@ -60,6 +61,7 @@
sclass="grid-textbox-max"
inplace="true"
onFocus="@command('onFocus', item=each)"
maxlength="@load(vm.lengthText)"
onChange="@command('calculate')"/>
</listcell>
<listcell>
@@ -85,6 +87,7 @@
width="200px"
value="@bind(vm.dataBean.requirement.numser)"
style="font-weight: bold;"
maxlength="@load(vm.lengthText)"
readonly="true"/>
</cell>
</row>
@@ -95,6 +98,7 @@
width="350px"
rows="5"
value="@bind(vm.dataBean.requirement.description)"
maxlength="@load(vm.lengthDescription)"
readonly="true" />
</cell>
</row>
@@ -103,7 +107,8 @@
<cell>
<textbox
width="150px"
value="@bind(vm.dataBean.requirement.sumTotal) @converter(vm.standardBigDecimalConverter)"
value="@bind(vm.dataBean.requirement.sumTotal) @converter(vm.standardBigDecimalConverter)"
maxlength="@load(vm.lengthText)"
readonly="true"/>
</cell>
</row>
@@ -114,6 +119,7 @@
width="150px"
value="@bind(vm.dataBean.totalInvoiced) @converter(vm.standardBigDecimalConverter)"
readonly="true"
maxlength="@load(vm.lengthText)"
style="@load(vm.dataBean.totalInvoiced gt vm.dataBean.requirement.sumTotal ? ' color: red;' : '' )"/>
</cell>
</row>
src/main/webapp/main/invoicing/invoicingGrid.zul
+4
View File
@@ -54,6 +54,7 @@
value="@bind(vm.filterTemplate.requirement.numser)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -121,6 +122,7 @@
value="@bind(vm.filterTemplate.requirement.description)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthDescription)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -135,6 +137,7 @@
value="@bind(vm.filterTemplate.requirement.sumTotal) @converter(vm.standardBigDecimalConverter)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -149,6 +152,7 @@
value="@bind(vm.filterTemplate.totalInvoiced) @converter(vm.standardBigDecimalConverter)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
src/main/webapp/main/orders/approved/grid.zul
+8
View File
@@ -88,6 +88,7 @@
value="@bind(vm.filterTemplate.code)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -102,6 +103,7 @@
value="@bind(vm.filterTemplate.name)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -116,6 +118,7 @@
value="@bind(vm.filterTemplate.textItem)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -133,6 +136,7 @@
value="@bind(vm.filterTemplate.quantity)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox-right" />
</div>
</div-->
@@ -144,6 +148,7 @@
value="@bind(vm.filterTemplate.munit.name)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -161,6 +166,7 @@
value="@bind(vm.filterTemplate.unitPrice)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox-right" />
</div>
</div-->
@@ -175,6 +181,7 @@
value="@bind(vm.filterTemplate.total)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox-right" />
</div>
</div-->
@@ -249,6 +256,7 @@
value="@bind(vm.filterTemplate.description)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthDescription)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
src/main/webapp/main/orders/created/grid.zul
+3
View File
@@ -96,6 +96,7 @@
value="@bind(vm.filterTemplate.numser)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -201,6 +202,7 @@
value="@bind(vm.filterTemplate.address)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -236,6 +238,7 @@
value="@bind(vm.filterTemplate.description)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthDescription)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
src/main/webapp/main/orders/created/orderForm.zul
+40
View File
@@ -61,6 +61,7 @@
constraint="@load(vm.constriant)"
value="@bind(fx.numser)"
placeholder="${labels.NotYetFilled}..."
maxlength="@load(vm.lengthText)"
readonly="true" />
</cell>
</row>
@@ -81,6 +82,7 @@
id="idOrderTotal"
readonly="true"
width="150px"
maxlength="@load(vm.lengthText)"
value="@bind(fx.total) @converter(vm.standardBigDecimalConverter)" />
</cell>
</row>
@@ -111,6 +113,7 @@
id="idOrderDescription"
width="100%"
rows="5"
maxlength="@load(vm.lengthDescription)"
value="@bind(fx.description)" />
</cell>
</row>
@@ -177,12 +180,14 @@
<textbox
id="idSuppIC"
value="@bind(fx.suplier.ic)"
maxlength="@load(vm.lengthText)"
instant="true" />
</cell>
<cell sclass="row-title">${labels.SuppliersFormDIC} :</cell>
<cell>
<textbox
id="idSuppDIC"
maxlength="@load(vm.lengthText)"
value="@bind(fx.suplier.dic)" />
</cell>
</row>
@@ -192,6 +197,7 @@
<textbox
id="idSuppDepartment"
value="@bind(fx.suplier.department)"
maxlength="@load(vm.lengthText)"
width="100%" />
</cell>
<cell sclass="row-title">${labels.SuppliersFormContact} :</cell>
@@ -199,6 +205,7 @@
<textbox
id="idSuppContactName"
value="@bind(fx.suplier.contactName)"
maxlength="@load(vm.lengthText)"
width="100%" />
</cell>
</row>
@@ -208,12 +215,14 @@
<textbox
id="idSuppStreet"
value="@bind(fx.suplier.street)"
maxlength="@load(vm.lengthText)"
width="100%" />
</cell>
<cell sclass="row-title">${labels.SuppliersFormNo} :</cell>
<cell>
<textbox
id="idSuppHouseNumber"
maxlength="@load(vm.lengthText)"
value="@bind(fx.suplier.houseNumber)" />
</cell>
</row>
@@ -223,12 +232,14 @@
<textbox
id="idSuppCity"
value="@bind(fx.suplier.city)"
maxlength="@load(vm.lengthText)"
width="100%" />
</cell>
<cell sclass="row-title">${labels.SuppliersFormZIP} :</cell>
<cell>
<textbox
id="idSuppZIP"
maxlength="@load(vm.lengthText)"
value="@bind(fx.suplier.zipCode)" />
</cell>
</row>
@@ -237,6 +248,7 @@
<cell>
<textbox
id="idSuppPhone"
maxlength="@load(vm.lengthText)"
value="@bind(fx.suplier.phone)" />
</cell>
<cell sclass="row-title">${labels.SuppliersFormEmail} :</cell>
@@ -244,6 +256,7 @@
<textbox
id="idSuppEmail"
value="@bind(fx.suplier.email)"
maxlength="@load(vm.lengthText)"
width="100%" />
</cell>
</row>
@@ -253,6 +266,7 @@
<textbox
id="idSuppWWW"
value="@bind(fx.suplier.web)"
maxlength="@load(vm.lengthText)"
width="100%" />
</cell>
</row>
@@ -297,12 +311,14 @@
<cell>
<textbox
id="idDeliveryIC"
maxlength="@load(vm.lengthText)"
value="@bind(fx.deliveryAddress.ic)" />
</cell>
<cell sclass="row-title">${labels.SuppliersFormDIC} :</cell>
<cell>
<textbox
id="idDeliveryDIC"
maxlength="@load(vm.lengthText)"
value="@bind(fx.deliveryAddress.dic)" />
</cell>
</row>
@@ -311,6 +327,7 @@
<cell>
<textbox
id="idDeliveryDepartment"
maxlength="@load(vm.lengthText)"
value="@bind(fx.deliveryAddress.department)"
width="100%" />
</cell>
@@ -319,6 +336,7 @@
<textbox
id="idDeliveryContactName"
value="@bind(fx.deliveryAddress.contactName)"
maxlength="@load(vm.lengthText)"
width="100%" />
</cell>
</row>
@@ -328,12 +346,14 @@
<textbox
id="idDeliveryStreet"
value="@bind(fx.deliveryAddress.street)"
maxlength="@load(vm.lengthText)"
width="100%" />
</cell>
<cell sclass="row-title">${labels.SuppliersFormNo} :</cell>
<cell>
<textbox
id="idDeliveryHouseNumber"
maxlength="@load(vm.lengthText)"
value="@bind(fx.deliveryAddress.houseNumber)" />
</cell>
</row>
@@ -343,12 +363,14 @@
<textbox
id="idDeliveryCity"
value="@bind(fx.deliveryAddress.city)"
maxlength="@load(vm.lengthText)"
width="100%" />
</cell>
<cell sclass="row-title">${labels.SuppliersFormZIP} :</cell>
<cell>
<textbox
id="idDeliveryZIP"
maxlength="@load(vm.lengthText)"
value="@bind(fx.deliveryAddress.zipCode)" />
</cell>
</row>
@@ -357,6 +379,7 @@
<cell>
<textbox
id="idDeliveryPhone"
maxlength="@load(vm.lengthText)"
value="@bind(fx.deliveryAddress.phone)" />
</cell>
<cell sclass="row-title">${labels.SuppliersFormEmail} :</cell>
@@ -364,6 +387,7 @@
<textbox
id="idDeliveryEmail"
value="@bind(fx.deliveryAddress.email)"
maxlength="@load(vm.lengthText)"
width="100%" />
</cell>
</row>
@@ -373,6 +397,7 @@
<textbox
id="idDeliveryWWW"
value="@bind(fx.deliveryAddress.web)"
maxlength="@load(vm.lengthText)"
width="100%" />
</cell>
</row>
@@ -400,6 +425,7 @@
<textbox
id="idInvoiceCompany"
value="@bind(fx.address.company)"
maxlength="@load(vm.lengthText)"
width="100%" />
</cell>
</row>
@@ -408,12 +434,14 @@
<cell>
<textbox
id="idInvoiceIC"
maxlength="@load(vm.lengthText)"
value="@bind(fx.address.ic)" />
</cell>
<cell sclass="row-title">${labels.SuppliersFormDIC} :</cell>
<cell>
<textbox
id="idInvoiceDIC"
maxlength="@load(vm.lengthText)"
value="@bind(fx.address.dic)" />
</cell>
</row>
@@ -423,6 +451,7 @@
<textbox
id="idInvoiceDepartment"
value="@bind(fx.address.department)"
maxlength="@load(vm.lengthText)"
width="100%" />
</cell>
<cell sclass="row-title">${labels.SuppliersFormContact} :</cell>
@@ -430,6 +459,7 @@
<textbox
id="idInvoiceContactName"
value="@bind(fx.address.contactName)"
maxlength="@load(vm.lengthText)"
width="100%" />
</cell>
</row>
@@ -439,12 +469,14 @@
<textbox
id="idInvoiceStreet"
value="@bind(fx.address.street)"
maxlength="@load(vm.lengthText)"
width="100%" />
</cell>
<cell sclass="row-title">${labels.SuppliersFormNo} :</cell>
<cell>
<textbox
id="idInvoiceHouseNumber"
maxlength="@load(vm.lengthText)"
value="@bind(fx.address.houseNumber)" />
</cell>
</row>
@@ -454,12 +486,14 @@
<textbox
id="idInvoiceCity"
value="@bind(fx.address.city)"
maxlength="@load(vm.lengthText)"
width="100%" />
</cell>
<cell sclass="row-title">${labels.SuppliersFormZIP} :</cell>
<cell>
<textbox
id="idInvoiceZIP"
maxlength="@load(vm.lengthText)"
value="@bind(fx.address.zipCode)" />
</cell>
</row>
@@ -468,6 +502,7 @@
<cell>
<textbox
id="idInvoicePhone"
maxlength="@load(vm.lengthText)"
value="@bind(fx.address.phone)" />
</cell>
<cell sclass="row-title">${labels.SuppliersFormEmail} :</cell>
@@ -475,6 +510,7 @@
<textbox
id="idInvoiceEmail"
value="@bind(fx.address.email)"
maxlength="@load(vm.lengthText)"
width="100%" />
</cell>
</row>
@@ -484,6 +520,7 @@
<textbox
id="idInvoiceWWW"
value="@bind(fx.address.web)"
maxlength="@load(vm.lengthText)"
width="100%" />
</cell>
</row>
@@ -550,6 +587,7 @@
readonly="true"
onFocus="@command('onFocusItem', item=each, ctrl=self)"
onChange="@command('recalculate', form=fx, changed='quantity')"
maxlength="@load(vm.lengthText)"
value="@bind(each.quantity) @converter(vm.standardBigDecimalConverter)" />
</listcell>
<listcell label="@load(each.munit.name)" />
@@ -560,6 +598,7 @@
readonly="${not sec:isAllGranted('ROLE_ADMIN')}"
onFocus="@command('onFocusItem', item=each, ctrl=self)"
onChange="@command('recalculate', form=fx, changed='unitPrice')"
maxlength="@load(vm.lengthText)"
value="@bind(each.unitPrice) @converter(vm.standardBigDecimalConverter)" />
</listcell>
<listcell>
@@ -569,6 +608,7 @@
readonly="${not sec:isAllGranted('ROLE_ADMIN')}"
onFocus="@command('onFocusItem', item=each, ctrl=self)"
onChange="@command('recalculate', form=fx, changed='total')"
maxlength="@load(vm.lengthText)"
value="@bind(each.total) @converter(vm.standardBigDecimalConverter)" />
</listcell>
<listcell label="@load(each.description)" />
src/main/webapp/main/orders/material/selectMaterial.zul
+3
View File
@@ -52,6 +52,7 @@
value="@bind(vm.filterTmpMaterial.code)"
instant="true"
onChange="@command('doFilterMaterial')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -66,6 +67,7 @@
value="@bind(vm.filterTmpMaterial.name)"
instant="true"
onChange="@command('doFilterMaterial')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -100,6 +102,7 @@
value="@bind(vm.filterTmpMaterial.description)"
instant="true"
onChange="@command('doFilterMaterial')"
maxlength="@load(vm.lengthDescription)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
src/main/webapp/main/orders/requirements/reqForm.zul
+10
View File
@@ -26,6 +26,7 @@
width="150px"
constraint="@load(vm.constriant)"
value="@bind(fx.numser)"
maxlength="@load(vm.lengthText)"
readonly="true" />
</cell>
</row>
@@ -72,6 +73,7 @@
id="idSumTotal"
readonly="true"
width="150px"
maxlength="@load(vm.lengthText)"
value="@bind(fx.sumTotal) @converter(vm.standardBigDecimalConverter)" />
</cell>
</row>
@@ -82,6 +84,7 @@
id="description"
width="400px"
rows="5"
maxlength="@load(vm.lengthDescription)"
value="@bind(fx.description)" />
</cell>
</row>
@@ -161,6 +164,7 @@
sclass="grid-textbox-max"
readonly="false"
onFocus="@command('onFocusItem', item=each, ctrl=self)"
maxlength="@load(vm.lengthText)"
value="@bind(each.name)" />
</listcell>
<listcell>
@@ -168,6 +172,7 @@
inplace="true"
sclass="grid-textbox-max"
onFocus="@command('onFocusItem', item=each, ctrl=self)"
maxlength="@load(vm.lengthText)"
value="@bind(each.textItem)" />
</listcell>
<listcell>
@@ -176,6 +181,7 @@
sclass="grid-textbox-max-right"
onFocus="@command('onFocusItem', item=each, ctrl=self)"
onChange="@command('recalculate', form=fx, changed='quantity')"
maxlength="@load(vm.lengthText)"
value="@bind(each.quantity) @converter(vm.standardBigDecimalConverter)" />
</listcell>
<listcell>
@@ -184,6 +190,7 @@
sclass="grid-textbox-max"
readonly="false"
onFocus="@command('onFocusItem', item=each, ctrl=self)"
maxlength="@load(vm.lengthText)"
value="@bind(each.munit.name)" />
</listcell>
<listcell>
@@ -192,6 +199,7 @@
sclass="grid-textbox-max-right"
onFocus="@command('onFocusItem', item=each, ctrl=self)"
onChange="@command('recalculate', form=fx, changed='unitprice')"
maxlength="@load(vm.lengthText)"
value="@bind(each.unitPrice) @converter(vm.standardBigDecimalConverter)" />
</listcell>
<listcell>
@@ -200,6 +208,7 @@
sclass="grid-textbox-max-right"
onFocus="@command('onFocusItem', item=each, ctrl=self)"
onChange="@command('recalculate', form=fx, changed='total')"
maxlength="@load(vm.lengthText)"
value="@bind(each.total) @converter(vm.standardBigDecimalConverter)" />
</listcell>
<listcell>
@@ -207,6 +216,7 @@
inplace="true"
sclass="grid-textbox-max"
onFocus="@command('onFocusItem', item=each, ctrl=self)"
maxlength="@load(vm.lengthDescription)"
value="@bind(each.description)" />
</listcell>
<listcell
src/main/webapp/main/orders/requirements/reqListMy.zul
+3
View File
@@ -59,6 +59,7 @@
value="@bind(vm.filterTemplate.numser)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -122,6 +123,7 @@
value="@bind(vm.filterTemplate.sumTotal) @converter(vm.bigDecimalConverter)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -136,6 +138,7 @@
value="@bind(vm.filterTemplate.description)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthDescription)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
src/main/webapp/main/orders/requirements/reqListMyAll.zul
+3
View File
@@ -65,6 +65,7 @@
value="@bind(vm.filterTemplate.numser)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -128,6 +129,7 @@
value="@bind(vm.filterTemplate.sumTotal) @converter(vm.bigDecimalConverter)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -142,6 +144,7 @@
value="@bind(vm.filterTemplate.description)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthDescription)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
src/main/webapp/main/orders/requirements/reqListMyCenters.zul
+3
View File
@@ -65,6 +65,7 @@
value="@bind(vm.filterTemplate.numser)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -128,6 +129,7 @@
value="@bind(vm.filterTemplate.sumTotal) @converter(vm.bigDecimalConverter)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -142,6 +144,7 @@
value="@bind(vm.filterTemplate.description)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthDescription)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
src/main/webapp/main/orders/requirements/reqListMyWorkgroups.zul
+3
View File
@@ -65,6 +65,7 @@
value="@bind(vm.filterTemplate.numser)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -128,6 +129,7 @@
value="@bind(vm.filterTemplate.sumTotal) @converter(vm.bigDecimalConverter)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -142,6 +144,7 @@
value="@bind(vm.filterTemplate.description)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthDescription)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
src/main/webapp/main/orders/requirements/selectItems.zul
+6
View File
@@ -64,6 +64,7 @@
value="@bind(vm.filterTmpMaterial.code)"
instant="true"
onChange="@command('doFilterMaterial')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -78,6 +79,7 @@
value="@bind(vm.filterTmpMaterial.name)"
instant="true"
onChange="@command('doFilterMaterial')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -112,6 +114,7 @@
value="@bind(vm.filterTmpMaterial.description)"
instant="true"
onChange="@command('doFilterMaterial')"
maxlength="@load(vm.lengthDescription)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -165,6 +168,7 @@
value="@bind(vm.filterTmpService.code)"
instant="true"
onChange="@command('doFilterService')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -179,6 +183,7 @@
value="@bind(vm.filterTmpService.name)"
instant="true"
onChange="@command('doFilterService')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -193,6 +198,7 @@
value="@bind(vm.filterTmpService.description)"
instant="true"
onChange="@command('doFilterService')"
maxlength="@load(vm.lengthDescription)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
src/main/webapp/main/orders/services/selectServices.zul
+3
View File
@@ -49,6 +49,7 @@
value="@bind(vm.filterTmpService.code)"
instant="true"
onChange="@command('doFilterService')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -63,6 +64,7 @@
value="@bind(vm.filterTmpService.name)"
instant="true"
onChange="@command('doFilterService')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -77,6 +79,7 @@
value="@bind(vm.filterTmpService.description)"
instant="true"
onChange="@command('doFilterService')"
maxlength="@load(vm.lengthDescription)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
src/main/webapp/main/trips/bill/tripBillForm.zul
+41 -9
View File
@@ -235,10 +235,12 @@
</vbox>
<vbox hflex="max">
<textbox inplace="true"
value="@load(each.to)"
value="@load(each.to)"
maxlength="@load(vm.lengthText)"
sclass="grid-textbox-max-left"/>
<textbox inplace="true"
value="@load(each.back)"
value="@load(each.back)"
maxlength="@load(vm.lengthText)"
sclass="grid-textbox-max-left"/>
</vbox>
<vbox>
@@ -275,15 +277,41 @@
<timebox inplace="true" width="68px" value="@bind(each.endWork)" format="short"/>
</vbox>
<vbox>
<textbox inplace="true" width="68px" value="@bind(each.distance) @converter(vm.standardBigDecimalConverter)"/>
<textbox inplace="true" width="68px" value="@bind(each.distanceAmount) @converter(vm.standardBigDecimalConverter)" onChange="@command('calculate')"/>
<textbox
inplace="true"
width="68px"
maxlength="@load(vm.lengthText)"
value="@bind(each.distance) @converter(vm.standardBigDecimalConverter)" />
<textbox
inplace="true"
width="68px"
value="@bind(each.distanceAmount) @converter(vm.standardBigDecimalConverter)"
maxlength="@load(vm.lengthText)"
onChange="@command('calculate')" />
</vbox>
<vbox>
<textbox inplace="true" width="68px" value="@bind(each.fuelConsumption) @converter(vm.standardBigDecimalConverter)"/>
<textbox inplace="true" width="68px" value="@bind(each.fuelAmount) @converter(vm.standardBigDecimalConverter)" onChange="@command('calculate')"/>
<textbox
inplace="true"
width="68px"
maxlength="@load(vm.lengthText)"
value="@bind(each.fuelConsumption) @converter(vm.standardBigDecimalConverter)" />
<textbox
inplace="true"
width="68px"
value="@bind(each.fuelAmount) @converter(vm.standardBigDecimalConverter)"
maxlength="@load(vm.lengthText)"
onChange="@command('calculate')" />
</vbox>
<textbox inplace="true" value="@bind(each.carefare) @converter(vm.standardBigDecimalConverter)" onChange="@command('calculate')"/>
<textbox inplace="true" value="@bind(each.housing) @converter(vm.standardBigDecimalConverter)" onChange="@command('calculate')"/>
<textbox
inplace="true"
value="@bind(each.carefare) @converter(vm.standardBigDecimalConverter)"
maxlength="@load(vm.lengthText)"
onChange="@command('calculate')" />
<textbox
inplace="true"
value="@bind(each.housing) @converter(vm.standardBigDecimalConverter)"
maxlength="@load(vm.lengthText)"
onChange="@command('calculate')" />
<combobox inplace="true" selectedIndex="@bind(each.freeMealsCount)"
readonly="true"
width="60px"
@@ -295,7 +323,11 @@
<comboitem value="3" label="3"/>
</combobox>
<label value="@load(each.meals) @converter(vm.standardBigDecimalConverter)"/>
<textbox inplace="true" value="@bind(each.otherExpenses) @converter(vm.standardBigDecimalConverter)" onChange="@command('calculate')"/>
<textbox
inplace="true"
value="@bind(each.otherExpenses) @converter(vm.standardBigDecimalConverter)"
maxlength="@load(vm.lengthText)"
onChange="@command('calculate')" />
<label value="@load(each.total) @converter(vm.standardBigDecimalConverter)"/>
<label value="@load(each.adjustedTotal) @converter(vm.standardBigDecimalConverter)"/>
</row>
src/main/webapp/main/trips/bill/tripBillGrid.zul
+2
View File
@@ -48,6 +48,7 @@
value="@bind(vm.filterTemplate.name)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -62,6 +63,7 @@
value="@bind(vm.filterTemplate.description)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthDescription)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
src/main/webapp/main/trips/requirements/reqListMy.zul
+3
View File
@@ -43,6 +43,7 @@
value="@bind(vm.filterTemplate.numser)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -92,6 +93,7 @@
value="@bind(vm.filterTemplate.from)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -107,6 +109,7 @@
instant="true"
onChange="@command('doFilter')"
sclass="find-grid-textbox"
maxlength="@load(vm.lengthText)"
width="100%" />
</div>
<div sclass="find-grid-img">
src/main/webapp/main/trips/requirements/reqListMyAll.zul
+3
View File
@@ -54,6 +54,7 @@
value="@bind(vm.filterTemplate.numser)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -122,6 +123,7 @@
value="@bind(vm.filterTemplate.from)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -137,6 +139,7 @@
instant="true"
onChange="@command('doFilter')"
sclass="find-grid-textbox"
maxlength="@load(vm.lengthText)"
width="100%" />
</div>
<div sclass="find-grid-img">
src/main/webapp/main/trips/requirements/reqListMyCenters.zul
+3
View File
@@ -50,6 +50,7 @@
value="@bind(vm.filterTemplate.numser)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -99,6 +100,7 @@
value="@bind(vm.filterTemplate.from)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -114,6 +116,7 @@
instant="true"
onChange="@command('doFilter')"
sclass="find-grid-textbox"
maxlength="@load(vm.lengthText)"
width="100%" />
</div>
<div sclass="find-grid-img">
src/main/webapp/main/trips/requirements/reqListMyWorkgroups.zul
+3
View File
@@ -54,6 +54,7 @@
value="@bind(vm.filterTemplate.numser)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -122,6 +123,7 @@
value="@bind(vm.filterTemplate.from)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
@@ -137,6 +139,7 @@
instant="true"
onChange="@command('doFilter')"
sclass="find-grid-textbox"
maxlength="@load(vm.lengthText)"
width="100%" />
</div>
<div sclass="find-grid-img">
src/main/webapp/main/trips/requirements/requirementsForm.zul
+9 -1
View File
@@ -27,6 +27,7 @@
id="numser"
width="200px"
value="@bind(fx.numser)"
maxlength="@load(vm.lengthText)"
readonly="true" />
</cell>
</row>
@@ -59,6 +60,7 @@
<textbox
id="from"
width="300px"
maxlength="@load(vm.lengthText)"
value="@bind(fx.from)" />
</cell>
</row>
@@ -86,6 +88,7 @@
<textbox
id="to"
width="300px"
maxlength="@load(vm.lengthText)"
value="@bind(fx.to)" />
</cell>
</row>
@@ -95,6 +98,7 @@
<textbox
id="description"
width="300px"
maxlength="@load(vm.lengthText)"
value="@bind(fx.description)" />
</cell>
</row>
@@ -104,6 +108,7 @@
<textbox
id="end"
width="200px"
maxlength="@load(vm.lengthText)"
value="@bind(fx.end)" />
</cell>
</row>
@@ -169,7 +174,10 @@
</row>
<row>
<checkbox label="Požaduji zálohu" checked="@bind(vm.dataBean.requireDownPayment)"/>
<textbox value="@bind(vm.dataBean.downPayment)" disabled="@bind(not vm.dataBean.requireDownPayment)"/>
<textbox
value="@bind(vm.dataBean.downPayment)"
maxlength="@load(vm.lengthText)"
disabled="@bind(not vm.dataBean.requireDownPayment)" />
</row>
</rows>
</grid>
src/main/webapp/settings/global/address.zul
+55 -11
View File
@@ -8,31 +8,55 @@
<rows>
<row>
<label value="${labels.SuppliersFormCompany}"/>
<textbox value="@bind(vm.settings.mainAddress.company)" width="100%" readonly="@load(not vm.canSave)"/>
<textbox
value="@bind(vm.settings.mainAddress.company)"
width="100%"
maxlength="@load(vm.lengthText)"
readonly="@load(not vm.canSave)" />
</row>
<row>
<label value="${labels.SuppliersFormIC}"/>
<textbox value="@bind(vm.settings.mainAddress.ic)" readonly="@load(not vm.canSave)"/>
<textbox
value="@bind(vm.settings.mainAddress.ic)"
maxlength="@load(vm.lengthText)"
readonly="@load(not vm.canSave)" />
</row>
<row>
<label value="${labels.SuppliersFormDIC}"/>
<textbox value="@bind(vm.settings.mainAddress.dic)" readonly="@load(not vm.canSave)"/>
<textbox
value="@bind(vm.settings.mainAddress.dic)"
maxlength="@load(vm.lengthText)"
readonly="@load(not vm.canSave)" />
</row>
<row>
<label value="${labels.SuppliersFormStreet}"/>
<textbox value="@bind(vm.settings.mainAddress.street)" width="100%" readonly="@load(not vm.canSave)"/>
<textbox
value="@bind(vm.settings.mainAddress.street)"
width="100%"
maxlength="@load(vm.lengthText)"
readonly="@load(not vm.canSave)" />
</row>
<row>
<label value="${labels.SuppliersFormNo}"/>
<textbox value="@bind(vm.settings.mainAddress.houseNumber)" readonly="@load(not vm.canSave)"/>
<textbox
value="@bind(vm.settings.mainAddress.houseNumber)"
maxlength="@load(vm.lengthText)"
readonly="@load(not vm.canSave)" />
</row>
<row>
<label value="${labels.SuppliersFormCity}"/>
<textbox value="@bind(vm.settings.mainAddress.city)" width="100%" readonly="@load(not vm.canSave)"/>
<textbox
value="@bind(vm.settings.mainAddress.city)"
width="100%"
maxlength="@load(vm.lengthText)"
readonly="@load(not vm.canSave)" />
</row>
<row>
<label value="${labels.SuppliersFormZIP}"/>
<textbox value="@bind(vm.settings.mainAddress.zipCode)" readonly="@load(not vm.canSave)"/>
<textbox
value="@bind(vm.settings.mainAddress.zipCode)"
maxlength="@load(vm.lengthText)"
readonly="@load(not vm.canSave)" />
</row>
</rows>
</grid>
@@ -50,16 +74,36 @@
<template name="model">
<listitem>
<listcell>
<textbox inplace="true" value="@bind(each.street)" readonly="@load(not vm.canSave)"></textbox>
<textbox
inplace="true"
value="@bind(each.street)"
maxlength="@load(vm.lengthText)"
readonly="@load(not vm.canSave)">
</textbox>
</listcell>
<listcell>
<textbox inplace="true" value="@bind(each.houseNumber)" readonly="@load(not vm.canSave)"></textbox>
<textbox
inplace="true"
value="@bind(each.houseNumber)"
maxlength="@load(vm.lengthText)"
readonly="@load(not vm.canSave)">
</textbox>
</listcell>
<listcell>
<textbox inplace="true" value="@bind(each.city)" readonly="@load(not vm.canSave)"></textbox>
<textbox
inplace="true"
value="@bind(each.city)"
maxlength="@load(vm.lengthText)"
readonly="@load(not vm.canSave)">
</textbox>
</listcell>
<listcell>
<textbox inplace="true" value="@bind(each.zipCode)" readonly="@load(not vm.canSave)"></textbox>
<textbox
inplace="true"
value="@bind(each.zipCode)"
maxlength="@load(vm.lengthText)"
readonly="@load(not vm.canSave)">
</textbox>
</listcell>
<listcell>
<button label="${labels.RemoveItem }" onClick="@command('removeAddress', addr=each)" disabled="@load(not vm.canSave)"/>
src/main/webapp/settings/global/bank.zul
+13 -3
View File
@@ -8,15 +8,25 @@
<rows>
<row>
<label value="${labels.BankName}"/>
<textbox value="@bind(vm.settings.bankName)" width="100%" readonly="@load(not vm.canSave)"/>
<textbox
value="@bind(vm.settings.bankName)"
width="100%"
maxlength="@load(vm.lengthText)"
readonly="@load(not vm.canSave)" />
</row>
<row>
<label value="${labels.AccountNumber}"/>
<textbox value="@bind(vm.settings.accountNumber)" readonly="@load(not vm.canSave)"/>
<textbox
value="@bind(vm.settings.accountNumber)"
maxlength="@load(vm.lengthText)"
readonly="@load(not vm.canSave)" />
</row>
<row>
<label value="${labels.BankCode}"/>
<textbox value="@bind(vm.settings.bankCode)" readonly="@load(not vm.canSave)"/>
<textbox
value="@bind(vm.settings.bankCode)"
maxlength="@load(vm.lengthText)"
readonly="@load(not vm.canSave)" />
</row>
</rows>
</grid>
src/main/webapp/settings/global/email.zul
+18 -3
View File
@@ -15,7 +15,12 @@
</columns>
<rows>
<row>
<label value="${labels.MailSubject}"/> <textbox value="@bind(vm.settings.newReqTemplate.subject)" width="100%" readonly="@load(not vm.canSave)"/>
<label value="${labels.MailSubject}" />
<textbox
value="@bind(vm.settings.newReqTemplate.subject)"
width="100%"
maxlength="@load(vm.lengthText)"
readonly="@load(not vm.canSave)" />
</row>
<row spans="2">
<vbox>
@@ -38,7 +43,12 @@
</columns>
<rows>
<row>
<label value="${labels.MailSubject}"/> <textbox value="@bind(vm.settings.authReqTemplate.subject)" width="100%" readonly="@load(not vm.canSave)"/>
<label value="${labels.MailSubject}" />
<textbox
value="@bind(vm.settings.authReqTemplate.subject)"
width="100%"
maxlength="@load(vm.lengthText)"
readonly="@load(not vm.canSave)" />
</row>
<row spans="2">
<vbox>
@@ -61,7 +71,12 @@
</columns>
<rows>
<row>
<label value="${labels.MailSubject}"/> <textbox value="@bind(vm.settings.confReqTemplate.subject)" width="100%" readonly="@load(not vm.canSave)"/>
<label value="${labels.MailSubject}" />
<textbox
value="@bind(vm.settings.confReqTemplate.subject)"
width="100%"
maxlength="@load(vm.lengthText)"
readonly="@load(not vm.canSave)" />
</row>
<row spans="2">
<vbox>
src/main/webapp/settings/global/travelOrders.zul
+30 -6
View File
@@ -23,10 +23,26 @@
<template name="model">
<row>
<label value="@load(each)"/>
<textbox value="@bind(vm.settings.refunds[each][0])" inplace="true" readonly="@load(not vm.canSave)"/>
<textbox value="@bind(vm.settings.refunds[each][1])" inplace="true" readonly="@load(not vm.canSave)"/>
<textbox value="@bind(vm.settings.refunds[each][2])" inplace="true" readonly="@load(not vm.canSave)"/>
<textbox value="@bind(vm.settings.refunds[each][3])" inplace="true" readonly="@load(not vm.canSave)"/>
<textbox
value="@bind(vm.settings.refunds[each][0])"
inplace="true"
maxlength="@load(vm.lengthText)"
readonly="@load(not vm.canSave)" />
<textbox
value="@bind(vm.settings.refunds[each][1])"
inplace="true"
maxlength="@load(vm.lengthText)"
readonly="@load(not vm.canSave)" />
<textbox
value="@bind(vm.settings.refunds[each][2])"
inplace="true"
maxlength="@load(vm.lengthText)"
readonly="@load(not vm.canSave)" />
<textbox
value="@bind(vm.settings.refunds[each][3])"
inplace="true"
maxlength="@load(vm.lengthText)"
readonly="@load(not vm.canSave)" />
</row>
</template>
@@ -45,8 +61,16 @@
<rows>
<template name="model">
<row>
<textbox inplace="true" value="@bind(each.code)" readonly="@load(not vm.canSave)"/>
<textbox inplace="true" value="@bind(each.description)" readonly="@load(not vm.canSave)"/>
<textbox
inplace="true"
value="@bind(each.code)"
maxlength="@load(vm.lengthText)"
readonly="@load(not vm.canSave)" />
<textbox
inplace="true"
value="@bind(each.description)"
maxlength="@load(vm.lengthDescription)"
readonly="@load(not vm.canSave)" />
<button label="${labels.RemoveItem}" onClick="@command('removeVehicle', vehicle=each)" disabled="@load(not vm.canSave)"/>
</row>
</template>
src/main/webapp/settings/numberSeries.zul
+3 -1
View File
@@ -15,7 +15,9 @@ binder="@init(queueName='numSeries')">
<template name="model">
<row>
<label value="@load(vm.moduleMap[each.module].name.concat(' - ').concat(labels.Prefix))"/>
<textbox value="@bind(each.prefix)"/>
<textbox
value="@bind(each.prefix)"
maxlength="@load(vm.lengthText)" />
<label value="${labels.Number}"/>
<label value="@load(each.number)"/>
</row>
src/main/webapp/settings/workflow/limit.zul
+3 -1
View File
@@ -6,7 +6,9 @@ viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.LimitVM')">
<vbox>
<hbox>
<label value="${labels.Limit}"/>
<textbox value="@bind(vm.workflow.limit)"/>
<textbox
value="@bind(vm.workflow.limit)"
maxlength="@load(vm.lengthText)" />
</hbox>
<include src="/app/formButtons.zul" />
</vbox>