Første nhn-klare versjon

Rapporteket · Jan 24, 2025 · 4192819 · 4192819
1 parent a4ff788
commit 4192819
Show file tree

Hide file tree

Showing 23 changed files with 904 additions and 249 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: nra
 Type: Package
 Encoding: UTF-8
 Title: Resultattjenester for Nasjonalt register for analinkontinens
-Version: 1.5.0
+Version: 2.0.001
 Date: 2016-04-18
 Author: Kevin Thon
 Maintainer: Kevin Thon <[email protected]>
@@ -18,13 +18,12 @@ Imports:
     knitr,
     xtable,
     DT,
-    tidyverse,
+    dplyr,
     kableExtra,
     shinyjs,
     shinyWidgets,
     rapFigurer,
-    rapbase,
-    shinyalert
+    rapbase
 Remotes:
   Rapporteket/rapbase@main,
   Rapporteket/rapFigurer

diff --git a/NAMESPACE b/NAMESPACE
@@ -4,6 +4,8 @@ export("%>%")
 export("%m+%")
 export("%m-%")
 export(BrValg)
+export(andeler_tid_server)
+export(andeler_tid_ui)
 export(appServer)
 export(appUi)
 export(binomkonf)

diff --git a/R/appServer.R b/R/appServer.R
@@ -8,38 +8,50 @@
 #' @export
 
 appServer <- function(input, output, session) {
+  rapbase::logShinyInputChanges(input)
+  nraData <-  nra::lastShinyData()
+  RegData <- nraData$RegData
+  map_avdeling <- data.frame(
+    UnitId = unique(RegData$AvdRESH),
+    orgname = RegData$SenterKortNavn[match(unique(RegData$AvdRESH),
+                                        RegData$AvdRESH)])
 
   user <- rapbase::navbarWidgetServer2(
     "navbar-widget",
     orgName = "nra",
-    caller = "nra"
+    caller = "nra",
+    map_orgname = shiny::req(map_avdeling)
   )
 
-  nraData <-  nra::lastShinyData()
-  RegData <- nraData$RegData
-
   BrValg <- BrValg(RegData=RegData)
 
   rapbase::appLogger(session = session, msg = 'Starter NRA')
 
   ##############################################################################
   # Startside ##################################################################
 
-  nra::startside_server("startside", usrRole = user$role())
+  nra::startside_server("startside", usrRole = user$role)
 
   ##############################################################################
 
-  nra::fordelingsfig_server("fordelingsfig", reshID = user$org(),
+  nra::fordelingsfig_server("fordelingsfig", reshID = user$org,
                             RegData = req(RegData), hvd_session = session,
-                            BrValg = req(BrValg))
+                            BrValg = req(BrValg), userRole = user$role)
 
   ##############################################################################
 
   nra::fordelingsfig_prepost_server("fordelingsfig_prepost_id",
-                                    reshID = user$org(), RegData = req(RegData),
-                                    hvd_session = session, BrValg = req(BrValg))
+                                    reshID = user$org, RegData = req(RegData),
+                                    hvd_session = session, userRole = user$role,
+                                    BrValg = req(BrValg))
 
   ##############################################################################
+
+  nra::andeler_tid_server("andeler_tid_id", reshID = user$org,
+                          RegData = RegData, hvd_session = session,
+                          BrValg = req(BrValg), userRole = user$role)
+
+
   # Eksport  ###################################################################
   rapbase::exportUCServer("nraExport", "nra")
 

diff --git a/R/appUi.R b/R/appUi.R
@@ -15,8 +15,8 @@ appUi <- function() {
     title = shiny::div(shiny::a(
       shiny::includeHTML(
         system.file('www/logo.svg', package='rapbase')
-        )
-        ),
+      )
+    ),
     regTitle),
     windowTitle = regTitle,
     theme = "rap/bootstrap.css",
@@ -33,10 +33,18 @@ appUi <- function() {
       nra::fordelingsfig_ui("fordelingsfig")
     ),
 
-    tabPanel("Fordelingsfigurer - Før og etter",
-             fordelingsfig_prepost_ui(id = "fordelingsfig_prepost_id")
+    shiny::tabPanel(
+      "Fordelingsfigurer - Før og etter",
+      nra::fordelingsfig_prepost_ui(id = "fordelingsfig_prepost_id")
     ),
 
+    shiny::tabPanel(
+      "Tidsutvikling andeler",
+             nra::andeler_tid_ui(id = "andeler_tid_id")
+    ),
+
+
+
     shiny::navbarMenu(
       "Verktøy",