DeceasedViz now uses ChartType DU (#770)

sledilnik · Dec 24, 2020 · b7d2fae · b7d2fae
1 parent 42a821f
commit b7d2fae
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/TODO.md b/TODO.md
@@ -1,7 +1,6 @@
 # TODO
 
 - https://github.com/sledilnik/website/issues/770
-    - move AgeGroupsTimeline analysis and synthesis code to a common namespace
     - try to reuse code from AgeGroupsTimeline
 
 - new OWID export

diff --git a/src/visualizations/DeceasedViz/Analysis.fs b/src/visualizations/DeceasedViz/Analysis.fs
@@ -1,5 +1,7 @@
 module DeceasedViz.Analysis
 
+open DataVisualization.ChartingTypes
+
 type DisplayMetricsType =
     | HospitalsToDate
     | HospitalsToday
@@ -9,7 +11,7 @@ type DisplayMetricsType =
 type VisualizationPage = {
     Id: string
     MetricsType: DisplayMetricsType
-    ChartType: string
+    ChartType: ChartType
 }
 
 let (|HospitalMetricsType|_|) (metricsType: DisplayMetricsType) =

diff --git a/src/visualizations/DeceasedViz/Rendering.fs b/src/visualizations/DeceasedViz/Rendering.fs
@@ -2,6 +2,7 @@ module DeceasedViz.Rendering
 
 open System
 open Data.Patients
+open DataVisualization.ChartingTypes
 open DeceasedViz.Analysis
 open DeceasedViz.Synthesis
 open Elmish
@@ -16,15 +17,15 @@ open Types
 
 let availablePages = [|
     { Id = "deceasedToDate"
-      MetricsType = HospitalsToDate; ChartType = "normal" }
+      MetricsType = HospitalsToDate; ChartType = StackedBarNormal }
     { Id = "deceasedToDateRelative"
-      MetricsType = HospitalsToDate; ChartType = "percent" }
+      MetricsType = HospitalsToDate; ChartType = StackedBarPercent }
     { Id = "deceasedToday"
-      MetricsType = HospitalsToday; ChartType = "normal" }
+      MetricsType = HospitalsToday; ChartType = StackedBarNormal }
     { Id = "deceasedTodayRelative"
-      MetricsType = HospitalsToday; ChartType = "percent" }
+      MetricsType = HospitalsToday; ChartType = StackedBarPercent }
     { Id = "deceasedToDateByAge"
-      MetricsType = ByAgeToDate; ChartType = "percent" }
+      MetricsType = ByAgeToDate; ChartType = StackedBarPercent }
 |]
 
 type Msg =
@@ -86,6 +87,12 @@ let renderChartOptions (state : DeceasedVizState) dispatch =
             true
         res
 
+    let stacking =
+        match state.Page.ChartType with
+        | StackedBarNormal -> "normal"
+        | StackedBarPercent -> "percent"
+        | _ -> invalidOp "not supported"
+
     let baseOptions =
         basicChartOptions
             scaleType className
@@ -100,7 +107,7 @@ let renderChartOptions (state : DeceasedVizState) dispatch =
                           groupPadding = 0
                           pointPadding = 0
                           borderWidth = 0 |}
-                series = {| stacking = state.Page.ChartType; crisp = true
+                series = {| stacking = stacking; crisp = true
                             borderWidth = 0
                             pointPadding = 0; groupPadding = 0
                             |}