Skip to content

Commit

Permalink
v2.0.7.9046
Browse files Browse the repository at this point in the history
- fix: Update shinyalert for HOBO reformat for multiple files
  • Loading branch information
leppott committed Dec 26, 2024
1 parent 45a81e6 commit 529015d
Show file tree
Hide file tree
Showing 9 changed files with 11,143 additions and 36 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: ContDataQC
Title: Quality Control (QC) of Continous Monitoring Data
Version: 2.0.7.9045
Version: 2.0.7.9046
Authors@R: c(
person("Erik W", "Leppo", email="[email protected]",role=c("aut","cre")),
person("Ann","Roseberry Lincoln", role="ctb"),
Expand Down
10 changes: 8 additions & 2 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,16 @@ NEWS-ContDataQC

<!-- NEWS.md is generated from NEWS.Rmd. Please edit that file -->

#> Last Update: 2024-12-26 12:35:08.668478
#> Last Update: 2024-12-26 13:39:53.643252

# Version History

## v2.0.7.9046

2024-12-26

- fix: Update shinyalert for HOBO reformat for multiple files

## v2.0.7.9045

2024-12-26
Expand All @@ -17,7 +23,7 @@ NEWS-ContDataQC

2024-12-23

- refactor: Update Excel file in Shinay 3c3_QCThresh_Eval
- refactor: Update Excel file in Shiny 3c3_QCThresh_Eval

## v2.0.7.9043

Expand Down
10 changes: 8 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,16 @@ NEWS-ContDataQC

<!-- NEWS.md is generated from NEWS.Rmd. Please edit that file -->

#> Last Update: 2024-12-26 12:35:08.668478
#> Last Update: 2024-12-26 13:39:53.643252

# Version History

## v2.0.7.9046

2024-12-26

- fix: Update shinyalert for HOBO reformat for multiple files

## v2.0.7.9045

2024-12-26
Expand All @@ -17,7 +23,7 @@ NEWS-ContDataQC

2024-12-23

- refactor: Update Excel file in Shinay 3c3_QCThresh_Eval
- refactor: Update Excel file in Shiny 3c3_QCThresh_Eval

## v2.0.7.9043

Expand Down
7 changes: 6 additions & 1 deletion NEWS.rmd
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ cat(paste0("Last Update: ",Sys.time()))

# Version History

## v2.0.7.9046
2024-12-26

* fix: Update shinyalert for HOBO reformat for multiple files

## v2.0.7.9045
2024-12-26

Expand All @@ -29,7 +34,7 @@ cat(paste0("Last Update: ",Sys.time()))
## v2.0.7.9044
2024-12-23

* refactor: Update Excel file in Shinay 3c3_QCThresh_Eval
* refactor: Update Excel file in Shiny 3c3_QCThresh_Eval

## v2.0.7.9043
2024-12-23
Expand Down
3,694 changes: 3,694 additions & 0 deletions inst/shiny-examples/ContDataQC/HOBO/ECO66G20_AW_20140728_20141013.csv

Large diffs are not rendered by default.

7,397 changes: 7,397 additions & 0 deletions inst/shiny-examples/ContDataQC/HOBO/ECO66G20_AW_20141013_20150316.csv

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions inst/shiny-examples/ContDataQC/HOBO/delete.me

This file was deleted.

2 changes: 1 addition & 1 deletion inst/shiny-examples/ContDataQC/global.R
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ library(shinyalert)
# Sys.setenv(PATH = paste(Sys.getenv("PATH"), "C:\\Rtools\\bin", sep = ";"))

# Version Number
version <- "2.0.7.9045"
version <- "2.0.7.9046"

#Maximum individual file size that can be uploaded is 70 MB
options(shiny.maxRequestSize = 70 * 1024^2)
Expand Down
52 changes: 28 additions & 24 deletions inst/shiny-examples/ContDataQC/server.R
Original file line number Diff line number Diff line change
Expand Up @@ -588,36 +588,40 @@ shinyServer(function(input, output, session) {
)## consoleRow ~ END

#~~~
# testing, 2024-11-04
df_test <- utils::read.delim(file.path("HOBO", fileNameVector)
# testing, 2024-11-04 (update for multiple files 20241226)
for(t in fileNameVector) {
df_test <- utils::read.delim(file.path("HOBO", t)
, skip = 0
, header = TRUE
, sep = ","
, check.names = FALSE
, stringsAsFactors = FALSE)
# pop up
na_date <- is.na(df_test[,ContData.env$myName.DateTime])
if (any(na_date)) {
# pop up
n_na <- sum(na_date)
msg <- paste0("Some 'Date Time' records did not convert!\n\n"
, n_na, " / ", nrow(df_test), " records converted to 'NA'.\n\n"
, "The user specified format '"
, HOBO_DateFormat_User
, "' "
, "did not match the data.\n\n"
, "Try another format and/or check your data in Notepad "
, "(or other similar text editor). "
, "Avoid Excel as it doesn't show dates or times 'as is'.")
} else {
msg <- "Date Time converted without issues."
}## IF ~ any NA in datetime
shinyalert::shinyalert(title = "HOBOware Date Time Conversion"
, text = msg
, type = "info"
, closeOnEsc = TRUE
, closeOnClickOutside = TRUE)
validate(msg)
na_date <- is.na(df_test[,ContData.env$myName.DateTime])
if (any(na_date)) {
# pop up
n_na <- sum(na_date)
msg <- paste0("Some 'Date Time' records did not convert!\n\n"
, t, "\n\n"
, n_na, " / ", nrow(df_test), " records converted to 'NA'.\n\n"
, "The user specified format '"
, HOBO_DateFormat_User
, "' "
, "did not match the data.\n\n"
, "Try another format and/or check your data in Notepad "
, "(or other similar text editor). "
, "Avoid Excel as it doesn't show dates or times 'as is'.")
} else {
msg <- paste0(t, "\n\n"
, "Date Time converted without issues.")
}## IF ~ any NA in datetime
shinyalert::shinyalert(title = "HOBOware Date Time Conversion"
, text = msg
, type = "info"
, closeOnEsc = TRUE
, closeOnClickOutside = TRUE)
validate(msg)
}## FOR ~ t
#~~~

#Appends the R console output generated from that input file to the
Expand Down

0 comments on commit 529015d

Please sign in to comment.