Updates from develop

Author: jlubken

.github/workflows/pythonapp.yml

@@ -44,4 +44,6 @@ jobs:
       uses: cypress-io/[email protected]
       with:
         working-directory: e2e
+        wait-on: 'http://localhost:8000'
+        wait-on-timeout: 300
 

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

@@ -10,8 +10,8 @@ context('Actions', () => {
 
     // This gets the "first" input from the sidebar. From clicking step up,
     // the Regional Population should increase from default 4119405 to 4219405.
-    // Updated to 3600001
+    // Updated to 3600000
     cy.get('input.st-al').eq(0)
-      .should('has.value', '360001')
+      .should('has.value', '3600000')
   })
 });

src/app.py

@@ -38,7 +38,7 @@
     display_more_info(st=st, model=m, parameters=p, defaults=DEFAULTS, notes=notes)
 
 st.subheader("New Admissions")
-st.markdown("Projected number of **daily** COVID-19 admissions. \n\n _NOTE: Now including back-casting of prior admissions for comparison._")
+st.markdown("Projected number of **daily** COVID-19 admissions. \n\n _NOTE: Now including estimates of prior admissions for comparison._")
 admits_chart = build_admits_chart(alt=alt, admits_df=m.admits_df, max_y_axis=p.max_y_axis)
 st.altair_chart(admits_chart, use_container_width=True)
 st.markdown(build_descriptions(chart=admits_chart, labels=p.labels, suffix=" Admissions"))
@@ -60,7 +60,7 @@
 
 
 st.subheader("Admitted Patients (Census)")
-st.markdown("Projected **census** of COVID-19 patients, accounting for arrivals and discharges \n\n _NOTE: Now including back-casting of prior census for comparison._")
+st.markdown("Projected **census** of COVID-19 patients, accounting for arrivals and discharges \n\n _NOTE: Now including estimates of prior census for comparison._")
 census_chart = build_census_chart(alt=alt, census_df=m.census_df, max_y_axis=p.max_y_axis)
 st.altair_chart(census_chart, use_container_width=True)
 st.markdown(build_descriptions(chart=census_chart, labels=p.labels, suffix=" Census"))

src/penn_chime/presentation.py

@@ -191,7 +191,7 @@ def display_sidebar(st, d: Parameters) -> Parameters:
     )
     doubling_time_input = NumberInput(
         st_obj,
-        "Doubling time before social distancing (days)",
+        "Doubling time in days (up to today)",
         min_value=0.5,
         value=d.doubling_time,
         step=0.25,
@@ -282,8 +282,6 @@ def display_sidebar(st, d: Parameters) -> Parameters:
         """**CHIME [v1.1.0](https://github.com/CodeForPhilly/chime/releases/tag/v1.1.0) (2020/03/30)**"""
     )
 
-    current_date = current_date_input()
-
     st.sidebar.markdown(
         "### Hospital Parameters [ℹ]({docs_url}/what-is-chime/parameters#hospital-parameters)".format(
             docs_url=DOCS_URL
@@ -336,6 +334,8 @@ def display_sidebar(st, d: Parameters) -> Parameters:
     if max_y_axis_set:
         max_y_axis = max_y_axis_input()
 
+    current_date = current_date_input()
+
     return Parameters(
         current_hospitalized=current_hospitalized,
         hospitalized=Disposition(hospitalized_rate, hospitalized_days),