feat: added row selection of treatment plan

Casper Bollen · Casper Bollen · commit 469cbbb5ebec · 2025-03-15T10:26:09.000+01:00
diff --git a/src/Client/Components/ResponsiveTable.fs b/src/Client/Components/ResponsiveTable.fs
@@ -116,6 +116,8 @@ module ResponsiveTable =
             rowCreate : string[] -> obj
             height : string
             onRowClick : string -> unit
+            selectedRows : string []
+            onSelectChange: string [] -> unit
         |}) =
         let state, setState = React.useState [||]
 
@@ -157,6 +159,12 @@ module ResponsiveTable =
             fun pars ->
                 pars?id |> string |> props.onRowClick
 
+        let onSelectionChange =
+            fun pars ->
+                (pars |> string).Split ","
+                |> Array.filter (String.IsNullOrWhiteSpace >> not)
+                |> props.onSelectChange
+
         let rows =
             props.rows
             |> Array.filter (fun r ->
@@ -199,6 +207,9 @@ module ResponsiveTable =
                 </Box>
                 <div style={ {| height =props.height; width = "100%" |} }>
                     <DataGrid
+                        checkboxSelection
+                        rowSelectionModel = {props.selectedRows}
+                        onRowSelectionModelChange = {onSelectionChange}
                         rows={rows}
                         slots={ {| toolbar = toolbar |} }
                         onRowClick={onRowClick}
diff --git a/src/Client/Views/ContinuousMeds.fs b/src/Client/Views/ContinuousMeds.fs
@@ -88,6 +88,8 @@ module ContinuousMeds =
                     rowCreate = rowCreate
                     height = "70vh"
                     onRowClick = ignore
+                    selectedRows = [||]
+                    onSelectChange = ignore
                 |})
             }
         </Box>
diff --git a/src/Client/Views/EmergencyList.fs b/src/Client/Views/EmergencyList.fs
@@ -111,6 +111,8 @@ module EmergencyList =
             rowCreate = rowCreate
             height = "70vh"
             onRowClick = ignore
+            selectedRows = [||]
+            onSelectChange = ignore
         |})
 
 
diff --git a/src/Client/Views/Nutrition.fs b/src/Client/Views/Nutrition.fs
@@ -72,6 +72,8 @@ module Nutrion =
                         rowCreate = rowCreate
                         height = "50vh"
                         onRowClick = ignore
+                        selectedRows = [||]
+                        onSelectChange = ignore
                     |})
                 }
             </Box>
diff --git a/src/Client/Views/TreatmentPlan.fs b/src/Client/Views/TreatmentPlan.fs
@@ -197,14 +197,41 @@ module TreatmentPlan =
                     setModalOpen true
             | _ -> ()
 
+        let filterOrders ids =
+            match props.treatmentPlan with
+            | Resolved tp ->
+                { tp with
+                    Filtered =
+                        if ids |> Array.isEmpty then [||]
+                        else
+                            tp.Scenarios
+                            |> Array.filter (fun os ->
+                                os.Order
+                                |> OrderState.getOrder
+                                |> _.Id
+                                |> fun id -> ids |> Array.exists ((=) id)
+                            )
+                }
+                |> props.updateTreatmentPlan
+            | _ -> ()
+
+        let selectedRows =
+            match props.treatmentPlan with
+            | Resolved tp ->
+                tp.Filtered
+                |> Array.map _.Order
+                |> Array.map OrderState.getOrder
+                |> Array.map _.Id
+            | _ -> [||]
+
         let updatePrescriptionResult (pr : PrescriptionContext) =
             match props.treatmentPlan with
             | Resolved tp ->
                 match pr.Scenarios |> Array.tryExactlyOne with
                 | None -> ()
                 | Some os ->
                     { tp with
-                        Selected = os |> Some
+                        Selected = Some os
                         Scenarios =
                             tp.Scenarios
                             |> Array.map (fun sc ->
@@ -229,6 +256,8 @@ module TreatmentPlan =
                     rowCreate = rowCreate
                     height = "50vh"
                     onRowClick = selectOrder
+                    selectedRows = selectedRows
+                    onSelectChange = filterOrders
                 |})
             }
             <Modal open={modalOpen} onClose={handleModalClose} >
diff --git a/src/Informedica.GenForm.Lib/Scripts/Check.fsx b/src/Informedica.GenForm.Lib/Scripts/Check.fsx
@@ -10,7 +10,6 @@ Environment.SetEnvironmentVariable("GENPRES_PROD", "1")
 #load "../Types.fs"
 #load "../Utils.fs"
 #load "../Mapping.fs"
-#load "../VenousAccess.fs"
 #load "../Patient.fs"
 #load "../LimitTarget.fs"
 #load "../DoseType.fs"
diff --git a/src/Informedica.GenForm.Lib/Scripts/DoseRule.fsx b/src/Informedica.GenForm.Lib/Scripts/DoseRule.fsx
@@ -13,7 +13,6 @@ Environment.SetEnvironmentVariable("GENPRES_URL_ID", dataUrlId)
 #load "../Types.fs"
 #load "../Utils.fs"
 #load "../Mapping.fs"
-#load "../VenousAccess.fs"
 #load "../Mapping.fs"
 #load "../Patient.fs"
 #load "../LimitTarget.fs"
diff --git a/src/Informedica.GenForm.Lib/Scripts/RenalRule.fsx b/src/Informedica.GenForm.Lib/Scripts/RenalRule.fsx
@@ -12,7 +12,6 @@ Environment.SetEnvironmentVariable("GENPRES_URL_ID", dataUrlId)
 #load "../Types.fs"
 #load "../Utils.fs"
 #load "../Mapping.fs"
-#load "../VenousAccess.fs"
 #load "../Mapping.fs"
 #load "../Patient.fs"
 #load "../LimitTarget.fs"
@@ -39,7 +38,4 @@ RenalRule.get ()
 
 Web.getDataFromSheet dataUrlId "RenalRules"
 
-Web.GoogleSheets.createUrl "RenalRules" (Web.getDataUrlIdGenPres ())
-
-
-
+Web.GoogleSheets.createUrl "RenalRules" (Web.getDataUrlIdGenPres ())
diff --git a/src/Informedica.GenForm.Lib/Scripts/Scripts.fsx b/src/Informedica.GenForm.Lib/Scripts/Scripts.fsx
@@ -13,7 +13,6 @@ Environment.SetEnvironmentVariable("GENPRES_URL_ID", dataUrlId)
 #load "../Types.fs"
 #load "../Utils.fs"
 #load "../Mapping.fs"
-#load "../VenousAccess.fs"
 #load "../Patient.fs"
 #load "../LimitTarget.fs"
 #load "../DoseType.fs"
diff --git a/src/Informedica.GenForm.Lib/Scripts/SolutionRule.fsx b/src/Informedica.GenForm.Lib/Scripts/SolutionRule.fsx
@@ -12,7 +12,6 @@ Environment.SetEnvironmentVariable("GENPRES_URL_ID", dataUrlId)
 #load "../Types.fs"
 #load "../Utils.fs"
 #load "../Mapping.fs"
-#load "../VenousAccess.fs"
 #load "../Patient.fs"
 #load "../LimitTarget.fs"
 #load "../DoseType.fs"
diff --git a/src/Informedica.GenForm.Lib/Scripts/Update.fsx b/src/Informedica.GenForm.Lib/Scripts/Update.fsx
@@ -5,7 +5,6 @@
 #load "../Types.fs"
 #load "../Utils.fs"
 #load "../Mapping.fs"
-#load "../VenousAccess.fs"
 #load "../Patient.fs"
 #load "../LimitTarget.fs"
 #load "../DoseType.fs"
diff --git a/src/Informedica.GenOrder.Lib/Api.fs b/src/Informedica.GenOrder.Lib/Api.fs
@@ -506,11 +506,21 @@ module Api =
                 | i, Ok (ord, pr) ->
                     OrderScenario.create i pr ord
                     |> Some
-                | _, Error (_, _, errs) ->
+                | _, Error (ord, prctx, errs) ->
                     errs
                     |> List.map string
                     |> String.concat "\n"
                     |> writeErrorMessage
+
+                    ord
+                    |> Order.toString
+                    |> String.concat "\n"
+                    |> writeWarningMessage
+
+                    prctx
+                    |> sprintf "%A"
+                    |> writeWarningMessage
+
                     None
             )
 
diff --git a/src/Informedica.GenOrder.Lib/Scripts/Scenarios.fsx b/src/Informedica.GenOrder.Lib/Scripts/Scenarios.fsx
@@ -8,30 +8,27 @@ System.Environment.SetEnvironmentVariable("GENPRES_URL_ID", "1IZ3sbmrM4W4OuSYELR
 
 open MathNet.Numerics
 open Informedica.Utils.Lib
-open Informedica.Utils.Lib.BCL
-open Informedica.Utils.Lib.BCL
-open Informedica.GenForm.Lib
 open Informedica.GenUnits.Lib
-open Informedica.GenSolver.Lib
+open Informedica.GenForm.Lib
 open Informedica.GenOrder.Lib
-open Informedica.GenSolver.Lib.Variable.Operators
+
 
 // TODO: could be used to precalc all possible
 // prescriptions for a patient
-let createScenarios (pr: PrescriptionResult) =
+let createScenarios (pr: PrescriptionContext) =
     let getRules filter =
-        { pr with Filter = filter } |> PrescriptionResult.getRules
+        { pr with Filter = filter } |> PrescriptionContext.getRules
 
     let print pr =
         let g = pr.Filter.Generic
         let i = pr.Filter.Indication
         let r = pr.Filter.Route
         let d = pr.Filter.DoseType
-        printfn $"=== no evalution of {g} {i} {r} {d} ==="
+        printfn $"=== no evaluation of {g} {i} {r} {d} ==="
         pr
 
     let eval pr s =
-        printfn $"evaluting {s}..."
+        printfn $"evaluating {s}"
         try
             let pr = pr |> Api.evaluate
 
@@ -47,42 +44,44 @@ let createScenarios (pr: PrescriptionResult) =
             let pr, rules = { pr.Filter with Generic = Some g } |> getRules
 
             if rules |> Array.isEmpty |> not then
-                $"evaluting {g}..." |> eval pr
+                g |> eval pr
 
             else
                 for i in pr.Filter.Indications do
                     let pr, rules = { pr.Filter with Indication = Some i } |> getRules
 
                     if rules |> Array.isEmpty |> not then
-                        $"evaluting {g} {i}..." |> eval pr
+                        $"{g}, {i}" |> eval pr
 
                     else
                         for r in pr.Filter.Routes do
                             let pr, rules = { pr.Filter with Route = Some r } |> getRules
 
                             if rules |> Array.isEmpty |> not then
-                                $"evaluting {g} {i} {r}..." |> eval pr
+                                $"{g}, {i}, {r}" |> eval pr
 
                             else
                                 for d in pr.Filter.DoseTypes do
                                     let pr, rules = { pr.Filter with DoseType = Some d } |> getRules
 
                                     if rules |> Array.isEmpty |> not then
-                                        $"evaluting {g} {i} {r} {d}..." |> eval pr
+                                        $"{g}, {i}, {r}, {d}" |> eval pr
 
                                     else pr |> print
     ]
 
 
-
-let pr = Patient.infant |> PrescriptionResult.create
+let pr =
+    { Patient.infant with
+        Weight = Some ([| 10N |] |> ValueUnit.withUnit Units.Weight.kiloGram)
+    }|> PrescriptionContext.create
 
 
-{ pr with PrescriptionResult.Filter.Generic = pr.Filter.Generics |> Array.tryItem 10 }
-|> PrescriptionResult.getRules
+{ pr with PrescriptionContext.Filter.Generic = pr.Filter.Generics |> Array.tryItem 10 }
+|> PrescriptionContext.getRules
 
 let scenarios =
-    pr |> createScenarios
+    pr |> createScenarios |> ignore
 
 
 scenarios
@@ -92,14 +91,14 @@ scenarios
 |> List.length
 
 // cidofovir
-{ pr with PrescriptionResult.Filter.Generic = Some "cidofovir" }
-|> PrescriptionResult.getRules
+{ pr with PrescriptionContext.Filter.Generic = Some "cidofovir" }
+|> PrescriptionContext.getRules
 |> fun (pr, _) ->
-    { pr with PrescriptionResult.Filter.Indication = pr.Filter.Indications |> Array.tryHead }
-    |> PrescriptionResult.getRules
+    { pr with PrescriptionContext.Filter.Indication = pr.Filter.Indications |> Array.tryHead }
+    |> PrescriptionContext.getRules
 |> fun (pr, _) ->
-    { pr with PrescriptionResult.Filter.DoseType = pr.Filter.DoseTypes |> Array.tryHead }
-    |> PrescriptionResult.getRules
+    { pr with PrescriptionContext.Filter.DoseType = pr.Filter.DoseTypes |> Array.tryHead }
+    |> PrescriptionContext.getRules
 |> snd
 |> Array.tryHead
 |> Option.map DrugOrder.fromRule
@@ -111,17 +110,17 @@ scenarios
 
 
 // TPV
-{ pr with PrescriptionResult.Filter.Indication = Some "TPV" }
-|> PrescriptionResult.getRules
+{ pr with PrescriptionContext.Filter.Indication = Some "TPV" }
+|> PrescriptionContext.getRules
 |> fun (pr, _) ->
-    { pr with PrescriptionResult.Filter.Indication = pr.Filter.Indications |> Array.tryHead }
-    |> PrescriptionResult.getRules
+    { pr with PrescriptionContext.Filter.Indication = pr.Filter.Indications |> Array.tryHead }
+    |> PrescriptionContext.getRules
 |> fun (pr, _) ->
-    { pr with PrescriptionResult.Filter.DoseType = pr.Filter.DoseTypes |> Array.tryHead }
-    |> PrescriptionResult.getRules
+    { pr with PrescriptionContext.Filter.DoseType = pr.Filter.DoseTypes |> Array.tryHead }
+    |> PrescriptionContext.getRules
 |> fun (pr, _) ->
-    { pr with PrescriptionResult.Filter.SelectedComponents = pr.Filter.Components |> Array.skip 1 }
-    |> PrescriptionResult.getRules
+    { pr with PrescriptionContext.Filter.SelectedComponents = pr.Filter.Components |> Array.skip 1 }
+    |> PrescriptionContext.getRules
 |> snd
 |> Array.tryHead
 |> Option.map DrugOrder.fromRule
@@ -133,19 +132,19 @@ scenarios
 
 
 { pr with
-    PrescriptionResult.Filter.Generic = Some "natriumfosfaat" }
+    PrescriptionContext.Filter.Generic = Some "natriumfosfaat" }
 |> Api.evaluate
 
 
 let tpvRule =
-    { pr with PrescriptionResult.Filter.Indication = Some "TPV" }
-    |> PrescriptionResult.getRules
+    { pr with PrescriptionContext.Filter.Indication = Some "TPV" }
+    |> PrescriptionContext.getRules
     |> fun (pr, _) ->
-        { pr with PrescriptionResult.Filter.Indication = pr.Filter.Indications |> Array.tryHead }
-        |> PrescriptionResult.getRules
+        { pr with PrescriptionContext.Filter.Indication = pr.Filter.Indications |> Array.tryHead }
+        |> PrescriptionContext.getRules
     |> fun (pr, _) ->
-        { pr with PrescriptionResult.Filter.DoseType = pr.Filter.DoseTypes |> Array.tryHead }
-        |> PrescriptionResult.getRules
+        { pr with PrescriptionContext.Filter.DoseType = pr.Filter.DoseTypes |> Array.tryHead }
+        |> PrescriptionContext.getRules
     |> snd
     |> Array.head
 
@@ -154,19 +153,16 @@ tpvRule.DoseRule.DoseLimits
 |> Array.map _.Component
 
 let norRule =
-    { pr with PrescriptionResult.Filter.Generic = Some "noradrenaline" }
-    |> PrescriptionResult.getRules
+    { pr with PrescriptionContext.Filter.Generic = Some "noradrenaline" }
+    |> PrescriptionContext.getRules
     |> fun (pr, _) ->
-        { pr with PrescriptionResult.Filter.Indication = pr.Filter.Indications |> Array.tryHead }
-        |> PrescriptionResult.getRules
+        { pr with PrescriptionContext.Filter.Indication = pr.Filter.Indications |> Array.tryHead }
+        |> PrescriptionContext.getRules
     |> fun (pr, _) ->
-        { pr with PrescriptionResult.Filter.DoseType = pr.Filter.DoseTypes |> Array.tryHead }
-        |> PrescriptionResult.getRules
+        { pr with PrescriptionContext.Filter.DoseType = pr.Filter.DoseTypes |> Array.tryHead }
+        |> PrescriptionContext.getRules
     |> snd
     |> Array.head
 
 norRule.DoseRule.DoseLimits
-|> Array.map _.Component
-
-
-[| "a"; "b"; "c" |] = [| "a"; "b"; "c" |]
+|> Array.map _.Component
diff --git a/src/Informedica.GenSolver.Lib/Variable.fs b/src/Informedica.GenSolver.Lib/Variable.fs
@@ -1691,7 +1691,7 @@ module Variable =
                 let incr = incrOpt |> Option.map (Increment.toString false) |> Option.defaultValue ""
                 let max = maxOpt |> Option.map (Maximum.toString false) |> Option.defaultValue ""
                 let vs = vs |> ValueUnit.toStringDutchShort
-                printfn $"filter with %s{min}, %s{incr}, %s{max} and %s{vs} gives empty set"
+                writeWarningMessage $"filter with min = '%s{min}', incr = '%s{incr}', max = '%s{max}' and vs = '%s{vs}' gives empty set"
                 raise e
 
 
diff --git a/src/Server/Scripts/Scripts.fsx b/src/Server/Scripts/Scripts.fsx
diff --git a/src/Server/Scripts/load.fsx b/src/Server/Scripts/load.fsx
diff --git a/src/Server/ServerApi.fs b/src/Server/ServerApi.fs
diff --git a/src/Shared/Models.fs b/src/Shared/Models.fs
diff --git a/src/Shared/Types.fs b/src/Shared/Types.fs

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,8 @@ module ContinuousMeds =`
`88`	`88`	`rowCreate = rowCreate`
`89`	`89`	`height = "70vh"`
`90`	`90`	`onRowClick = ignore`
	`91`	`+ selectedRows = [\|\|]`
	`92`	`+ onSelectChange = ignore`
`91`	`93`	`\|})`
`92`	`94`	`}`
`93`	`95`	`</Box>`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,8 @@ module Nutrion =`
`72`	`72`	`rowCreate = rowCreate`
`73`	`73`	`height = "50vh"`
`74`	`74`	`onRowClick = ignore`
	`75`	`+ selectedRows = [\|\|]`
	`76`	`+ onSelectChange = ignore`
`75`	`77`	`\|})`
`76`	`78`	`}`
`77`	`79`	`</Box>`