Whats the frequency Kevin

.github/workflows/R-CMD-check.yaml

@@ -22,8 +22,8 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: windows-latest, r: '4.0'}
-          - {os: macOS-latest, r: '3.6'}
+          - {os: windows-latest, r: '4.1'}
+          - {os: macOS-latest, r: '4.1'}
           - {os: ubuntu-20.04, r: '3.6', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
 
     env:

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: rapbase
 Type: Package
 Title: Base Functions and Resources for Rapporteket
-Version: 1.20.2
+Version: 1.21.0
 Authors@R: c(
     person(given = "Are",
            family = "Edvardsen",

NEWS.md

@@ -1,3 +1,9 @@
+# rapbase 1.21.0
+
+* Pre-set frequency of auto reports may now be set upon calling the auto report module server function
+* Fixed bug for default first issue date when frequency set to year
+* Fixed visual flaw in export GUI: download button does now show when no keys are found
+
 # rapbase 1.20.2
 
 * Fix short-term error in function finding next run date in auto reports

R/autoReport.R

@@ -56,6 +56,10 @@
 #' @param eligible Logical defining if the module should be allowed to work at
 #' full capacity. This might be useful when access to module products should be
 #' restricted. Default is TRUE, \emph{i.e.} no restrictions.
+#' @param freq Character string defining default frequency set in the auto
+#' report GUI. Must be one of
+#' \code{c("day", "week", "month", "quarter", "year")}. Default value is
+#' "month".
 #'
 #'
 #' @return In general, shiny objects. In particular, \code{autoreportOrgServer}
@@ -224,14 +228,25 @@ autoReportInput <- function(id) {
 autoReportServer <- function(id, registryName, type, org = NULL,
                              paramNames = shiny::reactiveVal(c("")),
                              paramValues = shiny::reactiveVal(c("")),
-                             reports = NULL, orgs = NULL, eligible = TRUE) {
+                             reports = NULL, orgs = NULL, eligible = TRUE,
+                             freq = "month") {
 
   if (!type %in% c("subscription")) {
     stopifnot(shiny::is.reactive(org))
     stopifnot(shiny::is.reactive(paramNames))
     stopifnot(shiny::is.reactive(paramValues))
   }
 
+  stopifnot(freq %in% c("day", "week", "month", "quarter", "year"))
+
+  defaultFreq <- switch (freq,
+                         day = "Daglig-day",
+                         week = "Ukentlig-week",
+                         month = "M\u00E5nedlig-month",
+                         quarter = "Kvartalsvis-quarter",
+                         year = "\u00C5rlig-year"
+  )
+
   shiny::moduleServer(id, function(input, output, session) {
 
     autoReport <- shiny::reactiveValues(
@@ -240,7 +255,7 @@ autoReportServer <- function(id, registryName, type, org = NULL,
                                        mapOrgId = orgList2df(orgs)),
       report = names(reports)[1],
       org = unlist(orgs, use.names = FALSE)[1],
-      freq = "M\u00E5nedlig-month",
+      freq = defaultFreq,
       email = vector()
     )
 
@@ -385,9 +400,14 @@ autoReportServer <- function(id, registryName, type, org = NULL,
           shiny::HTML(as.character(shiny::icon("calendar")),
                       "F\u00F8rste utsending:")
         ),
-        value = seq.Date(Sys.Date(),
-                         by = strsplit(input$freq, "-")[[1]][2],
-                         length.out = 2)[2],
+        # if freq is year make first issue tomorrow, otherwise postpone by freq
+        value = if (strsplit(input$freq, "-")[[1]][2] == "year") {
+          Sys.Date() + 1
+        } else {
+          seq.Date(Sys.Date(),
+                   by = strsplit(input$freq, "-")[[1]][2],
+                   length.out = 2)[2]
+        },
         min = Sys.Date() + 1,
         max = seq.Date(Sys.Date(), length.out = 2, by = "1 years")[2] - 1
       )

R/export.R

@@ -117,7 +117,7 @@ exportUCServer <- function(id, registryName, repoName = registryName,
       }
     })
     output$exportDownloadUI <- shiny::renderUI({
-      if (!eligible) {
+      if (!eligible | length(pubkey()) == 0) {
         shiny::tagList(
           shiny::hr(),
           shiny::h4("Funksjon utilgjengelig"),

tests/testthat/test-autoReport.R

@@ -115,9 +115,9 @@ test_that("new dispatchment can be written to and removed from file", {
     autoReportServer,
     args = list(registryName = registryName, type = type,
                 org = shiny::reactive(111111),
-                reports = reports, orgs = orgs), {
+                reports = reports, orgs = orgs, freq = "year"), {
                   session$setInputs(report = "FirstReport")
-                  session$setInputs(freq = "Maanedlig-month")
+                  session$setInputs(freq = "Aarlig-year")
                   session$setInputs(start = as.character(Sys.Date()))
                   session$setInputs(email = "true@email.no")
                   session$setInputs(addEmail = 1)