Skip to content

[BHP1-1415] Separate Map Units Results #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kcheung42 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[BHP1-1415] Separate Map Units Results #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d39b911
separate map units results
Kcheung42 Mar 27, 2026
c779dc5
add padding
Kcheung42 Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions projects/behave/resources/public/css/app-style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1455,6 +1455,10 @@ body {
text-align: left;
}

.result-matrix__map-units-table {
margin-top: 5px;
}

.wizard-results__pivot-tables .table {
margin-bottom: 20px;
}
Expand Down
120 changes: 67 additions & 53 deletions projects/behave/src/cljs/behave/components/results/matrices.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,26 +125,32 @@
(let [map-units-settings-entity @(subscribe [:worksheet/map-units-settings-entity ws-uuid])
map-units (:map-units-settings/units map-units-settings-entity)
map-rep-frac (:map-units-settings/map-rep-fraction map-units-settings-entity)
rows (reduce (fn [acc {output-gv-uuid :bp/uuid
regular-rows (reduce (fn [acc {output-gv-uuid :bp/uuid
units :units}]
(let [value @(subscribe [:worksheet/first-row-results-gv-uuid->value ws-uuid output-gv-uuid])
fmt-fn (get formatters output-gv-uuid identity)
var-name @(subscribe [:wizard/gv-uuid->resolve-result-variable-name output-gv-uuid])]
(cond-> acc
:always (conj {:output var-name
:value (if (neg? value)
"-"
(fmt-fn value))
:units units})

(process-map-units? output-gv-uuid)
(conj {:output (gstring/format @(<t (bp "s_map_units")) var-name)
:value (if (pos? value)
(-> value
(to-map-units units map-units map-rep-frac)
fmt-fn)
"-")
:units map-units}))))
(conj acc {:output var-name
:value (if (neg? value)
"-"
(fmt-fn value))
:units units})))
[]
output-entities)
map-units-rows (reduce (fn [acc {output-gv-uuid :bp/uuid
units :units}]
(if (process-map-units? output-gv-uuid)
(let [value @(subscribe [:worksheet/first-row-results-gv-uuid->value ws-uuid output-gv-uuid])
fmt-fn (get formatters output-gv-uuid identity)
var-name @(subscribe [:wizard/gv-uuid->resolve-result-variable-name output-gv-uuid])]
(conj acc {:output (gstring/format @(<t (bp "s_map_units")) var-name)
:value (if (pos? value)
(-> value
(to-map-units units map-units map-rep-frac)
fmt-fn)
"-")
:units map-units}))
acc))
[]
output-entities)]
[:div.print__result-table
Expand All @@ -153,7 +159,14 @@
@(<t (bp "value"))
@(<t (bp "units"))]
:columns [:output :value :units]
:rows rows})]))
:rows regular-rows})
(when (seq map-units-rows)
(c/table {:title (gstring/format @(<t (bp "s_map_units_(s)")) @(<t (bp "results")) map-units)
:headers [@(<t (bp "output_variable"))
@(<t (bp "value"))
@(<t (bp "units"))]
:columns [:output :value :units]
:rows map-units-rows}))]))

(defmethod construct-result-matrices 1
[{:keys [ws-uuid process-map-units? multi-valued-inputs formatters output-entities units-lookup table-setting-filters title]}]
Expand All @@ -173,47 +186,48 @@
(conj row)))
#{}
matrix-data-raw)
matrix-data-formatted (reduce-kv (fn [acc [row col-uuid] v]
(let [fmt-fn (get formatters col-uuid identity)
shaded? (contains? rows-to-shade-set row)]
(assoc acc [(input-fmt-fn row) col-uuid]
(format-matrix-cell v fmt-fn shaded?))))
{}
matrix-data-raw)
{:keys [units rep-fraction]} (fetch-map-units-settings ws-uuid)
column-headers (reduce (fn insert-map-units-columns [acc {output-gv-uuid :bp/uuid
output-units :units}]
[regular-column-headers
map-units-column-headers] (reduce (fn [[reg mu] {output-gv-uuid :bp/uuid output-units :units}]
(let [output-name @(subscribe [:wizard/gv-uuid->resolve-result-variable-name output-gv-uuid])]
(cond-> acc
(process-map-units? output-gv-uuid)
(conj {:name (gstring/format @(<t (bp "s_map_units_(s)"))
output-name
units)
:key (map-units-column-key output-gv-uuid)})
:always (conj {:name (header-label output-name output-units)
:key output-gv-uuid}))))
[]
(if (process-map-units? output-gv-uuid)
[reg (conj mu {:name (header-label output-name units)
:key (map-units-column-key output-gv-uuid)})]
[(conj reg {:name (header-label output-name output-units)
:key output-gv-uuid})
mu])))
[[] []]
output-entities)
[matrix-data-formatted
map-units-data] (reduce-kv (fn [[reg mu] [row col-uuid] v]
(let [fmt-fn (get formatters col-uuid identity)
shaded? (contains? rows-to-shade-set row)]
(if (process-map-units? col-uuid)
[reg (assoc mu [(input-fmt-fn row) (map-units-column-key col-uuid)]
(format-matrix-cell
(convert-to-map-units v (get units-lookup col-uuid) units rep-fraction)
fmt-fn
shaded?))]
[(assoc reg [(input-fmt-fn row) col-uuid]
(format-matrix-cell v fmt-fn shaded?))
mu])))
[{} {}]
matrix-data-raw)
row-headers (map (fn [value] {:name (input-fmt-fn value) :key (input-fmt-fn value)}) multi-var-values)
final-data (reduce (fn insert-map-units-values [acc [[row col] value]]
(let [fmt-fn (get formatters col identity)
shaded? (contains? rows-to-shade-set col)]
(cond-> acc
(process-map-units? col)
(assoc [(input-fmt-fn row) (map-units-column-key col)]
(format-matrix-cell
(convert-to-map-units value (get units-lookup col) units rep-fraction)
fmt-fn
shaded?)))))
matrix-data-formatted
matrix-data-raw)]
common-matrix-props {:rows-label (header-label multi-var-name multi-var-units)
:cols-label @(<t (bp "outputs"))
:row-headers row-headers}]
[:div.print__result-table
(c/matrix-table {:title title
:rows-label (header-label multi-var-name multi-var-units)
:cols-label @(<t (bp "outputs"))
:column-headers column-headers
:row-headers row-headers
:data final-data})]))
(c/matrix-table (merge common-matrix-props
{:title title
:column-headers regular-column-headers
:data matrix-data-formatted}))
(when (seq map-units-column-headers)
[:div.result-matrix__map-units-table
(c/matrix-table (merge common-matrix-props
{:title (gstring/format @(<t (bp "s_map_units_(s)")) title units)
:column-headers map-units-column-headers
:data map-units-data}))])]))

(defmethod construct-result-matrices 2
[{:keys [ws-uuid process-map-units? multi-valued-inputs formatters output-entities table-setting-filters
Expand Down