Merge remote-tracking branch 'upstream/develop' into log-scale

Author: psahgal

Dockerfile

@@ -4,6 +4,7 @@ WORKDIR /app
 COPY README.md .
 COPY setup.cfg .
 COPY setup.py .
+COPY MANIFEST.in .
 COPY .streamlit .streamlit
 COPY defaults defaults
 COPY src src

MANIFEST.in

@@ -0,0 +1 @@
+include src/penn_chime/locales/*.yml

Pipfile

@@ -16,6 +16,9 @@ dash = "*"
 dash-bootstrap-components = "*"
 gunicorn = "*"
 PyYAML = "*"
+python-i18n = "*"
+gspread="*"
+oauth2client="*"
 
 [requires]
 python_version = "3.7"

Pipfile.lock

@@ -26,14 +26,16 @@
         "gspread",
         "gunicorn",
         "dash",
+        "dash_daq",
         "dash_bootstrap_components",
         "numpy",
         "pandas",
         "pytest",
         "pyyaml",
         "streamlit",
         "gspread",
-        "oauth2client"
+        "oauth2client",
+        "python-i18n"
     ],
     classifiers=[
         "Programming Language :: Python :: 3",

setup.py

@@ -10,7 +10,7 @@
 from dash.development.base_component import ComponentMeta
 from dash_html_components import H2, Div, A
 from dash_core_components import Markdown, Graph
-from dash_bootstrap_components import Table, Container
+from dash_bootstrap_components import Table, Container, Button
 
 from chime_dash.app.components.base import Component
 
@@ -50,6 +50,16 @@ def get_html(self) -> List[ComponentMeta]:
                     target="_blank",
                     className="btn btn-sm btn-info",
                 ),
+                Div(
+                    children=Button(
+                        "Lock Zoom", 
+                        id="new_admissions_lock_zoom", 
+                        color="info", 
+                        outline=False,
+                        className="btn btn-sm"
+                        ),
+                    style={"display": "inline-block", "padding": 10}
+                ),
                 Div(
                     className="row justify-content-center",
                     children=Div(
@@ -79,6 +89,16 @@ def get_html(self) -> List[ComponentMeta]:
                     target="_blank",
                     className="btn btn-sm btn-info",
                 ),
+                Div(
+                    children=Button(
+                        "Lock Zoom", 
+                        id="admitted_patients_lock_zoom", 
+                        color="info", 
+                        outline=False, 
+                        className="btn btn-sm"
+                        ),
+                    style={"display": "inline-block", "padding": 10}
+                ),
                 Div(
                     className="row justify-content-center",
                     children=Div(
@@ -108,6 +128,16 @@ def get_html(self) -> List[ComponentMeta]:
                     target="_blank",
                     className="btn btn-sm btn-info my-4",
                 ),
+                Div(
+                    children=Button(
+                        "Lock Zoom", 
+                        id="SIR_lock_zoom", 
+                        color="info", 
+                        outline=False, 
+                        className="btn btn-sm"
+                        ),
+                    style={"display": "inline-block", "padding": 10}
+                ),
                 Div(
                     className="row justify-content-center",
                     children=Div(

src/chime_dash/app/components/visualizations.py

@@ -3,23 +3,24 @@
 
 #! _SIDEBAR_ELEMENTS should be considered for moving else where
 """
-from typing import List
 from collections import OrderedDict
 from datetime import date, datetime
+from typing import List
 
 from dash.development.base_component import ComponentMeta
-from dash_html_components import Nav, Div
 from dash_core_components import Store
+from dash_html_components import Nav, Div
 
 from chime_dash.app.components.base import Page
+from chime_dash.app.services.callbacks import SidebarCallbacks
 from chime_dash.app.utils import ReadOnlyDict
 from chime_dash.app.utils.templates import (
     create_switch_input,
     create_number_input,
     create_date_input,
     create_header,
+    create_line_break,
 )
-from chime_dash.app.services.callbacks import SidebarCallbacks
 
 FLOAT_INPUT_MIN = 0.001
 FLOAT_INPUT_STEP = "any"
@@ -37,13 +38,21 @@
     },
     current_hospitalized={"type": "number", "min": 0, "step": 1},
     ###
+    line_break_1={"type": "linebreak"},
     spread_parameters={"type": "header", "size": "h4"},
+    spread_parameters_checkbox={"type": "switch", "on": False},
     date_first_hospitalized={
         "type": "date",
         "min_date_allowed": datetime(2019, 10, 1),
-        "max_date_allowed": datetime(2021, 12, 31),
+        "max_date_allowed": datetime(2021, 12, 31)
     },
     doubling_time={"type": "number", "min": FLOAT_INPUT_MIN, "step": FLOAT_INPUT_STEP},
+    social_distancing_checkbox={"type": "switch", "on": False},
+    social_distancing_start_date={
+        "type": "date",
+        "min_date_allowed": datetime(2019, 10, 1),
+        "max_date_allowed": datetime(2021, 12, 31),
+    },
     relative_contact_rate={
         "type": "number",
         "min": 0.0,
@@ -52,6 +61,7 @@
         "percent": True,
     },
     ###
+    line_break_2={"type": "linebreak"},
     severity_parameters={"type": "header", "size": "h4"},
     hospitalized_rate={
         "type": "number",
@@ -79,6 +89,7 @@
     icu_los={"type": "number", "min": 0, "step": 1},
     ventilated_los={"type": "number", "min": 0, "step": 1},
     ###
+    line_break_3={"type": "linebreak"},
     display_parameters={"type": "header", "size": "h4"},
     n_days={"type": "number", "min": 30, "step": 1},
     current_date={
@@ -89,7 +100,7 @@
         "date": date.today(),
     },
     max_y_axis_value={"type": "number", "min": 10, "step": 10, "value": None},
-    show_tables={"type": "switch", "value": False},
+    show_tables={"type": "switch", "on": False},
 ))
 
 
@@ -107,13 +118,24 @@ class Sidebar(Page):
     input_type_map = ReadOnlyDict(OrderedDict(
         (key, value["type"])
         for key, value in _SIDEBAR_ELEMENTS.items()
-        if value["type"] not in ("header",)
+        if value["type"] not in ("header", "linebreak")
     ))
+
     input_value_map = ReadOnlyDict(OrderedDict(
-        (key, {"number": "value", "date": "date"}.get(value, "value"))
+        (key, {"number": "value", "date": "date", "switch": "on"}.get(value, "value"))
         for key, value in input_type_map.items()
     ))
 
+    input_state_map = ReadOnlyDict(OrderedDict(
+        [
+            ('group_date_first_hospitalized', 'style'),
+            ('group_doubling_time', 'style'),
+            ('group_social_distancing_start_date', 'style'),
+            ('group_relative_contact_rate', 'style'),
+        ]
+    ))
+
+
     def get_html(self) -> List[ComponentMeta]:
         """Initializes the view
         """
@@ -129,6 +151,8 @@ def get_html(self) -> List[ComponentMeta]:
                 element = create_date_input(idx, data, self.content, self.defaults)
             elif data["type"] == "header":
                 element = create_header(idx, self.content)
+            elif data["type"] == "linebreak":
+                element = create_line_break(idx)
             else:
                 raise ValueError(
                     "Failed to parse input '{idx}' with data '{data}'".format(
@@ -151,6 +175,7 @@ def get_html(self) -> List[ComponentMeta]:
                 "top": "56px",
                 "width": "320px",
                 "zIndex": 1,
+                "padding-top": "1rem",
             },
         )