Extracting common ChartType DU (#770)

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

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/src/visualizations/AgeGroupsTimelineViz/Rendering.fs b/src/visualizations/AgeGroupsTimelineViz/Rendering.fs
@@ -4,6 +4,7 @@ module AgeGroupsTimelineViz.Rendering
 open System
 open DataAnalysis.DatedTypes
 open DataAnalysis.AgeGroupsTimeline
+open DataVisualization.ChartingTypes
 open Synthesis
 open Highcharts
 open Types
@@ -133,6 +134,7 @@ let renderChartOptions state dispatch =
                     match state.Metrics.ChartType with
                     | StackedBarNormal -> pojo {| stacking = "normal" |}
                     | StackedBarPercent -> pojo {| stacking = "percent" |}
+                    | _ -> invalidOp "not supported"
             |}
         legend = pojo {| enabled = true ; layout = "horizontal" |}
         tooltip = pojo {|

diff --git a/src/visualizations/DataVisualization/ChartingTypes.fs b/src/visualizations/DataVisualization/ChartingTypes.fs
@@ -3,3 +3,4 @@
 type ChartType =
     | StackedBarNormal
     | StackedBarPercent
+    | SplineChart
diff --git a/src/visualizations/InfectionsChart.fs b/src/visualizations/InfectionsChart.fs
@@ -1,6 +1,7 @@
 [<RequireQualifiedAccess>]
 module InfectionsChart
 
+open DataVisualization.ChartingTypes
 open Statistics
 open System
 open Elmish
@@ -51,10 +52,6 @@ module Metrics  =
         | ShowOthers -> without AllConfirmed
 
 type ValueTypes = RunningTotals | MovingAverages
-type ChartType =
-    | StackedBarNormal
-    | StackedBarPercent
-    | SplineChart
 
 type DisplayType = {
     Id: string

diff --git a/src/visualizations/MetricsCorrelationViz/Rendering.fs b/src/visualizations/MetricsCorrelationViz/Rendering.fs
@@ -1,5 +1,6 @@
 module MetricsCorrelationViz.Rendering
 
+open DataVisualization.ChartingTypes
 open Statistics
 open System
 open Elmish
@@ -38,10 +39,6 @@ module Metrics  =
     ]
 
 type ValueTypes = RunningTotals | MovingAverages
-type ChartType =
-    | StackedBarNormal
-    | StackedBarPercent
-    | SplineChart
 
 type DisplayType = {
     Id: string