Styring på datoverdier etter rapporttype.

Rapporteket · Jun 21, 2023 · d7eec68 · d7eec68
1 parent b01e66e
commit d7eec68
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/R/moduleDefaultReport.R b/R/moduleDefaultReport.R
@@ -22,13 +22,17 @@ NULL
 defaultReportInput <- function(
   id,
   startDate = lubridate::today() - lubridate::years(1),
-  endDate = lubridate::today() - lubridate::weeks(1)) {
+  endDate = lubridate::today() - lubridate::weeks(1),
+  min = "1980-01-01",
+  max = "2100-01-01") {
 
   shiny::tagList(
     shiny::dateRangeInput(shiny::NS(id, "dateRange"),
                           label = "Velg periode:",
                           start = startDate,
                           end = endDate,
+                          min = min,
+                          max = max,
                           separator = "-"),
     shiny::radioButtons(shiny::NS(id, "format"),
                         "Format for nedlasting",

diff --git a/inst/shinyApps/smerte/ui.R b/inst/shinyApps/smerte/ui.R
@@ -39,7 +39,10 @@ ui <- shiny::tagList(
         "Dekningsgrad før reservasjon",
         shiny::sidebarLayout(
           shiny::sidebarPanel(
-            smerte::defaultReportInput("dekningsgrad")
+            smerte::defaultReportInput("dekningsgrad",
+                                       startDate = "2022-01-01",
+                                       endDate = "2022-11-30",
+                                       max = "2022-11-30")
           ),
           shiny::mainPanel(
             smerte::defaultReportUI("dekningsgrad")
@@ -50,7 +53,9 @@ ui <- shiny::tagList(
         "Dekningsgrad etter reservasjon",
         shiny::sidebarLayout(
           shiny::sidebarPanel(
-            smerte::defaultReportInput("dekningsgradReserv")
+            smerte::defaultReportInput("dekningsgradReserv",
+                                       startDate = "2022-12-01",
+                                       min = "2022-12-01")
           ),
           shiny::mainPanel(
             smerte::defaultReportUI("dekningsgradReserv")