feat: allow dosetype filter when applicable

src/Client/Components/Autocomplete.fs

@@ -53,6 +53,7 @@ module Autocomplete =
         <Autocomplete
             sx={ {| minWidth = 300 |} }
             id={props.label}
+//            disabled={props.isLoading |> not}
             value={props.selected |> Option.defaultValue ""}
             onChange={handleChange}
             options={props.values}
@@ -100,6 +101,7 @@ module Autocomplete =
         <Autocomplete
             sx={ {| minWidth = 300 |} }
             id={props.label}
+//            disabled={props.isLoading |> not}
             value={props.selected |> Option.defaultValue ""}
             onChange={handleChange}
             options={props.values}
@@ -110,7 +112,6 @@ module Autocomplete =
 
 
 
-
     [<JSX.Component>]
     let Routes (props :
             {|
@@ -148,6 +149,55 @@ module Autocomplete =
         <Autocomplete
             sx={ {| minWidth = 300 |} }
             id={props.label}
+//            disabled={props.isLoading |> not}
+            value={props.selected |> Option.defaultValue ""}
+            onChange={handleChange}
+            options={props.values}
+            renderInput={renderInput}
+        >
+        </Autocomplete>
+        """
+
+
+
+    [<JSX.Component>]
+    let DoseTypes (props :
+            {|
+                label : string
+                selected : string option
+                values : string []
+                updateSelected : string option -> unit
+                isLoading : bool
+            |}
+        ) =
+
+        let handleChange =
+            fun ev ->
+                ev?target?innerText
+                |> string
+                |> function
+                | s when s |> String.IsNullOrWhiteSpace ||
+                         s = "undefined" -> None
+                | s -> s |> Some
+                |> fun x -> Logging.log "value is none: " x.IsNone; x
+                |> props.updateSelected
+
+        let renderInput pars =
+            JSX.jsx """
+                <TextField {...pars} label="Doseer types" />
+            """
+
+        JSX.jsx
+            $"""
+        import InputLabel from '@mui/material/InputLabel';
+        import TextField from '@mui/material/TextField';
+        import Autocomplete from '@mui/material/Autocomplete';
+        import FormControl from '@mui/material/FormControl';
+
+        <Autocomplete
+            sx={ {| minWidth = 300 |} }
+            id={props.label}
+//            disabled={props.isLoading |> not}
             value={props.selected |> Option.defaultValue ""}
             onChange={handleChange}
             options={props.values}

src/Client/Views/Prescribe.fs

@@ -26,6 +26,7 @@ module Prescribe =
                 Indication: string option
                 Medication: string option
                 Route: string option
+                DoseType : string option
             }
 
 
@@ -35,6 +36,8 @@ module Prescribe =
             | IndicationChange of string option
             | MedicationChange of string option
             | RouteChange of string option
+            | DoseTypeChange of string option
+            | Clear
 
 
         let empty =
@@ -43,6 +46,7 @@ module Prescribe =
                 Indication = None
                 Medication = None
                 Route = None
+                DoseType = None
             }
 
 
@@ -55,6 +59,7 @@ module Prescribe =
                         Indication = sc.Indication
                         Medication = sc.Medication
                         Route = sc.Route
+                        DoseType = sc.DoseType
                     }
                 | _ -> empty
             state, Cmd.none
@@ -75,13 +80,11 @@ module Prescribe =
 
             match msg with
             | RowClick (i, xs) ->
-                Logging.log "rowclick:" i
                 { state with Dialog = xs }, Cmd.none
 
             | CloseDialog -> { state with Dialog = [] }, Cmd.none
 
             | IndicationChange s ->
-                printfn $"indication change {s}, is none: {s.IsNone}"
                 match scenarios with
                 | Resolved sc ->
                     if s |> Option.isNone then
@@ -103,13 +106,9 @@ module Prescribe =
                 | Resolved sc ->
                     if s |> Option.isNone then
                         { sc with
-                            Indications = 
-                                ScenarioResult.empty.Indications
-                            Indication = None
                             Medications =
                                 ScenarioResult.empty.Medications
                             Medication = None
-                            Shape = None                
                             Scenarios = [||]
                         }
 
@@ -123,14 +122,52 @@ module Prescribe =
             | RouteChange s ->
                 match scenarios with
                 | Resolved sc ->
-                    if s |> Option.isNone then ScenarioResult.empty
+                    if s |> Option.isNone then 
+                        { sc with
+                            Routes =
+                                ScenarioResult.empty.Routes
+                            Route = None
+                            Scenarios = [||]
+                        }
                     else
                         { sc with Route = s }
                     |> updateScenario
                 | _ -> ()
 
                 { state with Route = s }, Cmd.none
 
+            | DoseTypeChange s ->
+                match scenarios with
+                | Resolved sc ->
+                    if s |> Option.isNone then 
+                        { sc with
+                            DoseTypes =
+                                ScenarioResult.empty.DoseTypes
+                            DoseType = None
+                            Scenarios = [||]
+                        }
+                    else
+                        { sc with DoseType = s }
+                    |> updateScenario
+                | _ -> ()
+
+                { state with DoseType = s }, Cmd.none
+
+            | Clear ->
+                match scenarios with
+                | Resolved _ ->
+                    ScenarioResult.empty |> updateScenario
+                | _ -> ()
+
+                { state with 
+                    Indication = None
+                    Medication = None
+                    Route = None
+                    DoseType =  None
+
+                }, Cmd.none
+
+
 
     open Elmish
     open Shared
@@ -198,14 +235,25 @@ module Prescribe =
                     values = xs
                     isLoading = isLoading
                 |})
-            | _ -> 
+            | _ when lbl = "rts" -> 
                 Components.Autocomplete.Routes({|
                     updateSelected = dispatch
                     label = lbl
                     selected = selected
                     values = xs
                     isLoading = isLoading
                 |})
+            | _ when lbl = "dts" -> 
+                Components.Autocomplete.DoseTypes({|
+                    updateSelected = dispatch
+                    label = lbl
+                    selected = selected
+                    values = xs
+                    isLoading = isLoading
+                |})
+            | _ -> 
+                $"cannot create autocomplete from {lbl}"
+                |> failwith 
 
         let progress =
             match props.scenarios with
@@ -397,9 +445,26 @@ module Prescribe =
                                     |> autoComplete isLoading "rts" sel (RouteChange >> dispatch)
                                 
                         }
+                        {
+                            match props.scenarios with
+                            | Resolved scrs when scrs.Indication.IsSome &&
+                                                 scrs.Medication.IsSome &&
+                                                 scrs.Route.IsSome &&
+                                                 scrs.DoseTypes |> Array.length > 1 -> 
+                                (false, scrs.DoseType, scrs.DoseTypes)
+                                |> fun (isLoading, sel, items) ->
+                                    if isMobile then
+                                        items
+                                        |> Array.map (fun s -> s, s)
+                                        |> select isLoading "Doseer types" sel (DoseTypeChange >> dispatch)
+                                    else
+                                        items
+                                        |> autoComplete isLoading "dts" sel (DoseTypeChange >> dispatch)                                
+                            | _ -> JSX.jsx $"<></>"
+                        }
 
                         <Box sx={ {| mt=2 |} }>
-                            <Button variant="text" onClick={fun _ -> None |> RouteChange |> dispatch } fullWidth startIcon={Mui.Icons.Delete} >
+                            <Button variant="text" onClick={fun _ -> Clear |> dispatch } fullWidth startIcon={Mui.Icons.Delete} >
                                 {Terms.Delete |> getTerm "Verwijder"}
                             </Button>
                         </Box>

src/Informedica.GenForm.Lib/DoseRule.fs

@@ -837,9 +837,12 @@ module DoseRule =
                     fun (dr : DoseRule) -> dr.PatientCategory |> PatientCategory.filter filter
                 fun (dr : DoseRule) ->
                     match filter.DoseType, dr.DoseType with
-                    | AnyDoseType, _
+                    | None, _
                     | _, AnyDoseType -> true
-                    | _ -> filter.DoseType |> DoseType.eqs dr.DoseType
+                    | _ ->
+                        dr.DoseType
+                        |> DoseType.toString
+                        |> eqs filter.DoseType
             |]
             |> Array.fold (fun (acc : DoseRule[]) pred ->
                 acc |> Array.filter pred
@@ -871,6 +874,13 @@ module DoseRule =
     let routes = getMember _.Route
 
 
+    let doseTypes =
+        getMember (fun dr ->
+            dr.DoseType
+            |> DoseType.toString
+        )
+
+
     /// Extract all the departments from the DoseRules.
     let departments = getMember (fun dr -> dr.PatientCategory.Department |> Option.defaultValue "")
 

src/Informedica.GenForm.Lib/DoseType.fs

@@ -59,5 +59,6 @@ module DoseType =
                 | Discontinuous _ -> "onderhoud"
                 | Continuous _ -> "continu"
                 | AnyDoseType -> ""
+
         | AnyDoseType -> ""
 

src/Informedica.GenForm.Lib/Filter.fs

@@ -12,7 +12,7 @@ module Filter =
             Generic = None
             Shape = None
             Route = None
-            DoseType = AnyDoseType
+            DoseType = None
             Patient = Patient.patient
         }
 

src/Informedica.GenForm.Lib/PrescriptionRule.fs

@@ -30,12 +30,11 @@ module PrescriptionRule =
                             Generic = dr.Generic |> Some
                             Shape = dr.Shape |> Some
                             Route = dr.Route |> Some
-                            DoseType = dr.DoseType
+                            DoseType = dr.DoseType |> DoseType.toString |> Some
                         }
             }
         )
         |> Array.filter (fun pr ->
-//            pr.DoseRule.Products |> Array.isEmpty |> not  &&
             pr.DoseRule.DoseType <> DoseType.AnyDoseType
         )
         // recalculate adjusted dose limits
@@ -248,6 +247,7 @@ module PrescriptionRule =
     /// Get all routes of an array of PrescriptionRules.
     let routes = getDoseRules >> DoseRule.routes
 
+    let doseTypes = getDoseRules >> DoseRule.doseTypes
 
     /// Get all departments of an array of PrescriptionRules.
     let departments = getDoseRules >> DoseRule.departments

src/Informedica.GenForm.Lib/Product.fs

@@ -84,12 +84,6 @@ module Product =
                     {|
                         GPK = get "GPK"
                         Route = get "Route"
-                        Location =
-                            match get "CVL", get "PVL" with
-                            | s1, _ when s1 |> String.isNullOrWhiteSpace |> not -> CVL
-                            | _, s2 when s2 |> String.isNullOrWhiteSpace |> not -> PVL
-                            | _ -> AnyAccess
-                        DoseType = DoseType.fromString (get "DoseType") ""
                         Dep = get "Dep"
                         DiluentVol = get "DiluentVol" |> toBrOpt
                         ExpansionVol = get "ExpansionVol" |> toBrOpt
@@ -118,22 +112,7 @@ module Product =
 
             [|
                 fun (r : Reconstitution) -> r.Route |> Mapping.eqsRoute filter.Route
-                fun (r : Reconstitution) ->
-                    if filter.Patient.VenousAccess = [AnyAccess] ||
-                       filter.Patient.VenousAccess |> List.isEmpty then true
-                    else
-                        match filter.DoseType with
-                        | AnyDoseType -> true
-                        | _ -> filter.DoseType |> DoseType.eqs r.DoseType
                 fun (r : Reconstitution) -> r.Department |> eqs filter.Patient.Department
-                fun (r : Reconstitution) ->
-                    match r.Location, filter.Patient.VenousAccess with
-                    | AnyAccess, _
-                    | _, []
-                    | _, [ AnyAccess ] -> true
-                    | _ ->
-                        filter.Patient.VenousAccess
-                        |> List.exists ((=) r.Location)
             |]
             |> Array.fold (fun (acc : Reconstitution[]) pred ->
                 acc |> Array.filter pred
@@ -378,9 +357,7 @@ module Product =
                     |> Array.map (fun r ->
                         {
                             Route = r.Route
-                            DoseType = r.DoseType
                             Department = r.Dep
-                            Location = r.Location
                             DiluentVolume =
                                 r.DiluentVol.Value
                                 |> ValueUnit.singleWithUnit Units.Volume.milliLiter
@@ -557,9 +534,7 @@ module Product =
             prod.Reconstitution
             |> Array.filter (fun r ->
                 (rte |> String.isNullOrWhiteSpace || r.Route |> Mapping.eqsRoute (Some rte)) &&
-                (r.DoseType = AnyDoseType || r.DoseType = dtp) &&
-                (dep |> Option.map (fun dep -> r.Department |> String.isNullOrWhiteSpace || r.Department |> String.equalsCapInsens dep) |> Option.defaultValue true) &&
-                (loc |> List.isEmpty || loc |> List.exists ((=) r.Location) || r.Location = AnyAccess)
+                (dep |> Option.map (fun dep -> r.Department |> String.isNullOrWhiteSpace || r.Department |> String.equalsCapInsens dep) |> Option.defaultValue true)
             )
             |> Array.map (fun r ->
                 { prod with

src/Informedica.GenForm.Lib/SolutionRule.fs

@@ -202,10 +202,13 @@ module SolutionRule =
             fun (sr : SolutionRule) -> filter.Route |> Option.isNone || sr.Route |> Mapping.eqsRoute filter.Route
             fun (sr : SolutionRule) -> sr.Department |> Option.map  (eqs filter.Patient.Department) |> Option.defaultValue true
             fun (sr : SolutionRule) ->
-                match filter.DoseType, sr.DoseType with
-                | AnyDoseType, _
-                | _, AnyDoseType -> true
-                | _ -> filter.DoseType |> DoseType.eqs sr.DoseType
+                    match filter.DoseType, sr.DoseType with
+                    | None, _
+                    | _, AnyDoseType -> true
+                    | _ ->
+                        sr.DoseType
+                        |> DoseType.toString
+                        |> eqs filter.DoseType
             fun (sr : SolutionRule) -> filter.Patient.Weight |> Utils.MinMax.inRange sr.Weight
             fun (sr : SolutionRule) ->
                 match sr.Location with