Merge pull request #688 from The-Strategy-Unit/654-time-profiles-selection

Handle time profiles in v5.2 upgrade and default params

Author: matt-dray

app.R

@@ -192,6 +192,15 @@ upgrade_params.v5.0 <- function(p) {
   upgrade_params(p)
 }
 
+upgrade_params.v5.1 <- function(p) {
+  # Remove time-profile mappings
+
+  p[["time_profile_mappings"]] <- NULL
+
+  class(p) <- p$app_version <- "v5.2"
+  upgrade_params(p)
+}
+
 # Insert above a new upgrade step for each new major or minor version
 
 ## LOCATE PARAMS ----

default_params.json

@@ -63,23 +63,6 @@
     "ip": {},
     "op": {}
   },
-  "time_profile_mappings": {
-    "baseline_adjustment": "none",
-    "activity_avoidance": {
-      "ip": {},
-      "op": {},
-      "aae": {}
-    },
-    "efficiencies": {
-      "ip": {},
-      "op": {}
-    },
-    "expat": "linear",
-    "repat_local": "linear",
-    "repat_nonlocal": "linear",
-    "non-demographic_adjustment": "none",
-    "waiting_list_adjustment": "linear"
-  },
   "reasons": {
     "baseline_adjustment": "",
     "demographic_factors": "",

deploy.R

@@ -57,6 +57,7 @@ deploy <- function(server, app_id, app_version_choices) {
 
 # only use the versions that are deployed to the new server currently
 app_version_choices <- c(
+  "v5.2",
   "v5.1",
   "v5.0",
   "v4.4",