From d7161d37966a9b8e043c29238d88bd8bbfeff6f4 Mon Sep 17 00:00:00 2001 From: CodeSteak Date: Thu, 16 Jan 2020 20:17:48 +0100 Subject: [PATCH] move internal pages from employee to intern --- .../hso/ecommerce/app/RequestController.java | 12 +++--- .../fragments/{employee.html => intern.html} | 0 .../templates/{ => intern}/articles.html | 6 +-- .../{ => intern}/listedArticles.html | 40 +++++++++---------- .../{ => intern}/listedArticlesEdit.html | 12 ++++-- 5 files changed, 37 insertions(+), 33 deletions(-) rename prototype/src/main/resources/templates/fragments/{employee.html => intern.html} (100%) rename prototype/src/main/resources/templates/{ => intern}/articles.html (68%) rename prototype/src/main/resources/templates/{ => intern}/listedArticles.html (69%) rename prototype/src/main/resources/templates/{ => intern}/listedArticlesEdit.html (91%) diff --git a/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java b/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java index 4d83416..96020bc 100644 --- a/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java +++ b/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java @@ -52,19 +52,19 @@ public class RequestController { return "searchResults"; } - @GetMapping("/employee/articles") + @GetMapping("/intern/articles") public String articles() { - return "articles"; + return "intern/articles"; } - @GetMapping("/employee/listedarticles") + @GetMapping("/intern/listedarticles") public String listedarticles() { - return "listedArticles"; + return "intern/listedArticles"; } - @GetMapping("/employee/listedarticlesedit") + @GetMapping("/intern/listedarticlesedit") public String listedarticlesedit() { - return "listedArticlesEdit"; + return "intern/listedArticlesEdit"; } @GetMapping("/customer/accountsettings") diff --git a/prototype/src/main/resources/templates/fragments/employee.html b/prototype/src/main/resources/templates/fragments/intern.html similarity index 100% rename from prototype/src/main/resources/templates/fragments/employee.html rename to prototype/src/main/resources/templates/fragments/intern.html diff --git a/prototype/src/main/resources/templates/articles.html b/prototype/src/main/resources/templates/intern/articles.html similarity index 68% rename from prototype/src/main/resources/templates/articles.html rename to prototype/src/main/resources/templates/intern/articles.html index 8bc8c98..f67beb6 100644 --- a/prototype/src/main/resources/templates/articles.html +++ b/prototype/src/main/resources/templates/intern/articles.html @@ -8,15 +8,15 @@ - +
- +

Artikel

TODO

- + diff --git a/prototype/src/main/resources/templates/listedArticles.html b/prototype/src/main/resources/templates/intern/listedArticles.html similarity index 69% rename from prototype/src/main/resources/templates/listedArticles.html rename to prototype/src/main/resources/templates/intern/listedArticles.html index 98c61f3..a3682fe 100644 --- a/prototype/src/main/resources/templates/listedArticles.html +++ b/prototype/src/main/resources/templates/intern/listedArticles.html @@ -11,9 +11,9 @@ - +
- +

Gelistete Artikel

@@ -38,7 +38,7 @@

Artikel Hinzufügen

Weitere Artikel können über Artikelübersicht gelistet werden. - Jetzt Hinzufügen + Jetzt Hinzufügen

@@ -54,7 +54,7 @@ Preis (Netto) Kategorien - Aktiv + Lagerbestand (Aktiv) Artikel Id (bearbeiten) @@ -65,9 +65,9 @@ 100,50 € (84.45 €) Úberwachung, Elektronik - - A-5051 - L-890 + 301 + A-5051 + L-890 @@ -75,9 +75,9 @@ 63,95 € (53,73 €) Kopfhörer, Elektronik - - A-840 - L-13850 + 12 + A-840 + L-13850 @@ -85,9 +85,9 @@ 11,90 € (10,00 €) Sonstiges, Elektronik - - A-8401 - L-5784 + 3 + A-8401 + L-5784 @@ -95,9 +95,9 @@ 15,99 € (13.44 €) Úberwachung, Elektronik - - A-2135 - L-4564 + 4 + A-2135 + L-4564 @@ -105,15 +105,15 @@ 7,95 € (6.68 €) Úberwachung, Elektronik - - A-4565 - L-4566 + 0 + A-4565 + L-4566

- + diff --git a/prototype/src/main/resources/templates/listedArticlesEdit.html b/prototype/src/main/resources/templates/intern/listedArticlesEdit.html similarity index 91% rename from prototype/src/main/resources/templates/listedArticlesEdit.html rename to prototype/src/main/resources/templates/intern/listedArticlesEdit.html index 0fa7f2f..c57b5a9 100644 --- a/prototype/src/main/resources/templates/listedArticlesEdit.html +++ b/prototype/src/main/resources/templates/intern/listedArticlesEdit.html @@ -11,9 +11,9 @@ - +
- +

Gelistete Artikel

@@ -88,13 +88,17 @@ Elektronik
+

+ Lagerbestand: 12 +

Der Wert wird nur für zukünftige Lagerbuchungen verwendet. - Bei Problemen kann können Einheiten aus und wieder eingebucht werden. + Bei Problemen kann können Einheiten aus- und wieder eingebucht werden. + Lagerbuchung

@@ -115,7 +119,7 @@ Indianerehrenwort!
- +