Update chart descritpion labels

Author: jlubken

src/app.py

@@ -48,16 +48,16 @@
     use_container_width=True,
 )
 
-st.markdown(chart_descriptions(new_admit_chart))
+st.markdown(chart_descriptions(new_admit_chart, p.labels))
 
 if st.checkbox("Show Projected Admissions in tabular form"):
     if st.checkbox("Show Daily Counts"):
-        draw_projected_admissions_table(st, m.admits_df, as_date=p.as_date, daily_count=True)
+        draw_projected_admissions_table(st, m.admits_df, p.labels, as_date=p.as_date, daily_count=True)
     else:
-        draw_projected_admissions_table(st, m.admits_df, as_date=p.as_date, daily_count=False)
+        draw_projected_admissions_table(st, m.admits_df, p.labels, as_date=p.as_date, daily_count=False)
     build_download_link(st,
         filename="projected_admissions.csv",
-        df=admissions_df,
+        df=m.admits_df,
         parameters=p
     )
 st.subheader("Admitted Patients (Census)")
@@ -69,15 +69,15 @@
     admitted_patients_chart(alt=alt, census=m.census_df, parameters=p),
     use_container_width=True,
 )
-st.markdown(chart_descriptions(census_chart, suffix=" Census"))
+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, as_date=p.as_date, daily_count=True)
+        draw_census_table(st, m.census_df, p.labels, as_date=p.as_date, daily_count=True)
     else:
-        draw_census_table(st, m.census_df, as_date=p.as_date, daily_count=False)
+        draw_census_table(st, m.census_df, p.labels, as_date=p.as_date, daily_count=False)
     build_download_link(st,
         filename="projected_census.csv",
-        df=census_df,
+        df=m.census_df,
         parameters=p
     )
 

src/penn_chime/charts.py

@@ -129,7 +129,7 @@ def additional_projections_chart(
     )
 
 
-def chart_descriptions(chart: Chart, suffix: str = ""):
+def chart_descriptions(chart: Chart, labels, suffix: str = ""):
     """
 
     :param chart: Chart: The alt chart to be used in finding max points
@@ -156,7 +156,7 @@ def chart_descriptions(chart: Chart, suffix: str = ""):
 
         messages.append(
             "{}{} peaks at {:,} on day {}{}".format(
-                col,
+                labels[col],
                 suffix,
                 ceil(chart.data[col].max()),
                 on,

src/penn_chime/parameters.py

@@ -45,6 +45,17 @@ def __init__(
         self.n_days = n_days
         self.recovery_days = recovery_days
 
+        self.labels = {
+            "hospitalized": "Hospitalized",
+            "icu": "ICU",
+            "ventilated": "Ventilated",
+            "day": "Day",
+            "date": "Date",
+            "susceptible": "Susceptible",
+            "infected": "Infected",
+            "recovered": "Recovered",
+        }
+
         self.dispositions = {
             "hospitalized": hospitalized,
             "icu": icu,

src/penn_chime/presentation.py

@@ -391,7 +391,7 @@ def show_additional_projections(
 
 
 def draw_projected_admissions_table(
-    st, projection_admits: pd.DataFrame, as_date: bool = False, daily_count: bool = False,
+    st, projection_admits: pd.DataFrame, labels, as_date: bool = False, daily_count: bool = False,
 ):
     if daily_count == True:
         admits_table = projection_admits[np.mod(projection_admits.index, 1) == 0].copy()
@@ -405,11 +405,12 @@ def draw_projected_admissions_table(
         admits_table = add_date_column(
             admits_table, drop_day_column=True, date_format=DATE_FORMAT
         )
+    admits_table.rename(labels)
     st.table(admits_table)
     return None
 
 
-def draw_census_table(st, census_df: pd.DataFrame, as_date: bool = False, daily_count: bool = False):
+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:
@@ -423,6 +424,7 @@ def draw_census_table(st, census_df: pd.DataFrame, as_date: bool = False, daily_
             census_table, drop_day_column=True, date_format=DATE_FORMAT
         )
 
+    census_table.rename(labels)
     st.table(census_table)
     return None
 

tests/test_app.py

@@ -234,12 +234,11 @@ def test_model(model=MODEL, param=PARAM):
     assert (diff.abs() < 0.1).all()
 
 
-def test_chart_descriptions():
+def test_chart_descriptions(p=PARAM):
     # new admissions chart
     projection_admits = pd.read_csv('tests/projection_admits.csv')
-    # projection_admits = projection_admits.rename(columns={'hospitalized': 'Hospitalized', 'icu': 'ICU', 'ventilated': 'Ventilated'})
-    chart = new_admissions_chart(alt, projection_admits, PARAM)
-    description = chart_descriptions(chart)
+    chart = new_admissions_chart(alt, projection_admits, p)
+    description = chart_descriptions(chart, p.labels)
 
     hosp, icu, vent, asterisk = description.split("\n\n")  # break out the description into lines
 
@@ -256,16 +255,16 @@ def test_chart_descriptions():
 
     projection_admits = pd.read_csv('tests/projection_admits.csv')
     # projection_admits = projection_admits.rename(columns={'hospitalized': 'Hospitalized', 'icu': 'ICU', 'ventilated': 'Ventilated'})
-    chart = new_admissions_chart(alt, projection_admits, PARAM)
-    description = chart_descriptions(chart)
+    chart = new_admissions_chart(alt, projection_admits, p)
+    description = chart_descriptions(chart, p.labels)
     assert "*" not in description
 
     # census chart
     census_df = pd.read_csv('tests/census_df.csv')
     # census_df = census_df.rename(columns={'hospitalized': 'Hospitalized', 'icu': 'ICU', 'ventilated': 'Ventilated'})
     PARAM.as_date = True
-    chart = admitted_patients_chart(alt, census_df, PARAM)
-    description = chart_descriptions(chart)
+    chart = admitted_patients_chart(alt, census_df, p)
+    description = chart_descriptions(chart, p.labels)
 
     assert str(ceil(chart.data['ventilated'].max())) in description
     assert str(chart.data['icu'].idxmax()) not in description