fix: products in component limit

Author: Casper Bollen

src/Informedica.GenForm.Lib/DoseRule.fs

@@ -25,7 +25,6 @@ module DoseRule =
         let limit =
             {
                 Component = ""
-                Products = [||]
                 DoseLimitTarget = NoLimitTarget
                 AdjustUnit = None
                 DoseUnit = NoUnit
@@ -89,13 +88,9 @@ module DoseRule =
             | _ -> false
 
 
-        let hasProducts (dl : DoseLimit) = dl.Products |> Array.isEmpty |> not
-
-
         let hasNoLimits (dl : DoseLimit) =
             { limit with
                 Component = dl.Component
-                Products = dl.Products
                 DoseLimitTarget = dl.DoseLimitTarget
                 AdjustUnit = dl.AdjustUnit
                 DoseUnit = dl.DoseUnit
@@ -739,7 +734,6 @@ cannot map {r}
 
             {
                 Component = r.Component
-                Products = r.Products
                 DoseLimitTarget =
                     if r.Substance |> String.isNullOrWhiteSpace then
                         dr.Shape |> ShapeLimitTarget

src/Informedica.GenForm.Lib/Scripts/DoseRule.fsx

@@ -34,3 +34,13 @@ open Informedica.Utils.Lib.BCL
 DoseRule.get ()
 |> Array.tryFind (_.Generic >> String.equalsCapInsens "nutrilon pepti 1")
 |> Option.map _.ComponentLimits
+
+
+Web.getDataUrlIdGenPres ()
+|> DoseRule.get_
+|> Array.tryFind (fst >> _.Generic >> String.equalsCapInsens "nutrilon pepti 1")
+|> Option.map (fun (dr, rs) ->
+    dr
+    |> DoseRule.addDoseLimits rs
+)
+|> Option.get

src/Informedica.GenForm.Lib/Types.fs

@@ -152,8 +152,6 @@ module Types =
     type DoseLimit =
         {
             Component : string
-            // The list of associated Products of the DoseLimit.
-            Products : Product array
             DoseLimitTarget : LimitTarget
             // The unit to adjust dosing with
             AdjustUnit : Unit option

src/Informedica.GenOrder.Lib/DrugOrder.fs

@@ -195,8 +195,7 @@ module DrugOrder =
                         )
                 Dose = lim.Limit
                 Substances =
-                    lim.SubstanceLimits
-                    |> Array.collect _.Products
+                    lim.Products
                     |> Array.collect _.Substances
                     |> Array.groupBy _.Name
                     |> Array.map (fun (n, xs) ->