Skip to content

Enabling Ratios Chart #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
trumpets wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Enabling Ratios Chart #104

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c87230e
Enabling Ratios chart.
trumpets Aug 22, 2020
69b7893
removed Hospital and Mortality series from ratios chart
trumpets Aug 23, 2020
50531b2
Removed IcuCases from Cases series in RatiosChart.
trumpets Aug 23, 2020
92d5c65
Hiding chart tabs if there is only one. also hide CriticalCases
trumpets Sep 25, 2020
08c3157
default view for RatiosChart for mk is ALL
trumpets Sep 25, 2020
0793545
Merge branch 'master' into feature/enabling_ratios
trumpets Sep 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions src/visualizations/RatiosChart.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -42,7 +42,7 @@ type Ratios =

module Ratios =
let getSeries = function
| Cases -> [ HospitalCases; IcuCases; CriticalCases; DeceasedCases ]
| Cases -> [ HospitalCases; (* IcuCases; CriticalCases; SLO-spec *) DeceasedCases ]
| Hospital -> [ IcuHospital; CriticalHospital; DeceasedHospital]
| Mortality -> [ DeceasedHospitalDeceasedTotal; DeceasedIcuDeceasedTotal; DeceasedIcuC; DeceasedHospitalC; ]

Expand Down Expand Up @@ -80,7 +80,7 @@ let init (data : StatsData) : State * Cmd<Msg> =
patientsData = [||]
error = None
displayType = Cases
RangeSelectionButtonIndex = 0
RangeSelectionButtonIndex = 2 (* SLO-spec 0 *)
}
let cmd = Cmd.OfAsync.either Data.Patients.getOrFetch () ConsumePatientsData ConsumeServerError
state, cmd
Expand Down Expand Up @@ -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
Expand Down