Return row IDs as well

openpharma · Dec 10, 2024 · 02e65df · 02e65df
1 parent 5c64e08
commit 02e65df
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/R/fct_tables.R b/R/fct_tables.R
@@ -67,7 +67,9 @@ create_table.default <- function(
       names_from = {{name_column}}, 
       values_from = {{value_column}}, 
       values_fn = ~paste0(., collapse = "; ")
-      ) 
+      )
+  if ("o_reviewed" %in% names(df))
+    df <- dplyr::mutate(df, o_reviewed = lapply(dplyr::row_number(), \(x) append(o_reviewed[[x]], list(row_id = x))))
   expected_columns <- na.omit(expected_columns) %||% character(0)
   if(length(expected_columns) == 0) return(df)
   add_missing_columns(df, expected_columns)[
@@ -238,7 +240,7 @@ create_table.adverse_events <- function(
                              keep_vars, expected_columns) |> 
     adjust_colnames("^AE ") 
   df[["Number"]] <- NULL
-
+  
   # create new row when an AE gets worse:
   df_worsening <- df[!is.na(df[[worsening_start_column]]), ] |> 
     dplyr::mutate(

diff --git a/R/mod_common_forms.R b/R/mod_common_forms.R
@@ -161,7 +161,7 @@ mod_common_forms_server <- function(
       session$userData$review_records[[form]] <-
         dplyr::rows_upsert(
           session$userData$review_records[[form]],
-          input$common_form_table_review_selection,
+          input$common_form_table_review_selection[c("id", "reviewed")],
           by = "id"
         ) |> 
         dplyr::filter(!is.na(reviewed)) |> 
@@ -189,7 +189,7 @@ mod_common_forms_server <- function(
       session$userData$review_records[[form]] <-
         dplyr::rows_upsert(
           session$userData$review_records[[form]],
-          input$SAE_table_review_selection,
+          input$SAE_table_review_selection[c("id", "reviewed")],
           by = "id"
         ) |> 
         dplyr::filter(!is.na(reviewed)) |> 

diff --git a/R/mod_study_forms.R b/R/mod_study_forms.R
@@ -205,7 +205,7 @@ mod_study_forms_server <- function(
       session$userData$review_records[[form]] <-
         dplyr::rows_upsert(
           session$userData$review_records[[form]],
-          input$table_review_selection,
+          input$table_review_selection[, c("id", "reviewed")],
           by = "id"
         ) |>
         dplyr::filter(!is.na(reviewed)) |> 

diff --git a/R/shiny.R b/R/shiny.R
@@ -1,7 +1,8 @@
 shiny::registerInputHandler('CS.reviewInfo', function(val, ...) {
   with(val, data.frame(
     id = unlist(ids), 
-    reviewed = ifelse(isTRUE(review), "Yes", ifelse(isFALSE(review), "No", NA_character_))
+    reviewed = ifelse(isTRUE(review), "Yes", ifelse(isFALSE(review), "No", NA_character_)),
+    row_id = row_id
     ))
 }, TRUE)
 
@@ -19,11 +20,9 @@ checkbox_callback <- DT::JS(
   "table.on('click', 'input[type=\"checkbox\"]', function(){",
     "var tblId = $(this).closest('.datatables').attr('id');",
     "var cell = table.cell($(this).closest('td'));",
-    "var rowIdx = table.row($(this).closest('tr')).index();",
-    "var ids = cell.data().ids;",
     "var review = $(this).is(':indeterminate') ? null : $(this).is(':checked');",
     "cell.data().updated = review;",
-    "var info = {review: review, ids: ids, row: tblId + '_row_' + rowIdx};",
+    "var info = {review: review, ids: cell.data().ids, row_id: cell.data().row_id};",
     "Shiny.setInputValue(tblId + '_review_selection:CS.reviewInfo', info);",
   "});"
 )