Přepracovány styly pro celkový vzhled okna, nastavení rolování gridu.

BigDecimalConverter přesunut do báze...
Odstraněna stará cesta k původním požadavkům.
Nové požadavky připraveny do tabů.
multitenant
František Přibyl 10 years ago
parent 1829a5c0db
commit 0287c65d9c

@ -0,0 +1,48 @@
package info.bukova.isspst.ui.main.orders.requirements;
import info.bukova.isspst.data.Requirement;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.filters.RequirementFilter;
import info.bukova.isspst.services.requirement.RequirementService;
import info.bukova.isspst.services.users.UserService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import info.bukova.isspst.ui.requirement.RequirementSubpage;
import java.util.List;
import org.zkoss.bind.annotation.Init;
import org.zkoss.zk.ui.select.annotation.WireVariable;
public class ReqListMy extends RequirementSubpage<Requirement>
{
@WireVariable
private RequirementService requirementService;
@WireVariable
private UserService userService;
@WireVariable
private WorkgroupService workgroupService;
public List<Workgroup> getCentres()
{
return workgroupService.getUserCentres(userService.getCurrent());
}
@Init
public void init()
{
super.init();
service = requirementService;
dataClass = Requirement.class;
formZul = "reqForm.zul";
dataFilter = new RequirementFilter(getFilterTemplate());
}
@Override
protected List<Requirement> getListFromService()
{
return super.getListFromService();
}
}

@ -0,0 +1,48 @@
package info.bukova.isspst.ui.main.orders.requirements;
import info.bukova.isspst.data.Requirement;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.filters.RequirementFilter;
import info.bukova.isspst.services.requirement.RequirementService;
import info.bukova.isspst.services.users.UserService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import info.bukova.isspst.ui.requirement.RequirementSubpage;
import java.util.List;
import org.zkoss.bind.annotation.Init;
import org.zkoss.zk.ui.select.annotation.WireVariable;
public class ReqListMyAll extends RequirementSubpage<Requirement>
{
@WireVariable
private RequirementService requirementService;
@WireVariable
private UserService userService;
@WireVariable
private WorkgroupService workgroupService;
public List<Workgroup> getCentres()
{
return workgroupService.getUserCentres(userService.getCurrent());
}
@Init
public void init()
{
super.init();
service = requirementService;
dataClass = Requirement.class;
formZul = "reqForm.zul";
dataFilter = new RequirementFilter(getFilterTemplate());
}
@Override
protected List<Requirement> getListFromService()
{
return super.getListFromService();
}
}

@ -0,0 +1,48 @@
package info.bukova.isspst.ui.main.orders.requirements;
import info.bukova.isspst.data.Requirement;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.filters.RequirementFilter;
import info.bukova.isspst.services.requirement.RequirementService;
import info.bukova.isspst.services.users.UserService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import info.bukova.isspst.ui.requirement.RequirementSubpage;
import java.util.List;
import org.zkoss.bind.annotation.Init;
import org.zkoss.zk.ui.select.annotation.WireVariable;
public class ReqListMyCenters extends RequirementSubpage<Requirement>
{
@WireVariable
private RequirementService requirementService;
@WireVariable
private UserService userService;
@WireVariable
private WorkgroupService workgroupService;
public List<Workgroup> getCentres()
{
return workgroupService.getUserCentres(userService.getCurrent());
}
@Init
public void init()
{
super.init();
service = requirementService;
dataClass = Requirement.class;
formZul = "reqForm.zul";
dataFilter = new RequirementFilter(getFilterTemplate());
}
@Override
protected List<Requirement> getListFromService()
{
return super.getListFromService();
}
}

@ -0,0 +1,48 @@
package info.bukova.isspst.ui.main.orders.requirements;
import info.bukova.isspst.data.Requirement;
import info.bukova.isspst.data.Workgroup;
import info.bukova.isspst.filters.RequirementFilter;
import info.bukova.isspst.services.requirement.RequirementService;
import info.bukova.isspst.services.users.UserService;
import info.bukova.isspst.services.workgroups.WorkgroupService;
import info.bukova.isspst.ui.requirement.RequirementSubpage;
import java.util.List;
import org.zkoss.bind.annotation.Init;
import org.zkoss.zk.ui.select.annotation.WireVariable;
public class ReqListMyWorkgroups extends RequirementSubpage<Requirement>
{
@WireVariable
private RequirementService requirementService;
@WireVariable
private UserService userService;
@WireVariable
private WorkgroupService workgroupService;
public List<Workgroup> getCentres()
{
return workgroupService.getUserCentres(userService.getCurrent());
}
@Init
public void init()
{
super.init();
service = requirementService;
dataClass = Requirement.class;
formZul = "reqForm.zul";
dataFilter = new RequirementFilter(getFilterTemplate());
}
@Override
protected List<Requirement> getListFromService()
{
return super.getListFromService();
}
}

@ -2,14 +2,34 @@ package info.bukova.isspst.ui.requirement;
import info.bukova.isspst.data.RequirementBase;
import info.bukova.isspst.services.requirement.RequirementBaseService;
import info.bukova.isspst.ui.BigDecimalConverter;
import info.bukova.isspst.ui.ListViewModel;
import org.zkoss.bind.BindUtils;
import org.zkoss.bind.annotation.Command;
import org.zkoss.bind.annotation.Init;
import org.zkoss.bind.annotation.NotifyChange;
public class RequirementSubpage<T extends RequirementBase> extends ListViewModel<T> {
private BigDecimalConverter bigDecimalConverter;
public BigDecimalConverter getBigDecimalConverter()
{
return bigDecimalConverter;
}
public void setBigDecimalConverter(BigDecimalConverter bigDecimalConverter)
{
this.bigDecimalConverter = bigDecimalConverter;
}
@Init
public void init()
{
this.bigDecimalConverter = new BigDecimalConverter();
}
@SuppressWarnings("unchecked")
private RequirementBaseService<T> getReqService()
{

@ -207,7 +207,10 @@ false=Ne
Information=Informace
Requirements=Požadavky
Orders=Objednávky
CurrentRequirements=Aktuální požadavky
ApprovedOrders=Schválené objednávky
BussinessTrips=Služební cesty
TravelOrders=Cestovní příkazy
Lists=Seznamy
Settings=Nastavení
Administration=Administrace

@ -11,15 +11,28 @@
label="${labels.Information}"
href="/" />
<menuseparator />
<menu label="${labels.Orders}">
<menupopup>
<menuitem
image="/img/req-order-016.png"
label="${labels.CurrentRequirements}"
href="/main/orders/requirements/" />
<menuitem
label="${labels.Requirements}"
href="/requirements/actual" />
<!-- menuitem
label="${labels.Orders}"
href="/orders/actual" /-->
label="${labels.ApprovedOrders}"
href="" />
</menupopup>
</menu>
<menu label="${labels.BussinessTrips}">
<menupopup>
<menuitem
label="${labels.BussinessTrips}"
image="/img/req-trip-016.png"
label="${labels.CurrentRequirements}"
href="/trips/requirement" />
<menuitem
label="${labels.TravelOrders}"
href="" />
</menupopup>
</menu>
<menuseparator />
<menu label="${labels.Lists}">
<menupopup>
@ -40,6 +53,7 @@
href="/lists/buildings"
disabled="${not sec:isAllGranted('PERM_READ_BUILDINGS')}" />
<menuitem
image="/img/tape-measure-016.png"
label="${labels.AgendaMUnits}"
href="/lists/munits"
disabled="${not sec:isAllGranted('PERM_READ_MUNITS')}" />
@ -48,6 +62,7 @@
<menu label="${labels.Settings}">
<menupopup>
<menuitem
image="/img/global-setting-016.png"
label="${labels.GlobalSettings}…"
onClick="@command('globalSettings')" />
<menuitem
@ -78,6 +93,7 @@
<menu label="${labels.User}">
<menupopup>
<menuitem
image=""
label="${labels.ChangePassword}…"
onClick="@command('passwd')" />
<menuitem

@ -41,16 +41,18 @@
});
</script>
<div id="container">
<div id="screen">
<div id="header">
<u:include src="/app/header.zul" />
</div>
<div id="mainMenu">
<u:include src="/app/mainMenu.zul" />
</div>
<div id="maincolumn">
<div id="mainData">
<u:include src="${gridZul}" />
</div>
<div id="footer">Josef Rokos &amp; František Přibyl</div>
<div id="footer">
Josef Rokos &amp; František Přibyl
</div>
</div>
</html>

@ -1,43 +1,69 @@
html {
/*vertical scrollbar allways visible */
overflow: -moz-scrollbars-vertical;
overflow-y: scroll;
--overflow: -moz-scrollbars-vertical;
--overflow-y: scroll;
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
}
#container {
html, body {
height: 100%;
margin: 0px 0px 0px 0px;
padding: 0px;
}
#screen {
width: 100%;
min-height: 100%;
position: relative;
margin: 0px 0px 0px 0px;
}
#header {
width: auto;
height: 60px;
border: 1px solid #ccc;
padding-top: 5px;
padding-bottom: 5px;
/* při úzkém sloupci gridu neodřádkuje slova podle mezer */
white-space: nowrap;
overflow: hidden;
}
#navbar {
border: 1px solid #ccc;
#mainMenu {
height: 30px;
overflow: hidden;
}
#maincolumn {
padding-top: 5px;
padding-bottom: 25px; /* Height of the footer */
#mainData {
position: absolute;
width: 100%;
top: 105px;
bottom: 25px;
overflow: auto;
margin: 0px 0px 0px 0px;
padding: 0px;
}
#footer {
width: 100%;
clear: both;
position: absolute;
bottom: 5px;
height: 20px; /* Height of the footer */
border: 1px solid #ccc;
bottom: 0px;
width: 100%;
height: 20px; /* height of the footer */
margin: 0px;
padding: 0px;
padding-top: 5px;
border: 0px solid #ccc;
text-align: center;
vertical-align: center;
font-size: 10px;
color: gray;
/* při úzkém sloupci gridu neodřádkuje slova podle mezer */
white-space: nowrap;
overflow: hidden;
}
.form-caption {
@ -51,3 +77,15 @@ html {
.form-caption-content {
float: left;
}
.form-caption-image {
padding-right: 5px;
}
/*
html, body { background-color: red; }
#screen { background-color: lightgreen; }
#mainMenu { background-color: yellow; }
#mainData { background-color: cyan; }
#footer { background-color: orange; }
*/

@ -37,5 +37,12 @@
}
.row-title {
/* ve formuláři zarovná u víceřádkových editů label nahoru */
vertical-align: top;
}
.z-listcell-content {
/* při úzkém sloupci gridu neodřádkuje slova podle mezer */
white-space: nowrap;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 698 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 679 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 712 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

@ -1,24 +1,41 @@
<?page title="${labels.MUnitsFormTitle}" contentType="text/html;charset=UTF-8"?>
<zk>
<window id="editWin" closable="true" border="normal" position="center" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('info.bukova.isspst.ui.munits.MUnitsForm')">
<caption src="/img/munits.png" zclass="form-caption" label="${labels.MUnitsFormTitle}" />
<window
id="editWin"
closable="true"
border="normal"
position="center"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.munits.MUnitsForm')">
<caption
src="/img/tape-measure-032.png"
zclass="form-caption"
label="${labels.MUnitsFormTitle}" />
<vlayout>
<grid hflex="min">
<columns>
<column align="right" hflex="min" />
<column
align="right"
hflex="min" />
<column />
</columns>
<rows>
<row>
<cell sclass="row-title">${labels.MUnitsFormName} :</cell>
<cell>
<textbox id="name" width="200px" value="@bind(vm.dataBean.name)" />
<textbox
id="name"
width="200px"
value="@bind(vm.dataBean.name)" />
</cell>
</row>
<row>
<cell sclass="row-title">${labels.MUnitsFormDescription} :</cell>
<cell>
<textbox id="description" width="300px" value="@bind(vm.dataBean.description)" />
<textbox
id="description"
width="300px"
value="@bind(vm.dataBean.description)" />
</cell>
</row>
</rows>

@ -1,21 +1,41 @@
<?page title="${labels.AgendaMUnits}" contentType="text/html;charset=UTF-8"?>
<zk>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<window border="normal" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('info.bukova.isspst.ui.munits.MUnitsList')">
<caption zclass="form-caption" label="${labels.AgendaMUnits}" />
<window
vflex="1"
border="normal"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.munits.MUnitsList')">
<caption
src="/img/tape-measure-032.png"
zclass="form-caption"
label="${labels.AgendaMUnits}" />
<include src="/app/toolbar.zul" />
<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)">
<listbox
vflex="1"
model="@load(vm.dataList)"
selectedItem="@bind(vm.dataBean)">
<listhead menupopup="auto">
<listheader label="${labels.MUnitsGridColumnName}" sort="czech(name)" width="30%" />
<listheader label="${labels.MUnitsGridColumnDescription}" sort="czech(description)" width="70%" />
<listheader
label="${labels.MUnitsGridColumnName}"
sort="czech(name)"
width="30%" />
<listheader
label="${labels.MUnitsGridColumnDescription}"
sort="czech(description)"
width="70%" />
</listhead>
<auxhead sclass="category-center" visible="@load(vm.filter)">
<auxhead
sclass="category-center"
visible="@load(vm.filter)">
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.name)" 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" />
@ -25,7 +45,11 @@
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<textbox value="@bind(vm.filterTemplate.description)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
<textbox
value="@bind(vm.filterTemplate.description)"
instant="true"
onChange="@command('doFilter')"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
@ -33,7 +57,6 @@
</div>
</auxheader>
</auxhead>
<template name="model">
<listitem>
<listcell label="@load(each.name)" />
@ -41,6 +64,5 @@
</listitem>
</template>
</listbox>
</window>
</zk>

@ -2,9 +2,9 @@
<zk>
<zscript>
String gridZul = "requirements.zul";
String gridZul = "setup.zul";
</zscript>
<include src="../../app/template.zhtml"/>
<include src="/app/template.zhtml"/>
</zk>

@ -9,7 +9,7 @@
viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.RequirementForm')"
validationMessages="@id('vmsg')">
<caption
src="/img/reqact.png"
image="/img/req-order-032.png"
zclass="form-caption"
label="${labels.RequirementsFormTitle}" />
<vlayout

@ -1,17 +1,15 @@
<?page title="${labels.AgendaActRequirements}" contentType="text/html;charset=UTF-8"?>
<zk>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<window
border="normal"
vflex="1"
border="none"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.RequirementList')">
<caption
zclass="form-caption"
label="${labels.AgendaActRequirements}" />
viewModel="@id('vm') @init('info.bukova.isspst.ui.main.orders.requirements.ReqListMy')">
<include src="/app/toolbar.zul" />
<listbox
model="@load(vm.dataList)"
selectedItem="@bind(vm.dataBean)">
vflex="1"
selectedItem="@bind(vm.dataBean)"
model="@load(vm.dataList)">
<listhead menupopup="auto">
<listheader
label="${labels.RequirementsGridNumberSerie}"

@ -0,0 +1,144 @@
<zk>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<window
vflex="1"
border="none"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.main.orders.requirements.ReqListMyAll')">
<include src="/main/toolbar.zul" />
<listbox
vflex="1"
selectedItem="@bind(vm.dataBean)"
model="@load(vm.dataList)">
<listhead menupopup="auto">
<listheader
label="${labels.RequirementsGridNumberSerie}"
sort="czech(numser)"
width="7%" />
<listheader
label="${labels.RequirementsGridReqDate}"
sort="auto(reqDate)"
width="13%" />
<listheader
label="${labels.RequirementsGridCenter}"
sort="czech(description)"
width="10%" />
<listheader
label="${labels.RequirementsGridDeliveryDate}"
sort="auto(reqDate)"
width="13%" />
<listheader
label="${labels.Amount}"
sort="auto(sumTotal)"
align="right"
width="10%" />
<listheader
label="${labels.RequirementsGridDescription}"
sort="czech(description)"
width="60%" />
</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.numser)"
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">
<datebox
value="@bind(vm.filterTemplate.reqDate)"
format="${labels.DateFormat}"
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">
<combobox
model="@load(vm.centres)"
readonly="true"
width="100%"
selectedItem="@bind(vm.filterTemplate.workgroup)">
<template name="model">
<comboitem label="@load(each.fullName)" />
</template>
</combobox>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
</div>
</div>
</auxheader>
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<datebox
value="@bind(vm.filterTemplate.deliveryDate)"
format="${labels.DateFormat}"
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.sumTotal) @converter(vm.bigDecimalConverter)"
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.description)"
instant="true"
onChange="@command('doFilter')"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
</div>
</div>
</auxheader>
</auxhead>
<template name="model">
<listitem>
<listcell label="@load(each.numser)" />
<listcell label="@load(each.reqDate) @converter('formatedDate', format=labels.DateFormat)" />
<listcell label="@load(each.workgroup.fullName)" />
<listcell label="@load(each.deliveryDate) @converter('formatedDate', format=labels.DateFormat)" />
<listcell label="@load(each.sumTotal) @converter(vm.bigDecimalConverter)" />
<listcell label="@load(each.description)" />
</listitem>
</template>
</listbox>
</window>
</zk>

@ -0,0 +1,144 @@
<zk>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<window
vflex="1"
border="none"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.main.orders.requirements.ReqListMyCenters')">
<include src="/main/toolbar.zul" />
<listbox
vflex="1"
selectedItem="@bind(vm.dataBean)"
model="@load(vm.dataList)">
<listhead menupopup="auto">
<listheader
label="${labels.RequirementsGridNumberSerie}"
sort="czech(numser)"
width="7%" />
<listheader
label="${labels.RequirementsGridReqDate}"
sort="auto(reqDate)"
width="13%" />
<listheader
label="${labels.RequirementsGridCenter}"
sort="czech(description)"
width="10%" />
<listheader
label="${labels.RequirementsGridDeliveryDate}"
sort="auto(reqDate)"
width="13%" />
<listheader
label="${labels.Amount}"
sort="auto(sumTotal)"
align="right"
width="10%" />
<listheader
label="${labels.RequirementsGridDescription}"
sort="czech(description)"
width="60%" />
</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.numser)"
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">
<datebox
value="@bind(vm.filterTemplate.reqDate)"
format="${labels.DateFormat}"
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">
<combobox
model="@load(vm.centres)"
readonly="true"
width="100%"
selectedItem="@bind(vm.filterTemplate.workgroup)">
<template name="model">
<comboitem label="@load(each.fullName)" />
</template>
</combobox>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
</div>
</div>
</auxheader>
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<datebox
value="@bind(vm.filterTemplate.deliveryDate)"
format="${labels.DateFormat}"
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.sumTotal) @converter(vm.bigDecimalConverter)"
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.description)"
instant="true"
onChange="@command('doFilter')"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
</div>
</div>
</auxheader>
</auxhead>
<template name="model">
<listitem>
<listcell label="@load(each.numser)" />
<listcell label="@load(each.reqDate) @converter('formatedDate', format=labels.DateFormat)" />
<listcell label="@load(each.workgroup.fullName)" />
<listcell label="@load(each.deliveryDate) @converter('formatedDate', format=labels.DateFormat)" />
<listcell label="@load(each.sumTotal) @converter(vm.bigDecimalConverter)" />
<listcell label="@load(each.description)" />
</listitem>
</template>
</listbox>
</window>
</zk>

@ -0,0 +1,144 @@
<zk>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<window
vflex="1"
border="none"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.main.orders.requirements.ReqListMyWorkgroups')">
<include src="/main/toolbar.zul" />
<listbox
vflex="1"
selectedItem="@bind(vm.dataBean)"
model="@load(vm.dataList)">
<listhead menupopup="auto">
<listheader
label="${labels.RequirementsGridNumberSerie}"
sort="czech(numser)"
width="7%" />
<listheader
label="${labels.RequirementsGridReqDate}"
sort="auto(reqDate)"
width="13%" />
<listheader
label="${labels.RequirementsGridCenter}"
sort="czech(description)"
width="10%" />
<listheader
label="${labels.RequirementsGridDeliveryDate}"
sort="auto(reqDate)"
width="13%" />
<listheader
label="${labels.Amount}"
sort="auto(sumTotal)"
align="right"
width="10%" />
<listheader
label="${labels.RequirementsGridDescription}"
sort="czech(description)"
width="60%" />
</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.numser)"
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">
<datebox
value="@bind(vm.filterTemplate.reqDate)"
format="${labels.DateFormat}"
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">
<combobox
model="@load(vm.centres)"
readonly="true"
width="100%"
selectedItem="@bind(vm.filterTemplate.workgroup)">
<template name="model">
<comboitem label="@load(each.fullName)" />
</template>
</combobox>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
</div>
</div>
</auxheader>
<auxheader>
<div sclass="find-grid-cell">
<div sclass="find-grid-divtextbox">
<datebox
value="@bind(vm.filterTemplate.deliveryDate)"
format="${labels.DateFormat}"
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.sumTotal) @converter(vm.bigDecimalConverter)"
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.description)"
instant="true"
onChange="@command('doFilter')"
sclass="find-grid-textbox" />
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
</div>
</div>
</auxheader>
</auxhead>
<template name="model">
<listitem>
<listcell label="@load(each.numser)" />
<listcell label="@load(each.reqDate) @converter('formatedDate', format=labels.DateFormat)" />
<listcell label="@load(each.workgroup.fullName)" />
<listcell label="@load(each.deliveryDate) @converter('formatedDate', format=labels.DateFormat)" />
<listcell label="@load(each.sumTotal) @converter(vm.bigDecimalConverter)" />
<listcell label="@load(each.description)" />
</listitem>
</template>
</listbox>
</window>
</zk>

@ -0,0 +1,21 @@
<?page title="new page title" contentType="text/html;charset=UTF-8"?>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<zk>
<zscript>
String gridMy = "/main/orders/requirements/reqListMy.zul";
String gridMyCenters = "/main/orders/requirements/reqListMyCenters.zul";
String gridMyWorkgroups = "/main/orders/requirements/reqListMyWorkgroups.zul";
String gridAll = "/main/orders/requirements/reqListMyAll.zul";
</zscript>
<window
vflex="1"
border="normal">
<caption
image="/img/req-order-032.png"
zclass="form-caption"
label="${labels.AgendaActRequirements}" />
<include
vflex="1"
src="/main/tabPanels.zul" />
</window>
</zk>

@ -0,0 +1,22 @@
<tabbox vflex="1">
<tabs>
<tab label="${labels.RequirementsGridMy}" />
<tab label="${labels.RequirementsGridMyCentres}" />
<tab label="${labels.RequirementsGridMyWorkgroups}" />
<tab label="${labels.RequirementsGridAll}" />
</tabs>
<tabpanels>
<tabpanel>
<include src="${gridMy}" />
</tabpanel>
<tabpanel>
<include src="${gridMyCenters}" />
</tabpanel>
<tabpanel>
<include src="${gridMyWorkgroups}" />
</tabpanel>
<tabpanel>
<include src="${gridAll}" />
</tabpanel>
</tabpanels>
</tabbox>

@ -0,0 +1,8 @@
<?page title="req toolbar" contentType="text/html;charset=UTF-8"?>
<zk>
<toolbar>
<toolbarbutton image="/img/edit.png" tooltiptext="${labels.ToolbarRecEdit}" id="btnEdit" onClick="@command('edit')" disabled="@load(empty vm.dataBean ? 'true' : 'false')"/>
<toolbarbutton image="/img/funnel.png" tooltiptext="${labels.ToolbarRecFilter}" id="btnFilter" onClick="@command('filter')" />
<toolbarbutton image="/img/print.png" tooltiptext="${labels.ToolbarPrint}" id="btnPrint" onClick="@command('onPrint')" />
</toolbar>
</zk>

@ -1,11 +1,21 @@
<?page title="EMail" contentType="text/html;charset=UTF-8"?>
<?page title="${labels.GlobalSettings}" contentType="text/html;charset=UTF-8"?>
<zk>
<window id="editWin" border="normal" closable="true" apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.settings.GlobalSettingsVM')" width="820px"
<window
id="editWin"
border="normal"
closable="true"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.settings.GlobalSettingsVM')"
width="700px"
height="600px"
binder="@init(queueName='email')">
<caption src="/img/settings.png" zclass="form-caption" label="${labels.GlobalSettings}" />
<tabbox orient="vertical" height="500px">
<caption
src="/img/global-setting-032.png"
zclass="form-caption"
label="${labels.GlobalSettings}" />
<tabbox
orient="vertical"
vflex="1">
<tabs width="140px">
<tab label="${labels.Requirements}" />
<tab label="${labels.EMails}" />
@ -16,7 +26,9 @@ binder="@init(queueName='email')">
<tabpanels>
<tabpanel>
<div>
<checkbox label="${labels.EnableRequirements}" checked="@bind(vm.settings.enableRequirements)"/>
<checkbox
label="${labels.EnableRequirements}"
checked="@bind(vm.settings.enableRequirements)" />
</div>
</tabpanel>
<tabpanel>
@ -33,8 +45,6 @@ binder="@init(queueName='email')">
</tabpanel>
</tabpanels>
</tabbox>
<include src="/app/formButtons.zul" />
</window>
</zk>
Loading…
Cancel
Save