Added option for as date. Cleaned up variable names

Author: PJ Hoberman

src/app.py

@@ -56,8 +56,6 @@
 st.altair_chart(
     new_admit_chart, use_container_width=True
 )
-
-
 st.markdown(chart_descriptions(new_admit_chart))
 
 if st.checkbox("Show Projected Admissions in tabular form"):
@@ -66,11 +64,11 @@
 st.markdown(
     "Projected **census** of COVID-19 patients, accounting for arrivals and discharges at Penn hospitals"
 )
-admit_chart = admitted_patients_chart(alt=alt, census=census_df, parameters=p, as_date=as_date)
+census_chart = admitted_patients_chart(alt=alt, census=census_df, parameters=p, as_date=as_date)
 st.altair_chart(
-    admit_chart, use_container_width=True
+    census_chart, use_container_width=True
 )
-st.markdown(chart_descriptions(admit_chart, True))
+st.markdown(chart_descriptions(census_chart, census=True))
 if st.checkbox("Show Projected Census in tabular form"):
     draw_census_table(st, census_df, as_date=as_date)
 st.markdown(

src/penn_chime/charts.py

@@ -1,4 +1,5 @@
 from math import ceil
+import datetime
 from altair import Chart  # type: ignore
 import pandas as pd  # type: ignore
 import numpy as np  # type: ignore
@@ -127,18 +128,30 @@ def additional_projections_chart(
 
 def chart_descriptions(chart, census=False):
     messages = []
+
     cols = ["Hospitalized", "ICU", "Ventilated"]
     if census:
         cols = [col + " Census" for col in cols]
+
     asterisk = False
+
+    day = "date" if "date" in chart.data.columns else "day"
+
     for col in cols:
         if chart.data[col].idxmax() + 1 == len(chart.data):
             asterisk = True
+
+        on = chart.data[day][chart.data[col].idxmax()]
+        if day == "date":
+            on = datetime.datetime.strftime(on, "%b %d")  # todo: bring this to an optional arg / i18n
+        else:
+            on += 1  # 0 index issue
+
         messages.append(
             "{} peaks at {:,} on day {}{}".format(
                 col,
                 ceil(chart.data[col].max()),
-                chart.data[col].idxmax() + 1,
+                on,
                 "*" if asterisk else "",
             )
         )