v1.1.0.9020

metric.values, Added Piercer as valid FFG entry; Issue #34 UI.R, Added version number to title of Shiny app.
leppott · Jul 9, 2020 · 5d6997e · 5d6997e
1 parent e5cc6a1
commit 5d6997e
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 13 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -4,7 +4,7 @@ Description: Suite of tools for data manipulation and calculations for Maryland
     DNR MBSS program.  Includes functions for calculating FIBI, BIBI (MBSS 
     genus), BIBI (MSW family), PHI, flow sums, ion contributions, and taxa 
     distribution maps.
-Version: 1.1.0.9019
+Version: 1.1.0.9020
 Authors@R: c(
   person("Erik W.", "Leppo", email="Erik.Leppo@tetratech.com", role=c("aut","cre")),
   person("Ann","Roseberry Lincoln", role="ctb"),

diff --git a/NEWS b/NEWS
@@ -3,7 +3,14 @@ NEWS-MBSStools
 
 <!-- NEWS.md is generated from NEWS.Rmd. Please edit that file -->
 
-    #> Last Update: 2020-07-02 15:27:36
+    #> Last Update: 2020-07-09 08:53:09
+
+# MBSStools v1.1.0.9020 (2020-07-09)
+
+  - metric.values; Issue \#34
+      - Added Piercer as valid FFG entry.
+  - UI.R
+      - Added version number to title of Shiny app.
 
 # MBSStools v1.1.0.9019 (2020-07-02)
 

diff --git a/NEWS.md b/NEWS.md
@@ -3,7 +3,14 @@ NEWS-MBSStools
 
 <!-- NEWS.md is generated from NEWS.Rmd. Please edit that file -->
 
-    #> Last Update: 2020-07-02 15:27:36
+    #> Last Update: 2020-07-09 08:53:09
+
+# MBSStools v1.1.0.9020 (2020-07-09)
+
+  - metric.values; Issue \#34
+      - Added Piercer as valid FFG entry.
+  - UI.R
+      - Added version number to title of Shiny app.
 
 # MBSStools v1.1.0.9019 (2020-07-02)
 

diff --git a/NEWS.rmd b/NEWS.rmd
@@ -16,6 +16,12 @@ knitr::opts_chunk$set(
 ```{r, echo = FALSE}
 cat(paste0("Last Update: ",Sys.time()))
 ```
+MBSStools v1.1.0.9020 (2020-07-09)
+================
+* metric.values; Issue #34
+    + Added Piercer as valid FFG entry.
+* UI.R
+    + Added version number to title of Shiny app.
 
 MBSStools v1.1.0.9019 (2020-07-02)
 ================

diff --git a/R/metric.values.R b/R/metric.values.R
@@ -36,7 +36,7 @@
 #' + (PHYLUM), CLASS, ORDER, FAMILY, GENUS, OTHER_TAXA, TRIBE, FFG, HABIT,
 #' FINALTOLVAL07
 #'
-#' Valid values for FFG: col, fil, pre, scr, shr
+#' Valid values for FFG: col, fil, pre, scr, shr, pie
 #'
 #' Valid values for HABIT: BU, CB, CN, SP, SW
 #'
@@ -49,8 +49,8 @@
 #' For the EXCLUDE column there is additional QC to account for common non-standard
 #' entries.
 #'
-#' * "Y" will convert to TRUE.
-#' * "N", NA, or "" will convert to FALSE.
+#' * "Y" or "yes" will convert to TRUE.
+#' * "N", "no", NA, or "" will convert to FALSE.
 #'
 #' Fish
 #'
@@ -227,7 +227,7 @@ metric.values.bugs <- function(myDF, MetricNames=NULL, boo.Adjust){##FUNCTION.me
   # "Collector" "Shredder"  "Predator"  ""          "Filterer"  "Scraper"
   # remove white space to get all combos and make unique
   qc_col   <- "FFG"
-  qc_val   <- toupper(c(NA, "", "Collector", "Shredder", "Predator", "Filterer", "Scraper"))
+  qc_val   <- toupper(c(NA, "", "Collector", "Shredder", "Predator", "Filterer", "Scraper", "Piercer"))
   qc_user <- unique(unlist(strsplit(gsub("\\s", "", toupper(unique(myDF[, qc_col]))), ",")))
   qc_check <- qc_user %in% qc_val
   qc_invalid <- qc_user[!qc_check]
@@ -269,6 +269,7 @@ metric.values.bugs <- function(myDF, MetricNames=NULL, boo.Adjust){##FUNCTION.me
     myDF["FFG_pre"] <- grepl("PREDATOR",toupper(myDF[,"FFG"]))
     myDF["FFG_scr"] <- grepl("SCRAPER",toupper(myDF[,"FFG"]))
     myDF["FFG_shr"] <- grepl("SHREDDER",toupper(myDF[,"FFG"]))
+    myDF["FFG_pi"] <- grepl("PIERCER",toupper(myDF[,"FFG"]))
   # Calculate Metrics (could have used pipe, %>%)
   met.val <- dplyr::summarise(dplyr::group_by(myDF, SITE, INDEX.NAME, STRATA_R)
              #

diff --git a/inst/shiny-examples/MBSStools/rsconnect/shinyapps.io/leppott/MBSStools.dcf b/inst/shiny-examples/MBSStools/rsconnect/shinyapps.io/leppott/MBSStools.dcf
@@ -5,8 +5,8 @@ account: leppott
 server: shinyapps.io
 hostUrl: https://api.shinyapps.io/v1
 appId: 980188
-bundleId: 3340627
+bundleId: 3345126
 url: https://leppott.shinyapps.io/MBSStools/
-when: 1593634532.52306
+when: 1593719216.4217
 asMultiple: FALSE
 asStatic: FALSE
diff --git a/inst/shiny-examples/MBSStools/ui.R b/inst/shiny-examples/MBSStools/ui.R
@@ -19,7 +19,7 @@ library(ggplot2)
 shinyUI(fluidPage(
 
   # Application title
-  titlePanel("MBSStools, IBI Calculator"),
+  titlePanel("MBSStools, IBI Calculator, v1.1.0.9020"),
 
   # SideBar
   sidebarLayout(

diff --git a/man/metric.values.Rd b/man/metric.values.Rd