addeda unique error/warning/message system with specified colors for …

…each case red/orange/blue
ComPlat · Dec 12, 2024 · dc209c0 · dc209c0
1 parent 915f2a7
commit dc209c0
Show file tree

Hide file tree

Showing 19 changed files with 584 additions and 514 deletions.
diff --git a/app/DoseResponse.R b/app/DoseResponse.R
@@ -215,7 +215,7 @@ DoseResponseServer <- function(id, data, listResults) {
       neg <- input$negIdentifier
       req(input$posIdentifier)
       pos <- input$posIdentifier
-      print_noti(!is.null(data$formula), "You have to set a formula")
+      print_req(!is.null(data$formula), "You have to set a formula")
       req(!is.null(data$formula))
       r_vals$plots <- NULL # reset
       r_vals$names <- NULL # reset
@@ -258,7 +258,7 @@ DoseResponseServer <- function(id, data, listResults) {
       })
       if (inherits(e, "try-error")) {
         err <- conditionMessage(attr(e, "condition"))
-        print_noti(FALSE, err)
+        print_req(FALSE, err)
       } else {
         listResults$curr_data <- new("doseResponse", df = resDF, p = resPlot)
         listResults$curr_name <- paste("Test Nr", length(listResults$all_names) + 1, "Conducted dose response analysis")

diff --git a/app/MainApp.R b/app/MainApp.R
@@ -450,15 +450,15 @@ app <- function() {
     })
 
     observeEvent(input$download, {
-      print_noti(is_valid_filename(input$user_filename), "Defined filename is not valid")
-      print_noti(length(listResults$all_data) > 0, "No results to save")
+      print_req(is_valid_filename(input$user_filename), "Defined filename is not valid")
+      print_req(length(listResults$all_data) > 0, "No results to save")
       l <- listResults$all_data
       if (Sys.getenv("RUN_MODE") == "SERVER") {
-        print_noti(check_filename_for_server(input$user_filename), "Defined filename does not have xlsx as extension")
+        print_req(check_filename_for_server(input$user_filename), "Defined filename does not have xlsx as extension")
         excelFile <- createExcelFile(l)
         upload(session, excelFile, new_name = input$user_filename)
       } else {
-        print_noti(check_filename_for_serverless(input$user_filename), "Defined filename does not have zip as extension")
+        print_req(check_filename_for_serverless(input$user_filename), "Defined filename does not have zip as extension")
         jsString <- createJSString(l)
         session$sendCustomMessage(
           type = "downloadZip",

diff --git a/app/assumption.R b/app/assumption.R
@@ -174,7 +174,7 @@ assServer <- function(id, data, listResults) {
           output$curr_error <- renderText(err)
         } else {
           err <- conditionMessage(attr(e, "condition"))
-          print_noti(FALSE, err)
+          print_req(FALSE, err)
         }
       }
     }
@@ -207,7 +207,7 @@ assServer <- function(id, data, listResults) {
         output$curr_error <- renderText(err)
       } else {
         err <- conditionMessage(attr(e, "condition"))
-        print_noti(FALSE, err)
+        print_req(FALSE, err)
       }
     }
     observeEvent(input$shapiroResiduals, {
@@ -227,7 +227,7 @@ assServer <- function(id, data, listResults) {
       }, silent = TRUE)
       if (inherits(e, "try-error")) {
         err <- conditionMessage(attr(e, "condition"))
-        print_noti(FALSE, err)
+        print_req(FALSE, err)
       } else {
         exportTestValues(
           assumption_res  = fit
@@ -256,7 +256,7 @@ assServer <- function(id, data, listResults) {
       }, silent = TRUE)
       if (inherits(e, "try-error")) {
         err <- conditionMessage(attr(e, "condition"))
-        print_noti(FALSE, err)
+        print_req(FALSE, err)
       } else {
         exportTestValues(
           assumption_res  = p

diff --git a/app/correlation.R b/app/correlation.R
@@ -124,8 +124,12 @@ corrServer <- function(id, data, listResults) {
     })
 
     corr_fct <- function(method) {
-      req(is.data.frame(data$df))
-      req(!is.null(data$formula))
+      print(is.data.frame(data$df))
+      str(data$formula)
+      print_req(is.data.frame(data$df), "The dataset is missing")
+      # req(is.data.frame(data$df))
+      # req(!is.null(data$formula))
+      print_req(!is.null(data$formula), "The formula is missing")
       f <- as.character(data$formula)
       dep <- f[2]
       indep <- f[3]
@@ -158,7 +162,7 @@ corrServer <- function(id, data, listResults) {
         error = function(err) {
           err <- err$message
           showNotification(err)
-          print_noti(FALSE, err)
+          print_req(FALSE, err)
         }
       )
     }

diff --git a/app/statisticalTests.R b/app/statisticalTests.R
@@ -209,7 +209,7 @@ testsServer <- function(id, data, listResults) {
       })
       if (inherits(e, "try-error")) {
         err <- conditionMessage(attr(e, "condition"))
-        print_noti(FALSE, err)
+        print_req(FALSE, err)
       } else {
         listResults$counter <- listResults$counter + 1
         new_name <- paste0(
@@ -300,10 +300,10 @@ testsServer <- function(id, data, listResults) {
         if (inherits(e, "try-error")) {
           err <- conditionMessage(attr(e, "condition"))
           err <- paste0(err, "\n", "Test did not run successfully")
-          print_noti(FALSE, err)
+          print_req(FALSE, err)
         } else if (is.null(fit)) {
           err <- paste0(err, "\n", "Test did not run successfully")
-          print_noti(FALSE, err)
+          print_req(FALSE, err)
         } else {
           fit <- cbind(fit, row.names(fit))
           names(fit)[ncol(fit)] <- paste0(indep, collapse = ".")

diff --git a/app/utils.R b/app/utils.R
@@ -356,7 +356,7 @@ split <- function(df, cols, levels) {
 }
 
 # check and print notifications
-print_noti <- function(expr, message) {
+print_req <- function(expr, message) {
   if (!expr) {
     showNotification(message)
   }

diff --git a/app/visualisation.R b/app/visualisation.R
@@ -372,18 +372,18 @@ visServer <- function(id, data, listResults) {
       x <- input$xVar
       y <- input$yVar
       colNames <- names(df)
-      print_noti(x %in% colNames, "X variable not found")
-      print_noti(y %in% colNames, "Y variable not found")
+      print_req(x %in% colNames, "X variable not found")
+      print_req(y %in% colNames, "Y variable not found")
       width <- input$widthPlot
       height <- input$heightPlot
       resolution <- input$resPlot
-      print_noti(width > 0, "width has to be a positive number; It is changed to 10 cm")
+      print_req(width > 0, "width has to be a positive number; It is changed to 10 cm")
       if (width <= 0) width <- 10
-      print_noti(height > 0, "height has to be a positive number; It is changed to 10 cm")
+      print_req(height > 0, "height has to be a positive number; It is changed to 10 cm")
       if (height <= 0) height <- 10
-      print_noti(width < 100, "width exceeds max value of 100; It is changed to 100 cm")
+      print_req(width < 100, "width exceeds max value of 100; It is changed to 100 cm")
       if (width > 100) width <- 100
-      print_noti(height < 100, "height exceeds max value of 100; It is changed to 100 cm")
+      print_req(height < 100, "height exceeds max value of 100; It is changed to 100 cm")
       if (height > 100) height <- 100
       col <- input$col
       fill <- input$fill