diff --git a/DESCRIPTION b/DESCRIPTION index d384629..1bc2370 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: ContDataQC Title: Quality Control (QC) of Continous Monitoring Data -Version: 2.0.7.9023 +Version: 2.0.7.9024 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.md b/NEWS.md index 8335ef8..4bbf1d3 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,10 +3,16 @@ NEWS-ContDataQC - #> Last Update: 2023-09-22 16:14:21.634179 + #> Last Update: 2023-09-28 11:06:45.427073 # Version History +## v2.0.7.9024 + +2023-09-28 + +- refactor: Use USEPA template + ## v2.0.7.9023 2023-09-18 diff --git a/NEWS.rmd b/NEWS.rmd index f96a8ab..4dbfc73 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -21,6 +21,11 @@ cat(paste0("Last Update: ",Sys.time())) # Version History +## v2.0.7.9024 +2023-09-28 + +* refactor: Use USEPA template + ## v2.0.7.9023 2023-09-18 diff --git a/inst/shiny-examples/ContDataQC/ui.R b/inst/shiny-examples/ContDataQC/ui.R index 5e693c9..3c81502 100644 --- a/inst/shiny-examples/ContDataQC/ui.R +++ b/inst/shiny-examples/ContDataQC/ui.R @@ -23,23 +23,23 @@ tab_5b_Console <- source("external/tab_5b_Console.R", local = TRUE)$value #tab_9_Status <- source("external/tab_9_Status.R", local = TRUE)$value -shinyUI( - # VERSION, 1, current [non-EPA] ---- - navbarPage("Continuous data QC, summary, and statistics - v2.0.7.9023", - theme = shinytheme("spacelab") - ,tab_1_About() - #,tab_1a_Overview() - #,tab_1c_FAQ() - , tab_2_DataPrep() - , tab_3_MainFunc() - #,tab_3c_QCThresh() - , tab_4_USGSgage() - , tab_5_Troubleshooting() - #,tab_5b_Console() - #,tab_x_TestData() - #,tab_9_Status() - )## navbarPage ~ END -)## shinyUI ~ END +# shinyUI( +# # VERSION, 1, current [non-EPA] ---- +# navbarPage("Continuous data QC, summary, and statistics - v2.0.7.9024", +# theme = shinytheme("spacelab") +# ,tab_1_About() +# #,tab_1a_Overview() +# #,tab_1c_FAQ() +# , tab_2_DataPrep() +# , tab_3_MainFunc() +# #,tab_3c_QCThresh() +# , tab_4_USGSgage() +# , tab_5_Troubleshooting() +# #,tab_5b_Console() +# #,tab_x_TestData() +# #,tab_9_Status() +# )## navbarPage ~ END +# )## shinyUI ~ END # shinyUI( # # VERSION, 0, old ---- @@ -66,482 +66,494 @@ shinyUI( # VERSION, EPA Template ---- # 2022-09-15 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# shinyUI( -# fluidPage( -# tags$html(class = "no-js", lang="en"), -# tags$head( -# HTML( -# " -# -# -# " -# ), -# tags$meta(charset="utf-8"), -# tags$meta(property="og:site_name", content="US EPA"), -# #tags$link(rel = "stylesheet", type = "text/css", href = "css/uswds.css"), -# tags$link(rel = "stylesheet", type = "text/css", href = "https://cdnjs.cloudflare.com/ajax/libs/uswds/3.0.0-beta.3/css/uswds.min.css", integrity="sha512-ZKvR1/R8Sgyx96aq5htbFKX84hN+zNXN73sG1dEHQTASpNA8Pc53vTbPsEKTXTZn9J4G7R5Il012VNsDEReqCA==", crossorigin="anonymous", referrerpolicy="no-referrer"), -# tags$meta(property="og:url", content="https://www.epa.gov/themes/epa_theme/pattern-lab/.markup-only.html"), -# tags$link(rel="canonical", href="https://www.epa.gov/themes/epa_theme/pattern-lab/.markup-only.html"), -# tags$link(rel="shortlink", href="https://www.epa.gov/themes/epa_theme/pattern-lab/.markup-only.html"), -# tags$meta(property="og:url", content="https://www.epa.gov/themes/epa_theme/pattern-lab/.markup-only.html"), -# tags$meta(property="og:image", content="https://www.epa.gov/sites/all/themes/epa/img/epa-standard-og.jpg"), -# tags$meta(property="og:image:width", content="1200"), -# tags$meta(property="og:image:height", content="630"), -# tags$meta(property="og:image:alt", content="U.S. Environmental Protection Agency"), -# tags$meta(name="twitter:card", content="summary_large_image"), -# tags$meta(name="twitter:image:alt", content="U.S. Environmental Protection Agency"), -# tags$meta(name="twitter:image:height", content="600"), -# tags$meta(name="twitter:image:width", content="1200"), -# tags$meta(name="twitter:image", content="https://www.epa.gov/sites/all/themes/epa/img/epa-standard-twitter.jpg"), -# tags$meta(name="MobileOptimized", content="width"), -# tags$meta(name="HandheldFriendly", content="true"), -# tags$meta(name="viewport", content="width=device-width, initial-scale=1.0"), -# tags$meta(`http-equiv`="x-ua-compatible", content="ie=edge"), -# tags$script(src = "js/pattern-lab-head-script.js"), -# # _update title ---- -# tags$title('ContDataQC | US EPA'), -# tags$link(rel="icon", type="image/x-icon", href="https://www.epa.gov/themes/epa_theme/images/favicon.ico"), -# tags$meta(name="msapplication-TileColor", content="#FFFFFF"), -# tags$meta(name="msapplication-TileImage", content="https://www.epa.gov/themes/epa_theme/images/favicon-144.png"), -# tags$meta(name="application-name", content=""), -# tags$meta(name="msapplication-config", content="https://www.epa.gov/themes/epa_theme/images/ieconfig.xml"), -# tags$link(rel="apple-touch-icon-precomposed", sizes="196x196", href="https://www.epa.gov/themes/epa_theme/images/favicon-196.png"), -# tags$link(rel="apple-touch-icon-precomposed", sizes="152x152", href="https://www.epa.gov/themes/epa_theme/images/favicon-152.png"), -# tags$link(rel="apple-touch-icon-precomposed", sizes="144x144", href="https://www.epa.gov/themes/epa_theme/images/favicon-144.png"), -# tags$link(rel="apple-touch-icon-precomposed", sizes="120x120", href="https://www.epa.gov/themes/epa_theme/images/favicon-120.png"), -# tags$link(rel="apple-touch-icon-precomposed", sizes="114x114", href="https://www.epa.gov/themes/epa_theme/images/favicon-114.png"), -# tags$link(rel="apple-touch-icon-precomposed", sizes="72x72", href="https://www.epa.gov/themes/epa_theme/images/favicon-72.png"), -# tags$link(rel="apple-touch-icon-precomposed", href="https://www.epa.gov/themes/epa_theme/images/favicon-180.png"), -# tags$link(rel="icon", href="https://www.epa.gov/themes/epa_theme/images/favicon-32.png", sizes="32x32"), -# tags$link(rel="preload", href="https://www.epa.gov/themes/epa_theme/fonts/source-sans-pro/sourcesanspro-regular-webfont.woff2", as="font", crossorigin="anonymous"), -# tags$link(rel="preload", href="https://www.epa.gov/themes/epa_theme/fonts/source-sans-pro/sourcesanspro-bold-webfont.woff2", as="font", crossorigin="anonymous"), -# tags$link(rel="preload", href="https://www.epa.gov/themes/epa_theme/fonts/merriweather/Latin-Merriweather-Bold.woff2", as="font", crossorigin="anonymous"), -# tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/ajax-progress.module.css?r6lsex"), -# tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/autocomplete-loading.module.css?r6lsex" ), -# tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/js.module.css?r6lsex"), -# tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/sticky-header.module.css?r6lsex"), -# tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/system-status-counter.css?r6lsex"), -# tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/system-status-report-counters.css?r6lsex"), -# tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/system-status-report-general-info.css?r6lsex"), -# tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/tabledrag.module.css?r6lsex"), -# tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/tablesort.module.css?r6lsex"), -# tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/tree-child.module.css?r6lsex"), -# tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/themes/epa_theme/css/styles.css?r6lsex"), -# tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/themes/epa_theme/css-lib/colorbox.min.css?r6lsex"), -# -# tags$script(src = 'https://cdnjs.cloudflare.com/ajax/libs/uswds/3.0.0-beta.3/js/uswds-init.min.js'), -# #fix container-fluid that boostrap RShiny uses -# tags$style(HTML( -# '.container-fluid { -# padding-right: 0; -# padding-left: 0; -# margin-right: 0; -# margin-left: 0; -# } -# .tab-content { -# margin-right: 30px; -# margin-left: 30px; -# }' -# )) -# ), -# tags$body( -# class="path-themes not-front has-wide-template", id="top", -# tags$script( -# src = 'https://cdnjs.cloudflare.com/ajax/libs/uswds/3.0.0-beta.3/js/uswds.min.js' -# ) -# ), -# -# # Site Header -# HTML( -# ' -# -# -# -# -# -#
-#
-#
-#
-#
-#
-# U.S. flag -#
-#
-#

An official website of the United States government

-# -#
-# -#
-#
-#
-#
-#
-# Dot gov -#
-#

-# Official websites use .gov -#
A .gov website belongs to an official government organization in the United States. -#

-#
-#
-#
-# HTTPS -#
-#

-# Secure .gov websites use HTTPS -#
A lock () or https:// means you’ve safely connected to the .gov website. Share sensitive information only on official, secure websites. -#

-#
-#
-#
-#
-#
-#
-#
-#
-# -#
-#
-#
-#
-#
-#
-#
-# -# -#
-#
-#
-#
-# -# -# -# -# -# -# -# -# -# -#
-#
-#
-#
-#
-#
-# -#
-#
-#
' -# ), -# -# # Individual Page Header -# HTML( -# '
-#
-#
-#
-#
-#
-#
-# Contact Us -#
-#
-#
' -# ), -# -# # _Insert your UI code here ---- -# # ## Begin example UI code -# # titlePanel("Hello Shiny!"), -# # sidebarLayout -# # ( -# # sidebarPanel -# # ( -# # sliderInput -# # ( -# # "obs", -# # "Number of observations:", -# # min = 0, -# # max = 1000, -# # value = 500 -# # ) -# # ), -# # mainPanel -# # ( -# # plotOutput("distPlot") -# # ) -# # ) -# # ## End example UI code -# -# # IMPORTANT! For a navbar page, you will need to place the header and footer inside the navbar section (as shown below) - -# # you will then want to comment out lines 201-213 and lines 254-263 -# navbarPage( -# title = h2("Continuous data QC, summary, and statistics - v2.0.7.9007"), -# #theme= shinytheme("spacelab"), -# header = HTML( -# '
-#
-#
-#
-#
-#
-#
-# Contact Us -#
-#
-#
' -# ), -# footer = HTML( -# '
-#
-#
-#
-#

Contact Us to ask a question, provide feedback, or report a problem.

-#
-#
-#
' -# ), -# tab_1Overview(), -# tab_2FAQ(), -# tab_3DataPrep(), -# tab_4QCThresh(), -# tab_5MainFunc(), -# tab_6USGSgage(), -# tab_7TestData(), -# tab_8Console(), -# #tab_9Status(), -# ), -# -# # Individual Page Footer -# HTML( -# '
-#
-#
-#
-#

Contact Us to ask a question, provide feedback, or report a problem.

-#
-#
-#
' -# ), -# -# # Site Footer -# HTML( -# '
-# -# -# -# -# -# -# -# ' -# ) -# ) # END fluidPage -# )## shinyUI +shinyUI( + fluidPage( + tags$html(class = "no-js", lang="en"), + tags$head( + HTML( + " + + + " + ), + tags$meta(charset="utf-8"), + tags$meta(property="og:site_name", content="US EPA"), + #tags$link(rel = "stylesheet", type = "text/css", href = "css/uswds.css"), + tags$link(rel = "stylesheet", type = "text/css", href = "https://cdnjs.cloudflare.com/ajax/libs/uswds/3.0.0-beta.3/css/uswds.min.css", integrity="sha512-ZKvR1/R8Sgyx96aq5htbFKX84hN+zNXN73sG1dEHQTASpNA8Pc53vTbPsEKTXTZn9J4G7R5Il012VNsDEReqCA==", crossorigin="anonymous", referrerpolicy="no-referrer"), + tags$meta(property="og:url", content="https://www.epa.gov/themes/epa_theme/pattern-lab/.markup-only.html"), + tags$link(rel="canonical", href="https://www.epa.gov/themes/epa_theme/pattern-lab/.markup-only.html"), + tags$link(rel="shortlink", href="https://www.epa.gov/themes/epa_theme/pattern-lab/.markup-only.html"), + tags$meta(property="og:url", content="https://www.epa.gov/themes/epa_theme/pattern-lab/.markup-only.html"), + tags$meta(property="og:image", content="https://www.epa.gov/sites/all/themes/epa/img/epa-standard-og.jpg"), + tags$meta(property="og:image:width", content="1200"), + tags$meta(property="og:image:height", content="630"), + tags$meta(property="og:image:alt", content="U.S. Environmental Protection Agency"), + tags$meta(name="twitter:card", content="summary_large_image"), + tags$meta(name="twitter:image:alt", content="U.S. Environmental Protection Agency"), + tags$meta(name="twitter:image:height", content="600"), + tags$meta(name="twitter:image:width", content="1200"), + tags$meta(name="twitter:image", content="https://www.epa.gov/sites/all/themes/epa/img/epa-standard-twitter.jpg"), + tags$meta(name="MobileOptimized", content="width"), + tags$meta(name="HandheldFriendly", content="true"), + tags$meta(name="viewport", content="width=device-width, initial-scale=1.0"), + tags$meta(`http-equiv`="x-ua-compatible", content="ie=edge"), + tags$script(src = "js/pattern-lab-head-script.js"), + # _update title ---- + tags$title('ContDataQC | US EPA'), + tags$link(rel="icon", type="image/x-icon", href="https://www.epa.gov/themes/epa_theme/images/favicon.ico"), + tags$meta(name="msapplication-TileColor", content="#FFFFFF"), + tags$meta(name="msapplication-TileImage", content="https://www.epa.gov/themes/epa_theme/images/favicon-144.png"), + tags$meta(name="application-name", content=""), + tags$meta(name="msapplication-config", content="https://www.epa.gov/themes/epa_theme/images/ieconfig.xml"), + tags$link(rel="apple-touch-icon-precomposed", sizes="196x196", href="https://www.epa.gov/themes/epa_theme/images/favicon-196.png"), + tags$link(rel="apple-touch-icon-precomposed", sizes="152x152", href="https://www.epa.gov/themes/epa_theme/images/favicon-152.png"), + tags$link(rel="apple-touch-icon-precomposed", sizes="144x144", href="https://www.epa.gov/themes/epa_theme/images/favicon-144.png"), + tags$link(rel="apple-touch-icon-precomposed", sizes="120x120", href="https://www.epa.gov/themes/epa_theme/images/favicon-120.png"), + tags$link(rel="apple-touch-icon-precomposed", sizes="114x114", href="https://www.epa.gov/themes/epa_theme/images/favicon-114.png"), + tags$link(rel="apple-touch-icon-precomposed", sizes="72x72", href="https://www.epa.gov/themes/epa_theme/images/favicon-72.png"), + tags$link(rel="apple-touch-icon-precomposed", href="https://www.epa.gov/themes/epa_theme/images/favicon-180.png"), + tags$link(rel="icon", href="https://www.epa.gov/themes/epa_theme/images/favicon-32.png", sizes="32x32"), + tags$link(rel="preload", href="https://www.epa.gov/themes/epa_theme/fonts/source-sans-pro/sourcesanspro-regular-webfont.woff2", as="font", crossorigin="anonymous"), + tags$link(rel="preload", href="https://www.epa.gov/themes/epa_theme/fonts/source-sans-pro/sourcesanspro-bold-webfont.woff2", as="font", crossorigin="anonymous"), + tags$link(rel="preload", href="https://www.epa.gov/themes/epa_theme/fonts/merriweather/Latin-Merriweather-Bold.woff2", as="font", crossorigin="anonymous"), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/ajax-progress.module.css?r6lsex"), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/autocomplete-loading.module.css?r6lsex" ), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/js.module.css?r6lsex"), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/sticky-header.module.css?r6lsex"), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/system-status-counter.css?r6lsex"), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/system-status-report-counters.css?r6lsex"), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/system-status-report-general-info.css?r6lsex"), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/tabledrag.module.css?r6lsex"), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/tablesort.module.css?r6lsex"), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/core/themes/stable/css/system/components/tree-child.module.css?r6lsex"), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/themes/epa_theme/css/styles.css?r6lsex"), + tags$link(rel="stylesheet", media="all", href="https://www.epa.gov/themes/epa_theme/css-lib/colorbox.min.css?r6lsex"), + + tags$script(src = 'https://cdnjs.cloudflare.com/ajax/libs/uswds/3.0.0-beta.3/js/uswds-init.min.js'), + #fix container-fluid that boostrap RShiny uses + tags$style(HTML( + '.container-fluid { + padding-right: 0; + padding-left: 0; + margin-right: 0; + margin-left: 0; + } + .tab-content { + margin-right: 30px; + margin-left: 30px; + }' + )) + ), + tags$body( + class="path-themes not-front has-wide-template", id="top", + tags$script( + src = 'https://cdnjs.cloudflare.com/ajax/libs/uswds/3.0.0-beta.3/js/uswds.min.js' + ) + ), + + # Site Header + HTML( + ' + + + + + +
+
+
+
+
+
+ U.S. flag +
+
+

An official website of the United States government

+ +
+ +
+
+
+
+
+ Dot gov +
+

+ Official websites use .gov +
A .gov website belongs to an official government organization in the United States. +

+
+
+
+ HTTPS +
+

+ Secure .gov websites use HTTPS +
A lock () or https:// means you’ve safely connected to the .gov website. Share sensitive information only on official, secure websites. +

+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ + +
+
+
+
+ + + + + + + + + + +
+
+
+
+
+
+ +
+
+
' + ), + + # Individual Page Header + HTML( + '
+
+
+
+
+
+
+ Contact Us +
+
+
' + ), + + # _Insert your UI code here ---- + # ## Begin example UI code + # titlePanel("Hello Shiny!"), + # sidebarLayout + # ( + # sidebarPanel + # ( + # sliderInput + # ( + # "obs", + # "Number of observations:", + # min = 0, + # max = 1000, + # value = 500 + # ) + # ), + # mainPanel + # ( + # plotOutput("distPlot") + # ) + # ) + # ## End example UI code + + # IMPORTANT! For a navbar page, you will need to place the header and footer inside the navbar section (as shown below) - + # you will then want to comment out lines 201-213 and lines 254-263 + navbarPage( + title = h2("Continuous data QC, summary, and statistics - v2.0.7.9024"), + #theme= shinytheme("spacelab"), + header = HTML( + '
+
+
+
+
+
+
+ Contact Us +
+
+
' + ), + footer = HTML( + '
+
+
+
+

Contact Us to ask a question, provide feedback, or report a problem.

+
+
+
' + ), + tab_1_About(), + #,tab_1a_Overview() + #,tab_1c_FAQ() + tab_2_DataPrep(), + tab_3_MainFunc(), + #,tab_3c_QCThresh() + tab_4_USGSgage(), + tab_5_Troubleshooting(), + #,tab_5b_Console() + #,tab_x_TestData() + #,tab_9_Status() + + # tab_1Overview(), + # tab_2FAQ(), + # tab_3DataPrep(), + # tab_4QCThresh(), + # tab_5MainFunc(), + # tab_6USGSgage(), + # tab_7TestData(), + # tab_8Console(), + # #tab_9Status(), + ), + + # Individual Page Footer + HTML( + '
+
+
+
+

Contact Us to ask a question, provide feedback, or report a problem.

+
+
+
' + ), + + # Site Footer + HTML( + '
+ + + + + + + + ' + ) + ) # END fluidPage +)## shinyUI