Merge remote-tracking branch 'upstream/develop' into download_full_table_data

Author: Nick Canzoneri

src/app.py

@@ -53,13 +53,15 @@
 st.markdown(chart_descriptions(new_admit_chart))
 
 if st.checkbox("Show Projected Admissions in tabular form"):
-    draw_projected_admissions_table(st, admissions_df, as_date=p.as_date)
+    if st.checkbox("Show Daily Counts"):
+        draw_projected_admissions_table(st, admissions_df, as_date=p.as_date, daily_count=True)
+    else:
+        draw_projected_admissions_table(st, admissions_df, as_date=p.as_date, daily_count=False)
     build_download_link(st,
         filename="projected_admissions.csv",
         df=admissions_df,
         parameters=p
     )
-
 st.subheader("Admitted Patients (Census)")
 st.markdown(
     "Projected **census** of COVID-19 patients, accounting for arrivals and discharges at Penn hospitals"
@@ -70,12 +72,16 @@
 )
 st.markdown(chart_descriptions(census_chart, suffix=" Census"))
 if st.checkbox("Show Projected Census in tabular form"):
-    draw_census_table(st, census_df, as_date=p.as_date)
+    if st.checkbox("Show Daily Census Counts"):
+        draw_census_table(st, admissions_df, as_date=p.as_date, daily_count=True)
+    else:
+        draw_census_table(st, census_df, as_date=p.as_date, daily_count=False)
     build_download_link(st,
         filename="projected_census.csv",
         df=census_df,
         parameters=p
     )
+
 st.markdown(
     """**Click the checkbox below to view additional data generated by this simulation**"""
 )

src/penn_chime/presentation.py

@@ -389,9 +389,12 @@ def show_additional_projections(
 
 
 def draw_projected_admissions_table(
-    st, projection_admits: pd.DataFrame, as_date: bool = False
+    st, projection_admits: pd.DataFrame, as_date: bool = False, daily_count: bool = False,
 ):
-    admits_table = projection_admits[np.mod(projection_admits.index, 7) == 0].copy()
+    if daily_count == True:
+        admits_table = projection_admits[np.mod(projection_admits.index, 1) == 0].copy()
+    else:
+        admits_table = projection_admits[np.mod(projection_admits.index, 7) == 0].copy()
     admits_table["day"] = admits_table.index
     admits_table.index = range(admits_table.shape[0])
     admits_table = admits_table.fillna(0).astype(int)
@@ -404,8 +407,11 @@ def draw_projected_admissions_table(
     return None
 
 
-def draw_census_table(st, census_df: pd.DataFrame, as_date: bool = False):
-    census_table = census_df[np.mod(census_df.index, 7) == 0].copy()
+def draw_census_table(st, census_df: pd.DataFrame, as_date: bool = False, daily_count: bool = False):
+    if daily_count == True:
+        census_table = census_df[np.mod(census_df.index, 1) == 0].copy()
+    else:
+        census_table = census_df[np.mod(census_df.index, 7) == 0].copy()
     census_table.index = range(census_table.shape[0])
     census_table.loc[0, :] = 0
     census_table = census_table.dropna().astype(int)