handle dates in part 2 without assumptions in number of characters

wadpac · Sep 23, 2024 · 9a9331a · 9a9331a
1 parent 735b528
commit 9a9331a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/R/GGIR.R b/R/GGIR.R
@@ -369,7 +369,7 @@ GGIR = function(mode = 1:5, datadir = c(), outputdir = c(),
       g.report.part2(metadatadir = metadatadir, f0 = f0, f1 = f1,
                      maxdur = params_cleaning[["maxdur"]],
                      store.long = store.long, params_output,
-                     verbose = verbose)
+                     verbose = verbose, desiredtz = params_general[["desiredtz"]])
     }
   }
   if (length(which(do.report == 4)) > 0) {

diff --git a/R/g.report.part2.R b/R/g.report.part2.R
@@ -1,5 +1,6 @@
 g.report.part2 = function(metadatadir = c(), f0 = c(), f1 = c(), maxdur = 0,
-                          store.long = FALSE, params_output, verbose = TRUE) {
+                          store.long = FALSE, params_output, verbose = TRUE,
+                          desiredtz = "") {
   ms2.out = "/meta/ms2.out"
   if (file.exists(paste0(metadatadir,ms2.out))) {
     if (length(dir(paste0(metadatadir,ms2.out))) == 0) {
@@ -239,8 +240,9 @@ g.report.part2 = function(metadatadir = c(), f0 = c(), f1 = c(), maxdur = 0,
       # tidy up data.frames
       SUMMARY_clean = tidyup_df(SUMMARY)
       daySUMMARY_clean = tidyup_df(daySUMMARY)
-      # format calendar dates (dates are stored as iso8601, so date is in the first 10 characters )
-      daySUMMARY_clean$calendar_date = substr(daySUMMARY_clean$calendar_date, 1, 10)
+      # format calendar dates
+      dd = iso8601chartime2POSIX(daySUMMARY_clean$calendar_date, tz = desiredtz) 
+      daySUMMARY_clean$calendar_date = format(dd, format = "%Y-%m-%d")
       #===============================================================================
       # store final matrices again
       data.table::fwrite(x = SUMMARY_clean, file = paste0(metadatadir, "/results/part2_summary.csv"),

diff --git a/man/g.report.part2.Rd b/man/g.report.part2.Rd
@@ -9,7 +9,7 @@
 }
 \usage{
   g.report.part2(metadatadir = c(), f0 = c(), f1 = c(), maxdur = 0,
-  store.long = FALSE, params_output, verbose = TRUE)
+  store.long = FALSE, params_output, verbose = TRUE, desiredtz = "")
 }
 \arguments{
   \item{metadatadir}{
@@ -39,6 +39,9 @@
   \item{verbose}{
     See details in \link{GGIR}.
   }
+  \item{desiredtz}{
+    See details in \link{GGIR}.
+  }
 }
 \value{
 Function does not produce data, but only writes reports