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 658a5cf..961ebba 100644 --- a/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java +++ b/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java @@ -18,6 +18,8 @@ import java.util.UUID; @Controller public class RequestController { + static int notSoRandom = 0; + @GetMapping("/") public String home() { return "redirect:/shop/"; @@ -209,11 +211,36 @@ public class RequestController { @GetMapping("/intern/warehouse/") public String accountingWarehouse() { - return "/intern/warehouse/"; + return "/intern/warehouse/index"; + } + + @GetMapping("/intern/warehouse/todo") + public String accountingWarehouseTodo() { + return "/intern/warehouse/todo"; } @GetMapping("/intern/warehouse/addManual") public String accountingWarehouseAddManual() { return "/intern/warehouse/addManual"; } + + @PostMapping("/intern/warehouse/progress/{id}") + public String accountingWarehouseProgressIdPost(HttpServletResponse response) { + if((notSoRandom++) % 2 == 1) { + return "redirect:/intern/warehouse/progress/450"; + } else { + response.setStatus(409); + return "/intern/warehouse/error_progress_failed"; + } + } + + @GetMapping("/intern/warehouse/progress/{id}") + public String accountingWarehouseProgressId() { + return "/intern/warehouse/id_progress"; + } + + @GetMapping("/intern/warehouse/slots/") + public String accountingWarehouseSlots() { + return "/intern/warehouse/slots/index"; + } } diff --git a/prototype/src/main/resources/static/css/ecom.css b/prototype/src/main/resources/static/css/ecom.css index 3cd1f51..f82a680 100644 --- a/prototype/src/main/resources/static/css/ecom.css +++ b/prototype/src/main/resources/static/css/ecom.css @@ -360,6 +360,8 @@ input[type="password"]::placeholder { } button, .button { + display: inline-block; + font-family: "Fira Mono"; font-weight: bold; text-decoration: none; @@ -535,7 +537,7 @@ input[type="number"]:focus { .detailgrid { display: grid; - grid-auto-flow: dense; + grid-auto-flow: row; min-width: 20rem; grid-template-columns: repeat(auto-fit, minmax(20rem, 1fr)); grid-template-rows: auto; @@ -842,6 +844,16 @@ input[type="number"]:focus { display: block; } +th.r, +td.r { + text-align: right; +} + +th.l, +td.l { + text-align: left; +} + /*** THE UGLY diff --git a/prototype/src/main/resources/static/img/undraw_cancel_u1it.svg b/prototype/src/main/resources/static/img/undraw_cancel_u1it.svg new file mode 100644 index 0000000..1983df9 --- /dev/null +++ b/prototype/src/main/resources/static/img/undraw_cancel_u1it.svg @@ -0,0 +1 @@ +cancel \ No newline at end of file diff --git a/prototype/src/main/resources/templates/fragments/intern.html b/prototype/src/main/resources/templates/fragments/intern.html index a984212..9f1ff87 100644 --- a/prototype/src/main/resources/templates/fragments/intern.html +++ b/prototype/src/main/resources/templates/fragments/intern.html @@ -43,6 +43,15 @@ +
  • Lager + +
    • + diff --git a/prototype/src/main/resources/templates/intern/warehouse/addManual.html b/prototype/src/main/resources/templates/intern/warehouse/addManual.html index e69de29..9880c34 100644 --- a/prototype/src/main/resources/templates/intern/warehouse/addManual.html +++ b/prototype/src/main/resources/templates/intern/warehouse/addManual.html @@ -0,0 +1,86 @@ + + + + + + + + Manuelle Buchung + + + + + +
    + +
    +

    Manuelle Buchung

    +
    +
    +
    + +
    +
    +
    + + + + +
    +
    + + +
    +
    + + +
    + +
    +
    + +
    + + +
    +
    + + + +
    +
    +
    + +
    +
    + +
    + + +
    +
    + + + +
    +
    +
    + +
    +

    + Manuelle Buchungen können nicht rückgängig gemacht werden!
    + Es können jedoch Gegenbuchungen erstellt werden. +

    + + +
    +
    +
    +
    + + + + diff --git a/prototype/src/main/resources/templates/intern/warehouse/error_progress_failed.html b/prototype/src/main/resources/templates/intern/warehouse/error_progress_failed.html new file mode 100644 index 0000000..6cc956f --- /dev/null +++ b/prototype/src/main/resources/templates/intern/warehouse/error_progress_failed.html @@ -0,0 +1,29 @@ + + + + + e-commerce + + + + + +
    +
    +

    Wurde bereits zugewiesen.

    +

    + +

    +

    + Diese Seite leitet sie automatisch nach 3 Sekunden weiter. +

    + Zurück +
    +
    + + + diff --git a/prototype/src/main/resources/templates/intern/warehouse/id_progress.html b/prototype/src/main/resources/templates/intern/warehouse/id_progress.html new file mode 100644 index 0000000..d71b708 --- /dev/null +++ b/prototype/src/main/resources/templates/intern/warehouse/id_progress.html @@ -0,0 +1,58 @@ + + + + + e-commerce + + + + +
    +
    +

    Erfolgreich zugewiesen.

    +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ZeitpunktArtikelAnzahlVonNach
    2020-01-12 12:18 + Bestellung 8408 +
    + Hans Maier
    + Hauptstraße 12
    + 74880 Musterstadt
    + Deutschland
    +
    +
    Kamera1Lagherplatz 01 -
    Spielzeugauto2Lagherplatz 02 -
    +

    + Fertig +
    +
    + + + + diff --git a/prototype/src/main/resources/templates/intern/warehouse/index.html b/prototype/src/main/resources/templates/intern/warehouse/index.html index e69de29..2d9ff2b 100644 --- a/prototype/src/main/resources/templates/intern/warehouse/index.html +++ b/prototype/src/main/resources/templates/intern/warehouse/index.html @@ -0,0 +1,121 @@ + + + + + + + + Lager + + + + + + +
    + +
    +

    Lagerbuchungen

    +
    +
    +
    + +
    +

    + Die Lagerbestände nach Artikel können Sie unter den gelisteten Artikeln einsehen. +

    +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    ZeitpunktArtikelAnzahlVonNachStatus
    2020-01-12 12:18 + Bestellung 8408 + Auf Warteliste
    +
    Kamera1Lagherplatz 01 -
    Spielzeugauto2Lagherplatz 02 -
    2020-01-12 12:15 + Manuell: Ware war defekt. + In Arbeit
    +
    Kamera1Lagherplatz 01 -
    2020-01-12 12:11 + Lieferung 4545 + Fertig
    Kamera10 - Lagherplatz 01 +
    Kamera1 - Lagherplatz 04
    +

    +
    +
    + + + + diff --git a/prototype/src/main/resources/templates/intern/warehouse/slots/index.html b/prototype/src/main/resources/templates/intern/warehouse/slots/index.html new file mode 100644 index 0000000..5f6bb8d --- /dev/null +++ b/prototype/src/main/resources/templates/intern/warehouse/slots/index.html @@ -0,0 +1,100 @@ + + + + + + + + Inventar + + + + + + +
    + +
    +

    Inventar

    +
    +
    +
    + +
    + +
    +

    Plätze in Verwendung

    +

    67%

    +
    +
    +

    Lagereffizienz

    +

    43%

    +
    +
    +

    Lagerdiversität

    +

    3

    +
    +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    LagerplatzBildArtikelAnzahlMax.

    1

    		Kamera2020

    2

    		Kamera120

    3

    		0

    4

    		0

    5

    		Usb-Ding110

    6

    		Stativ35
    +

    +
    +
    + + + + diff --git a/prototype/src/main/resources/templates/intern/warehouse/todo.html b/prototype/src/main/resources/templates/intern/warehouse/todo.html new file mode 100644 index 0000000..a7154ad --- /dev/null +++ b/prototype/src/main/resources/templates/intern/warehouse/todo.html @@ -0,0 +1,102 @@ + + + + + + + + Packliste + + + + + + +
    + +
    +

    Packliste

    +
    +
    +
    + +
    +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    ZeitpunktArtikelAnzahlVonNachStatus
    2020-01-12 12:18 + Bestellung 8408 +
    + Hans Maier
    + Hauptstraße 12
    + 74880 Musterstadt
    + Deutschland
    +
    +     		+
    + +
    +
    Kamera1Lagherplatz 01 - +
    Spielzeugauto2Lagherplatz 02 -
    2020-01-12 12:15 + Manuell: Ware war defekt. + Abschließen +
    Kamera1Lagherplatz 01 -
    +

    +
    +
    + + + +