Fixing tooltips for the age groups pages (#770)

sledilnik · Dec 30, 2020 · 22a6aa5 · 22a6aa5
1 parent f6267ef
commit 22a6aa5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/TODO.md b/TODO.md
@@ -2,8 +2,7 @@
 
 - https://github.com/sledilnik/website/issues/770
     - try using different colors
-        - using color mixing function
-    - tooltips
+        - using color transition from one color to another
 
 - new OWID export
     - return back the official URL, once it has been pushed to production

diff --git a/src/visualizations/DeceasedViz/Rendering.fs b/src/visualizations/DeceasedViz/Rendering.fs
@@ -69,15 +69,17 @@ let update (msg: Msg) (state: DeceasedVizState) : DeceasedVizState * Cmd<Msg> =
 
 let tooltipFormatter jsThis =
     let pts: obj [] = jsThis?points
-    let total = pts |> Array.map (fun p -> p?point?y |> Utils.optionToInt) |> Array.sum
-    let fmtDate = pts.[0]?point?fmtDate
+    let total =
+        pts |> Array.map (fun p -> p?point?y |> Utils.optionToInt) |> Array.sum
+    let fmtDate = pts.[0]?point?date
 
     fmtDate
     + "<br>"
     + (pts
        |> Seq.map (fun p ->
            sprintf """<span style="color:%s">●</span> %s: <b>%s</b>"""
-                p?series?color p?series?name (I18N.NumberFormat.formatNumber(p?point?y : float)))
+                p?series?color p?series?name
+                (I18N.NumberFormat.formatNumber(p?point?y : float)))
        |> String.concat "<br>")
     + sprintf """<br><br><span style="color: rgba(0,0,0,0)">●</span> %s: <b>%s</b>"""
         (I18N.t "charts.deceased.deceased-total")

diff --git a/src/visualizations/DeceasedViz/Synthesis.fs b/src/visualizations/DeceasedViz/Synthesis.fs
@@ -88,7 +88,7 @@ let getHospitalsPointTotalValue state series dataPoint : int option =
         | _ -> invalidOp "bug"
     | _ -> invalidOp "bug"
 
-let constructSeriesData state series =
+let constructHospitalsSeriesData state series =
     match series.SeriesType with
     | HospitalSeriesType ->
         state.PatientsData
@@ -97,7 +97,7 @@ let constructSeriesData state series =
                 x = dataPoint.Date |> jsTime12h
                 y = getHospitalsPointValue state series dataPoint
                 seriesId = series.SeriesId
-                fmtDate = I18N.tOptions "days.longerDate"
+                date = I18N.tOptions "days.longerDate"
                               {| date = dataPoint.Date |}
                 fmtTotal = getHospitalsPointTotalValue state series dataPoint
                            |> string
@@ -125,7 +125,7 @@ let renderAllHospitalSeriesData state =
             visible = true
             color = series.Color
             name = I18N.tt "charts.deceased" series.SeriesId
-            data = constructSeriesData state series
+            data = constructHospitalsSeriesData state series
             animation = false
         |}
         |> pojo