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

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	src/main/webapp/app/mainMenu.zul
This commit is contained in:
Josef Rokos
2015-02-23 22:28:14 +01:00
parent 1d2810f78d c4f5671327
commit 48d2c75d7b
2 changed files with 117 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/app/search/searchForm.zul
+1 -1
View File
@@ -18,7 +18,7 @@
<vbox> <vbox>
<image src="/img/lucene_logo.png"/> <image src="/img/lucene_logo.png"/>
<hbox> <hbox>
<textbox value="@bind(vm.keyWord)" instant="true" width="250px" <textbox value="@bind(vm.keyWord)" instant="true" width="250px" onCreate="self.setFocus(true)"
onOK="@command('doSearch')"/> onOK="@command('doSearch')"/>
<button label="${labels.Search}" onClick="@command('doSearch')" sclass="nicebutton" <button label="${labels.Search}" onClick="@command('doSearch')" sclass="nicebutton"
image="/img/search.png"/> image="/img/search.png"/>
src/main/webapp/main/invoicing/invoicingForm.zul
+116 -117
View File
@@ -1,4 +1,4 @@
<?page title="${labels.Invoicing}" contentType="text/html;charset=UTF-8"?> <?page contentType="text/html;charset=UTF-8"?>
<zk> <zk>
<window <window
id="editWin" id="editWin"
@@ -14,122 +14,122 @@
zclass="form-caption" zclass="form-caption"
label="${labels.InvoicingFormTitle}" /> label="${labels.InvoicingFormTitle}" />
<vlayout vflex="1"> <vlayout vflex="1">
<hbox> <hbox
vflex="min"
<vbox height="300px"> hflex="1">
<button <button
image="/img/item-add.png" image="/img/item-add.png"
label="${labels.InvoicingAdd}" label="${labels.InvoicingAdd}"
sclass="nicebutton" sclass="nicebutton"
onClick="@command('addItem')"/> onClick="@command('addItem')" />
</hbox>
<listbox <hbox vflex="1">
model="@load(vm.dataBean.items)" <vbox vflex="1">
vflex="1" <listbox
selectedItem="@bind(vm.selectedItem)" model="@load(vm.dataBean.items)"
selectedIndex="@bind(vm.selectedIndex)"> vflex="1"
<listhead> selectedItem="@bind(vm.selectedItem)"
<listheader selectedIndex="@bind(vm.selectedIndex)">
label="${labels.InvoicingDate}" <listhead>
width="150px"/> <listheader
<listheader label="${labels.InvoicingInvoiceNumber}" /> label="${labels.InvoicingDate}"
<listheader width="150px" />
label="${labels.InvoicingAmount}" <listheader label="${labels.InvoicingInvoiceNumber}" />
align="right" <listheader
width="90px"/> label="${labels.InvoicingAmount}"
<listheader/> align="right"
</listhead> width="90px" />
<template name="model"> <listheader />
<listitem> </listhead>
<listcell> <template name="model">
<datebox <listitem>
value="@bind(each.invoiceDate)" <listcell>
inplace="true" <datebox
onFocus="@command('onFocus', item=each)"/> value="@bind(each.invoiceDate)"
</listcell> inplace="true"
<listcell> onFocus="@command('onFocus', item=each)" />
<textbox </listcell>
value="@bind(each.invoiceNumber)" <listcell>
sclass="grid-textbox-max" <textbox
inplace="true" value="@bind(each.invoiceNumber)"
maxlength="@load(vm.lengthText)" sclass="grid-textbox-max"
onFocus="@command('onFocus', item=each)"/> inplace="true"
</listcell> maxlength="@load(vm.lengthText)"
<listcell> onFocus="@command('onFocus', item=each)" />
<textbox </listcell>
value="@bind(each.amount) @converter(vm.standardBigDecimalConverter)" <listcell>
sclass="grid-textbox-max" <textbox
inplace="true" value="@bind(each.amount) @converter(vm.standardBigDecimalConverter)"
onFocus="@command('onFocus', item=each)" sclass="grid-textbox-max"
maxlength="@load(vm.lengthText)" inplace="true"
onChange="@command('calculate')"/> onFocus="@command('onFocus', item=each)"
</listcell> maxlength="@load(vm.lengthText)"
<listcell> onChange="@command('calculate')" />
<button label="${labels.RemoveItem}" sclass="nicebutton" onClick="@command('removeItem', item=each)"/> </listcell>
</listcell> <listcell>
</listitem> <button
</template> label="${labels.RemoveItem}"
</listbox> sclass="nicebutton"
</vbox> onClick="@command('removeItem', item=each)" />
</listcell>
<grid hflex="min"> </listitem>
<columns> </template>
<column </listbox>
align="right" </vbox>
hflex="min" /> <grid hflex="min">
<column /> <columns>
</columns> <column
<rows> align="right"
<row> hflex="min" />
<cell sclass="row-title">${labels.InvoicingRequirementNumber} :</cell> <column />
<cell> </columns>
<textbox <rows>
width="200px" <row>
value="@bind(vm.dataBean.requirement.numser)" <cell sclass="row-title">${labels.InvoicingRequirementNumber} :</cell>
style="font-weight: bold;" <cell>
maxlength="@load(vm.lengthText)" <textbox
readonly="true"/> width="200px"
</cell> value="@bind(vm.dataBean.requirement.numser)"
</row> style="font-weight: bold;"
<row> maxlength="@load(vm.lengthText)"
<cell sclass="row-title">${labels.InvoicingDescription} :</cell> readonly="true" />
<cell> </cell>
<textbox </row>
width="350px" <row>
rows="5" <cell sclass="row-title">${labels.InvoicingDescription} :</cell>
value="@bind(vm.dataBean.requirement.description)" <cell>
maxlength="@load(vm.lengthDescription)" <textbox
readonly="true" /> width="350px"
</cell> rows="5"
</row> value="@bind(vm.dataBean.requirement.description)"
<row> maxlength="@load(vm.lengthDescription)"
<cell sclass="row-title">${labels.InvoicingRequirementPrice} :</cell> readonly="true" />
<cell> </cell>
<textbox </row>
width="150px" <row>
value="@bind(vm.dataBean.requirement.sumTotal) @converter(vm.standardBigDecimalConverter)" <cell sclass="row-title">${labels.InvoicingRequirementPrice} :</cell>
maxlength="@load(vm.lengthText)" <cell>
readonly="true"/> <textbox
</cell> width="150px"
</row> value="@bind(vm.dataBean.requirement.sumTotal) @converter(vm.standardBigDecimalConverter)"
<row> maxlength="@load(vm.lengthText)"
<cell sclass="row-title">${labels.InvoicingInvoicedPrice} :</cell> readonly="true" />
<cell> </cell>
<textbox </row>
width="150px" <row>
value="@bind(vm.dataBean.totalInvoiced) @converter(vm.standardBigDecimalConverter)" <cell sclass="row-title">${labels.InvoicingInvoicedPrice} :</cell>
readonly="true" <cell>
maxlength="@load(vm.lengthText)" <textbox
style="@load(vm.dataBean.totalInvoiced gt vm.dataBean.requirement.sumTotal ? ' color: red;' : '' )"/> width="150px"
</cell> value="@bind(vm.dataBean.totalInvoiced) @converter(vm.standardBigDecimalConverter)"
</row> readonly="true"
</rows> maxlength="@load(vm.lengthText)"
</grid> style="@load(vm.dataBean.totalInvoiced gt vm.dataBean.requirement.sumTotal ? ' color: red;' : '' )" />
</cell>
</row>
</rows>
</grid>
</hbox> </hbox>
<listbox <listbox
vflex="1" vflex="1"
model="@load(vm.dataBean.requirement.items)"> model="@load(vm.dataBean.requirement.items)">
@@ -169,7 +169,7 @@
<template name="model"> <template name="model">
<listitem> <listitem>
<listcell> <listcell>
<label value="@load(each.code)"/> <label value="@load(each.code)" />
</listcell> </listcell>
<listcell> <listcell>
<label value="@load(each.name)" /> <label value="@load(each.name)" />
@@ -190,7 +190,7 @@
<label value="@bind(each.total) @converter(vm.standardBigDecimalConverter)" /> <label value="@bind(each.total) @converter(vm.standardBigDecimalConverter)" />
</listcell> </listcell>
<listcell> <listcell>
<checkbox checked="@bind(each.paid)"/> <checkbox checked="@bind(each.paid)" />
</listcell> </listcell>
<listcell> <listcell>
<label value="@bind(each.description)" /> <label value="@bind(each.description)" />
@@ -198,7 +198,6 @@
</listitem> </listitem>
</template> </template>
</listbox> </listbox>
<include src="/app/formButtons.zul" /> <include src="/app/formButtons.zul" />
</vlayout> </vlayout>
</window> </window>