Merge branch 'Verze_1.0'

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:
2015-01-19 13:29:41 +01:00
78 changed files with 818 additions and 131 deletions
+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')"/>
+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"/>
+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">