Fjernet abonnement V1

DESCRIPTION

@@ -21,7 +21,7 @@ Imports:
   shiny,
   shinyalert
 Remotes:
-  Rapporteket/rapbase
+  Rapporteket/rapbase@main
 License: GPL-3
 Encoding: UTF-8
 LazyData: true

R/app_server.R

@@ -29,6 +29,5 @@ app_server <- function(input, output, session) {
   plots_server("plots")
   samlerapport_server("samlerapport")
   abonnement_server("abonnement")
-  abonnement_v2_server("abonnementV2")
   utsending_server("utsending")
 }

R/app_ui.R

@@ -33,13 +33,9 @@ app_ui <- function() {
         samlerapport_ui("samlerapport")
       ),
       shiny::tabPanel(
-        "Abonnement",
-        abonnement_ui("abonnement")
-      ),
-      shiny::tabPanel(
-        shiny::span("Abonnement v2",
+        shiny::span("Abonnement",
                     title = "Bestill tilsending av rapporter p\u00e5 e-post"),
-        abonnement_v2_ui("abonnementV2")
+        abonnement_ui("abonnement")
       ),
       shiny::tabPanel(
         "Utsending",

R/mod_abonnement.R

@@ -1,72 +1,45 @@
-#' Shiny module providing GUI and server logic for the subscription tab
+#' Shiny module providing GUI and server logic for the subscription v2 tab
 #'
 #' @param id Character string module namespace
 NULL
 
 abonnement_ui <- function(id) {
-  ns <- shiny::NS(id)
 
   shiny::sidebarLayout(
     shiny::sidebarPanel(
-      width = 3,
-      shiny::selectInput(
-        ns("subscriptionRep"), "Rapport:",
-        c("Samlerapport1", "Samlerapport2")
-      ),
-      shiny::selectInput(
-        ns("subscriptionFreq"), "Frekvens:",
-        list("\u212brlig" = "\u212brlig-year",
-            Kvartalsvis = "Kvartalsvis-quarter",
-            "M\u00e5nedlig" = "M\u00e5nedlig-month",
-            Ukentlig = "Ukentlig-week",
-            Daglig = "Daglig-DSTday"),
-        selected = "M\u00e5nedlig-month"
-      ),
-      shiny::actionButton(
-        ns("subscribe"), "Bestill",
-        icon = shiny::icon("paper-plane")
-      )
+      rapbase::autoReportInput("testSubscription")
     ),
     shiny::mainPanel(
-      shiny::uiOutput(ns("subscriptionContent"))
+      rapbase::autoReportUI("testSubscription")
     )
   )
 }
 
 abonnement_server <- function(id) {
-  shiny::moduleServer(
-    id,
-    function(input, output, session) {
-      ns <- session$ns
-
-      # Abonnement
-      ## rekative verdier for aa holde rede paa endringer som skjer mens
-      ## applikasjonen kjorer
-      subscription <- shiny::reactiveValues(
-        tab = rapbase::makeAutoReportTab(session, type = "subscription")
-      )
+
 
-      ## lag tabell over gjeldende status for abonnement
-      output$activeSubscriptions <- DT::renderDataTable(
-        subscription$tab, server = FALSE, escape = FALSE, selection = "none",
-        options = list(dom = "tp", ordning = FALSE,
-                      columnDefs = list(list(visible = FALSE, targets = 6))),
-        rownames = FALSE
+      ## nye abonnement
+      ## Objects currently shared among subscription and dispathcment
+      orgs <- list(Sykehus1 = 1234,
+                   Sykehus2 = 4321)
+      reports <- list(
+        Samlerapport1 = list(
+          synopsis = "Automatisk samlerapport1",
+          fun = "samlerapport1Fun",
+          paramNames = c("p1", "p2"),
+          paramValues = c("Alder", 1)
+        ),
+        Samlerapport2 = list(
+          synopsis = "Automatisk samlerapport2",
+          fun = "samlerapport2Fun",
+          paramNames = c("p1", "p2"),
+          paramValues = c("BMI", 1)
+        )
       )
 
-      ## lag side som viser status for abonnement, ogsaa naar det ikke finnes noen
-      output$subscriptionContent <- shiny::renderUI({
-        userFullName <- rapbase::getUserFullName(session)
-        if (length(subscription$tab) == 0) {
-          shiny::p(paste("Ingen aktive abonnement for", userFullName))
-        } else {
-          shiny::tagList(
-            shiny::p(paste0("Aktive abonnement som sendes per epost til ",
-                            userFullName, ":")),
-            DT::dataTableOutput(ns("activeSubscriptions"))
-          )
-        }
-      })
-    }
+      ## Subscription
+      rapbase::autoReportServer(
+        id = "testSubscription", registryName = "rapRegTemplate",
+        type = "subscription", reports = reports, orgs = orgs, freq = "quarter"
   )
 }