✨ update modules

ecoisilva · ecoisilva · commit f39c62fccb26 · 2025-03-26T16:44:33.000+01:00
diff --git a/R/fct_meta.R b/R/fct_meta.R
@@ -899,7 +899,7 @@ plot_meta_permutations <- function(rv,
         overlaps_with_threshold = 
           (error_lci <= rv$error_threshold & 
              error_uci >= -rv$error_threshold),
-        status = dplyr::case_when(
+        color = dplyr::case_when(
           within_threshold ~ "Yes",
           !within_threshold & overlaps_with_threshold ~ "Near",
           TRUE ~ "No"))
@@ -936,7 +936,7 @@ plot_meta_permutations <- function(rv,
                      y = error,
                      group = group,
                      shape = group,
-                     color = status)) +
+                     color = color)) +
       
       p_error1 +
       p_error2 +
diff --git a/R/mod_comp_m.R b/R/mod_comp_m.R
@@ -49,7 +49,7 @@ mod_comp_m_ui <- function(id) {
 
           # shinyWidgets::autonumericInput(
           #   inputId = ns("nsims_iter"),
-          #   label = "Simulation steps:",
+          #   label = "Check every _ tags:",
           #   currencySymbol = " tag(s)",
           #   currencySymbolPlacement = "s",
           #   decimalPlaces = 0,
diff --git a/R/mod_tab_data_upload.R b/R/mod_tab_data_upload.R
@@ -1395,6 +1395,8 @@ mod_tab_data_upload_server <- function(id, rv) {
               " of group(s): ", msg_danger(toString(bug_group))),
             detail = "Try again with different groupings.")
           
+          rv$is_valid <- FALSE
+          
           shinybusy::remove_modal_spinner()
           
           shinyalert::shinyalert(
diff --git a/R/mod_tab_report.R b/R/mod_tab_report.R
@@ -1533,7 +1533,7 @@ mod_tab_report_server <- function(id, rv) {
             txt_final <- span(
               style = paste(css_mono, css_bold),
               "The number of simulations appears",
-              wrap_none("sufficient",, color = pal$sea),
+              wrap_none("sufficient", color = pal$sea),
               "to accurately estimate mean", 
               wrap_none(txt_target[[target]], end = ","),
               txt_uncertainty)
@@ -1542,16 +1542,16 @@ mod_tab_report_server <- function(id, rv) {
             txt_final <- span(
               style = paste(css_mono, css_bold),
               "The number of simulations appears",
-              wrap_none("insufficient",, color = pal$grn),
-              "to accurately estimate mean", 
+              wrap_none("insufficient", color = pal$grn),
+              "to accurately estimate man", 
               wrap_none(txt_target[[target]], end = ","),
               txt_uncertainty)
           },
           "No" = {
             txt_final <- span(
               style = paste(css_mono, css_bold),
               "The number of simulations appears",
-              wrap_none("insufficient",, color = pal$dgr),
+              wrap_none("insufficient", color = pal$dgr),
               "to accurately estimate mean", 
               wrap_none(txt_target[[target]], end = ","),
               txt_uncertainty)
diff --git a/R/mod_viz.R b/R/mod_viz.R
@@ -801,15 +801,33 @@ mod_viz_server <- function(id, rv) {
                                   name = "speed")), 1)
           }
         })
-      }
+        
+      } # end of if (!is.null(rv$fitList))
+      
+      if (rv$grouped) {
+        if (!is.null(rv$groups[[2]]))
+          if (!is.null(rv$groups[[2]][["A"]]) &&
+              !is.null(rv$groups[[2]][["B"]])) {
+            
+            out_sum$group <- sapply(names(rv$datList), function(x)
+              ifelse(x %in% rv$groups[[2]][["A"]], "A", "B"))
+          }
+        
+      } # end of if (rv$grouped)
       
       is_selection <- "multiple"
       if (rv$which_meta == "none") {
         is_selection <- "single"
         if(length(id) > 1) id <- NULL
       }
       
+      if (rv$which_meta == "compare") {
+        if (!is.null(rv$groups[[2]][["A"]]))
+        out_sum <- dplyr::relocate(out_sum, group)
+      }
+      
       if (anyNA(id)) id <- NULL
+      
       reactable::reactable(
         out_sum,
         onClick = "select",
@@ -822,22 +840,37 @@ mod_viz_server <- function(id, rv) {
         defaultSelected = id,
         defaultColDef =
           reactable::colDef(
-            headerClass = "rtable_header", align = "left"),
+            headerClass = "rtable_header", 
+            align = "left",
+            minWidth = 120),
         columns = list(
-          n = reactable::colDef(name = "n"),
+          n = reactable::colDef(
+            name = "n",
+            minWidth = 60,
+            style = format_num,
+            format = reactable::colFormat(
+              separators = TRUE, locale = "en-US", digits = 0)),
+          mod = if ("mod" %in% names(out_sum)) {
+            reactable::colDef(
+              minWidth = 80, name = "Model:") },
+          group = if (rv$grouped) {
+            reactable::colDef(
+              name = "Group:",
+              minWidth = 80) },
           longitude = reactable::colDef(
             format = reactable::colFormat(digits = 3)),
           latitude = reactable::colDef(
             format = reactable::colFormat(digits = 3)),
-          N1 = if ("N_area" %in% names(out_sum)) {
+          N_area = if ("N_area" %in% names(out_sum)) {
             reactable::colDef(
-              minWidth = 80, name = "N (area)",
+              minWidth = 90, name = "N (area)",
               style = format_num,
               format = reactable::colFormat(separators = TRUE,
                                             digits = 1)) },
-          N2 = if ("N_speed" %in% names(out_sum)) {
+          N_speed = if ("N_speed" %in% names(out_sum)) {
             reactable::colDef(
-              minWidth = 80, name = "N (speed)",
+              name = "N (speed)",
+              minWidth = 90,
               style = format_num,
               format = reactable::colFormat(separators = TRUE,
                                             digits = 1)) }
