Add event_name_edc to event name if available

R/fct_data_helpers.R

@@ -182,7 +182,7 @@ add_timevars_to_data <- function(
       factor(subject_id, levels = order_string(subject_id))
     )
   if ("event_name" %in% names(data)) { return(df) }
-  
+
   all_ids <- unique(data$event_id)
   #expanding table so that all matching id's are shown:
   events_table <- events |> 
@@ -202,6 +202,7 @@ add_timevars_to_data <- function(
     tidyr::replace_na(
       list(
         event_prefix = "Any visit", 
+        is_scheduled_visit = FALSE,
         add_visit_numbers = FALSE, 
         add_event_repeat_number = FALSE
       )
@@ -212,10 +213,11 @@ add_timevars_to_data <- function(
         add_event_repeat_number ~ paste0(event_prefix, " ", event_repeat),
         .default = event_prefix
       ),
-      event_name = ifelse(
-        !is.na(event_suffix), 
-        paste0(event_name, " (", event_suffix, ")"), 
-        event_name
+      event_name = dplyr::case_when(
+        !is.na(event_suffix) ~ paste0(event_name, " (", event_suffix, ")"), 
+        !is.na(event_name_edc) & is_scheduled_visit & 
+          event_name != event_name_edc ~ paste0(event_name, " (", event_name_edc, ")"),
+        .default = event_name
         ),
       event_label = event_label %|_|% dplyr::case_when(
         !is.na(vis_num)   ~ paste0("V", vis_num),

R/global.R

@@ -116,7 +116,8 @@ utils::globalVariables(
     "is_scheduled_visit",
     "expected_events",
     "event_prefix",
-    "event_suffix"
+    "event_suffix",
+    "event_name_edc"
   )
 )