v2.0.7.9028

- refactor: Replace images in Shiny, Issue \#157
leppott · Jan 31, 2024 · da9e8be · da9e8be
1 parent 7336d5a
commit da9e8be
Show file tree

Hide file tree

Showing 12 changed files with 161 additions and 22 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.9027
+Version: 2.0.7.9028
 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,10 +3,16 @@ NEWS-ContDataQC
 
 <!-- NEWS.md is generated from NEWS.Rmd. Please edit that file -->
 
-    #> Last Update: 2024-01-31 16:53:57.644938
+    #> Last Update: 2024-01-31 17:15:26.657884
 
 # Version History
 
+## v2.0.7.9028
+
+2024-01-31
+
+- refactor: Replace images in Shiny, Issue \#157
+
 ## v2.0.7.9027
 
 2024-01-31

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: 2024-01-31 16:53:57.644938
+    #> Last Update: 2024-01-31 17:15:26.657884
 
 # Version History
 
+## v2.0.7.9028
+
+2024-01-31
+
+- refactor: Replace images in Shiny, Issue \#157
+
 ## v2.0.7.9027
 
 2024-01-31

diff --git a/NEWS.rmd b/NEWS.rmd
@@ -21,6 +21,11 @@ cat(paste0("Last Update: ",Sys.time()))
 
 # Version History
 
+## v2.0.7.9028
+2024-01-31
+
+* refactor: Replace images in Shiny, Issue #157
+
 ## v2.0.7.9027
 2024-01-31
 

diff --git a/inst/shiny-examples/ContDataQC/global.R b/inst/shiny-examples/ContDataQC/global.R
@@ -22,7 +22,7 @@ library(shinyjs)
 # Sys.setenv(PATH = paste(Sys.getenv("PATH"), "C:\\Rtools\\bin", sep = ";"))
 
 # Version Number
-version <- "2.0.7.9027"
+version <- "2.0.7.9028"
 
 #Maximum individual file size that can be uploaded is 70 MB
 options(shiny.maxRequestSize = 70 * 1024^2)

diff --git a/inst/shiny-examples/ContDataQC/rmd/App_1a_Overview.rmd b/inst/shiny-examples/ContDataQC/rmd/App_1a_Overview.rmd
@@ -36,7 +36,25 @@ The figure below lays out the general workflow for using the ContDataQC R tools.
 Want to try it yourself? Click [here](Custom_QC_Config_ECO66G20_test1.R) [R] to 
 download test files.
 
-![ContDataQC Shiny App workflow](RMD_Images/1.1_Fig1_About_20230828.jpg){width=95%}
+```{r}
+library(readxl)
+library(knitr)
+library(kableExtra)
+# state directories
+table.dir  <- "tables"
+table.file <- "App_Information_Tables.xlsx"
+table.sheet  <- "About_Overview"
+
+table <- read_excel(file.path(table.dir, table.file), sheet = table.sheet
+                     , na = c("NA", ""), trim_ws = TRUE, skip = 0
+                     , col_names = TRUE)  
+
+options(knitr.kable.NA = '')
+# kable(table1)
+table %>% 
+  kbl() %>% 
+  kable_styling(full_width = F, position = "left")
+```
 
 # Funding
 

diff --git a/inst/shiny-examples/ContDataQC/rmd/App_1e_Advanced.rmd b/inst/shiny-examples/ContDataQC/rmd/App_1e_Advanced.rmd
@@ -35,5 +35,3 @@ PDF) by editing a plain text [configuration file](Config_default.zip) [ZIP].  Us
 have more flexibility using the Shiny app versus R package when it comes to 
 setting directories and file naming schemes because they can browse to the 
 desired input file(s).
-
-![Figure 1. Example code from the ContDataQC R package for running the QCRaw function. Entries highlighted in yellow show places where users can modify entries. The other colors show where linkages exist between lines of code, with comments explaining how the R code uses each entry.](RMD_Images/1.6_Fig1_Advanced_20230828.jpg){width=95%}
diff --git a/inst/shiny-examples/ContDataQC/rmd/App_2a_FormattingFiles.rmd b/inst/shiny-examples/ContDataQC/rmd/App_2a_FormattingFiles.rmd
@@ -40,7 +40,7 @@ Input files need to be formatted a specific way in order for the Shiny app and R
 *	Optional fields include rowID, logger ID (serial number) and discrete measurements. Discrete (in situ) measurements can be entered for any parameter (just add ‘Discrete’ to the beginning of the column heading; for example, ‘Discrete Air Temp C’). The discrete data point will be included in the time series plots that are generated when the user runs the QC function. If using Onset HOBO sensors, you can save time by using the automated reformat function ('Data Preparation - Automated Formatting - HOBOware reformat' tab). 
 
 
-## Data Formattting Information
+## Data Formatting Information
 
 ```{r table_1}
 library(readxl)

diff --git a/inst/shiny-examples/ContDataQC/rmd/tables/App_Information_Tables.xlsx b/inst/shiny-examples/ContDataQC/rmd/tables/App_Information_Tables.xlsx
diff --git a/inst/shiny-examples/ContDataQC/www/RMD_HTML/App_1a_Overview.html b/inst/shiny-examples/ContDataQC/www/RMD_HTML/App_1a_Overview.html
diff --git a/inst/shiny-examples/ContDataQC/www/RMD_HTML/App_1e_Advanced.html b/inst/shiny-examples/ContDataQC/www/RMD_HTML/App_1e_Advanced.html
diff --git a/inst/shiny-examples/ContDataQC/www/RMD_HTML/App_2a_FormattingFiles.html b/inst/shiny-examples/ContDataQC/www/RMD_HTML/App_2a_FormattingFiles.html
@@ -31,8 +31,8 @@ <h1>Formatting Files</h1>
 time by using the automated reformat function (‘Data Preparation -
 Automated Formatting - HOBOware reformat’ tab).</p></li>
 </ul>
-<div id="data-formattting-information" class="section level2">
-<h2>Data Formattting Information</h2>
+<div id="data-formatting-information" class="section level2">
+<h2>Data Formatting Information</h2>
 <table class="table" style="width: auto !important; ">
 <thead>
 <tr>