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

Přidány sloupce pro vlastníky, střediska a komise.

Browse Source 
Přidáno kontextové menu pro budoucí vytváření objednávek.

refs #139
This commit is contained in:
František Přibyl
2014-09-26 10:41:51 +02:00
parent 78cf41d2a0
commit 73c3ce7180
10 changed files with 267 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/WEB-INF/locales/zk-label.properties
+2
View File
@@ -292,6 +292,8 @@ SelectGroup=Vybrat skupinu...
RemoveItem=Smazat
Amount=Částka
Owner=Vlastník
CreateOrder=Vytvořit objednávku
WorkgroupFormUserIsCenterMember=Uživatel je členem střediska, jehož je komise členem!
WorkgroupFormMemberIsCenterMember=Některý ze členů přidávané komise je členem tohoto střediska!
src/main/webapp/img/autotruck-016.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 722 B

src/main/webapp/img/autotruck-032.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

src/main/webapp/main/orders/approved/grid.zul
+103 -24
View File
@@ -26,6 +26,7 @@
multiple="true"
checkmark="true"
vflex="1"
context="popupMenu"
model="@load(vm.dataList)">
<listhead menupopup="auto">
<listheader width="27" />
@@ -61,7 +62,19 @@
sort="auto(total)"
label="${labels.RequirementItemTotal}" />
<listheader
hflex="20"
hflex="7"
sort="auto(workgroup.fullName)"
label="${labels.RequirementsGridWorkgroup}" />
<listheader
hflex="7"
sort="auto(centre.fullName)"
label="${labels.RequirementsGridCenter}" />
<listheader
hflex="7"
sort="auto(ownedBy.fullName)"
label="${labels.Owner}" />
<listheader
hflex="15"
sort="czech(description)"
label="${labels.RequirementItemDescription}" />
</listhead>
@@ -112,19 +125,19 @@
<auxheader>
<!-- div sclass="find-grid-cell">
<div sclass="find-grid-img-left">
<image src="/img/funnel.png" />
<image src="/img/funnel.png" />
</div>
<div sclass="find-grid-divtextbox">
<textbox
value="@bind(vm.filterTemplate.quantity)"
instant="true"
onChange="@command('doFilter')"
sclass="find-grid-textbox-right" />
<textbox
value="@bind(vm.filterTemplate.quantity)"
instant="true"
onChange="@command('doFilter')"
sclass="find-grid-textbox-right" />
</div>
</div-->
</div-->
</auxheader>
<auxheader>
<!-- div sclass="find-grid-cell">
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox
value="@bind(vm.filterTemplate.munit.name)"
@@ -135,35 +148,92 @@
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
</div>
</div-->
</div>
</auxheader>
<auxheader>
<!-- div sclass="find-grid-cell">
<div sclass="find-grid-img-left">
<image src="/img/funnel.png" />
<image src="/img/funnel.png" />
</div>
<div sclass="find-grid-divtextbox">
<textbox
value="@bind(vm.filterTemplate.unitPrice)"
instant="true"
onChange="@command('doFilter')"
sclass="find-grid-textbox-right" />
<textbox
value="@bind(vm.filterTemplate.unitPrice)"
instant="true"
onChange="@command('doFilter')"
sclass="find-grid-textbox-right" />
</div>
</div-->
</div-->
</auxheader>
<auxheader>
<!-- div sclass="find-grid-cell">
<div sclass="find-grid-img-left">
<image src="/img/funnel.png" />
<image src="/img/funnel.png" />
</div>
<div sclass="find-grid-divtextbox">
<textbox
value="@bind(vm.filterTemplate.total)"
instant="true"
onChange="@command('doFilter')"
sclass="find-grid-textbox-right" />
<textbox
value="@bind(vm.filterTemplate.total)"
instant="true"
onChange="@command('doFilter')"
sclass="find-grid-textbox-right" />
</div>
</div-->
</div-->
</auxheader>
<auxheader>
<div zclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<combobox
readonly="true"
width="100%"
selectedItem="@bind(vm.filterTemplate.workgroup)"
model="@load(vm.workgroups)"
onChange="@command('doFilter')">
<template name="model">
<comboitem label="@load(each.fullName)" />
</template>
</combobox>
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
</div>
</div>
</auxheader>
<auxheader>
<div zclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<combobox
readonly="true"
width="100%"
selectedItem="@bind(vm.filterTemplate.centre)"
model="@load(vm.centers)"
onChange="@command('doFilter')">
<template name="model">
<comboitem label="@load(each.fullName)" />
</template>
</combobox>
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
</div>
</div>
</auxheader>
<auxheader>
<div zclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<combobox
readonly="true"
width="100%"
selectedItem="@bind(vm.filterTemplate.ownedBy)"
model="@load(vm.users)"
onChange="@command('doFilter')">
<template name="model">
<comboitem label="@load(each.fullName)" />
</template>
</combobox>
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
</div>
</div>
</auxheader>
<auxheader>
<div sclass="find-grid-cell">
@@ -190,9 +260,18 @@
<listcell label="@load(each.munit.name)" />
<listcell label="@load(each.unitPrice) @converter(vm.bigDecimalConverter)" />
<listcell label="@load(each.total) @converter(vm.bigDecimalConverter)" />
<listcell label="@load(each.workgroup.fullName)" />
<listcell label="@load(each.centre.fullName)" />
<listcell label="@load(each.ownedBy.fullName)" />
<listcell label="@load(each.description)" />
</listitem>
</template>
</listbox>
</window>
<menupopup id="popupMenu">
<menuitem
image="/img/autotruck-016.png"
label="${labels.CreateOrder}..."
onClick="" />
</menupopup>
</zk>