Modify links to PPE tool

Author: therealthaibinh

Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.7.7-slim-buster
 ENV PARAMETERS=./defaults/webapp.cfg
-ENV PPE_EXCEL=./defaults/PPE_Usage_Draft_CC_modifications_v2.xlsx
+ENV PPE_FOLDER=./defaults/assets/
 ENV STREAMLIT_SERVER_PORT=$PORT
 WORKDIR /app
 COPY README.md .
@@ -13,5 +13,5 @@ COPY src src
 COPY st_app.py st_app.py
 RUN pip install -q .
 
-CMD ["streamlit", "run", "st_app.py"]
+CMD STREAMLIT_SERVER_PORT=$PORT streamlit run st_app.py
 

defaults/assets/PPE_Calculator_for_COVID-19.xlsx

@@ -2,6 +2,4 @@ build:
   docker:
     web: Dockerfile
   config: 
-    PORT: ${PORT}
-run:
-  web: PARAMETERS=./defaults/webapp.cfg PPE_EXCEL=./defaults/PPE_Usage_Draft_CC_modifications_v2.xlsx streamlit run st_app.py
+    PORT: ${PORT}

defaults/assets/PPE_Screenshot.jpg

@@ -3,7 +3,7 @@ en:
   app-new-admissions-text: "Projected number of **daily** COVID-19 admissions."
   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: "PPE Forecasting Tool"
+  app-PPE-title: "Personal Protective Equipment (PPE) 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"

defaults/assets/PPE_Screenshot_Interface_v0.png

@@ -29,18 +29,19 @@
 
 class PPE:
 
-    excel_file = None
+    ppe_folder = None
 
     @classmethod
     def __init__(cls, env: Dict[str, str]):
-        cls.excel_file = env.get("PPE_EXCEL")
+        cls.ppe_folder = env.get("PPE_FOLDER")
         return
 
     @classmethod
     def display_ppe_download_link(cls, st):
-        excel = excel_to_base64(cls.excel_file)
-        filename = cls.excel_file[cls.excel_file.rfind('/')+1:]
+        excel_filepath = cls.ppe_folder+'PPE_Calculator_for_COVID-19.xlsx'
+        filename = excel_filepath[excel_filepath.rfind('/')+1:]
+        excel = excel_to_base64(excel_filepath)
         st.markdown("""
-                        Download the PPE forecasting tool here: <a download="{filename}" href="data:file/xlsx;base64,{excel}">{filename}</a>.
+                        Download the PPE Calculator here: <a download="{filename}" href="data:file/xlsx;base64,{excel}">{filename}</a>.
                     """.format(excel=excel, filename=filename), unsafe_allow_html=True
                     )

defaults/assets/PPE_Screenshot_Output_v0.png

@@ -72,12 +72,12 @@ def main():
         df=m.ppe_df,
     )
     if st.checkbox("Show a screenshot of the tool"):
-        st.image(image='https://docs.google.com/uc?export=download&id=1K6y3mdo5vHxs2WlnaD-EVykXgrIOFfPk',
-                 width=400,
-                 format='PNG')
+        st.image(image=ppe.ppe_folder+'PPE_Screenshot.jpg',
+                 width=600,
+                 format='JPG')
     st.markdown("""
                     Refer to our <a href="{link_to_docs}">user documentation for instructions on how to use the tool</a>.
-                """.format(link_to_docs="https://code-for-philly.gitbook.io/chime/"),
+                """.format(link_to_docs="https://code-for-philly.gitbook.io/chime/ppe-calculator"),
                 unsafe_allow_html=True
                 )