Merge pull request #3 from alxsrobert/update_fix

Fix github action
EU-ECDC · Feb 15, 2024 · a4a3c04 · a4a3c04
2 parents 70a7923 + 7d50e6b
commit a4a3c04
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/R/functions_import_data/function_import_data.R b/R/functions_import_data/function_import_data.R
@@ -597,7 +597,8 @@ import_vacc <- function(country, vacc_ecdc, total = F, national = F){
     }
 
     # Convert date_week variable to date
-    vacc[,date_week := as.character(ISOweek2date(paste0(date_week,"-7")))]
+    vacc[!grepl("W", date_week),date_week := paste0(as.character(date_week), "-01")]
+    vacc[grepl("W", date_week),date_week := as.character(ISOweek2date(paste0(date_week,"-7")))]
 
     # Sum doses over different vaccines
     cols <- c("dose1", "dose2", "dose3")

diff --git a/R/script_model/function_generate_list_output.R b/R/script_model/function_generate_list_output.R
@@ -96,7 +96,8 @@ generate_list_output <- function(country, range_dates, download, data_file, tota
   equations <- 
     list(ar = ar_terms,
          ne = addSeason2formula(reformulate(ne_terms, intercept = TRUE), period = 365),
-         end = addSeason2formula(reformulate(end_terms, intercept = TRUE))
+         end = if(country != "FR") addSeason2formula(reformulate(end_terms, intercept = TRUE)) else
+           reformulate(end_terms, intercept = TRUE)
     )
   ## Run the model
   model_fit <-