v2.0.0.9123

* fix: Modify taxatrans hack for noteworthy to only trigger if present
leppott · Dec 1, 2023 · b00f85c · b00f85c
1 parent b147360
commit b00f85c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 8 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: BCGcalc
 Type: Package
 Title: Biological Condition Gradient, calculator
-Version: 2.0.0.9122
+Version: 2.0.0.9123
 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,15 @@
 BCGcalc-NEWS
 ================
 <Erik.Leppo@tetratech.com>
-2023-12-01 08:26:50.27944
+2023-12-01 15:52:48.602803
 
 <!-- NEWS.md is generated from NEWS.Rmd. Please edit that file -->
 
-    #> Last Update: 2023-12-01 08:26:50.298339
+    #> Last Update: 2023-12-01 15:52:48.632879
+
+# BCGcalc 2.0.0.9123 (2023-12-01)
+
+- fix: Modify taxatrans hack for noteworthy to only trigger if present
 
 # BCGcalc 2.0.0.9122 (2023-12-01)
 

diff --git a/NEWS.md b/NEWS.md
@@ -1,11 +1,15 @@
 BCGcalc-NEWS
 ================
 <Erik.Leppo@tetratech.com>
-2023-12-01 08:26:50.27944
+2023-12-01 15:52:48.602803
 
 <!-- NEWS.md is generated from NEWS.Rmd. Please edit that file -->
 
-    #> Last Update: 2023-12-01 08:26:50.298339
+    #> Last Update: 2023-12-01 15:52:48.632879
+
+# BCGcalc 2.0.0.9123 (2023-12-01)
+
+- fix: Modify taxatrans hack for noteworthy to only trigger if present
 
 # BCGcalc 2.0.0.9122 (2023-12-01)
 

diff --git a/NEWS.rmd b/NEWS.rmd
@@ -21,6 +21,10 @@ knitr::opts_chunk$set(
 cat(paste0("Last Update: ",Sys.time()))
 ```
 
+# BCGcalc 2.0.0.9123 (2023-12-01)
+
+* fix: Modify taxatrans hack for noteworthy to only trigger if present 
+
 # BCGcalc 2.0.0.9122 (2023-12-01)
 
 * refactor: BCG calculation user column select to lower case

diff --git a/inst/shiny-examples/BCGcalc/server.R b/inst/shiny-examples/BCGcalc/server.R
@@ -676,9 +676,12 @@ shinyServer(function(input, output) {
 
       # Hack/Fix
       # Noteworthy NA causing issue later in Shiny app
-      taxatrans_results$merge$Noteworthy <- ifelse(is.na(taxatrans_results$merge$Noteworthy)
-                                                   , FALSE
-                                                   , TRUE)
+      # 20231201, only if have Noteworthy
+      if ("NOTEWORTHY" %in% toupper(taxatrans_results$merge)) {
+        taxatrans_results$merge$Noteworthy <- ifelse(is.na(taxatrans_results$merge$Noteworthy)
+                                                     , FALSE
+                                                     , TRUE)
+      }## IF ~ Noteworthy
 
 
       ## Calc, 04, Save Results ----