From 0287c65d9c6c7e51319d40493f3bdc1ce5b36fe2 Mon Sep 17 00:00:00 2001 From: Franta Pribyl Date: Fri, 25 Jul 2014 16:43:11 +0200 Subject: [PATCH] =?UTF-8?q?P=C5=99epracov=C3=A1ny=20styly=20pro=20celkov?= =?UTF-8?q?=C3=BD=20vzhled=20okna,=20nastaven=C3=AD=20rolov=C3=A1n=C3=AD?= =?UTF-8?q?=20gridu.=20BigDecimalConverter=20p=C5=99esunut=20do=20b=C3=A1z?= =?UTF-8?q?e...=20Odstran=C4=9Bna=20star=C3=A1=20cesta=20k=20p=C5=AFvodn?= =?UTF-8?q?=C3=ADm=20po=C5=BEadavk=C5=AFm.=20Nov=C3=A9=20po=C5=BEadavky=20?= =?UTF-8?q?p=C5=99ipraveny=20do=20tab=C5=AF.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/orders/requirements/ReqListMy.java | 48 ++++++ .../orders/requirements/ReqListMyAll.java | 48 ++++++ .../orders/requirements/ReqListMyCenters.java | 48 ++++++ .../requirements/ReqListMyWorkgroups.java | 48 ++++++ .../ui/requirement/RequirementSubpage.java | 20 +++ .../WEB-INF/locales/zk-label.properties | 3 + src/main/webapp/app/mainMenu.zul | 34 +++-- src/main/webapp/app/template.zhtml | 8 +- src/main/webapp/css/page.css | 70 +++++++-- src/main/webapp/css/zk-modify.css | 9 +- src/main/webapp/img/global-setting-016.png | Bin 0 -> 1075 bytes src/main/webapp/img/global-setting-032.png | Bin 0 -> 2704 bytes src/main/webapp/img/munits.png | Bin 3117 -> 0 bytes src/main/webapp/img/req-order-016.png | Bin 0 -> 698 bytes src/main/webapp/img/req-order-032.png | Bin 0 -> 1933 bytes src/main/webapp/img/req-trip-016.png | Bin 0 -> 679 bytes src/main/webapp/img/req-trip-032.png | Bin 0 -> 1877 bytes src/main/webapp/img/settings.png | Bin 3188 -> 0 bytes src/main/webapp/img/tape-measure-016.png | Bin 0 -> 712 bytes src/main/webapp/img/tape-measure-032.png | Bin 0 -> 1879 bytes src/main/webapp/lists/munits/munitsForm.zul | 27 +++- src/main/webapp/lists/munits/munitsGrid.zul | 46 ++++-- .../orders/requirements}/index.zul | 4 +- .../orders/requirements/reqForm.zul} | 2 +- .../orders/requirements/reqListMy.zul} | 14 +- .../main/orders/requirements/reqListMyAll.zul | 144 ++++++++++++++++++ .../orders/requirements/reqListMyCenters.zul | 144 ++++++++++++++++++ .../requirements/reqListMyWorkgroups.zul | 144 ++++++++++++++++++ .../webapp/main/orders/requirements/setup.zul | 21 +++ src/main/webapp/main/tabPanels.zul | 22 +++ src/main/webapp/main/toolbar.zul | 8 + src/main/webapp/settings/globalSettings.zul | 86 ++++++----- 32 files changed, 903 insertions(+), 95 deletions(-) create mode 100644 src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMy.java create mode 100644 src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyAll.java create mode 100644 src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyCenters.java create mode 100644 src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyWorkgroups.java create mode 100644 src/main/webapp/img/global-setting-016.png create mode 100644 src/main/webapp/img/global-setting-032.png delete mode 100644 src/main/webapp/img/munits.png create mode 100644 src/main/webapp/img/req-order-016.png create mode 100644 src/main/webapp/img/req-order-032.png create mode 100644 src/main/webapp/img/req-trip-016.png create mode 100644 src/main/webapp/img/req-trip-032.png delete mode 100644 src/main/webapp/img/settings.png create mode 100644 src/main/webapp/img/tape-measure-016.png create mode 100644 src/main/webapp/img/tape-measure-032.png rename src/main/webapp/{requirements/actual => main/orders/requirements}/index.zul (57%) rename src/main/webapp/{requirements/actual/requirementsForm.zul => main/orders/requirements/reqForm.zul} (99%) rename src/main/webapp/{requirements/actual/requirements.zul => main/orders/requirements/reqListMy.zul} (92%) create mode 100644 src/main/webapp/main/orders/requirements/reqListMyAll.zul create mode 100644 src/main/webapp/main/orders/requirements/reqListMyCenters.zul create mode 100644 src/main/webapp/main/orders/requirements/reqListMyWorkgroups.zul create mode 100644 src/main/webapp/main/orders/requirements/setup.zul create mode 100644 src/main/webapp/main/tabPanels.zul create mode 100644 src/main/webapp/main/toolbar.zul diff --git a/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMy.java b/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMy.java new file mode 100644 index 00000000..e412d0d7 --- /dev/null +++ b/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMy.java @@ -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 +{ + + @WireVariable + private RequirementService requirementService; + + @WireVariable + private UserService userService; + + @WireVariable + private WorkgroupService workgroupService; + + public List 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 getListFromService() + { + return super.getListFromService(); + } +} diff --git a/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyAll.java b/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyAll.java new file mode 100644 index 00000000..29336b4a --- /dev/null +++ b/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyAll.java @@ -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 +{ + + @WireVariable + private RequirementService requirementService; + + @WireVariable + private UserService userService; + + @WireVariable + private WorkgroupService workgroupService; + + public List 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 getListFromService() + { + return super.getListFromService(); + } +} diff --git a/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyCenters.java b/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyCenters.java new file mode 100644 index 00000000..c3a651dc --- /dev/null +++ b/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyCenters.java @@ -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 +{ + + @WireVariable + private RequirementService requirementService; + + @WireVariable + private UserService userService; + + @WireVariable + private WorkgroupService workgroupService; + + public List 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 getListFromService() + { + return super.getListFromService(); + } +} diff --git a/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyWorkgroups.java b/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyWorkgroups.java new file mode 100644 index 00000000..cc20ee71 --- /dev/null +++ b/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyWorkgroups.java @@ -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 +{ + + @WireVariable + private RequirementService requirementService; + + @WireVariable + private UserService userService; + + @WireVariable + private WorkgroupService workgroupService; + + public List 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 getListFromService() + { + return super.getListFromService(); + } +} diff --git a/src/main/java/info/bukova/isspst/ui/requirement/RequirementSubpage.java b/src/main/java/info/bukova/isspst/ui/requirement/RequirementSubpage.java index 2f9a723b..0f0601d9 100644 --- a/src/main/java/info/bukova/isspst/ui/requirement/RequirementSubpage.java +++ b/src/main/java/info/bukova/isspst/ui/requirement/RequirementSubpage.java @@ -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 extends ListViewModel { + 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 getReqService() { diff --git a/src/main/webapp/WEB-INF/locales/zk-label.properties b/src/main/webapp/WEB-INF/locales/zk-label.properties index 4edf85ce..d2d55f7e 100644 --- a/src/main/webapp/WEB-INF/locales/zk-label.properties +++ b/src/main/webapp/WEB-INF/locales/zk-label.properties @@ -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 diff --git a/src/main/webapp/app/mainMenu.zul b/src/main/webapp/app/mainMenu.zul index 279dff1f..ed19343c 100644 --- a/src/main/webapp/app/mainMenu.zul +++ b/src/main/webapp/app/mainMenu.zul @@ -11,15 +11,28 @@ label="${labels.Information}" href="/" /> - - - + + + + + + + + + + + + @@ -40,6 +53,7 @@ href="/lists/buildings" disabled="${not sec:isAllGranted('PERM_READ_BUILDINGS')}" /> @@ -48,6 +62,7 @@ -
+
-
+
- +
\ No newline at end of file diff --git a/src/main/webapp/css/page.css b/src/main/webapp/css/page.css index 9a4740a5..98347b8d 100644 --- a/src/main/webapp/css/page.css +++ b/src/main/webapp/css/page.css @@ -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; } +*/ diff --git a/src/main/webapp/css/zk-modify.css b/src/main/webapp/css/zk-modify.css index 6d13c000..6364f59f 100644 --- a/src/main/webapp/css/zk-modify.css +++ b/src/main/webapp/css/zk-modify.css @@ -37,5 +37,12 @@ } .row-title { + /* ve formuláři zarovná u víceřádkových editů label nahoru */ vertical-align: top; -} \ No newline at end of file +} + +.z-listcell-content { + /* při úzkém sloupci gridu neodřádkuje slova podle mezer */ + white-space: nowrap; +} + diff --git a/src/main/webapp/img/global-setting-016.png b/src/main/webapp/img/global-setting-016.png new file mode 100644 index 0000000000000000000000000000000000000000..8858cf1e12ed69a7bd596501eeba083816d93d5c GIT binary patch literal 1075 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 KMNUMnLSTYCnD|Nn literal 0 HcmV?d00001 diff --git a/src/main/webapp/img/munits.png b/src/main/webapp/img/munits.png deleted file mode 100644 index bc56ed738239156b073ff693ffb576cc9cef56b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3117 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 P00000NkvXXu0mjfh8dTO literal 0 HcmV?d00001 diff --git a/src/main/webapp/img/settings.png b/src/main/webapp/img/settings.png deleted file mode 100644 index 833e607d58bed5c85838b6c9cb440f977837ac85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3188 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 a>i+;!$hT3O%}*}?0000 diff --git a/src/main/webapp/img/tape-measure-016.png b/src/main/webapp/img/tape-measure-016.png new file mode 100644 index 0000000000000000000000000000000000000000..e8b63857ab88a4a68141025a77d7eab0a1c5ae2b GIT binary patch literal 712 zcmV;(0yq7MP)F{xy+g%@C35pm`GsieFFK$N?bbWhh8lpx+%kjeiMA5J==iQ>855#fsy%O z9aLlmwfon1j7I`!29%}&F@cF$p!?P)<`&mcQ&ZDPUXM9syy$9u?{W{f9T`P-K^5fc zVn8Nm2nke5KuQFV4Er$jDvc|5WAJ!9(CKurSS(${>2!WhCX@M*$VRSJYzJW%hQ&gp z6=v|a*x&1SO(0s-st(#MU{EwDCJqY+eBHvCq} zyT1l;tWHjw52po}AMQa%_QK>RIGHc(tn1*G6PdDDqLIlEVb7Ef6hn~_k*CwZ$PsAL uBI4mFez0F%jl_{!kAm(r-tI2bzvw53As?DY82R@A0000_>}%h955IHsYPJGm z1EEQ~%CYagzUTM-oZsu*F#Mkn_A$Um9)NdyO6jYP11WHRmFs*^UUw_;KL^nKx!W1z zhsnTN!Z7~C2j@`e>x$0hGn#I0(YUQOePgfkUjxv(y%w7GLy7Tyq$cT{f$=2(aE-3@ z`Ew>7nO3>uw<=HjY5J#nyFL_v)}32UCL0;UTAl3s$95pZ9zqksRSb7 zAmTG2$b1?Zwi$Tv2OxTZCz9;-n-kW3cQ65*5v?dPf4AO_+PI?A6=1M{)}-?B-E{UU&i{(qj%0(x|M((=X+F~y`3X=KAWZ?V0CC%t z1@Q%8TD3sux&k#eif{h10OvXb_*-u;rlzJAr-=#@9xwn-pFW+gtF!U@w(jI-n-9Gh zmnt9Yzcz?nS$kngcfy)MweI%8WcLzBI_b*`9b!&cr#(oUfv$u|bOed$C=!t|sEH&V zZm2;trsKwq8_NKM2db*7#wi5Zti8ScH&nx0#>N8uYu1!)({&v^-JRIsdfMo2Oyb6( zWvc@wn+I~505Q`lleFL&XvryP$~27`sMHgHz{Af~BX$P>uh%QOXoLVZF^Ypmr6#3PDdR`cLMO(@a9`S!27n|0 zCTX+hG9G!M4zvpz1_|0o$RcXT`!;uBi;u3Xbjz{?@X%56KvKfc(9p6Fcsw4^f?Md` z6RfeZk&AXJ+N#}dM<^5`v+AM;1VG0n;CQ!;YmquKuA{H7Z_(iD)!Eqpz&Jj!n!`$s zsJ3_s;7doV5KAx&4-YQ`Af4+J_Gf4x`7=9q>{ys+R*FqU0C*`rgIy=E+5Lk>faww7 zk6kiO^xqkPCCA~*D~! zjEo=}jZ!AzIE`a8dLUlmL=gAv*;C?nyPu$Kw1_r`;}L^> zAQUDtY6GDHXaTu`A@^L0#uDg5dAlN~~6^q$rAu z&NJp?G)`l7;emUrVM!=(j7=gl62)ql10J^vSvCvoqVQ%Dh)qNg4o4C6WMZ7aL-sU8 zRgI+rR6U_7qeuVK;{&}FZ>|B0QyUPpHY>Qr1f04A{y}Vg^#3vW7~sPm{{Z7ZcOL1u Rh-d%+002ovPDHLkV1n5al7IjJ literal 0 HcmV?d00001 diff --git a/src/main/webapp/lists/munits/munitsForm.zul b/src/main/webapp/lists/munits/munitsForm.zul index e4916af2..1fdafd9b 100644 --- a/src/main/webapp/lists/munits/munitsForm.zul +++ b/src/main/webapp/lists/munits/munitsForm.zul @@ -1,24 +1,41 @@ - - + + - + ${labels.MUnitsFormName} : - + ${labels.MUnitsFormDescription} : - + diff --git a/src/main/webapp/lists/munits/munitsGrid.zul b/src/main/webapp/lists/munits/munitsGrid.zul index b7d00df8..c1f71706 100644 --- a/src/main/webapp/lists/munits/munitsGrid.zul +++ b/src/main/webapp/lists/munits/munitsGrid.zul @@ -1,21 +1,41 @@ - - + + - - + - - + + - - +
- +
@@ -25,7 +45,11 @@
- +
@@ -33,7 +57,6 @@
- - \ No newline at end of file diff --git a/src/main/webapp/requirements/actual/index.zul b/src/main/webapp/main/orders/requirements/index.zul similarity index 57% rename from src/main/webapp/requirements/actual/index.zul rename to src/main/webapp/main/orders/requirements/index.zul index 86024360..57ae3d87 100644 --- a/src/main/webapp/requirements/actual/index.zul +++ b/src/main/webapp/main/orders/requirements/index.zul @@ -2,9 +2,9 @@ - String gridZul = "requirements.zul"; + String gridZul = "setup.zul"; - + \ No newline at end of file diff --git a/src/main/webapp/requirements/actual/requirementsForm.zul b/src/main/webapp/main/orders/requirements/reqForm.zul similarity index 99% rename from src/main/webapp/requirements/actual/requirementsForm.zul rename to src/main/webapp/main/orders/requirements/reqForm.zul index 6d58d45b..e71ba831 100644 --- a/src/main/webapp/requirements/actual/requirementsForm.zul +++ b/src/main/webapp/main/orders/requirements/reqForm.zul @@ -9,7 +9,7 @@ viewModel="@id('vm') @init('info.bukova.isspst.ui.requirement.RequirementForm')" validationMessages="@id('vmsg')"> - + viewModel="@id('vm') @init('info.bukova.isspst.ui.main.orders.requirements.ReqListMy')"> + vflex="1" + selectedItem="@bind(vm.dataBean)" + model="@load(vm.dataList)"> + + + + + + + + + + + + + + +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+ + +
+ + + +
+ +
+
+ + +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+ + + + + + \ No newline at end of file diff --git a/src/main/webapp/main/orders/requirements/reqListMyCenters.zul b/src/main/webapp/main/orders/requirements/reqListMyCenters.zul new file mode 100644 index 00000000..1767962f --- /dev/null +++ b/src/main/webapp/main/orders/requirements/reqListMyCenters.zul @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+ + +
+ + + +
+ +
+
+ + +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+ + + + + + \ No newline at end of file diff --git a/src/main/webapp/main/orders/requirements/reqListMyWorkgroups.zul b/src/main/webapp/main/orders/requirements/reqListMyWorkgroups.zul new file mode 100644 index 00000000..30ef9e6c --- /dev/null +++ b/src/main/webapp/main/orders/requirements/reqListMyWorkgroups.zul @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+ + +
+ + + +
+ +
+
+ + +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+ + + + + + \ No newline at end of file diff --git a/src/main/webapp/main/orders/requirements/setup.zul b/src/main/webapp/main/orders/requirements/setup.zul new file mode 100644 index 00000000..4b31918a --- /dev/null +++ b/src/main/webapp/main/orders/requirements/setup.zul @@ -0,0 +1,21 @@ + + + + + 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"; + + + + + + \ No newline at end of file diff --git a/src/main/webapp/main/tabPanels.zul b/src/main/webapp/main/tabPanels.zul new file mode 100644 index 00000000..072ee3af --- /dev/null +++ b/src/main/webapp/main/tabPanels.zul @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/main/toolbar.zul b/src/main/webapp/main/toolbar.zul new file mode 100644 index 00000000..f80975e2 --- /dev/null +++ b/src/main/webapp/main/toolbar.zul @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/settings/globalSettings.zul b/src/main/webapp/settings/globalSettings.zul index 6af0f30d..14b45da8 100644 --- a/src/main/webapp/settings/globalSettings.zul +++ b/src/main/webapp/settings/globalSettings.zul @@ -1,40 +1,50 @@ - + - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + \ No newline at end of file