Merge pull request #468 from mangalap123/develop

Moved the legend to the bottom of the chart #465.

Author: MooseQuest

.gitignore

@@ -26,3 +26,4 @@ devel.ipynb
 
 # build artifacts
 results/
+runtime.txt

runtime.txt

@@ -1,2 +1,2 @@
-python-3.7.2
+python-3.7.7
 

src/penn_chime/charts.py

@@ -1,4 +1,3 @@
-
 from datetime import datetime
 from math import ceil
 from typing import Dict, Optional
@@ -12,10 +11,7 @@
 
 
 def build_admits_chart(
-    *,
-    alt,
-    admits_floor_df: pd.DataFrame,
-    max_y_axis: Optional[int] = None,
+    *, alt, admits_floor_df: pd.DataFrame, max_y_axis: Optional[int] = None
 ) -> Chart:
     """Build admits chart."""
     y_scale = alt.Scale()
@@ -25,14 +21,26 @@ def build_admits_chart(
     x = dict(shorthand="date:T", title="Date", axis=alt.Axis(format=(DATE_FORMAT)))
     y = dict(shorthand="value:Q", title="Daily admissions", scale=y_scale)
     color = "key:N"
-    tooltip=["date:T", alt.Tooltip("value:Q", format=".0f", title="Admit"), "key:N"]
+    tooltip = ["date:T", alt.Tooltip("value:Q", format=".0f", title="Admit"), "key:N"]
 
     # TODO fix the fold to allow any number of dispositions
     points = (
         alt.Chart()
         .transform_fold(fold=["hospitalized", "icu", "ventilated"])
         .encode(x=alt.X(**x), y=alt.Y(**y), color=color, tooltip=tooltip)
         .mark_line(point=True)
+        .encode(
+            x=alt.X(**x_kwargs),
+            y=alt.Y("value:Q", title="Daily admissions", scale=y_scale),
+            color="key:N",
+            tooltip=[
+                tooltip_dict[as_date],
+                alt.Tooltip("value:Q", format=".0f", title="Admissions"),
+                "key:N",
+            ],
+        )
+        .configure_legend(orient="bottom")
+        .interactive()
     )
     bar = (
         alt.Chart()
@@ -43,12 +51,8 @@ def build_admits_chart(
     return alt.layer(points, bar, data=admits_floor_df)
 
 
-
 def build_census_chart(
-    *,
-    alt,
-    census_floor_df: pd.DataFrame,
-    max_y_axis: Optional[int] = None,
+    *, alt, census_floor_df: pd.DataFrame, max_y_axis: Optional[int] = None
 ) -> Chart:
     """Build census chart."""
     y_scale = alt.Scale()
@@ -66,6 +70,18 @@ def build_census_chart(
         .transform_fold(fold=["hospitalized", "icu", "ventilated"])
         .encode(x=alt.X(**x), y=alt.Y(**y), color=color, tooltip=tooltip)
         .mark_line(point=True)
+        .encode(
+            x=alt.X(**x_kwargs),
+            y=alt.Y("value:Q", title="Census", scale=y_scale),
+            color="key:N",
+            tooltip=[
+                idx,
+                alt.Tooltip("value:Q", format=".0f", title="Census"),
+                "key:N",
+            ],
+        )
+        .configure_legend(orient="bottom")
+        .interactive()
     )
     bar = (
         alt.Chart()
@@ -77,10 +93,7 @@ def build_census_chart(
 
 
 def build_sim_sir_w_date_chart(
-    *,
-    alt,
-    sim_sir_w_date_floor_df: pd.DataFrame,
-    max_y_axis: Optional[int] = None,
+    *, alt, sim_sir_w_date_floor_df: pd.DataFrame, max_y_axis: Optional[int] = None
 ) -> Chart:
     """Build sim sir w date chart."""
     y_scale = alt.Scale()
@@ -98,6 +111,14 @@ def build_sim_sir_w_date_chart(
         .transform_fold(fold=["susceptible", "infected", "recovered"])
         .encode(x=alt.X(**x), y=alt.Y(**y), color=color, tooltip=tooltip)
         .mark_line()
+        .encode(
+            x=alt.X(**x_kwargs),
+            y=alt.Y("value:Q", title="Case Volume", scale=y_scale),
+            tooltip=["key:N", "value:Q"],
+            color="key:N",
+        )
+        .configure_legend(orient="bottom")
+        .interactive()
     )
     bar = (
         alt.Chart()
@@ -109,10 +130,7 @@ def build_sim_sir_w_date_chart(
 
 
 def build_descriptions(
-    *,
-    chart: Chart,
-    labels: Dict[str, str],
-    suffix: str = ""
+    *, chart: Chart, labels: Dict[str, str], suffix: str = ""
 ) -> str:
     """
 
@@ -146,15 +164,14 @@ def build_descriptions(
         )
 
     if asterisk:
-        messages.append("_* The max is at the upper bound of the data, and therefore may not be the actual max_")
+        messages.append(
+            "_* The max is at the upper bound of the data, and therefore may not be the actual max_"
+        )
     return "\n\n".join(messages)
 
 
 def build_table(
-    *,
-    df: pd.DataFrame,
-    labels: Dict[str, str],
-    modulo: int = 1,
+    *, df: pd.DataFrame, labels: Dict[str, str], modulo: int = 1
 ) -> pd.DataFrame:
     table_df = df[np.mod(df.day, modulo) == 0].copy()
     table_df.date = table_df.date.dt.strftime(DATE_FORMAT)