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
Verze_2.0
Josef Rokos 10 years ago
parent 1d2810f78d c4f5671327
commit 48d2c75d7b
2 changed files with 115 additions and 116 deletions
Show Stats Download Patch File Download Diff File

2
src/main/webapp/app/search/searchForm.zul
Unescape Escape 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"/>

219
src/main/webapp/main/invoicing/invoicingForm.zul
Unescape Escape 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}" />
<listheader
label="${labels.InvoicingAmount}"
align="right"
width="90px" />
<listheader />
</listhead>
<template name="model">
<listitem>
<listcell>
<datebox
value="@bind(each.invoiceDate)"
inplace="true"
onFocus="@command('onFocus', item=each)" />
</listcell>
<listcell>
<textbox
value="@bind(each.invoiceNumber)"
sclass="grid-textbox-max"
inplace="true"
maxlength="@load(vm.lengthText)"
onFocus="@command('onFocus', item=each)" />
</listcell>
<listcell>
<textbox
value="@bind(each.amount) @converter(vm.standardBigDecimalConverter)"
sclass="grid-textbox-max"
inplace="true"
onFocus="@command('onFocus', item=each)"
maxlength="@load(vm.lengthText)"
onChange="@command('calculate')" />
</listcell>
<listcell>
<button
label="${labels.RemoveItem}"
sclass="nicebutton"
onClick="@command('removeItem', item=each)" />
</listcell>
</listitem>
</template>
</listbox>
</vbox>
<grid hflex="min">
<columns>
<column
align="right" align="right"
width="90px"/> hflex="min" />
<listheader/> <column />
</listhead> </columns>
<template name="model"> <rows>
<listitem> <row>
<listcell> <cell sclass="row-title">${labels.InvoicingRequirementNumber} :</cell>
<datebox <cell>
value="@bind(each.invoiceDate)"
inplace="true"
onFocus="@command('onFocus', item=each)"/>
</listcell>
<listcell>
<textbox <textbox
value="@bind(each.invoiceNumber)" width="200px"
sclass="grid-textbox-max" value="@bind(vm.dataBean.requirement.numser)"
inplace="true" style="font-weight: bold;"
maxlength="@load(vm.lengthText)" maxlength="@load(vm.lengthText)"
onFocus="@command('onFocus', item=each)"/> readonly="true" />
</listcell> </cell>
<listcell> </row>
<row>
<cell sclass="row-title">${labels.InvoicingDescription} :</cell>
<cell>
<textbox
width="350px"
rows="5"
value="@bind(vm.dataBean.requirement.description)"
maxlength="@load(vm.lengthDescription)"
readonly="true" />
</cell>
</row>
<row>
<cell sclass="row-title">${labels.InvoicingRequirementPrice} :</cell>
<cell>
<textbox <textbox
value="@bind(each.amount) @converter(vm.standardBigDecimalConverter)" width="150px"
sclass="grid-textbox-max" value="@bind(vm.dataBean.requirement.sumTotal) @converter(vm.standardBigDecimalConverter)"
inplace="true"
onFocus="@command('onFocus', item=each)"
maxlength="@load(vm.lengthText)" maxlength="@load(vm.lengthText)"
onChange="@command('calculate')"/> readonly="true" />
</listcell> </cell>
<listcell> </row>
<button label="${labels.RemoveItem}" sclass="nicebutton" onClick="@command('removeItem', item=each)"/> <row>
</listcell> <cell sclass="row-title">${labels.InvoicingInvoicedPrice} :</cell>
</listitem> <cell>
</template> <textbox
</listbox> width="150px"
</vbox> value="@bind(vm.dataBean.totalInvoiced) @converter(vm.standardBigDecimalConverter)"
readonly="true"
<grid hflex="min"> maxlength="@load(vm.lengthText)"
<columns> style="@load(vm.dataBean.totalInvoiced gt vm.dataBean.requirement.sumTotal ? ' color: red;' : '' )" />
<column </cell>
align="right" </row>
hflex="min" /> </rows>
<column /> </grid>
</columns>
<rows>
<row>
<cell sclass="row-title">${labels.InvoicingRequirementNumber} :</cell>
<cell>
<textbox
width="200px"
value="@bind(vm.dataBean.requirement.numser)"
style="font-weight: bold;"
maxlength="@load(vm.lengthText)"
readonly="true"/>
</cell>
</row>
<row>
<cell sclass="row-title">${labels.InvoicingDescription} :</cell>
<cell>
<textbox
width="350px"
rows="5"
value="@bind(vm.dataBean.requirement.description)"
maxlength="@load(vm.lengthDescription)"
readonly="true" />
</cell>
</row>
<row>
<cell sclass="row-title">${labels.InvoicingRequirementPrice} :</cell>
<cell>
<textbox
width="150px"
value="@bind(vm.dataBean.requirement.sumTotal) @converter(vm.standardBigDecimalConverter)"
maxlength="@load(vm.lengthText)"
readonly="true"/>
</cell>
</row>
<row>
<cell sclass="row-title">${labels.InvoicingInvoicedPrice} :</cell>
<cell>
<textbox
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>
</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>

Write Preview
Loading…
Cancel
Save