v2.0.7.9032

- fix: Update minidoct_cat() function to display midnight values, Issue \#163 - refactor: Update config file, Issue \#162 - threshold for flat tolerance sensor depth from 0.0 to 0.01 - ext - config.ORIG.R - config.COOL.R - config.WARM.R - config.Lakes.metric.R - shiny-examples - Config_Default.R - Config_default.zip - Config_Lakes_meters.zip - Config_Lakes_metric.R - Config_Template.R - Config_Template.zip - Config.R
leppott · Jun 26, 2024 · 1d62b56 · 1d62b56
1 parent 96a36ae
commit 1d62b56
Show file tree

Hide file tree

Showing 24 changed files with 200 additions and 16,004 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: ContDataQC
 Title: Quality Control (QC) of Continous Monitoring Data
-Version: 2.0.7.9032
+Version: 2.0.7.9033
 Authors@R: c(
 	person("Erik W", "Leppo", email="[email protected]",role=c("aut","cre")),
 	person("Ann","Roseberry Lincoln", role="ctb"),

diff --git a/NEWS b/NEWS
@@ -3,10 +3,32 @@ NEWS-ContDataQC
 
 <!-- NEWS.md is generated from NEWS.Rmd. Please edit that file -->
 
-    #> Last Update: 2024-03-01 13:34:32.498829
+    #> Last Update: 2024-06-26 15:12:12.624955
 
 # Version History
 
+## v2.0.7.9032
+
+2024-06-26
+
+- fix: Update minidoct_cat() function to display midnight values, Issue
+  \#163
+- refactor: Update config file, Issue \#162
+  - threshold for flat tolerance sensor depth from 0.0 to 0.01
+  - ext
+    - config.ORIG.R
+    - config.COOL.R
+    - config.WARM.R
+    - config.Lakes.metric.R
+  - shiny-examples
+    - Config_Default.R
+    - Config_default.zip
+    - Config_Lakes_meters.zip
+    - Config_Lakes_metric.R
+    - Config_Template.R
+    - Config_Template.zip
+    - Config.R
+
 ## v2.0.7.9031
 
 2024-03-01
@@ -2261,7 +2283,7 @@ zFun.AggregateData + config docs: DESCRIPTION, Add Remotes for non-CRAN
   printing to the console all 11 parameters being checked. 20170512.
 
 - config.R;
-  ContData.env$myName.Turbidity modified value, ContData.env$myName.Chlorophylla
+  ContData.env$myName.Turbidity modified value,  ContData.env$myName.Chlorophylla
   modified typo in name (and changed value),
   ContData.env$myLab.Chlorophylla modified value typo, ContData.env$myThresh.RoC.SD.number.Chlorophylla
   name fix,

diff --git a/NEWS.md b/NEWS.md
@@ -3,10 +3,32 @@ NEWS-ContDataQC
 
 <!-- NEWS.md is generated from NEWS.Rmd. Please edit that file -->
 
-    #> Last Update: 2024-03-01 13:34:32.498829
+    #> Last Update: 2024-06-26 15:12:12.624955
 
 # Version History
 
+## v2.0.7.9032
+
+2024-06-26
+
+- fix: Update minidoct_cat() function to display midnight values, Issue
+  \#163
+- refactor: Update config file, Issue \#162
+  - threshold for flat tolerance sensor depth from 0.0 to 0.01
+  - ext
+    - config.ORIG.R
+    - config.COOL.R
+    - config.WARM.R
+    - config.Lakes.metric.R
+  - shiny-examples
+    - Config_Default.R
+    - Config_default.zip
+    - Config_Lakes_meters.zip
+    - Config_Lakes_metric.R
+    - Config_Template.R
+    - Config_Template.zip
+    - Config.R
+
 ## v2.0.7.9031
 
 2024-03-01
@@ -2261,7 +2283,7 @@ zFun.AggregateData + config docs: DESCRIPTION, Add Remotes for non-CRAN
   printing to the console all 11 parameters being checked. 20170512.
 
 - config.R;
-  ContData.env$myName.Turbidity modified value, ContData.env$myName.Chlorophylla
+  ContData.env$myName.Turbidity modified value,  ContData.env$myName.Chlorophylla
   modified typo in name (and changed value),
   ContData.env$myLab.Chlorophylla modified value typo, ContData.env$myThresh.RoC.SD.number.Chlorophylla
   name fix,

diff --git a/NEWS.rmd b/NEWS.rmd
@@ -21,6 +21,26 @@ cat(paste0("Last Update: ",Sys.time()))
 
 # Version History
 
+## v2.0.7.9032
+2024-06-26
+
+* fix: Update minidoct_cat() function to display midnight values, Issue #163
+* refactor: Update config file, Issue #162
+    + threshold for flat tolerance sensor depth from 0.0 to 0.01
+    + ext
+        - config.ORIG.R
+        - config.COOL.R
+        - config.WARM.R
+        - config.Lakes.metric.R
+    + shiny-examples\ContDataQC\www
+        - Config_Default.R
+        - Config_default.zip
+        - Config_Lakes_meters.zip
+        - Config_Lakes_metric.R
+        - Config_Template.R
+        - Config_Template.zip
+        - Config.R
+
 ## v2.0.7.9031
 2024-03-01
 

diff --git a/R/formatminiDOT.R b/R/formatminiDOT.R
@@ -2,15 +2,15 @@
 #'
 #' @description  Format miniDOT concatenate (cat) output for use with
 #' `ContDataQC` package.   Works on single files.  Imports, modifies, and saves
-#' the new file.  Data columns with all NA values are removed.
+#' the combined new file.  Data columns with all NA values are removed.
 #'
 #' @details
 #' 1. Imports a miniDOT cat output file from a folder.
 #' Can also use ContDataQC::minidot_cat function.
 #'
-#' 2. Reformats it using defaults from the ContDataQC config file.
+#' 2. Reformat using defaults from the ContDataQC config file.
 #'
-#' 3. As a QC step to prevent issues with ContDataQC function any columns that
+#' 3. As a QC step, to prevent issues with ContDataQC function, any columns that
 #' are all NA will be removed.
 #'
 #' 4. Exports a CSV to the provided folder for use with ContDataQC.

diff --git a/R/fun.miniDOT.cat.R b/R/fun.miniDOT.cat.R
@@ -17,10 +17,12 @@
 #'
 #' * Replaced lubridate::use_tz with as.POSIXct.
 #'
+#' * Added format to avoid loss of time on midnight entries.
+#'
 #' * Added serial number as column.
 #'
-#' * Swaped order of operations so fail condition is triggered it happens before
-#' any work is done.
+#' * Swapped order of operations so if fail condition is triggered it happens
+#' before any work is done.
 #'
 #' * Added working example with data.
 #'
@@ -47,6 +49,8 @@ minidot_cat <- function(folderpath
                         , local_tz = Sys.timezone(location = TRUE)
                         ) {
 
+  dt_format <- "%Y-%m-%d %H:%M:%S"
+
   if (is.null(savetofolder)) {
 
     warning("Missing saveto")
@@ -80,11 +84,15 @@ minidot_cat <- function(folderpath
 
 
       doreformat=data.frame("Unix.Timestamp"=as.character(datetime)
-                            ,"UTC_Date_._Time"=as.character(datetimeutc)
+                            ,"UTC_Date_._Time"=as.character(format(datetimeutc
+                                                                   , dt_format
+                                                              , usetz = FALSE))
                             # ,"Central.Standard.Time"=as.character(
                             #      lubridate::with_tz(datetimeutc,'US/Central'))
-                            ,"Local.Time" = as.character(as.POSIXct(
-                                datetime, origin = "1970-01-01", tz = local_tz))
+                            ,"Local.Time" = as.character(format(as.POSIXct(datetime
+                                                          , origin = "1970-01-01"
+                                                          , tz = local_tz)
+                                                                , dt_format))
                             ,"Battery"=as.character(batteryformat)
                             ,"Temperature"=as.character(tempformat)
                             ,"Dissolved.Oxygen"=as.character(doformat)

diff --git a/inst/extdata/ContDataQC_LibraryCreation.Rmd b/inst/extdata/ContDataQC_LibraryCreation.Rmd
@@ -83,7 +83,7 @@ package directory
 # Set working directory
 myLibrary <- "ContDataQC"
 dir_base <- "C:/Users/Erik.Leppo/OneDrive - Tetra Tech, Inc/MyDocs_OneDrive/GitHub"
-setwd(file.path(dir_base, myLibrary))
+#setwd(file.path(dir_base, myLibrary))
 
 
 # Remove all files in "Results" folder