#606: cleaned up SpreadChart.fs a little

sledilnik · Oct 12, 2020 · 7d70424 · 7d70424
1 parent c50833b
commit 7d70424
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 24 deletions.
diff --git a/TODO.md b/TODO.md
@@ -1,10 +1,6 @@
 # TODO
 
-- https://github.com/sledilnik/website/issues/593
-    - disclaimer for age groups
-        - can we extract only a part of it
-
-    - `charts.metricsComparison.show7DaysAverage`
+- https://github.com/sledilnik/website/issues/606
 
 
 ## New countries chart

diff --git a/src/visualizations/Highcharts.fs b/src/visualizations/Highcharts.fs
@@ -82,11 +82,6 @@ let shadedWeekendPlotBands =
 let showDoublingTimeFeatures =
     true
 
-// if set to true:
-// - SpreadChart will show exponential growth pages
-let showExpGrowthFeatures =
-    false
-
 let addContainmentMeasuresFlags
     (startDate: JsTimestamp)
     (endDate: JsTimestamp option) =

diff --git a/src/visualizations/SpreadChart.fs b/src/visualizations/SpreadChart.fs
@@ -10,6 +10,10 @@ open Browser
 open Types
 open Highcharts
 
+// if set to true:
+// - SpreadChart will show exponential growth pages
+let showExpGrowthFeatures = true
+
 type Scale =
     | Absolute
     | Percentage
@@ -31,8 +35,8 @@ type Page =
         | Explainer     -> I18N.t "charts.spread.explainer"
 
 type State = {
-    page: Page
-    data: StatsData
+    Page: Page
+    Data: StatsData
     RangeSelectionButtonIndex: int
 }
 
@@ -42,16 +46,16 @@ type Msg =
 
 let init data : State * Cmd<Msg> =
     let state = {
-        page = Chart Absolute
-        data = data
+        Page = Chart Absolute
+        Data = data
         RangeSelectionButtonIndex = 0
     }
     state, Cmd.none
 
 let update (msg: Msg) (state: State) : State * Cmd<Msg> =
     match msg with
     | ChangePage page ->
-        { state with page = page }, Cmd.none
+        { state with Page = page }, Cmd.none
     | RangeSelectionChanged buttonIndex ->
         { state with RangeSelectionButtonIndex = buttonIndex }, Cmd.none
 
@@ -68,7 +72,7 @@ let inline yAxisBase () =
         opposite = true
         reversed = false
         title = {| text = null |}
-        showFirstLabel = not Highcharts.showExpGrowthFeatures // need to hide negative label for addContainmentMeasuresFlags
+        showFirstLabel = not showExpGrowthFeatures // need to hide negative label for addContainmentMeasuresFlags
         tickInterval = None
         gridZIndex = -1
         max = None
@@ -78,7 +82,7 @@ let inline yAxisBase () =
 
 let inline legend title =
     {|
-        enabled = Highcharts.showExpGrowthFeatures
+        enabled = showExpGrowthFeatures
         title = {| text=title |}
         align = "left"
         verticalAlign = "middle"
@@ -178,12 +182,12 @@ let renderChartOptions scaleType state dispatch =
                 name = chartCfg.seriesLabel
                 dataLabels = pojo {| enabled = true |}
                 data =
-                    state.data
+                    state.Data
                     |> Seq.skipWhile (fun dp -> dp.Date < startDate)
                     |> Seq.map chartCfg.dataKey
                     |> Seq.toArray
             |}
-        if Highcharts.showExpGrowthFeatures then
+        if showExpGrowthFeatures then
             yield addContainmentMeasuresFlags startTime None |> pojo
     |]
 
@@ -258,14 +262,14 @@ let renderChartContainer scaleType data dispatch =
         prop.className "highcharts-wrapper"
         prop.children [
             renderChartOptions scaleType data dispatch
-            |> Highcharts.chartFromWindow
+            |> chartFromWindow
         ]
     ]
 
 let renderScaleSelectors state dispatch =
 
     let renderScaleSelector (page: Page) dispatch =
-        let isActive = state.page = page
+        let isActive = state.Page = page
         let style =
             if isActive
             then [ style.backgroundColor "#808080" ]
@@ -292,15 +296,16 @@ let render (state: State) dispatch =
             Html.div [
                 prop.style [ style.height 480; (Interop.mkStyle "width" "100%"); style.position.relative ]
                 prop.children [
-                    match state.page with
+                    match state.Page with
                     | Chart scale ->
                         yield renderChartContainer scale state dispatch
                     | Explainer ->
                         yield renderChartContainer DoublingRate state dispatch
-                        yield renderExplainer state.data
+                        yield renderExplainer state.Data
                 ]
             ]
-            if Highcharts.showExpGrowthFeatures then
+
+            if showExpGrowthFeatures then
                 renderScaleSelectors state dispatch
         ]
     ]