Introduced the new page in Deceased chart - daily deceased by age gro…

…ups (not yet finished) (#770)
sledilnik · Dec 24, 2020 · 6fb832d · 6fb832d
1 parent 01c8a80
commit 6fb832d
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 18 deletions.
diff --git a/TODO.md b/TODO.md
@@ -1,7 +1,7 @@
 # TODO
 
 - https://github.com/sledilnik/website/issues/770
-    - try to reuse code from AgeGroupsTimeline
+    - remove age groups that don't have any deceased
 
 - new OWID export
     - return back the official URL, once it has been pushed to production

diff --git a/src/visualizations/AgeGroupsTimelineViz/Rendering.fs b/src/visualizations/AgeGroupsTimelineViz/Rendering.fs
@@ -43,7 +43,8 @@ let update (msg: Msg) (state: State) : State * Cmd<Msg> =
 let renderChartOptions state dispatch =
     let allSeries =
         getAgeGroupTimelineAllSeriesData
-            state.Data state.Metrics.CasesMetricsType
+            state.Data state.Metrics.ValueCalculation
+            (fun dataPoint -> dataPoint.StatePerAgeToDate)
 
     let onRangeSelectorButtonClick(buttonIndex: int) =
         let res (_ : Event) =

diff --git a/src/visualizations/AgeGroupsTimelineViz/Synthesis.fs b/src/visualizations/AgeGroupsTimelineViz/Synthesis.fs
@@ -9,18 +9,18 @@ open JsInterop
 
 type DisplayMetrics = {
     Id: string
-    CasesMetricsType: CasesMetricsType
+    ValueCalculation: ValueCalculationFormula
     ChartType: ChartType
 }
 
 let availableDisplayMetrics = [|
-    { Id = "newCases"; CasesMetricsType = NewCases
+    { Id = "newCases"; ValueCalculation = Daily
       ChartType = StackedBarNormal }
-    { Id = "newCasesRelative"; CasesMetricsType = NewCases
+    { Id = "newCasesRelative"; ValueCalculation = Daily
       ChartType = StackedBarPercent }
-    { Id = "activeCases"; CasesMetricsType = ActiveCases
+    { Id = "activeCases"; ValueCalculation = Active
       ChartType = StackedBarNormal }
-    { Id = "activeCasesRelative"; CasesMetricsType = ActiveCases
+    { Id = "activeCasesRelative"; ValueCalculation = Active
       ChartType = StackedBarPercent }
 |]
 

diff --git a/src/visualizations/DataAnalysis/AgeGroupsTimeline.fs b/src/visualizations/DataAnalysis/AgeGroupsTimeline.fs
@@ -101,11 +101,11 @@ type CasesInAgeGroupSeries = {
     Timeline: CasesInAgeGroupTimeline
 }
 
-type CasesMetricsType = NewCases | ActiveCases
+type ValueCalculationFormula = Daily | Active | Total
 
 let extractTimelineForAgeGroup
     ageGroupKey
-    (casesMetricsType: CasesMetricsType)
+    (calculationFormula: ValueCalculationFormula)
     (casesTimeline: CasesByAgeGroupsTimeline)
     : CasesInAgeGroupTimeline =
 
@@ -118,18 +118,21 @@ let extractTimelineForAgeGroup
                     dataForGroup.All
                     |> Utils.optionToInt
                 )
-    match casesMetricsType with
-    | NewCases -> newCasesTimeline
-    | ActiveCases ->
+    match calculationFormula with
+    | Daily -> newCasesTimeline
+    | Active ->
         newCasesTimeline
         |> mapDatedArray (Statistics.calculateWindowedSumInt 14)
+    | Total -> invalidOp "todo"
 
 let getAgeGroupTimelineAllSeriesData
         (statsData: StatsData)
-        (casesMetricsType: CasesMetricsType) =
+        (valueCalculationFormula: ValueCalculationFormula)
+        (pointAgeGroupListSelector: StatsDataPoint -> AgeGroupsList) =
     let totalCasesByAgeGroupsList =
         statsData
-        |> List.map (fun point -> (point.Date, point.StatePerAgeToDate))
+        |> List.map (fun point -> (point.Date,
+                                   point |> pointAgeGroupListSelector))
 
     let totalCasesByAgeGroups =
         mapDateTuplesListToArray totalCasesByAgeGroupsList
@@ -163,10 +166,11 @@ let getAgeGroupTimelineAllSeriesData
     |> List.mapi (fun index ageGroupKey ->
         let points =
             timeline
-            |> extractTimelineForAgeGroup ageGroupKey casesMetricsType
+            |> extractTimelineForAgeGroup ageGroupKey valueCalculationFormula
             |> mapAllPoints
 
         pojo {|
+             ``type`` = "column"
              visible = true
              name = ageGroupKey.Label
              color = AgeGroup.ColorOfAgeGroup index

diff --git a/src/visualizations/DeceasedViz/Rendering.fs b/src/visualizations/DeceasedViz/Rendering.fs
@@ -25,7 +25,7 @@ let availablePages = [|
     { Id = "deceasedTodayRelative"
       MetricsType = HospitalsToday; ChartType = StackedBarPercent }
     { Id = "deceasedToDateByAge"
-      MetricsType = ByAgeToDate; ChartType = StackedBarPercent }
+      MetricsType = ByAgeToDate; ChartType = StackedBarNormal }
 |]
 
 type Msg =

diff --git a/src/visualizations/DeceasedViz/Synthesis.fs b/src/visualizations/DeceasedViz/Synthesis.fs
@@ -2,6 +2,7 @@
 
 open Data.Patients
 open DeceasedViz.Analysis
+open DataAnalysis.AgeGroupsTimeline
 open Types
 open Highcharts
 
@@ -131,7 +132,9 @@ let renderAllHospitalSeriesData state =
     hospitalSeries |> Array.map renderSeriesData
 
 let renderAllAgeGroupsSeriesData state =
-    invalidOp "todo"
+    getAgeGroupTimelineAllSeriesData
+        state.StatsData Daily
+        (fun dataPoint -> dataPoint.DeceasedPerAgeToDate)
 
 let renderAllSeriesData state =
     match state.Page.MetricsType with

diff --git a/tests/Visualizations.Tests/AgeGroupsTimelineTests/Sythensizing data.fs b/tests/Visualizations.Tests/AgeGroupsTimelineTests/Sythensizing data.fs
@@ -52,7 +52,7 @@ let ``Can extract data for individual age group``() =
 
     let timeline =
         sourceData
-        |> extractTimelineForAgeGroup (groupKey 1) NewCases
+        |> extractTimelineForAgeGroup (groupKey 1) Daily
 
     test <@ timeline.StartDate = baseDate @>
     test <@ timeline.Data = [| 15; 25 |] @>