Merge pull request #233 from kmid5280/develop

Fix for plateauing y-axis on graphs

Author: quinn-dougherty

src/app.py

@@ -52,9 +52,13 @@
 
 if st.checkbox("Show Projected Admissions in tabular form"):
     if st.checkbox("Show Daily Counts"):
-        draw_projected_admissions_table(st, m.admits_df, p.labels, as_date=p.as_date, daily_count=True)
+        draw_projected_admissions_table(st, m.admits_df, p.labels, 1, as_date=p.as_date)
     else:
-        draw_projected_admissions_table(st, m.admits_df, p.labels, as_date=p.as_date, daily_count=False)
+        admissions_day_range = st.slider(
+            'Interval of Days for Projected Admissions',
+            1, 10, 7
+        )
+        draw_projected_admissions_table(st, m.admits_df, p.labels, admissions_day_range, as_date=p.as_date)
     build_download_link(st,
         filename="projected_admissions.csv",
         df=m.admits_df,
@@ -72,9 +76,13 @@
 st.markdown(chart_descriptions(census_chart, p.labels, suffix=" Census"))
 if st.checkbox("Show Projected Census in tabular form"):
     if st.checkbox("Show Daily Census Counts"):
-        draw_census_table(st, m.census_df, p.labels, as_date=p.as_date, daily_count=True)
+        draw_census_table(st, m.census_df, p.labels, 1, as_date=p.as_date)
     else:
-        draw_census_table(st, m.census_df, p.labels, as_date=p.as_date, daily_count=False)
+        census_day_range = st.slider(
+            'Interval of Days for Projected Census',
+            1, 10, 7
+        )
+        draw_census_table(st, m.census_df, p.labels, census_day_range, as_date=p.as_date)
     build_download_link(st,
         filename="projected_census.csv",
         df=m.census_df,

src/penn_chime/charts.py

@@ -22,7 +22,6 @@ def new_admissions_chart(
 
     if max_y_axis is not None:
         y_scale.domain = (0, max_y_axis)
-        y_scale.clamp = True
 
     tooltip_dict = {False: "day", True: "date:T"}
     if as_date:
@@ -70,7 +69,6 @@ def admitted_patients_chart(
 
     if max_y_axis:
         y_scale.domain = (0, max_y_axis)
-        y_scale.clamp = True
 
     # TODO fix the fold to allow any number of dispositions
     return (
@@ -116,7 +114,6 @@ def additional_projections_chart(
 
     if max_y_axis is not None:
         y_scale.domain = (0, max_y_axis)
-        y_scale.clamp = True
 
     return (
         alt.Chart(dat)

src/penn_chime/presentation.py

@@ -381,12 +381,9 @@ def show_additional_projections(
 
 
 def draw_projected_admissions_table(
-    st, projection_admits: pd.DataFrame, labels, as_date: bool = False, daily_count: bool = False,
+    st, projection_admits: pd.DataFrame, labels, day_range, as_date: bool = False
 ):
-    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 = projection_admits[np.mod(projection_admits.index, day_range) == 0].copy()
     admits_table["day"] = admits_table.index
     admits_table.index = range(admits_table.shape[0])
     admits_table = admits_table.fillna(0).astype(int)
@@ -400,11 +397,8 @@ def draw_projected_admissions_table(
     return None
 
 
-def draw_census_table(st, census_df: pd.DataFrame, labels, 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()
+def draw_census_table(st, census_df: pd.DataFrame, labels, day_range, as_date: bool = False):
+    census_table = census_df[np.mod(census_df.index, day_range) == 0].copy()
     census_table.index = range(census_table.shape[0])
     census_table.loc[0, :] = 0
     census_table = census_table.dropna().astype(int)