#11 updated clean_REDCap() to work with all datetime formats

NAMESPACE

@@ -43,11 +43,17 @@ importFrom(igraph,layout_with_fr)
 importFrom(janitor,excel_numeric_to_date)
 importFrom(kableExtra,cell_spec)
 importFrom(labelled,set_variable_labels)
+importFrom(lubridate,dmy)
+importFrom(lubridate,dmy_hm)
+importFrom(lubridate,dmy_hms)
 importFrom(lubridate,hm)
 importFrom(lubridate,int_end)
 importFrom(lubridate,int_overlaps)
 importFrom(lubridate,int_start)
 importFrom(lubridate,interval)
+importFrom(lubridate,mdy)
+importFrom(lubridate,mdy_hm)
+importFrom(lubridate,mdy_hms)
 importFrom(lubridate,ms)
 importFrom(lubridate,seconds)
 importFrom(lubridate,ymd)

R/clean_REDCap.R

@@ -320,7 +320,7 @@ yesno_vars <- function(d) {
 #' @importFrom dplyr mutate across
 #' @importFrom magrittr `%>%`
 #' @importFrom tidyselect starts_with
-#' @importFrom lubridate ymd ymd_hm ymd_hms hm ms
+#' @importFrom lubridate ymd mdy dmy ymd_hm mdy_hm dmy_hm ymd_hms mdy_hms dmy_hms hm ms
 #' @importFrom janitor excel_numeric_to_date
 #'
 #' @examples
@@ -357,9 +357,18 @@ clean_REDCap <- function(d, dict, numeric_date = FALSE, yesno_to_bool = FALSE, q
     d <- mutate(d, across(dict[grepl("^date.*$", dict$`Text Validation Type OR Show Slider Number`, perl = TRUE),]$`Variable / Field Name`, ~excel_numeric_to_date(as.numeric(.))))
   } else {
     d <- mutate(d,
-                across(dict[map_lgl(str_detect(dict$`Text Validation Type OR Show Slider Number`, "^date_"), isTRUE),]$`Variable / Field Name`, ymd, quiet = quiet),
-                across(dict[map_lgl(str_detect(dict$`Text Validation Type OR Show Slider Number`, "^datetime_(?!seconds_)"), isTRUE),]$`Variable / Field Name`, ymd_hm, quiet = quiet),
-                across(dict[map_lgl(str_detect(dict$`Text Validation Type OR Show Slider Number`, "^datetime_seconds_"), isTRUE),]$`Variable / Field Name`, ymd_hms, quiet = quiet),
+                across(dict[map_lgl(str_detect(dict$`Text Validation Type OR Show Slider Number`, "^date_ymd"), isTRUE),]$`Variable / Field Name`, ymd, quiet = quiet),
+                across(dict[map_lgl(str_detect(dict$`Text Validation Type OR Show Slider Number`, "^date_mdy"), isTRUE),]$`Variable / Field Name`, mdy, quiet = quiet),
+                across(dict[map_lgl(str_detect(dict$`Text Validation Type OR Show Slider Number`, "^date_dmy"), isTRUE),]$`Variable / Field Name`, dmy, quiet = quiet),
+
+                across(dict[map_lgl(str_detect(dict$`Text Validation Type OR Show Slider Number`, "^datetime_ymd"), isTRUE),]$`Variable / Field Name`, ymd_hm, quiet = quiet),
+                across(dict[map_lgl(str_detect(dict$`Text Validation Type OR Show Slider Number`, "^datetime_mdy"), isTRUE),]$`Variable / Field Name`, mdy_hm, quiet = quiet),
+                across(dict[map_lgl(str_detect(dict$`Text Validation Type OR Show Slider Number`, "^datetime_dmy"), isTRUE),]$`Variable / Field Name`, dmy_hm, quiet = quiet),
+
+                across(dict[map_lgl(str_detect(dict$`Text Validation Type OR Show Slider Number`, "^datetime_seconds_ymd"), isTRUE),]$`Variable / Field Name`, ymd_hms, quiet = quiet),
+                across(dict[map_lgl(str_detect(dict$`Text Validation Type OR Show Slider Number`, "^datetime_seconds_mdy"), isTRUE),]$`Variable / Field Name`, mdy_hms, quiet = quiet),
+                across(dict[map_lgl(str_detect(dict$`Text Validation Type OR Show Slider Number`, "^datetime_seconds_dmy"), isTRUE),]$`Variable / Field Name`, dmy_hms, quiet = quiet),
+
                 across(dict[map_lgl(str_detect(dict$`Text Validation Type OR Show Slider Number`, "^time$"), isTRUE),]$`Variable / Field Name`, hm, quiet = quiet),
                 across(dict[map_lgl(str_detect(dict$`Text Validation Type OR Show Slider Number`, "^time_mm_ss$"), isTRUE),]$`Variable / Field Name`, ms, quiet = quiet))
   }

data-raw/REDCap_test_data.csv

@@ -1,3 +1,3 @@
 id1,yesno1,checkbox1___1,checkbox1___2,dropdown1,radio1,date_dmy1,date_mdy1,date_ymd1,datetime_dmy1,datetime_mdy1,datetime_ymd1,datetime_seconds_dmy1,datetime_seconds_mdy1,datetime_seconds_ymd1,integer1,number1,number_comma_decimal1,number_1dp1,number_1dp_comma_decimal1
-1,0,0,1,1,1,1985-02-16,1985-02-16,1985-02-16,1985-02-16 12:01 AM,1985-02-16 12:01 AM,1985-02-16 12:01 AM,1985-02-16 12:01:01 AM,1985-02-16 12:01:01 AM,1985-02-16 12:01:01 AM,1,1.5,"1,5",1.5,"1,5"
-2,1,1,0,2,2,1985-02-16,1985-02-16,1985-02-16,1985-02-16 12:01 PM,1985-02-16 12:01 PM,1985-02-16 12:01 PM,1985-02-16 12:01:01 PM,1985-02-16 12:01:01 PM,1985-02-16 12:01:01 PM,1,1.5,"1,5",1.5,"1,5"
+1,0,0,1,1,1,16/02/1985,02/16/1985,1985/02/16,16/02/1985 12:01 AM,02/16/1985 12:01 AM,1985/02/16 12:01 AM,16/02/1985 12:01:01 AM,02/16/1985 12:01:01 AM,1985/02/16 12:01:01 AM,1,1.5,"1,5",1.5,"1,5"
+2,1,1,0,2,2,16/02/1985,02/16/1985,1985/02/16,16/02/1985 12:01 PM,02/16/1985 12:01 PM,1985/02/16 12:01 PM,16/02/1985 12:01:01 PM,02/16/1985 12:01:01 PM,1985/02/16 12:01:01 PM,1,1.5,"1,5",1.5,"1,5"