From c8cdcf2a8ca3d4f5d50f6ee876e8b22603451e05 Mon Sep 17 00:00:00 2001 From: Philipp Schweizer Date: Mon, 20 Jan 2020 20:59:35 +0100 Subject: [PATCH] template Files for customers and suppliers created --- .../hso/ecommerce/app/RequestController.java | 25 ++++ .../src/main/resources/static/css/NoFocus.css | 15 ++ .../src/main/resources/static/css/ecom.css | 9 ++ .../intern/customers_allOrders_overview.html | 80 +++++++++++ .../customers_detailview_bookings_orders.html | 106 ++++++++++++++ .../intern/customers_order_detailview.html | 101 +++++++++++++ .../templates/intern/customers_overview.html | 133 ++++++++++++++++++ .../intern/suppliers_allOrders_overview.html | 88 ++++++++++++ .../suppliers_detailview_bookings_orders.html | 111 +++++++++++++++ .../intern/suppliers_order_detailview.html | 91 ++++++++++++ .../templates/intern/suppliers_overview.html | 76 ++++++++++ 11 files changed, 835 insertions(+) create mode 100644 prototype/src/main/resources/static/css/NoFocus.css create mode 100644 prototype/src/main/resources/templates/intern/customers_allOrders_overview.html create mode 100644 prototype/src/main/resources/templates/intern/customers_detailview_bookings_orders.html create mode 100644 prototype/src/main/resources/templates/intern/customers_order_detailview.html create mode 100644 prototype/src/main/resources/templates/intern/customers_overview.html create mode 100644 prototype/src/main/resources/templates/intern/suppliers_allOrders_overview.html create mode 100644 prototype/src/main/resources/templates/intern/suppliers_detailview_bookings_orders.html create mode 100644 prototype/src/main/resources/templates/intern/suppliers_order_detailview.html create mode 100644 prototype/src/main/resources/templates/intern/suppliers_overview.html 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 0fa38c3..590863b 100644 --- a/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java +++ b/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java @@ -104,6 +104,31 @@ public class RequestController { return "intern/listedArticlesEdit"; } + @GetMapping("/intern/customers_allOrders_overview") + public String customers_allOrders_overview() {return "intern/customers_allOrders_overview"; } + + @GetMapping("/intern/customers_order_detailview") + public String customers_order_detailview() {return "intern/customers_order_detailview"; } + + @GetMapping("/intern/customers_overview") + public String customers_overview() {return "intern/customers_overview"; } + + @GetMapping("/intern/customers_detailview_bookings_orders") + public String customers_detailview_bookings_orders() {return "intern/customers_detailview_bookings_orders"; } + + @GetMapping("/intern/suppliers_overview") + public String suppliers_overview() {return "intern/suppliers_overview"; } + + @GetMapping("/intern/suppliers_detailview_bookings_orders") + public String suppliers_detailview_bookings_orders() {return "intern/suppliers_detailview_bookings_orders"; } + + @GetMapping("/intern/suppliers_allOrders_overview") + public String suppliers_allOrders_overview() {return "intern/suppliers_allOrders_overview"; } + + @GetMapping("/intern/suppliers_order_detailview") + public String suppliers_order_detailview() {return "intern/suppliers_order_detailview"; } + + @GetMapping("/customer/accountsettings") public String customerAccountSettings(Model model) { Customer customer = new Customer(); diff --git a/prototype/src/main/resources/static/css/NoFocus.css b/prototype/src/main/resources/static/css/NoFocus.css new file mode 100644 index 0000000..8f93494 --- /dev/null +++ b/prototype/src/main/resources/static/css/NoFocus.css @@ -0,0 +1,15 @@ +.border{ + + border:4px solid black; + border-radius: 0.7rem; +} + +input.nofocus:focus{ + + outline-width: 0; +} + +button.nofocus:focus{ + + outline-width: 0; +} diff --git a/prototype/src/main/resources/static/css/ecom.css b/prototype/src/main/resources/static/css/ecom.css index 6189227..d273d7d 100644 --- a/prototype/src/main/resources/static/css/ecom.css +++ b/prototype/src/main/resources/static/css/ecom.css @@ -584,6 +584,15 @@ fieldset { .leftspace { padding-left: 1em; } +.noPadding { + padding: 0rem; +} +.noMargin { + margin: 0rem; +} +.Margin-left.s { + margin-left: 2rem; +} diff --git a/prototype/src/main/resources/templates/intern/customers_allOrders_overview.html b/prototype/src/main/resources/templates/intern/customers_allOrders_overview.html new file mode 100644 index 0000000..a4b92b0 --- /dev/null +++ b/prototype/src/main/resources/templates/intern/customers_allOrders_overview.html @@ -0,0 +1,80 @@ + + + + + Bestell -und Buchungsübersicht + + + + + + + +
+
+

Übersicht aller Bestellungen

+
+

Bestellungen

+
+ + +
+

+ + + + + + + + + + + + + + + + + +
KundennummerBestellnummerBestelldatumBetragBonuspunkte
112019-11-1010,13 EUR10
+

+
+
+
+ + + + \ No newline at end of file diff --git a/prototype/src/main/resources/templates/intern/customers_detailview_bookings_orders.html b/prototype/src/main/resources/templates/intern/customers_detailview_bookings_orders.html new file mode 100644 index 0000000..6fc8f3e --- /dev/null +++ b/prototype/src/main/resources/templates/intern/customers_detailview_bookings_orders.html @@ -0,0 +1,106 @@ + + + + + Bestell -und Buchungsübersicht + + + + + + + +
+
+

1 (Kundennummer)

+
+

Bestellungen

+
+ + +
+

+ + + + + + + + + + + + + + + +
BestellnummerBestelldatumBetragBonuspunkte
12019-11-1010,13 EUR10
+
+

Buchungen

+
+ + +
+

+ + + + + + + + + + + + + + + + + + + + + +
ZeitpunktBetragVonKontostandNachKontostandGrundReferenz
10.09.2019 14:10119,00 EURHauptkonto331,00 EURMehrwertsteuer1510,95 EURKunden-Bestellung2504
+

+
+
+ + + + \ No newline at end of file diff --git a/prototype/src/main/resources/templates/intern/customers_order_detailview.html b/prototype/src/main/resources/templates/intern/customers_order_detailview.html new file mode 100644 index 0000000..9eea06a --- /dev/null +++ b/prototype/src/main/resources/templates/intern/customers_order_detailview.html @@ -0,0 +1,101 @@ + + + + + Bestell -und Buchungsübersicht + + + + + + + +
+
+

Bestelldetails

+
+
+

Allgemeineinformationen

+

Die Bestellung wurde am 01.01.2020 bestellt

+

Bestellnummer: 614899499

+

Letzte Ziffern der Karte: 578

+
+
+

Versandinformationen

+

Name
Straße
Ort, plz
Deutschland

+
+
+

Preiszusammensetzung

+
+
+

Startwert
Versand
Bonuspunkte

+

Gesamtsumme

+
+
+

6,00 EUR
3,00 EUR
-1,00 EUR

+

9,52‬ EUR

+
+
+
+
+
+

Bestellte Artikel

+
+ +
+

Lorem Ipsum

+ +

Menge: 1

+

25.14 €

+

+ Als Gregor Samsa eines Morgens aus unruhigen Träumen erwachte. +

+
+ +
+

Lorem Ipsum

+ +

Menge: 4

+

25.14 €

+

+ Als Gregor Samsa eines Morgens aus unruhigen Träumen erwachte. +

+
+
+
+
+ + + \ No newline at end of file diff --git a/prototype/src/main/resources/templates/intern/customers_overview.html b/prototype/src/main/resources/templates/intern/customers_overview.html new file mode 100644 index 0000000..28ff1f4 --- /dev/null +++ b/prototype/src/main/resources/templates/intern/customers_overview.html @@ -0,0 +1,133 @@ + + + + + Kundenübersicht + + + + + + + +
+
+

Kunden

+
+ + +
+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
KundennummerBeitrittsdatumGeschäftskundeKartennummerAdresse
12019-11-10Ja51988516981HTMLgasse 10
12019-11-10Ja51988516981HTMLgasse 10
12019-11-10Ja51988516981HTMLgasse 10
12019-11-10Ja51988516981HTMLgasse 10
12019-11-10Ja51988516981HTMLgasse 10
12019-11-10Ja51988516981HTMLgasse 10
12019-11-10Ja51988516981HTMLgasse 10
12019-11-10nein51988516981HTMLgasse 10
+

+
+
+ + + + \ No newline at end of file diff --git a/prototype/src/main/resources/templates/intern/suppliers_allOrders_overview.html b/prototype/src/main/resources/templates/intern/suppliers_allOrders_overview.html new file mode 100644 index 0000000..37d6fae --- /dev/null +++ b/prototype/src/main/resources/templates/intern/suppliers_allOrders_overview.html @@ -0,0 +1,88 @@ + + + + + Bestell -und Buchungsübersicht + + + + + + + +
+
+

Übersicht aller Bestellungen

+
+

Bestellungen

+
+ + +
+

+ + + + + + + + + + + + + + + + + + + + + + + + + +
BestellnummerBestelldatumArtikelMengeGesamtpreis
12019-11-10Grafikkarte600,00 EUR
12019-11-10Grafikkarte600,00 EURAngekommen
+

+
+
+
+ + + + \ No newline at end of file diff --git a/prototype/src/main/resources/templates/intern/suppliers_detailview_bookings_orders.html b/prototype/src/main/resources/templates/intern/suppliers_detailview_bookings_orders.html new file mode 100644 index 0000000..1d5e6a7 --- /dev/null +++ b/prototype/src/main/resources/templates/intern/suppliers_detailview_bookings_orders.html @@ -0,0 +1,111 @@ + + + + + Bestell -und Buchungsübersicht + + + + + + + +
+
+

1 (Lieferranten)

+
+

Bestellungen

+
+ + +
+

+ + + + + + + + + + + + + + + + + + + +
BestellnummerBestelldatumArtikelMengeGesamtpreis
12019-11-10Grafikkarte2600,00 EUR
+ +
+

Buchungen

+
+ + +
+

+ + + + + + + + + + + + + + + + + + + + + +
ZeitpunktBetragVonKontostandNachKontostandGrundReferenz
10.09.2019 14:10119,00 EURHauptkonto331,00 EURMehrwertsteuer1510,95 EURKunden-Bestellung2504
+

+
+
+ + + + \ No newline at end of file diff --git a/prototype/src/main/resources/templates/intern/suppliers_order_detailview.html b/prototype/src/main/resources/templates/intern/suppliers_order_detailview.html new file mode 100644 index 0000000..cae208c --- /dev/null +++ b/prototype/src/main/resources/templates/intern/suppliers_order_detailview.html @@ -0,0 +1,91 @@ + + + + + Bestell -und Buchungsübersicht + + + + + + + +
+
+

Bestelldetails

+
+
+

Allgemeineinformationen

+

Die Bestellung wurde am 01.01.2020 bestellt

+

Bestellnummer: 614899499

+

Ist angekommen

+
+
+

Versandinformationen

+

Name
Straße
Ort, plz
Deutschland

+
+
+

Preiszusammensetzung

+
+
+

Startwert
Versand
Summe ohne MwSt.
Anzurechnende MwSt.

+

Gesamtsumme

+
+
+

6,00 EUR
3,00 EUR
9,00 Eur
1,71 Eur

+

‭10,71‬ EUR

+
+
+
+
+
+

Bestellter Artikel

+
+ +
+

Lorem Ipsum

+ +

Menge: 1

+

25.14 €

+

+ Als Gregor Samsa eines Morgens aus unruhigen Träumen erwachte. +

+
+
+
+
+ + + \ No newline at end of file diff --git a/prototype/src/main/resources/templates/intern/suppliers_overview.html b/prototype/src/main/resources/templates/intern/suppliers_overview.html new file mode 100644 index 0000000..89f3fbc --- /dev/null +++ b/prototype/src/main/resources/templates/intern/suppliers_overview.html @@ -0,0 +1,76 @@ + + + + + Kundenübersicht + + + + + + + +
+
+

Kunden

+
+ + +
+

+ + + + + + + + + + + + + + + + +
LieferrantennummerName
1Nike
1Adidas
+

+
+
+ + + + \ No newline at end of file