From c87230eacdea4a7718e4151af9038496f895b8af Mon Sep 17 00:00:00 2001 From: Ivo Neskovic Date: Sat, 22 Aug 2020 17:15:10 +0200 Subject: [PATCH 1/5] Enabling Ratios chart. --- src/visualizations/App.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/visualizations/App.fs b/src/visualizations/App.fs index e17b53c2a..10e0e16f6 100644 --- a/src/visualizations/App.fs +++ b/src/visualizations/App.fs @@ -289,7 +289,7 @@ let render (state: State) (_: Msg -> unit) = let macedoniaVisualizations = [ metricsComparison; spread; map; municipalities europeMap; tests; infections - cases; patients; + cases; patients; ratios; ] let embedded, visualizations = From 69b78937438f4945abeaa3174787f7c348a1f400 Mon Sep 17 00:00:00 2001 From: Ivo Neskovic Date: Sun, 23 Aug 2020 14:44:29 +0200 Subject: [PATCH 2/5] removed Hospital and Mortality series from ratios chart --- src/visualizations/RatiosChart.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/visualizations/RatiosChart.fs b/src/visualizations/RatiosChart.fs index c7ee0d3bb..ee923c0f6 100644 --- a/src/visualizations/RatiosChart.fs +++ b/src/visualizations/RatiosChart.fs @@ -17,7 +17,7 @@ type DisplayType = | Hospital | Mortality with - static member all = [ Cases; Hospital; Mortality ] + static member all = [ Cases; (* Hospital; Mortality SLO-spec *) ] static member getName = function | Cases -> I18N.t "charts.ratios.seriousCases" | Hospital -> I18N.t "charts.ratios.hospitalizations" From 50531b21d5f7ee9d5e6bd6344659e72d9f7f0a70 Mon Sep 17 00:00:00 2001 From: Ivo Neskovic Date: Sun, 23 Aug 2020 14:55:02 +0200 Subject: [PATCH 3/5] Removed IcuCases from Cases series in RatiosChart. --- src/visualizations/RatiosChart.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/visualizations/RatiosChart.fs b/src/visualizations/RatiosChart.fs index ee923c0f6..4c64be100 100644 --- a/src/visualizations/RatiosChart.fs +++ b/src/visualizations/RatiosChart.fs @@ -42,7 +42,7 @@ type Ratios = module Ratios = let getSeries = function - | Cases -> [ HospitalCases; IcuCases; CriticalCases; DeceasedCases ] + | Cases -> [ HospitalCases; (* IcuCases; SLO-spec *) CriticalCases; DeceasedCases ] | Hospital -> [ IcuHospital; CriticalHospital; DeceasedHospital] | Mortality -> [ DeceasedHospitalDeceasedTotal; DeceasedIcuDeceasedTotal; DeceasedIcuC; DeceasedHospitalC; ] From 92d5c6551b7535076ee3d2f107b361a6a450e1b4 Mon Sep 17 00:00:00 2001 From: Ivo Neskovic Date: Fri, 25 Sep 2020 14:56:09 +0200 Subject: [PATCH 4/5] Hiding chart tabs if there is only one. also hide CriticalCases --- src/visualizations/RatiosChart.fs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/visualizations/RatiosChart.fs b/src/visualizations/RatiosChart.fs index 4c64be100..9ae4ea9be 100644 --- a/src/visualizations/RatiosChart.fs +++ b/src/visualizations/RatiosChart.fs @@ -42,7 +42,7 @@ type Ratios = module Ratios = let getSeries = function - | Cases -> [ HospitalCases; (* IcuCases; SLO-spec *) CriticalCases; DeceasedCases ] + | Cases -> [ HospitalCases; (* IcuCases; CriticalCases; SLO-spec *) DeceasedCases ] | Hospital -> [ IcuHospital; CriticalHospital; DeceasedHospital] | Mortality -> [ DeceasedHospitalDeceasedTotal; DeceasedIcuDeceasedTotal; DeceasedIcuC; DeceasedHospitalC; ] @@ -196,11 +196,15 @@ let renderDisplaySelector state dt dispatch = ] let renderDisplaySelectors state dispatch = - Html.div [ - prop.className "metrics-selectors" - prop.children ( - DisplayType.all - |> List.map (fun dt -> renderDisplaySelector state dt dispatch) ) ] + if DisplayType.all.Length > 1 (* SLO-spec *) + then + Html.div [ + prop.className "metrics-selectors" + prop.children ( + DisplayType.all + |> List.map (fun dt -> renderDisplaySelector state dt dispatch) ) ] + else + Html.none let render (state : State) dispatch = match state.patientsData, state.error with From 08c3157d18d62b73d1c54d830841d08578c2038b Mon Sep 17 00:00:00 2001 From: Ivo Neskovic Date: Fri, 25 Sep 2020 15:01:02 +0200 Subject: [PATCH 5/5] default view for RatiosChart for mk is ALL --- src/visualizations/RatiosChart.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/visualizations/RatiosChart.fs b/src/visualizations/RatiosChart.fs index 9ae4ea9be..366958989 100644 --- a/src/visualizations/RatiosChart.fs +++ b/src/visualizations/RatiosChart.fs @@ -80,7 +80,7 @@ let init (data : StatsData) : State * Cmd = patientsData = [||] error = None displayType = Cases - RangeSelectionButtonIndex = 0 + RangeSelectionButtonIndex = 2 (* SLO-spec 0 *) } let cmd = Cmd.OfAsync.either Data.Patients.getOrFetch () ConsumePatientsData ConsumeServerError state, cmd