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

Implementovány požadavky

Browse Source 
closes #100
This commit is contained in:
František Přibyl
2014-07-16 10:33:54 +02:00
parent 91fdbd7a9d
commit 0cd4e039f8
31 changed files with 1074 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/lists/material/material.zul
+22 -3
View File
@@ -9,8 +9,8 @@
<listhead menupopup="auto">
<listheader label="${labels.code}" sort="czech(code)" width="10%" />
<listheader label="${labels.name}" sort="czech(name)" width="25%" />
<listheader label="${labels.description}" sort="czech(description)" width="55%" />
<listheader label="${labels.munit}" width="10%"/>
<listheader label="${labels.munit}" width="15%"/>
<listheader label="${labels.description}" sort="czech(description)" width="50%" />
</listhead>
<auxhead sclass="category-center" visible="@load(vm.filter)">
@@ -34,6 +34,25 @@
</div>
</div>
</auxheader>
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<combobox
model="@load(vm.munitList)"
selectedItem="@bind(vm.filterTemplate.munit)"
onChange="@command('doFilter')"
readonly="true"
sclass="find-grid-textbox">
<template name="model">
<comboitem label="@load(each.name)" />
</template>
</combobox>
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
</div>
</div>
</auxheader>
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
@@ -50,8 +69,8 @@
<listitem>
<listcell label="@load(each.code)" />
<listcell label="@load(each.name)" />
<listcell label="@load(each.munit.name)"/>
<listcell label="@load(each.description)" />
<listcell label="@load(each.munit.code)"/>
</listitem>
</template>
</listbox>
src/main/webapp/lists/material/materialForm.zul
+7 -7
View File
@@ -22,22 +22,22 @@
<textbox id="name" width="200px" value="@bind(vm.dataBean.name)" />
</cell>
</row>
<row>
<cell sclass="row-title">${labels.description} :</cell>
<cell>
<textbox id="description" width="300px" value="@bind(vm.dataBean.description)" />
</cell>
</row>
<row>
<cell sclass="row-title">${labels.munit} :</cell>
<cell>
<combobox model="@load(vm.munits)" selectedItem="@bind(vm.dataBean.munit)" readonly="true">
<template name="model">
<comboitem label="@load(each.code)"/>
<comboitem label="@load(each.name)"/>
</template>
</combobox>
</cell>
</row>
<row>
<cell sclass="row-title">${labels.description} :</cell>
<cell>
<textbox id="description" width="300px" value="@bind(vm.dataBean.description)" />
</cell>
</row>
</rows>
</grid>
<include src="/app/formButtons.zul" />
src/main/webapp/lists/munits/munitsForm.zul
-6
View File
@@ -9,12 +9,6 @@
<column />
</columns>
<rows>
<row>
<cell sclass="row-title">${labels.MUnitsFormCode} :</cell>
<cell>
<textbox id="code" constraint="@load(vm.constriant)" width="200px" value="@bind(vm.dataBean.code)" />
</cell>
</row>
<row>
<cell sclass="row-title">${labels.MUnitsFormName} :</cell>
<cell>
src/main/webapp/lists/munits/munitsGrid.zul
+3 -15
View File
@@ -7,26 +7,15 @@
<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)">
<listhead menupopup="auto">
<listheader label="${labels.MUnitsGridColumnCode}" sort="czech(code)" width="10%" />
<listheader label="${labels.MUnitsGridColumnName}" sort="czech(name)" width="30%" />
<listheader label="${labels.MUnitsGridColumnDescription}" sort="czech(description)" width="60%" />
<listheader label="${labels.MUnitsGridColumnDescription}" sort="czech(description)" width="70%" />
</listhead>
<auxhead sclass="category-center" visible="@load(vm.filter)">
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.code)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
</div>
</div>
</auxheader>
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.nameSpecial)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
<textbox value="@bind(vm.filterTemplate.name)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
@@ -47,8 +36,7 @@
<template name="model">
<listitem>
<listcell label="@load(each.code)" />
<listcell label="@load(each.nameSpecial)" />
<listcell label="@load(each.name)" />
<listcell label="@load(each.description)" />
</listitem>
</template>