Skip to content

Commit

Permalink
UI and L&F improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
Remco van 't Veer committed Jun 19, 2024
1 parent 6c2d38a commit 7caa512
Show file tree
Hide file tree
Showing 14 changed files with 329 additions and 355 deletions.
266 changes: 136 additions & 130 deletions resources/public/assets/base.css
View file

Large diffs are not rendered by default.

Binary file modified resources/public/assets/bdi-logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion resources/public/assets/dil.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@
*/

:root {
--color-bg: #aaaaaa;
--site-color: #444;
--site-other-color: #8f8;
}
7 changes: 2 additions & 5 deletions resources/public/assets/erp.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
*/

:root {
--color-bg: #c9e4de;
}

td.status {
font-style: italic;
--site-color: #7540BF;
--site-other-color: #058686;
}
Binary file added resources/public/assets/jomco-logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions resources/public/assets/jomco-logo.png.license
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SPDX-FileCopyrightText: 2024 Jomco B.V.

SPDX-License-Identifier: CC0-1.0
7 changes: 2 additions & 5 deletions resources/public/assets/tms-1.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
*/

:root {
--color-bg: #faedcd;
}

.trip .qr-code img {
width: 100%;
--site-color: #00895A;
--site-other-color: #FF9500;
}
7 changes: 2 additions & 5 deletions resources/public/assets/tms-2.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
*/

:root {
--color-bg: #c6def1;
}

.trip .qr-code img {
width: 100%;
--site-color: #FFBF00;
--site-other-color: #A5D601;
}
20 changes: 2 additions & 18 deletions resources/public/assets/wms.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,6 @@
*/

:root {
--color-bg: #dbcdf0;
}

h3.verification {
padding: 1em;
}
h3.verification-accepted {
background: var(--color-success-bg);
}
h3.verification-accepted:before {
content: '✔ ';
}

h3.verification-rejected {
background: var(--color-error-bg);
}
h3.verification-rejected:before {
content: '❌ ';
--site-color: #D24317;
--site-other-color: #017FC0;
}
121 changes: 57 additions & 64 deletions src/dil_demo/erp/web.clj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,43 +19,35 @@
(def publishable-status? #{otm/status-draft})

(defn list-consignments [consignments {:keys [carriers warehouses]}]
(let [actions [:a.button.button-primary {:href "consignment-new"} "Nieuw"]]
[:table
[:thead
[:tr
[:th.ref "Klantorder nr."]
[:th.date "Orderdatum"]
[:th.location "Ophaaladres"]
[:th.location "Afleveradres"]
[:th.goods "Goederen"]
[:th.carrier "Vervoerder"]
[:th.status "Status"]
[:td.actions actions]]]
[:tbody
(when-not (seq consignments)
[:tr.empty
[:td {:colspan 999}
"Nog geen klantorders geregistreerd.."]])
[:main
[:section.actions
[:a.button.primary {:href "consignment-new"} "Nieuwe order aanmaken"]]

(for [{:keys [id ref load-date load-location unload-location goods carrier-eori status]}
(map otm/consignment->map consignments)]
[:tr.consignment
[:td.ref ref]
[:td.date load-date]
[:td.location (warehouses load-location)]
[:td.location unload-location]
[:td.goods goods]
[:td.carrier (carriers carrier-eori)]
[:td.status (otm/statuses status)]
[:td.actions
[:ul
[:li [:a.button.button-secondary {:href (str "consignment-" id)} "Openen"]]
(when (publishable-status? status)
[:li [:a.button.button-primary {:href (str "publish-" id)} "Versturen"]])
[:li (w/delete-button (str "consignment-" id))]]]])]
[:tfoot
[:tr
[:td.actions {:colspan 999} actions]]]]))
(when-not (seq consignments)
[:article.empty
[:p "Nog geen klantorders geregistreerd.."]])

(for [{:keys [id ref load-date load-location unload-location goods carrier-eori status]}
(map otm/consignment->map consignments)]
[:article
[:header
[:div.status (otm/statuses status)]
[:div.ref-date ref " / " load-date]
[:div.from-to (warehouses load-location) " → " unload-location]]

[:div.goods goods]
[:div.carrier (carriers carrier-eori)]

[:footer.actions
(when (publishable-status? status)
[:a.button.primary {:href (str "consignment-" id)
:title "Eigenschappen aanpassen"}
"Aanpassen"])
(when (publishable-status? status)
[:a.button.secondary {:href (str "publish-" id)
:title "Opdracht versturen naar locatie en vervoerder"}
"Versturen"])
(w/delete-button (str "consignment-" id))]])])

(defn edit-consignment [consignment {:keys [carriers warehouses]}]
(let [{:keys [status ref load-date load-location load-remarks unload-location unload-date unload-remarks goods carrier-eori]}
Expand Down Expand Up @@ -96,8 +88,8 @@
(w/field {:name "carrier-eori", :value carrier-eori,
:label "Vervoerder", :type "select",
:list carriers, :required true})]
[:div.actions
[:button.button.button-primary {:type "submit"} "Bewaren"]
[:section.actions
[:button {:type "submit"} "Opslaan"]
[:a.button {:href "."} "Annuleren"]]]))

(defn deleted-consignment [{:keys [explanation]}]
Expand Down Expand Up @@ -151,8 +143,8 @@
[:legend "Goederen"]
[:pre goods]]]
[:div.actions
[:button.button-primary {:type "submit"
:onclick "return confirm('Zeker weten?')"}
[:button {:type "submit"
:onclick "return confirm('Zeker weten?')"}
"Versturen"]
[:a.button {:href "."} "Annuleren"]]]))

Expand Down Expand Up @@ -214,72 +206,71 @@
(otm/map->consignment)))]
(routes
(GET "/" {:keys [flash master-data ::store/store]}
(render "Klantorders"
(render "Orders"
(list-consignments (get-consignments store) master-data)
flash))

(GET "/consignment-new" {:keys [flash master-data ::store/store user-number]}
(render "Nieuwe klantorder"
(render "Order aanmaken"
(edit-consignment
(otm/map->consignment {:ref (next-consignment-ref store user-number)
:load-date (w/format-date (Date.))
:unload-date (w/format-date (Date.))
:status "draft"})
:status otm/status-draft})
master-data)
flash))

(POST "/consignment-new" {:keys [params]}
(let [id (str (UUID/randomUUID))]
(let [consignment (-> params
(assoc :id (str (UUID/randomUUID))
:status otm/status-draft)
(params->consignment))]
(-> "."
(redirect :see-other)
(assoc :flash {:success "Klantorder aangemaakt"})
(assoc ::store/commands [[:put! :consignments
(-> params
(assoc :id id
:status otm/status-draft)
(params->consignment))]]))))
(assoc :flash {:success (str "Order " (otm/consignment-ref consignment) " aangemaakt")})
(assoc ::store/commands [[:put! :consignments consignment]]))))

(GET "/consignment-:id" {:keys [flash master-data ::store/store]
{:keys [id]} :params}
(when-let [consignment (get-consignment store id)]
(render (str "Klantorder: " (otm/consignment-ref consignment))
(render (str "Order " (otm/consignment-ref consignment) " aanpassen")
(edit-consignment consignment master-data)
flash)))

(POST "/consignment-:id" {:keys [params]}
(-> "."
(redirect :see-other)
(assoc :flash {:success "Klantorder aangepast"})
(assoc ::store/commands [[:put! :consignments
(params->consignment params)]])))
(let [consignment (params->consignment params)]
(-> "."
(redirect :see-other)
(assoc :flash {:success (str "Order " (otm/consignment-ref consignment) " aangepast")})
(assoc ::store/commands [[:put! :consignments consignment]]))))

(DELETE "/consignment-:id" {:keys [::store/store]
{:keys [id]} :params}
(when (get-consignment store id)
(when-let [consignment (get-consignment store id)]
(-> "deleted"
(redirect :see-other)
(assoc :flash {:success "Klantorder verwijderd"})
(assoc :flash {:success (str "Order " (otm/consignment-ref consignment) " verwijderd")})
(assoc ::store/commands [[:delete! :consignments id]]))))

(GET "/deleted" {:keys [flash]}
(render "Transportopdracht verwijderd"
(render "Order verwijderd"
(deleted-consignment flash)
flash))

(GET "/publish-:id" {:keys [flash master-data ::store/store]
{:keys [id]} :params}
(when-let [consignment (get-consignment store id)]
(render "Transportopdracht aanmaken"
(render (str "Order " (otm/consignment-ref consignment) " naar locatie en vervoerder sturen")
(publish-consignment consignment master-data)
flash)))

(POST "/publish-:id" {:keys [::store/store]
{:keys [id]} :params}
(POST "/publish-:id" {:keys [::store/store]
{:keys [id]} :params}
(when-let [consignment (get-consignment store id)]
(let [consignment (otm/consignment-status! consignment otm/status-requested)]
(-> (str "published-" id)
(redirect :see-other)
(assoc :flash {:success "Transportopdracht aangemaakt"})
(assoc :flash {:success (str "Order " (otm/consignment-ref consignment) " verstuurd")})
(assoc ::store/commands [[:put! :consignments consignment]
[:publish! ;; to warehouse WMS
:transport-orders
Expand All @@ -293,6 +284,8 @@
(GET "/published-:id" {:keys [flash master-data ::store/store]
{:keys [id]} :params}
(when-let [consignment (get-consignment store id)]
(render "Transportopdracht aangemaakt"
(render (str "Order "
(otm/consignment-ref consignment)
" verstuurd")
(published-consignment consignment master-data flash)
flash))))))
Loading

0 comments on commit 7caa512

Please sign in to comment.