WIP

Basic-Data-Infrastructure · Jun 17, 2024 · b2287c3 · b2287c3
1 parent a4bc4e1
commit b2287c3
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 61 deletions.
diff --git a/src/dil_demo/erp/web.clj b/src/dil_demo/erp/web.clj
@@ -59,34 +59,43 @@
 
 (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]}
-        (otm/consignment->map consignment)]
+        (otm/consignment->map consignment)
+
+        ;; add empty option
+        carriers (into {nil nil} carriers)]
     [:form {:method "POST"}
      (w/anti-forgery-input)
 
      [:section
       (w/field {:name  "status", :value status,
-                :label "Status", :type  "select", :list otm/statuses})
-      (w/field {:name  "ref",            :value ref,
-                :label "Klantorder nr.", :type  "number", :required true})]
+                :label "Status", :type  "select",
+                :list  otm/statuses})
+      (w/field {:name     "ref",            :value ref,
+                :label    "Klantorder nr.", :type  "number",
+                :required true})]
      [:section
       (w/field {:name  "load-date",   :type  "date",
                 :label "Ophaaldatum", :value load-date})
-      (w/field {:name  "load-location", :value load-location, ;; EORIs?!
-                :label "Ophaaladres",   :type  "select", :list warehouses, :required true})
+      (w/field {:name  "load-location", :value    load-location, ;; EORIs?!
+                :label "Ophaaladres",   :type     "select",
+                :list  warehouses,      :required true})
       (w/field {:name  "load-remarks", :value load-remarks,
                 :label "Opmerkingen",  :type  "textarea"})]
      [:section
       (w/field {:name  "unload-date",  :value unload-date,
                 :label "Afleverdatum", :type  "date"})
-      (w/field {:name  "unload-location", :value unload-location,
-                :label "Afleveradres",    :type  "text", :list (keys d/locations), :required true})
+      (w/field {:name  "unload-location",  :value    unload-location,
+                :label "Afleveradres",     :type     "text",
+                :list  (keys d/locations), :required true})
       (w/field {:name  "unload-remarks", :value unload-remarks,
                 :label "Opmerkingen",    :type  "textarea"})]
      [:section
-      (w/field {:name  "goods",    :value goods,
-                :label "Goederen", :type  "text", :list d/goods, :required true})
-      (w/field {:name  "carrier-eori", :value carrier-eori,
-                :label "Vervoerder",   :type  "select", :list carriers, :required true})]
+      (w/field {:name  "goods",    :value    goods,
+                :label "Goederen", :type     "text",
+                :list  d/goods,    :required true})
+      (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"]
       [:a.button {:href "."} "Annuleren"]]]))
@@ -160,19 +169,9 @@
        "."]
       [:div.actions
        [:a.button {:href "."} "Terug naar overzicht"]]]
-     (w/explanation explanation)
-#_     [:details.explanation
-      [:summary "Uitleg"]
-      [:ol
-       [:li
-        [:details
-         [:summary "Stuur OTM Transportopdracht naar WMS van DC"]
-         [:pre.json (w/otm-to-json (otm/consignment->transport-order consignment))]]]
-       [:li
-        [:details
-         [:summary "Stuur OTM Trip naar TMS van Vervoerder"]
-         [:pre.json (w/otm-to-json (otm/consignment->trip consignment))]]]
-       (w/ishare-log-intercept-to-hiccup ishare-log)]]]))
+     (w/explanation (into [["Stuur OTM Transportopdracht naar WMS van DC"]
+                           ["Stuur OTM Trip naar TMS van Vervoerder"]]
+                          explanation))]))
 
 
 

diff --git a/src/dil_demo/tms/web.clj b/src/dil_demo/tms/web.clj
@@ -144,18 +144,7 @@
 
     [:div.actions
      [:a.button {:href "."} "Terug naar overzicht"]]]
-   (w/explanation explanation)
-#_   [:details.explanation
-    [:summary "Uitleg"]
-    [:ol
-     [:li
-      [:h3 "Autoriseer de Chauffeur names de Vervoerder voor de Klantorder vervoerd met Kenteken"]
-      [:p "API call naar " [:strong "AR van de Vervoerder"] " om een autorisatie te registeren"]
-      [:ul [:li "Klantorder nr."] [:li "Rijbewijs (laatste 4 cijfers)"] [:li "Kenteken"]]]
-     [:li
-      [:h3 "OTM Trip"]
-      [:pre.json (w/to-json trip)]]
-     (w/ishare-log-intercept-to-hiccup ishare-log)]]])
+   (w/explanation explanation)])
 
 (defn outsource-trip [trip {:keys [carriers] :as master-data}]
   [:form {:method "POST"}
@@ -164,10 +153,11 @@
    (trip-details trip master-data)
 
    [:section
-    (let [carriers (into {nil nil} carriers)]
-      (w/field {:label "Vervoerder"
-                :name  "carrier-eori", :required true
-                :type  "select",       :list     carriers}))]
+    (let [;; add empty option
+          carriers (into {nil nil} carriers)]
+      (w/field {:name  "carrier-eori",
+                :label "Vervoerder", :type     "select",
+                :list  carriers,     :required true}))]
 
    [:div.actions
     [:button.button-primary {:type "submit"} "Uitbesteden"]
@@ -188,15 +178,7 @@
    [:section
     [:div.actions
      [:a.button {:href "."} "Terug naar overzicht"]]]
-   (w/explanation explanation)
-   #_    [:ol
-            [:li
-             [:h3 "Autorisatie van Chauffeur ingetrokken"]
-             [:p "API call naar " [:strong "AR van de Vervoerder"] " om een autorisatie te verwijderen"]
-             [:ul [:li "Klantorder nr."]
-              [:li "Rijbewijs (laatste 4 cijfers)"]
-              [:li "Kenteken"]]]
-            (w/ishare-log-intercept-to-hiccup ishare-log)]])
+   (w/explanation explanation)])
 
 
 

diff --git a/src/dil_demo/web_utils.clj b/src/dil_demo/web_utils.clj
@@ -155,14 +155,14 @@
 (defn otm-to-json [val]
   (to-json val :key-fn (comp camelize name)))
 
-(defmulti ishare-interaction-summary #(-> % :request :ishare/message-type))
-
 (defn server-description
   [{:ishare/keys [server-id server-name]}]
   (if server-name
     [:span [:q server-id] " (" server-name ")"]
     [:q server-id]))
 
+(defmulti ishare-interaction-summary #(-> % :request :ishare/message-type))
+
 (defmethod ishare-interaction-summary :default
   [_]
   [:span "Oeps.."])
@@ -200,22 +200,24 @@
     [:li.interaction
      [:details
       [:summary (ishare-interaction-summary interaction)]
-      [:p "Request:"]
-      [:pre.request
-       (to-json (-> interaction
-                    :request
-                    (select-keys [:method :uri :params :form-params :json-params :headers])))]
-      [:p "Response:"]
-      [:pre.response
-       (to-json (select-keys interaction [:status :headers :body]))]]]))
+      (when (:request interaction)
+        [:div.request
+         [:p "Request:"]
+         [:pre (to-json (-> interaction
+                            :request
+                            (select-keys [:method :uri :params :form-params :json-params :headers])))]])
+      (when (:status interaction)
+        [:div.response
+         [:p "Response:"]
+         [:pre (to-json (select-keys interaction [:status :headers :body]))]])]]))
 
 (defn explanation [explanation]
   [:details.explanation
     [:summary "Uitleg"]
     [:ol
      (for [[title ishare-log] explanation]
        [:li [:h3 title]
-        [:ol (ishare-log-intercept-to-hiccup (pk ishare-log))]])]])
+        [:ol (ishare-log-intercept-to-hiccup ishare-log)]])]])
 
 (defn wrap-config [app config]
   (fn config-wrapper [req]