Merge branch 'develop' into issue_90

Author: quinn-dougherty

e2e/cypress/integration/tests/actions.spec.js

@@ -3,14 +3,14 @@
 context('Actions', () => {
   beforeEach(() => {
     cy.visit('http://localhost:8000')
-  })
+  });
 
   it('All + elements are clickable', () => {
-    cy.get('.step-up').click( { multiple: true } )
+    cy.get('.step-up').click( { multiple: true } );
 
     // This gets the "first" input from the sidebar. From clicking step up,
-    // the number of days to project should increase from default 60 to 70.
+    // the Regional Population should increase from default 4119405 to 4219405.
     cy.get('input.st-al')
-      .should('has.value', '70')
+      .should('has.value', '4219405')
   })
-})
+});

src/app.py

@@ -55,8 +55,11 @@
         draw_projected_admissions_table(st, m.admits_df, p.labels, 1, as_date=p.as_date)
     else:
         admissions_day_range = st.slider(
-            'Interval of Days for Projected Admissions',
-            1, 10, 7
+            label="Interval of Days",
+            key="admissions_day_range_slider",
+            min_value=1,
+            max_value=10,
+            value=7 
         )
         draw_projected_admissions_table(st, m.admits_df, p.labels, admissions_day_range, as_date=p.as_date)
     build_download_link(st,
@@ -79,8 +82,11 @@
         draw_census_table(st, m.census_df, p.labels, 1, as_date=p.as_date)
     else:
         census_day_range = st.slider(
-            'Interval of Days for Projected Census',
-            1, 10, 7
+            label='Interval of Days',
+            key="census_day_range_slider",
+            min_value=1,
+            max_value=10,
+            value=7 
         )
         draw_census_table(st, m.census_df, p.labels, census_day_range, as_date=p.as_date)
     build_download_link(st,

src/penn_chime/charts.py

@@ -4,6 +4,7 @@
 
 from altair import Chart  # type: ignore
 import pandas as pd  # type: ignore
+import numpy as np
 
 from .parameters import Parameters
 from .utils import add_date_column
@@ -31,8 +32,15 @@ def new_admissions_chart(
         x_kwargs = {"shorthand": "day", "title": "Days from today"}
 
     # TODO fix the fold to allow any number of dispositions
+
+    ceiled_admits = projection_admits.copy()
+
+    ceiled_admits.hospitalized = np.ceil(ceiled_admits.hospitalized)
+    ceiled_admits.icu = np.ceil(ceiled_admits.icu)
+    ceiled_admits.ventilated = np.ceil(ceiled_admits.ventilated)
+
     return (
-        alt.Chart(projection_admits.head(plot_projection_days))
+        alt.Chart(ceiled_admits.head(plot_projection_days))
         .transform_fold(fold=["hospitalized", "icu", "ventilated"])
         .mark_line(point=True)
         .encode(