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

Agenda "Fakturace požadavků" nyní podporuje řazení.

Browse Source 
Po otevření agendy je nastaveno řazení podle sloupce čísla požadavku.
U textových sloupců se data řadí podle CZ pravidel.
Přidána možnost řadit vnořené property podle CZ pravidel.


closes #189
This commit is contained in:
František Přibyl
2015-01-20 09:01:24 +01:00
parent d37076cd27
commit 8e33bb8ef7
6 changed files with 136 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/main/invoicing/invoicingGrid.zul
+36 -28
View File
@@ -18,35 +18,43 @@
<listhead menupopup="auto">
<listheader
label="${labels.InvoicingRequirementNumber}"
sort="czech(requirement.numser)"
onCreate="self.sort(true)"
width="130px" />
<listheader
label="${labels.RequirementsGridReqDate}"
width="150px"/>
sort="auto(requirement.reqDate)"
width="150px" />
<listheader
label="${labels.RequirementsGridCenter}"
width="180px"/>
sort="czech(requirement.centre.fullName)"
width="180px" />
<listheader
label="${labels.RequirementsGridWorkgroup}"
width="180px"/>
sort="czech(requirement.workgroup.fullName)"
width="180px" />
<listheader
label="${labels.InvoicingApplicant}"
width="180px"/>
label="${labels.InvoicingApplicant}"
sort="czech(requirement.ownedBy.fullName)"
width="180px" />
<listheader
label="${labels.InvoicingDescription}"
width=""/>
label="${labels.InvoicingDescription}"
sort="czech(requirement.description)"
width="" />
<listheader
label="${labels.InvoicingRequirementPrice}"
sort="auto(requirement.sumTotal)"
align="right"
width="130px" />
<listheader
label="${labels.InvoicingInvoicedPrice}"
align="right"
sort="auto(totalInvoiced)"
width="130px" />
</listhead>
<auxhead
sclass="category-center"
visible="@load(vm.filter)">
sclass="category-center"
visible="@load(vm.filter)">
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
@@ -133,34 +141,33 @@
<auxheader>
<!-- div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox
value="@bind(vm.filterTemplate.requirement.sumTotal) @converter(vm.standardBigDecimalConverter)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
<textbox
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">
<image src="/img/funnel.png" />
<image src="/img/funnel.png" />
</div>
</div -->
</div -->
</auxheader>
<auxheader>
<!-- div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox
value="@bind(vm.filterTemplate.totalInvoiced) @converter(vm.standardBigDecimalConverter)"
instant="true"
onChange="@command('doFilter')"
maxlength="@load(vm.lengthText)"
sclass="find-grid-textbox" />
<textbox
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">
<image src="/img/funnel.png" />
<image src="/img/funnel.png" />
</div>
</div-->
</div-->
</auxheader>
</auxhead>
<template name="model">
<listitem>
@@ -171,7 +178,8 @@
<listcell label="@load(each.requirement.ownedBy)" />
<listcell label="@load(each.requirement.description)" />
<listcell label="@load(each.requirement.sumTotal) @converter(vm.standardBigDecimalConverter)" />
<listcell label="@load(each.totalInvoiced) @converter(vm.standardBigDecimalConverter)"
<listcell
label="@load(each.totalInvoiced) @converter(vm.standardBigDecimalConverter)"
style="@load(vm.dataBean.totalInvoiced gt vm.dataBean.requirement.sumTotal ? ' color: red;' : '' )" />
</listitem>
</template>