Přepracováno vykreslování dialogu Faturace požadavků.

Vyhledávací edit dostane focus po otevření okna.
Opraveno Main menu.


closes #210
Verze_2.0
František Přibyl 10 years ago
parent f94afbc3ed
commit c4f5671327

@ -135,6 +135,7 @@
href="/j_spring_security_logout" /> href="/j_spring_security_logout" />
</menupopup> </menupopup>
</menu> </menu>
<menuitem label="${labels.Help}" target="blank"
href="https://drive.google.com/folderview?id=0B2inqAvr2t-TODg4ZWZoSThYbGM&amp;usp=sharing_eid" href="https://drive.google.com/folderview?id=0B2inqAvr2t-TODg4ZWZoSThYbGM&amp;usp=sharing_eid"
tooltiptext="${labels.GoogleDriveUrl}" /> tooltiptext="${labels.GoogleDriveUrl}" />
<menuseparator /> <menuseparator />

@ -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"/>

@ -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,15 +14,17 @@
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>
<hbox vflex="1">
<vbox vflex="1">
<listbox <listbox
model="@load(vm.dataBean.items)" model="@load(vm.dataBean.items)"
vflex="1" vflex="1"
@ -31,13 +33,13 @@
<listhead> <listhead>
<listheader <listheader
label="${labels.InvoicingDate}" label="${labels.InvoicingDate}"
width="150px"/> width="150px" />
<listheader label="${labels.InvoicingInvoiceNumber}" /> <listheader label="${labels.InvoicingInvoiceNumber}" />
<listheader <listheader
label="${labels.InvoicingAmount}" label="${labels.InvoicingAmount}"
align="right" align="right"
width="90px"/> width="90px" />
<listheader/> <listheader />
</listhead> </listhead>
<template name="model"> <template name="model">
<listitem> <listitem>
@ -45,7 +47,7 @@
<datebox <datebox
value="@bind(each.invoiceDate)" value="@bind(each.invoiceDate)"
inplace="true" inplace="true"
onFocus="@command('onFocus', item=each)"/> onFocus="@command('onFocus', item=each)" />
</listcell> </listcell>
<listcell> <listcell>
<textbox <textbox
@ -53,7 +55,7 @@
sclass="grid-textbox-max" sclass="grid-textbox-max"
inplace="true" inplace="true"
maxlength="@load(vm.lengthText)" maxlength="@load(vm.lengthText)"
onFocus="@command('onFocus', item=each)"/> onFocus="@command('onFocus', item=each)" />
</listcell> </listcell>
<listcell> <listcell>
<textbox <textbox
@ -62,16 +64,18 @@
inplace="true" inplace="true"
onFocus="@command('onFocus', item=each)" onFocus="@command('onFocus', item=each)"
maxlength="@load(vm.lengthText)" maxlength="@load(vm.lengthText)"
onChange="@command('calculate')"/> onChange="@command('calculate')" />
</listcell> </listcell>
<listcell> <listcell>
<button label="${labels.RemoveItem}" sclass="nicebutton" onClick="@command('removeItem', item=each)"/> <button
label="${labels.RemoveItem}"
sclass="nicebutton"
onClick="@command('removeItem', item=each)" />
</listcell> </listcell>
</listitem> </listitem>
</template> </template>
</listbox> </listbox>
</vbox> </vbox>
<grid hflex="min"> <grid hflex="min">
<columns> <columns>
<column <column
@ -88,7 +92,7 @@
value="@bind(vm.dataBean.requirement.numser)" value="@bind(vm.dataBean.requirement.numser)"
style="font-weight: bold;" style="font-weight: bold;"
maxlength="@load(vm.lengthText)" maxlength="@load(vm.lengthText)"
readonly="true"/> readonly="true" />
</cell> </cell>
</row> </row>
<row> <row>
@ -109,7 +113,7 @@
width="150px" width="150px"
value="@bind(vm.dataBean.requirement.sumTotal) @converter(vm.standardBigDecimalConverter)" value="@bind(vm.dataBean.requirement.sumTotal) @converter(vm.standardBigDecimalConverter)"
maxlength="@load(vm.lengthText)" maxlength="@load(vm.lengthText)"
readonly="true"/> readonly="true" />
</cell> </cell>
</row> </row>
<row> <row>
@ -120,16 +124,12 @@
value="@bind(vm.dataBean.totalInvoiced) @converter(vm.standardBigDecimalConverter)" value="@bind(vm.dataBean.totalInvoiced) @converter(vm.standardBigDecimalConverter)"
readonly="true" readonly="true"
maxlength="@load(vm.lengthText)" maxlength="@load(vm.lengthText)"
style="@load(vm.dataBean.totalInvoiced gt vm.dataBean.requirement.sumTotal ? ' color: red;' : '' )"/> style="@load(vm.dataBean.totalInvoiced gt vm.dataBean.requirement.sumTotal ? ' color: red;' : '' )" />
</cell> </cell>
</row> </row>
</rows> </rows>
</grid> </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>

Loading…
Cancel
Save