diff --git a/src/main/webapp/WEB-INF/locales/zk-label.properties b/src/main/webapp/WEB-INF/locales/zk-label.properties index c8d6e4db..5ce002d2 100644 --- a/src/main/webapp/WEB-INF/locales/zk-label.properties +++ b/src/main/webapp/WEB-INF/locales/zk-label.properties @@ -253,6 +253,10 @@ false=Ne Information=Informace Requirements=Požadavky Orders=Objednávky + +MaterialRequirements=Požadavky na materiál +ServiceRequirements=Požadavky na servis + CurrentRequirements=Aktuální požadavky ApprovedOrders=Schválené objednávky BussinessTrips=Služební cesty diff --git a/src/main/webapp/app/mainMenu.zul b/src/main/webapp/app/mainMenu.zul index f2c63a2f..a987b05f 100644 --- a/src/main/webapp/app/mainMenu.zul +++ b/src/main/webapp/app/mainMenu.zul @@ -14,9 +14,14 @@ + image="/img/beam-032.png" + label="${labels.MaterialRequirements}" + href="/main/orders/material/" /> + + diff --git a/src/main/webapp/app/template.zhtml b/src/main/webapp/app/template.zhtml index 007390a8..38f80528 100644 --- a/src/main/webapp/app/template.zhtml +++ b/src/main/webapp/app/template.zhtml @@ -51,8 +51,6 @@
- + \ No newline at end of file diff --git a/src/main/webapp/img/beam-032.png b/src/main/webapp/img/beam-032.png new file mode 100644 index 00000000..1d6ca7f9 Binary files /dev/null and b/src/main/webapp/img/beam-032.png differ diff --git a/src/main/webapp/img/worker-032.png b/src/main/webapp/img/worker-032.png new file mode 100644 index 00000000..093ffec6 Binary files /dev/null and b/src/main/webapp/img/worker-032.png differ diff --git a/src/main/webapp/main/orders/requirements/index.zul b/src/main/webapp/main/orders/material/index.zul similarity index 51% rename from src/main/webapp/main/orders/requirements/index.zul rename to src/main/webapp/main/orders/material/index.zul index 57ae3d87..c6784a88 100644 --- a/src/main/webapp/main/orders/requirements/index.zul +++ b/src/main/webapp/main/orders/material/index.zul @@ -1,4 +1,4 @@ - + diff --git a/src/main/webapp/main/orders/material/setup.zul b/src/main/webapp/main/orders/material/setup.zul new file mode 100644 index 00000000..ac8b46f6 --- /dev/null +++ b/src/main/webapp/main/orders/material/setup.zul @@ -0,0 +1,22 @@ + + + + + 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"; + String selectItem = "/main/selectMaterial.zul"; + + + + + + \ 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 deleted file mode 100644 index 4b31918a..00000000 --- a/src/main/webapp/main/orders/requirements/setup.zul +++ /dev/null @@ -1,21 +0,0 @@ - - - - - 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/orders/services/index.zul b/src/main/webapp/main/orders/services/index.zul new file mode 100644 index 00000000..f9098c54 --- /dev/null +++ b/src/main/webapp/main/orders/services/index.zul @@ -0,0 +1,10 @@ + + + + + String gridZul = "setup.zul"; + + + + + \ No newline at end of file diff --git a/src/main/webapp/main/orders/services/setup.zul b/src/main/webapp/main/orders/services/setup.zul new file mode 100644 index 00000000..11ad23af --- /dev/null +++ b/src/main/webapp/main/orders/services/setup.zul @@ -0,0 +1,22 @@ + + + + + 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"; + String selectItem = "/main/selectServices.zul"; + + + + + + \ No newline at end of file diff --git a/src/main/webapp/main/selectMaterial.zul b/src/main/webapp/main/selectMaterial.zul new file mode 100644 index 00000000..0ab1bb7c --- /dev/null +++ b/src/main/webapp/main/selectMaterial.zul @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+ + + +
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ + + + + + + + + + + + +
+
+ +
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
\ No newline at end of file diff --git a/src/main/webapp/main/selectServices.zul b/src/main/webapp/main/selectServices.zul new file mode 100644 index 00000000..0ab1bb7c --- /dev/null +++ b/src/main/webapp/main/selectServices.zul @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+ + + +
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ + + + + + + + + + + + +
+
+ +
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
\ No newline at end of file diff --git a/src/main/webapp/trips-delete/requirement/index.zul b/src/main/webapp/trips-delete/requirement/index.zul deleted file mode 100644 index 86024360..00000000 --- a/src/main/webapp/trips-delete/requirement/index.zul +++ /dev/null @@ -1,10 +0,0 @@ - - - - - String gridZul = "requirements.zul"; - - - - - \ No newline at end of file diff --git a/src/main/webapp/trips-delete/requirement/requirements.zul b/src/main/webapp/trips-delete/requirement/requirements.zul deleted file mode 100644 index 6a16d070..00000000 --- a/src/main/webapp/trips-delete/requirement/requirements.zul +++ /dev/null @@ -1,649 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
- -
-
-
- -
-
- -
-
- -
-
-
- -
- - - -
- -
-
-
- -
-
- -
-
- -
-
-
- -
-
- -
-
- -
-
-
-
- -
-
- - - - - - - - - - - - - - - - -
-
- -
-
- -
-
-
- -
-
- -
-
- -
-
-
- -
- - - -
- -
-
-
- -
-
- -
-
- -
-
-
- -
-
- -
-
- -
-
-
- -
-
- -
-
- -
-
-
-
- -
- -
- -
- -
-
- - - - - - - - - - - - - - - - -
-
- -
-
- -
-
-
- -
-
- -
-
- -
-
-
- -
- - - -
- -
-
-
- -
- - - -
- -
-
-
- -
-
- -
-
- -
-
-
- -
-
- -
-
- -
-
-
- -
-
- -
-
- -
-
-
-
- -
- -
- -
- -
-
- - - - - - - - - - - - - - - - -
-
- -
-
- -
-
-
- -
-
- -
-
- -
-
-
- -
- - - -
- -
-
-
- -
- - - -
- -
-
-
- -
-
- -
-
- -
-
-
- -
-
- -
-
- -
-
-
- -
-
- -
-
- -
-
-
-
- -
- -
- -
- -
-
-
-
- - - -
-
\ No newline at end of file diff --git a/src/main/webapp/trips-delete/requirement/requirementsForm.zul b/src/main/webapp/trips-delete/requirement/requirementsForm.zul deleted file mode 100644 index cef33b0e..00000000 --- a/src/main/webapp/trips-delete/requirement/requirementsForm.zul +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - - ${labels.RequirementsFormNumberSerie} : - - - - - - ${labels.RequirementsFormReqDate} : - - - - - - ${labels.RequirementsFormCenter} : - - - - - - - - ${labels.RequirementsFormFrom} : - - - - - - ${labels.RequirementsFormStartDateTime} : - - - - - - - - - - ${labels.RequirementsFormTo} : - - - - - - ${labels.RequirementsFormPurpose} : - - - - - - ${labels.RequirementsFormEndTravel} : - - - - - - ${labels.RequirementsFormEndDate} : - - - - - - - -