Merge branch 'main' into default_db

Rapporteket · Jan 16, 2025 · a7338b0 · a7338b0
2 parents 972629d + 71391a3
commit a7338b0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -48,7 +48,6 @@ Imports:
     shiny,
     shinyalert,
     sship (>= 0.9.0),
-    timeplyr,
     utils,
     yaml
 RoxygenNote: 7.3.2

diff --git a/R/autoReport.R b/R/autoReport.R
@@ -581,10 +581,10 @@ runAutoReport <- function(dayNumber = as.POSIXlt(Sys.Date())$yday + 1,
           target == "db"
           && as.Date(rep$startDate) <= dato
           && as.Date(rep$terminateDate) > dato
-          && dato %in% timeplyr::time_seq(
+          && dato %in% seq.Date(
             as.Date(rep$startDate),
-            dato,
-            time_by = rep$interval
+            as.Date(dato),
+            by = rep$interval
           ) # 'days', 'weeks', 'months', 'years',
         )) {
           # get explicit referenced function and call it
@@ -717,10 +717,10 @@ findNextRunDate <- function(runDayOfYear,
       nextDate <- as.Date(startDate)
     }
     if (Sys.Date() >= startDate && Sys.Date() <= terminateDate) {
-      dateseq <- timeplyr::time_seq(
+      dateseq <- seq.Date(
         as.Date(startDate),
         as.Date(terminateDate),
-        time_by = interval
+        by = interval
       )
       tidsdiff <- difftime(dateseq, Sys.Date(), units = "days")
       tidsdiff[tidsdiff <= 0] <- NA