Skip to content

[BHP1-1339] Update Formatter So Whole Number Results Between 0 and 1 Return <1 #199

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 1 commit into
base: main
Choose a base branch
from
Open

[BHP1-1339] Update Formatter So Whole Number Results Between 0 and 1 Return <1 #199

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
96 changes: 49 additions & 47 deletions projects/behave/src/cljs/behave/worksheet/subs.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,9 +703,11 @@
*cached-decimals (rf/subscribe [:settings/cached-decimal domain-uuid])
significant-digits (or @*cached-decimals (:domain/decimals domain))]
(fn continuous-fmt [value]
(cond->> value
:always (parse-float)
(and significant-digits is-output?) (gstring/format (str "%." significant-digits "f")))))
(let [float-value (parse-float value)]
(cond
(and (= significant-digits "0") (< 0 float-value 1)) "< 1"
(and significant-digits is-output?) (gstring/format (str "%." significant-digits "f") float-value)
:else float-value))))

(or (= v-kind :discrete) multi-discrete?)
(let [{llist :variable/list} (d/pull @@vms-conn '[{:variable/list [* {:list/options [*]}]}] (:db/id variable))
Expand Down Expand Up @@ -775,25 +777,25 @@
(rp/reg-sub
:worksheet/result-table-cell-data
(fn [_ [_ ws-uuid]]
{:type :query
:query '[:find ?row ?col-uuid ?repeat-id ?value
:in $ ?ws-uuid
:where
[?w :worksheet/uuid ?ws-uuid]
[?w :worksheet/result-table ?rt]
[?rt :result-table/rows ?r]
{:type :query
:query '[:find ?row ?col-uuid ?repeat-id ?value
:in $ ?ws-uuid
:where
[?w :worksheet/uuid ?ws-uuid]
[?w :worksheet/result-table ?rt]
[?rt :result-table/rows ?r]

;;get row
[?r :result-row/id ?row]
[?r :result-row/id ?row]

;;get-header
[?r :result-row/cells ?c]
[?c :result-cell/header ?h]
[?h :result-header/group-variable-uuid ?col-uuid]
[?h :result-header/repeat-id ?repeat-id]
[?r :result-row/cells ?c]
[?c :result-cell/header ?h]
[?h :result-header/group-variable-uuid ?col-uuid]
[?h :result-header/repeat-id ?repeat-id]

;;get value
[?c :result-cell/value ?value]]
[?c :result-cell/value ?value]]
:variables
[ws-uuid]}))

Expand Down Expand Up @@ -1060,50 +1062,50 @@
(rp/reg-sub
:worksheet/input-gv-uuid+value+units
(fn [_ [_ ws-uuid row-id]]
{:type :query
:query '[:find ?gv-uuid ?value ?units
:in $ ?ws-uuid ?row-id
:where
[?ws :worksheet/uuid ?ws-uuid]
[?ws :worksheet/input-groups ?ig]
[?ws :worksheet/result-table ?t]
[?t :result-table/rows ?rr]
[?rr :result-row/id ?row-id]
[?rr :result-row/cells ?c]
{:type :query
:query '[:find ?gv-uuid ?value ?units
:in $ ?ws-uuid ?row-id
:where
[?ws :worksheet/uuid ?ws-uuid]
[?ws :worksheet/input-groups ?ig]
[?ws :worksheet/result-table ?t]
[?t :result-table/rows ?rr]
[?rr :result-row/id ?row-id]
[?rr :result-row/cells ?c]

;; Filter only input variables
[?ig :input-group/inputs ?i]
[?i :input/group-variable-uuid ?gv-uuid]
[?ig :input-group/inputs ?i]
[?i :input/group-variable-uuid ?gv-uuid]

;; Get gv-uuid, value and units
[?rh :result-header/group-variable-uuid ?gv-uuid]
[?rh :result-header/units ?units]
[?c :result-cell/header ?rh]
[?c :result-cell/value ?value]]
[?rh :result-header/group-variable-uuid ?gv-uuid]
[?rh :result-header/units ?units]
[?c :result-cell/header ?rh]
[?c :result-cell/value ?value]]
:variables [ws-uuid row-id]}))

(rp/reg-sub
:worksheet/output-gv-uuid+value+units
(fn [_ [_ ws-uuid row-id]]
{:type :query
:query '[:find ?gv-uuid ?value ?units
:in $ ?ws-uuid ?row-id
:where
[?ws :worksheet/uuid ?ws-uuid]
[?ws :worksheet/outputs ?o]
[?ws :worksheet/result-table ?t]
[?t :result-table/rows ?rr]
[?rr :result-row/id ?row-id]
[?rr :result-row/cells ?c]
{:type :query
:query '[:find ?gv-uuid ?value ?units
:in $ ?ws-uuid ?row-id
:where
[?ws :worksheet/uuid ?ws-uuid]
[?ws :worksheet/outputs ?o]
[?ws :worksheet/result-table ?t]
[?t :result-table/rows ?rr]
[?rr :result-row/id ?row-id]
[?rr :result-row/cells ?c]

;; Filter only output variables
[?o :output/group-variable-uuid ?gv-uuid]
[?o :output/group-variable-uuid ?gv-uuid]

;; Get gv-uuid, value and units
[?rh :result-header/group-variable-uuid ?gv-uuid]
[?rh :result-header/units ?units]
[?c :result-cell/header ?rh]
[?c :result-cell/value ?value]]
[?rh :result-header/group-variable-uuid ?gv-uuid]
[?rh :result-header/units ?units]
[?c :result-cell/header ?rh]
[?c :result-cell/value ?value]]
:variables [ws-uuid row-id]}))

(rf/reg-sub
Expand Down