Update to match base branch

Author: BrianThomasRoss

defaults/cli.cfg

@@ -6,7 +6,7 @@
 --icu-rate 0.0075
 --infectious-days 10
 --market-share 0.15
---n-days 100
+--n-days 30
 --population 3600000
 --recovered 0
 --relative-contact-rate 0.45

defaults/cypress.cfg

@@ -7,7 +7,7 @@
 --icu-rate 0.0075
 --infectious-days 14
 --market-share 0.15
---n-days 100
+--n-days 30
 --population 3600000
 --recovered 0
 --relative-contact-rate 0.3

defaults/webapp.cfg

@@ -7,7 +7,7 @@
 --icu-rate 0.0075
 --infectious-days 10
 --market-share 0.15
---n-days 100
+--n-days 30
 --population 3600000
 --recovered 0
 --relative-contact-rate 0.45

src/penn_chime/model/parameters.py

@@ -153,7 +153,7 @@ def validate(string):
     "mitigation_date": "Date on which social distancing measures too effect",
     "market_share": "Hospital market share (0.00001 - 1.0)",
     "max_y_axis": "Max y-axis",
-    "n_days": "Number of days to project >= 0",
+    "n_days": "Number of days to project >= 1 and less than 30",
     "parameters": "Parameters file",
     "population": "Regional population >= 1",
     "recovered": "Number of patients already recovered (not yet implemented)",
@@ -259,8 +259,8 @@ def validate(string):
     (
         "n-days",
         int,
-        0,
-        None,
+        1,
+        30,
         True,
     ),
     (

src/penn_chime/view/st_display.py

@@ -171,7 +171,8 @@ def display_sidebar(st, d: Parameters) -> Parameters:
     n_days_input = NumberInput(
         st_obj,
         i18n.t("presentation-n-days"),
-        min_value=30,
+        min_value=1,
+        max_value=30,
         value=d.n_days,
         step=1,
         format="%i",