Merge pull request #61 from firelab/kc-BHP1-1280-fix-discrete-input-order-review-page

[BHP1-1280] Fix Multi Discrete Input order in Review and Result Page

Author: rjsheperd

projects/behave/src/cljs/behave/components/results/inputs/views.cljs

@@ -31,18 +31,20 @@
             single-var?      (= (count variables) 1)
             multi-var?       (> (count variables) 1)
             new-entries      (cond single-var?
-                                   (let [gv-uuid (:bp/uuid (first variables))
-                                         fmt-fn  (get formatters gv-uuid identity)
-                                         fvar    (first variables)
-                                         units   (get gv-uuid->units gv-uuid)
-                                         value   @(subscribe [:worksheet/input-value
-                                                              ws-uuid
-                                                              (:bp/uuid current-group)
-                                                              0 ;repeat-id
-                                                              gv-uuid])]
+                                   (let [gv-uuid      (:bp/uuid (first variables))
+                                         list-eid     @(subscribe [:vms/gv-uuid->list-eid gv-uuid])
+                                         fmt-fn       (get formatters gv-uuid identity)
+                                         fvar         (first variables)
+                                         units        (get gv-uuid->units gv-uuid)
+                                         value        @(subscribe [:worksheet/input-value
+                                                                   ws-uuid
+                                                                   (:bp/uuid current-group)
+                                                                   0 ;repeat-id
+                                                                   gv-uuid])]
                                      (when (seq value)
                                        (if (:group-variable/discrete-multiple? fvar)
                                          (let [values (->> (str/split value ",")
+                                                           (sort-by #(deref (subscribe [:worksheet/resolve-enum-order list-eid %])))
                                                            (map fmt-fn))]
                                            (into [{:input  (indent-name level @(subscribe [:result.inputs/resolve-group-name (:bp/uuid current-group)]))
                                                    :units  units
@@ -65,6 +67,7 @@
                                                            (flatten
                                                             (for [variable (sort-by :group-variable/order variables)
                                                                   :let     [gv-uuid (:bp/uuid variable)
+                                                                            list-eid     @(subscribe [:vms/gv-uuid->list-eid gv-uuid])
                                                                             value @(subscribe [:worksheet/input-value
                                                                                                ws-uuid
                                                                                                (:bp/uuid current-group)
@@ -76,6 +79,7 @@
                                                                     variable-name @(subscribe [:wizard/gv-uuid->default-variable-name gv-uuid])]
                                                                 (if (:group-variable/discrete-multiple? variable)
                                                                   (let [values (->> (str/split value ",")
+                                                                                    (sort-by #(deref (subscribe [:worksheet/resolve-enum-order list-eid %])))
                                                                                     (map fmt-fn))]
                                                                     (into [{:input  (indent-name (+ level 2) variable-name)
                                                                             :units  units-used

projects/behave/src/cljs/behave/components/review_input_group.cljs

@@ -73,8 +73,10 @@
                                          repeat-id
                                          _repeat-group?
                                          edit-route]
-  (let [*value               (rf/subscribe [:worksheet/input-value ws-uuid group-uuid repeat-id gv-uuid])
+  (let [list-eid             @(rf/subscribe [:vms/gv-uuid->list-eid gv-uuid])
+        *value               (rf/subscribe [:worksheet/input-value ws-uuid group-uuid repeat-id gv-uuid])
         resolved-enum-values (->> (str/split @*value ",")
+                                  (sort-by #(deref (rf/subscribe [:worksheet/resolve-enum-order list-eid %])))
                                   (map #(deref (rf/subscribe [:worksheet/resolve-enum-value eid %]))))]
     [:div.wizard-input {:on-mouse-over #(rf/dispatch [:help/highlight-section help-key])}
      [:div.wizard-review__input

projects/behave/src/cljs/behave/vms/subs.cljs

@@ -188,3 +188,14 @@
           [?gv :bp/uuid ?gv-uuid]
           [?gv :group-variable/discrete-multiple? ?discrete-multiple]]
         @@vms-conn gv-uuid)))
+
+(reg-sub
+ :vms/gv-uuid->list-eid
+ (fn [_ [_ gv-uuid]]
+   (d/q '[:find ?l .
+          :in $ ?gv-uuid
+          :where
+          [?gv :bp/uuid ?gv-uuid]
+          [?v :variable/group-variables ?gv]
+          [?v :variable/list ?l]]
+        @@vms-conn gv-uuid)))

projects/behave/src/cljs/behave/worksheet/subs.cljs

@@ -979,6 +979,16 @@
        @(<t (:list-option/translation-key option))
        value))))
 
+(rf/reg-sub
+ :worksheet/resolve-enum-order
+
+ (fn [_ [_ list-eid value]]
+   (let [list-entity             (d/touch (d/entity @@vms-conn list-eid))
+         {options :list/options} list-entity
+         options                 (index-by :list-option/value options)
+         option                  (get options value)]
+     (:list-option/order option))))
+
 (rf/reg-sub
  :worksheet/result-table-gv-uuid->units
  (fn [_ [_ ws-uuid]]