Moved age groups timeline rendering to a common module (#770)

sledilnik · Dec 24, 2020 · 01c8a80 · 01c8a80
1 parent b7d2fae
commit 01c8a80
Show file tree

Hide file tree

Showing 4 changed files with 99 additions and 98 deletions.
diff --git a/src/visualizations/AgeGroupsTimelineViz/Rendering.fs b/src/visualizations/AgeGroupsTimelineViz/Rendering.fs
@@ -1,8 +1,6 @@
 [<RequireQualifiedAccess>]
 module AgeGroupsTimelineViz.Rendering
 
-open System
-open DataAnalysis.DatedTypes
 open DataAnalysis.AgeGroupsTimeline
 open DataVisualization.ChartingTypes
 open Synthesis
@@ -43,58 +41,9 @@ let update (msg: Msg) (state: State) : State * Cmd<Msg> =
         { state with RangeSelectionButtonIndex = buttonIndex }, Cmd.none
 
 let renderChartOptions state dispatch =
-
-    // map state data into a list needed for calculateCasesByAgeTimeline
-    let totalCasesByAgeGroupsList =
-        state.Data
-        |> List.map (fun point -> (point.Date, point.StatePerAgeToDate))
-
-    let totalCasesByAgeGroups =
-        mapDateTuplesListToArray totalCasesByAgeGroupsList
-
-    // calculate complete merged timeline
-    let timeline = calculateCasesByAgeTimeline totalCasesByAgeGroups
-
-    // get keys of all age groups
-    let allGroupsKeys = listAgeGroups timeline
-
-    let mapPoint
-        (startDate: DateTime)
-        (daysFromStartDate: int)
-        (cases: CasesInAgeGroupForDay) =
-        let date = startDate |> Days.add daysFromStartDate
-
-        pojo {|
-             x = date |> jsTime12h :> obj
-             y = cases
-             date = I18N.tOptions "days.longerDate" {| date = date |}
-        |}
-
-    let mapAllPoints (groupTimeline: CasesInAgeGroupTimeline) =
-        let startDate = groupTimeline.StartDate
-        let timelineArray = groupTimeline.Data
-
-        timelineArray
-        |> Array.mapi (fun i cases -> mapPoint startDate i cases)
-
-    // generate all series
     let allSeries =
-        allGroupsKeys
-        |> List.mapi (fun index ageGroupKey ->
-            let points =
-                timeline
-                |> extractTimelineForAgeGroup
-                       ageGroupKey state.Metrics.MetricsType
-                |> mapAllPoints
-
-            pojo {|
-                 visible = true
-                 name = ageGroupKey.Label
-                 color = AgeGroup.ColorOfAgeGroup index
-                 data = points
-            |}
-        )
-        |> List.toArray
+        getAgeGroupTimelineAllSeriesData
+            state.Data state.Metrics.CasesMetricsType
 
     let onRangeSelectorButtonClick(buttonIndex: int) =
         let res (_ : Event) =

diff --git a/src/visualizations/AgeGroupsTimelineViz/Synthesis.fs b/src/visualizations/AgeGroupsTimelineViz/Synthesis.fs
@@ -1,68 +1,29 @@
 module AgeGroupsTimelineViz.Synthesis
 
 open DataAnalysis.AgeGroupsTimeline
-open DataAnalysis.DatedTypes
 open DataVisualization.ChartingTypes
-open Types
-open System.Collections.Generic
 open System.Text
 open Fable.Core
 open JsInterop
 
-type CasesInAgeGroupForDay = int
-type CasesInAgeGroupTimeline = DatedArray<CasesInAgeGroupForDay>
-type CasesInAgeGroupSeries = {
-    AgeGroupKey: AgeGroupKey
-    Timeline: CasesInAgeGroupTimeline
-}
-
-type AllCasesInAgeGroupSeries = IDictionary<AgeGroupKey, CasesInAgeGroupSeries>
-
 
-type DisplayMetricsType = NewCases | ActiveCases
 type DisplayMetrics = {
     Id: string
-    MetricsType: DisplayMetricsType
+    CasesMetricsType: CasesMetricsType
     ChartType: ChartType
 }
 
 let availableDisplayMetrics = [|
-    { Id = "newCases"; MetricsType = NewCases
+    { Id = "newCases"; CasesMetricsType = NewCases
       ChartType = StackedBarNormal }
-    { Id = "newCasesRelative"; MetricsType = NewCases
+    { Id = "newCasesRelative"; CasesMetricsType = NewCases
       ChartType = StackedBarPercent }
-    { Id = "activeCases"; MetricsType = ActiveCases
+    { Id = "activeCases"; CasesMetricsType = ActiveCases
       ChartType = StackedBarNormal }
-    { Id = "activeCasesRelative"; MetricsType = ActiveCases
+    { Id = "activeCasesRelative"; CasesMetricsType = ActiveCases
       ChartType = StackedBarPercent }
 |]
 
-let listAgeGroups (timeline: CasesByAgeGroupsTimeline): AgeGroupKey list  =
-    timeline.Data.[0]
-    |> List.map (fun group -> group.GroupKey)
-    |> List.sortBy (fun groupKey -> groupKey.AgeFrom)
-
-let extractTimelineForAgeGroup
-    ageGroupKey
-    (metricsType: DisplayMetricsType)
-    (casesTimeline: CasesByAgeGroupsTimeline)
-    : CasesInAgeGroupTimeline =
-
-    let newCasesTimeline =
-        casesTimeline
-        |> mapDatedArrayItems (fun dayGroupsData ->
-                    let dataForGroup =
-                        dayGroupsData
-                        |> List.find(fun group -> group.GroupKey = ageGroupKey)
-                    dataForGroup.All
-                    |> Utils.optionToInt
-                )
-    match metricsType with
-    | NewCases -> newCasesTimeline
-    | ActiveCases ->
-        newCasesTimeline
-        |> mapDatedArray (Statistics.calculateWindowedSumInt 14)
-
 let tooltipFormatter jsThis =
     let points: obj[] = jsThis?points
 

diff --git a/src/visualizations/DataAnalysis/AgeGroupsTimeline.fs b/src/visualizations/DataAnalysis/AgeGroupsTimeline.fs
@@ -1,8 +1,10 @@
 module DataAnalysis.AgeGroupsTimeline
 
+open System
 open System.Collections.Generic
 open DataAnalysis.DatedTypes
 open Types
+open Highcharts
 
 type CasesByAgeGroupsForDay = AgeGroupsList
 
@@ -86,3 +88,89 @@ let calculateCasesByAgeTimeline
     }
     // skip initial and trailing days without any cases
     |> trimDatedArray thereAreNoCases
+
+let listAgeGroups (timeline: CasesByAgeGroupsTimeline): AgeGroupKey list  =
+    timeline.Data.[0]
+    |> List.map (fun group -> group.GroupKey)
+    |> List.sortBy (fun groupKey -> groupKey.AgeFrom)
+
+type CasesInAgeGroupForDay = int
+type CasesInAgeGroupTimeline = DatedArray<CasesInAgeGroupForDay>
+type CasesInAgeGroupSeries = {
+    AgeGroupKey: AgeGroupKey
+    Timeline: CasesInAgeGroupTimeline
+}
+
+type CasesMetricsType = NewCases | ActiveCases
+
+let extractTimelineForAgeGroup
+    ageGroupKey
+    (casesMetricsType: CasesMetricsType)
+    (casesTimeline: CasesByAgeGroupsTimeline)
+    : CasesInAgeGroupTimeline =
+
+    let newCasesTimeline =
+        casesTimeline
+        |> mapDatedArrayItems (fun dayGroupsData ->
+                    let dataForGroup =
+                        dayGroupsData
+                        |> List.find(fun group -> group.GroupKey = ageGroupKey)
+                    dataForGroup.All
+                    |> Utils.optionToInt
+                )
+    match casesMetricsType with
+    | NewCases -> newCasesTimeline
+    | ActiveCases ->
+        newCasesTimeline
+        |> mapDatedArray (Statistics.calculateWindowedSumInt 14)
+
+let getAgeGroupTimelineAllSeriesData
+        (statsData: StatsData)
+        (casesMetricsType: CasesMetricsType) =
+    let totalCasesByAgeGroupsList =
+        statsData
+        |> List.map (fun point -> (point.Date, point.StatePerAgeToDate))
+
+    let totalCasesByAgeGroups =
+        mapDateTuplesListToArray totalCasesByAgeGroupsList
+
+    // calculate complete merged timeline
+    let timeline = calculateCasesByAgeTimeline totalCasesByAgeGroups
+
+    // get keys of all age groups
+    let allGroupsKeys = listAgeGroups timeline
+
+    let mapPoint
+        (startDate: DateTime)
+        (daysFromStartDate: int)
+        (cases: CasesInAgeGroupForDay) =
+        let date = startDate |> Days.add daysFromStartDate
+
+        pojo {|
+             x = date |> jsTime12h :> obj
+             y = cases
+             date = I18N.tOptions "days.longerDate" {| date = date |}
+        |}
+
+    let mapAllPoints (groupTimeline: CasesInAgeGroupTimeline) =
+        let startDate = groupTimeline.StartDate
+        let timelineArray = groupTimeline.Data
+
+        timelineArray
+        |> Array.mapi (fun i cases -> mapPoint startDate i cases)
+
+    allGroupsKeys
+    |> List.mapi (fun index ageGroupKey ->
+        let points =
+            timeline
+            |> extractTimelineForAgeGroup ageGroupKey casesMetricsType
+            |> mapAllPoints
+
+        pojo {|
+             visible = true
+             name = ageGroupKey.Label
+             color = AgeGroup.ColorOfAgeGroup index
+             data = points
+        |}
+    )
+    |> List.toArray
diff --git a/src/visualizations/DeceasedViz/Synthesis.fs b/src/visualizations/DeceasedViz/Synthesis.fs
@@ -130,8 +130,11 @@ let renderAllHospitalSeriesData state =
 
     hospitalSeries |> Array.map renderSeriesData
 
+let renderAllAgeGroupsSeriesData state =
+    invalidOp "todo"
+
 let renderAllSeriesData state =
     match state.Page.MetricsType with
     | HospitalMetricsType -> renderAllHospitalSeriesData state
-    | AgeGroupsMetricsType -> invalidOp "todo"
+    | AgeGroupsMetricsType -> renderAllAgeGroupsSeriesData state
     | _ -> invalidOp "todo"