From d7a749863c6c22b7a6f4fc6a6fe0ee2b411053e0 Mon Sep 17 00:00:00 2001 From: Luka Renko <46861689+lukarenko@users.noreply.github.com> Date: Fri, 15 Dec 2023 18:40:23 +0100 Subject: [PATCH] Use NIJZ deceased for MetricsComparison chart --- src/visualizations/MetricsComparisonChart.fs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/visualizations/MetricsComparisonChart.fs b/src/visualizations/MetricsComparisonChart.fs index a27703a7b..53c2cc5f2 100644 --- a/src/visualizations/MetricsComparisonChart.fs +++ b/src/visualizations/MetricsComparisonChart.fs @@ -70,6 +70,7 @@ type Metric = static member UseStatsData metric = [PerformedTestsToday; PerformedTestsToDate; ConfirmedCasesToday ConfirmedCasesToDate; ActiveCases; RecoveredToDate + DeceasedToday; DeceasedToDate; VacAdministeredToday; VacAdministeredToDate; VacAdministered2Today; VacAdministered2ToDate; VacAdministered3Today; VacAdministered3ToDate ] @@ -199,6 +200,8 @@ let statsDataGenerator metric = | ConfirmedCasesToDate -> point.Cases.ConfirmedToDate | ActiveCases -> point.Cases.Active | RecoveredToDate -> point.Cases.RecoveredToDate + | DeceasedToday -> point.DeceasedToday |> Utils.zeroToNone + | DeceasedToDate -> point.DeceasedToDate | VacAdministeredToday -> point.Vaccination.Administered.Today | VacAdministeredToDate -> point.Vaccination.Administered.ToDate | VacAdministered2Today -> point.Vaccination.Administered2nd.Today @@ -224,8 +227,9 @@ let patientsDataGenerator metric = | VentilatorIn -> point.total.critical.``in`` | VentilatorOut -> point.total.critical.out | VentilatorToDate -> point.total.critical.toDate - | DeceasedToday -> point.total.deceased.today |> Utils.zeroToNone - | DeceasedToDate -> point.total.deceased.toDate + // From Hospital data - not used anymore + // | DeceasedToday -> point.total.deceased.today |> Utils.zeroToNone + // | DeceasedToDate -> point.total.deceased.toDate | _ -> None