v2.0.0.9133

- fix: Add shiny::validate(msg) back to shiny alert for when no file uploaded - Avoid the app crashing by preventing rest of code from running - refactor: update shiny alert message for upload to account for file upload not complete - fix: Update order of conditional formatting for nt_ti_stenocold
leppott · Jan 9, 2024 · b04b5e0 · b04b5e0
1 parent be40113
commit b04b5e0
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 12 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: BCGcalc
 Type: Package
 Title: Biological Condition Gradient, calculator
-Version: 2.0.0.9132
+Version: 2.0.0.9133
 Authors@R: c(
   person("Erik W.", "Leppo", email="Erik.Leppo@tetratech.com", role=c("aut","cre")), 
   person("Jen", "Stamp", email="Jen.Stamp@tetratech.com", role="ctb"),

diff --git a/NEWS b/NEWS
@@ -1,11 +1,20 @@
 BCGcalc-NEWS
 ================
 <Erik.Leppo@tetratech.com>
-2024-01-08 17:27:10.207971
+2024-01-09 10:27:29.176497
 
 <!-- NEWS.md is generated from NEWS.Rmd. Please edit that file -->
 
-    #> Last Update: 2024-01-08 17:27:10.241104
+    #> Last Update: 2024-01-09 10:27:29.229061
+
+# BCGcalc 2.0.0.9133 (2024-01-09)
+
+- fix: Add shiny::validate(msg) back to shiny alert for when no file
+  uploaded
+  - Avoid the app crashing by preventing rest of code from running
+- refactor: update shiny alert message for upload to account for file
+  upload not complete
+- fix: Update order of conditional formatting for nt_ti_stenocold
 
 # BCGcalc 2.0.0.9132 (2024-01-08)
 

diff --git a/NEWS.md b/NEWS.md
@@ -1,11 +1,20 @@
 BCGcalc-NEWS
 ================
 <Erik.Leppo@tetratech.com>
-2024-01-08 17:27:10.207971
+2024-01-09 10:27:29.176497
 
 <!-- NEWS.md is generated from NEWS.Rmd. Please edit that file -->
 
-    #> Last Update: 2024-01-08 17:27:10.241104
+    #> Last Update: 2024-01-09 10:27:29.229061
+
+# BCGcalc 2.0.0.9133 (2024-01-09)
+
+- fix: Add shiny::validate(msg) back to shiny alert for when no file
+  uploaded
+  - Avoid the app crashing by preventing rest of code from running
+- refactor: update shiny alert message for upload to account for file
+  upload not complete
+- fix: Update order of conditional formatting for nt_ti_stenocold
 
 # BCGcalc 2.0.0.9132 (2024-01-08)
 

diff --git a/NEWS.rmd b/NEWS.rmd
@@ -21,6 +21,13 @@ knitr::opts_chunk$set(
 cat(paste0("Last Update: ",Sys.time()))
 ```
 
+# BCGcalc 2.0.0.9133 (2024-01-09)
+
+* fix: Add shiny::validate(msg) back to shiny alert for when no file uploaded
+    + Avoid the app crashing by preventing rest of code from running
+* refactor: update shiny alert message for upload to account for file upload not complete
+* fix: Update order of conditional formatting for nt_ti_stenocold 
+
 # BCGcalc 2.0.0.9132 (2024-01-08)
 
 * fix: Remove testing line in Report server code

diff --git a/inst/shiny-examples/BCGcalc/global.R b/inst/shiny-examples/BCGcalc/global.R
@@ -1,7 +1,7 @@
 # Shiny Global File
 
 # Version ----
-pkg_version <- "2.0.0.9132"
+pkg_version <- "2.0.0.9133"
 
 # Packages----
 # nolint start

diff --git a/inst/shiny-examples/BCGcalc/server.R b/inst/shiny-examples/BCGcalc/server.R
@@ -5140,13 +5140,15 @@ shinyServer(function(input, output) {
 
       if (is.null(inFile)) {
         # end process with pop up
-        msg <- "No file uploaded.  Upload a file and try again."
+        msg <- paste("No file uploaded.  Upload a file and try again."
+                      , "OR file did not finish loading.\nWait for 'Upload Complete' message before clicking."
+                      , sep = "\n\n")
         shinyalert::shinyalert(title = "Report"
                                , text = msg
                                , type = "error"
                                , closeOnEsc = TRUE
                                , closeOnClickOutside = TRUE)
-        # shiny::validate(msg)
+        shiny::validate(msg)
       }## IF ~ is.null(inFile)
 
       # Remove existing files in "results"
@@ -6662,13 +6664,13 @@ shinyServer(function(input, output) {
         openxlsx::conditionalFormatting(wb, "summary"
                                         , cols = cols_cf
                                         , rows = rows_cf
-                                        , rule = '>=3'
-                                        , style = style_cf_ft_vcold_cold)
+                                        , rule = '>=1'
+                                        , style = style_cf_ft_cold)
         openxlsx::conditionalFormatting(wb, "summary"
                                         , cols = cols_cf
                                         , rows = rows_cf
-                                        , rule = '>=1'
-                                        , style = style_cf_ft_cold)
+                                        , rule = '>=3'
+                                        , style = style_cf_ft_vcold_cold)
       }## IF ~ !is.na(cols_cf)
 
       ##### nt_ti_stenocold_cold----