From 87bccd69870ba088ce4b06143740bb15f54aa453 Mon Sep 17 00:00:00 2001 From: Franta Pribyl Date: Sun, 24 Aug 2014 19:46:29 +0200 Subject: [PATCH] =?UTF-8?q?Rozpracov=C3=A1no=20odd=C4=9Blen=C3=AD=20materi?= =?UTF-8?q?=C3=A1lu=20a=20servisu=20do=202=20agend.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/locales/zk-label.properties | 4 + src/main/webapp/app/mainMenu.zul | 11 +- src/main/webapp/app/template.zhtml | 4 +- src/main/webapp/img/beam-032.png | Bin 0 -> 1699 bytes src/main/webapp/img/worker-032.png | Bin 0 -> 1751 bytes .../{requirements => material}/index.zul | 2 +- .../webapp/main/orders/material/setup.zul | 22 + .../webapp/main/orders/requirements/setup.zul | 21 - .../webapp/main/orders/services/index.zul | 10 + .../webapp/main/orders/services/setup.zul | 22 + src/main/webapp/main/selectMaterial.zul | 234 +++++++ src/main/webapp/main/selectServices.zul | 234 +++++++ .../webapp/trips-delete/requirement/index.zul | 10 - .../trips-delete/requirement/requirements.zul | 649 ------------------ .../requirement/requirementsForm.zul | 167 ----- 15 files changed, 536 insertions(+), 854 deletions(-) create mode 100644 src/main/webapp/img/beam-032.png create mode 100644 src/main/webapp/img/worker-032.png rename src/main/webapp/main/orders/{requirements => material}/index.zul (51%) create mode 100644 src/main/webapp/main/orders/material/setup.zul delete mode 100644 src/main/webapp/main/orders/requirements/setup.zul create mode 100644 src/main/webapp/main/orders/services/index.zul create mode 100644 src/main/webapp/main/orders/services/setup.zul create mode 100644 src/main/webapp/main/selectMaterial.zul create mode 100644 src/main/webapp/main/selectServices.zul delete mode 100644 src/main/webapp/trips-delete/requirement/index.zul delete mode 100644 src/main/webapp/trips-delete/requirement/requirements.zul delete mode 100644 src/main/webapp/trips-delete/requirement/requirementsForm.zul 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 0000000000000000000000000000000000000000..1d6ca7f906edda9a1c3479dd453bd1c1700740b9 GIT binary patch literal 1699 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 literal 0 HcmV?d00001 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} : - - - - - - - -