v2.0.6.9026

feature: Add miniDOT functions to Shiny, Issue #141
leppott · Jun 15, 2022 · ff767fe · ff767fe
1 parent 2a39ce6
commit ff767fe
Show file tree

Hide file tree

Showing 8 changed files with 259 additions and 15,879 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: ContDataQC
 Title: Quality Control (QC) of Continous Monitoring Data
-Version: 2.0.6.9025
+Version: 2.0.6.9026
 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,16 @@ NEWS-ContDataQC
 
 <!-- NEWS.md is generated from NEWS.Rmd. Please edit that file -->
 
-    #> Last Update: 2022-06-07 09:47:51
+    #> Last Update: 2022-06-15 17:01:04
 
 # Version History
 
+## v2.0.6.9026
+
+2022-06-15
+
+-   feature: Add miniDOT functions to Shiny, Issue #141
+
 ## v2.0.6.9025
 
 2022-06-07

diff --git a/NEWS.md b/NEWS.md
@@ -3,10 +3,16 @@ NEWS-ContDataQC
 
 <!-- NEWS.md is generated from NEWS.Rmd. Please edit that file -->
 
-    #> Last Update: 2022-06-07 09:47:51
+    #> Last Update: 2022-06-15 17:01:04
 
 # Version History
 
+## v2.0.6.9026
+
+2022-06-15
+
+-   feature: Add miniDOT functions to Shiny, Issue #141
+
 ## v2.0.6.9025
 
 2022-06-07

diff --git a/NEWS.rmd b/NEWS.rmd
@@ -21,6 +21,11 @@ cat(paste0("Last Update: ",Sys.time()))
 
 # Version History
 
+## v2.0.6.9026
+2022-06-15
+
+* feature: Add miniDOT functions to Shiny, Issue #141
+
 ## v2.0.6.9025
 2022-06-07
 

diff --git a/inst/shiny-examples/ContDataQC/HOBO/10RD014_AW_20180510_20181022.csv b/inst/shiny-examples/ContDataQC/HOBO/10RD014_AW_20180510_20181022.csv
diff --git a/inst/shiny-examples/ContDataQC/external/tab_2DataPrep.R b/inst/shiny-examples/ContDataQC/external/tab_2DataPrep.R
@@ -19,7 +19,7 @@ function() {
                          , tabPanel("Formatting files"
                                     , includeHTML("www/App_2cDataPrep.html")
                          )## tabPanel ~ END
-
+                          # Hoboware, reformat ----
                          , tabPanel("HOBOware Reformat"
                                     ,sidebarLayout(
                                       sidebarPanel(
@@ -43,7 +43,7 @@ function() {
                                         )# tags$div ~ END
                                         , br()
                                         #Only shows the "Download" button after the process has run
-                                        ,tags$div(title="Click to download your data"
+                                        ,tags$div(title="Click to download your data (HOBO reformat)"
                                                   ,uiOutput('ui.downloadData_HOBO')
                                         )# tags$div ~ END
                                       )# sidebarPanel~ END
@@ -54,24 +54,26 @@ function() {
                                       ) ## mainPanel ~ END
                                     )# sidebarLayout~ END
                          )## tabPanel ~ HOBO ~ END
+                         # miniDOT, cat ----
                          , tabPanel("miniDOT Concatenate"
                                     , sidebarLayout(
                                       sidebarPanel(
-                                        tags$div(title = "Select one miniDOT csv files to upload here"
-                                                 , fileInput("selectedFiles_miniDOT"
+                                        tags$div(title = "Select one or more miniDOT txt files to upload here"
+                                                 , fileInput("selectedFiles_miniDOT_cat"
                                                              , label = "Choose files"
                                                              , multiple = TRUE
-                                                             , accept = ".csv"
+                                                             , accept = ".txt"
                                                              , width = "600px") # same as HOBO
                                         )##tags$div ~ END
+                                        , br()
                                         #Only shows the "Run operation" button after data are uploaded
-                                        ,tags$div(title="Click to run selected operation (miniDOT reformat)"
-                                                  ,uiOutput('ui.runProcess_miniDOT')
+                                        ,tags$div(title="Click to run selected operation (miniDOT concatenate)"
+                                                  ,uiOutput('ui.runProcess_miniDOT_cat')
                                         )# tags$div ~ END
                                         , br()
                                         #Only shows the "Download" button after the process has run
-                                        ,tags$div(title="Click to download your data"
-                                                  ,uiOutput('ui.downloadData_miniDOT')
+                                        ,tags$div(title="Click to download your data (miniDOT_cat)"
+                                                  ,uiOutput('ui.downloadData_miniDOT_cat')
                                         )# tags$div ~ END
                                       )# sidebarPanel~ END
                                       , mainPanel(
@@ -80,24 +82,26 @@ function() {
                                       ) ## mainPanel ~ END
                                     )# sidebarLayout~ END
                          )## tabPanel ~ miniDOT cat ~ END
+                         # miniDOT, reformat ----
                          , tabPanel("miniDOT Reformat"
                                     , sidebarLayout(
                                       sidebarPanel(
                                         tags$div(title = "Select one miniDOT csv files to upload here"
-                                                 , fileInput("selectedFiles_miniDOT"
+                                                 , fileInput("selectedFiles_miniDOT_reformat"
                                                              , label = "Choose files"
-                                                             , multiple = TRUE
+                                                             , multiple = FALSE
                                                              , accept = ".csv"
                                                              , width = "600px") # same as HOBO
                                                  )##tags$div ~ END
+                                        , br()
                                         #Only shows the "Run operation" button after data are uploaded
                                         ,tags$div(title="Click to run selected operation (miniDOT reformat)"
-                                                  ,uiOutput('ui.runProcess_miniDOT')
+                                                  ,uiOutput('ui.runProcess_miniDOT_reformat')
                                         )# tags$div ~ END
                                         , br()
                                         #Only shows the "Download" button after the process has run
-                                        ,tags$div(title="Click to download your data"
-                                                  ,uiOutput('ui.downloadData_miniDOT')
+                                        ,tags$div(title="Click to download your data (miniDOT_reformat)"
+                                                  ,uiOutput('ui.downloadData_miniDOT_reformat')
                                         )# tags$div ~ END
                                       )# sidebarPanel~ END
                                       , mainPanel(