PPE

CodeForPhilly · May 1, 2020 · a986bdc · a986bdc
2 parents 4d1417d + 8e7718b
commit a986bdc
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 4 deletions.
diff --git a/defaults/assets/PPE_Calculator.xlsx b/defaults/assets/PPE_Calculator.xlsx
diff --git a/defaults/assets/PPE_Calculator_COVID-19.xlsx b/defaults/assets/PPE_Calculator_COVID-19.xlsx
diff --git a/src/penn_chime/locales/en.yml b/src/penn_chime/locales/en.yml
@@ -4,8 +4,13 @@ en:
  app-admitted-patients-title: "Admitted Patients (Census)"
  app-admitted-patients-text: "Projected **census** of COVID-19 patients, accounting for arrivals and discharges."
  app-PPE-title: "Personal Protective Equipment (PPE) Forecasting Calculator"
+ app-PPE-text: "This Excel-based calculator uses hospitalized/ICU/ventilated censuses and admissions projections from any model to forecast PPE usage."
+ app-PPE-text2: "To use CHIME’s projections based on your own parameters, set the parameters in the sidebar, then download this file:"
+ app-PPE-screenshot: "Show a screenshot of the calculator"
  app-PPE-documentation: |+
- Refer to our <a href="{link_to_docs}">user documentation for instructions</a> on how to incorporate input data and use the calculator.
+ Refer to our [user documentation]({link_to_docs}) or
+ watch [a quick tutorial]({link_to_tutorial}) for instructions on
+ how to incorporate these projections--or projections from other models--into the calculator.
  app-SIR-title: "Susceptible, Infected, and Recovered"
  app-SIR-text: "The number of susceptible, infected, and recovered individuals in the hospital catchment region at any given moment"
  charts-date: "Date"

diff --git a/src/penn_chime/locales/ja.yml b/src/penn_chime/locales/ja.yml
@@ -4,9 +4,13 @@ ja:
  app-admitted-patients-title: "累計入院患者数"
  app-admitted-patients-text: "入院と退院を考慮したCOVID-19患者の予測**累計患者数**"
  app-PPE-title: "個人用防護具 (PPE) 計算機"
+ app-PPE-text: "This Excel-based calculator uses hospitalized/ICU/ventilated censuses and admissions projections from any model to forecast PPE usage."
+ app-PPE-text2: "To use CHIME’s projections based on your own parameters, set the parameters in the sidebar, then download this file:"
  app-PPE-screenshot: "ツールのスクリーンショットを表示"
  app-PPE-documentation: |+
- ツールの使い方については<a href="{link_to_docs}">ユーザドキュメントの説明</a>を確認してください。
+ Refer to our [user documentation]({link_to_docs}) or
+ watch [a quick tutorial]({link_to_tutorial}) for instructions on
+ how to incorporate these projections--or projections from other models--into the calculator.
  app-SIR-title: "感受性保持者、感染者と回復者"
  app-SIR-text: "与えられた時間範囲での、病院の担当範囲領域における感受性保持者、感染者と回復者の人数"
  charts-date: "日付"

diff --git a/src/penn_chime/model/ppe.py b/src/penn_chime/model/ppe.py
@@ -9,5 +9,5 @@ class PPE:
  def __init__(self, env: Dict[str, str]):
  """__init__."""
  self.assets = assets = env['ASSETS']
- self.filename = filename = "PPE_Calculator.xlsx"
+ self.filename = filename = "PPE_Calculator_COVID-19.xlsx"
  self.src = os.path.join(assets, filename)
diff --git a/src/penn_chime/view/st_app.py b/src/penn_chime/view/st_app.py
@@ -72,17 +72,19 @@ def main():
  )
 
  st.subheader(i18n.t("app-PPE-title"))
+ st.markdown(i18n.t("app-PPE-text"))
  display_excel_download_link(st, ppe.filename, ppe.src)
+ st.markdown(i18n.t("app-PPE-text2"))
  display_download_link(
  st,
  p,
  filename=f"{p.current_date}_projected_census_for_ppe_calculator.csv",
  df=m.ppe_df,
  )
-
  st.markdown(
  i18n.t("app-PPE-documentation").format(
  link_to_docs="{docs_url}/ppe-calculator".format(docs_url=DOCS_URL),
+ link_to_tutorial="{docs_url}/ppe-calculator/ppe-basic-tutorial".format(docs_url=DOCS_URL),
  ),
  unsafe_allow_html=True
  )