Skip to content

Commit

Permalink
indikatorfig lagt til
Browse files Browse the repository at this point in the history
  • Loading branch information
@kevinthon
kevinthon committed Jan 28, 2025
1 parent e944eef commit e7e02c6
Show file tree
Hide file tree
Showing 12 changed files with 456 additions and 99 deletions.
1 change: 0 additions & 1 deletion DESCRIPTION
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ Imports:
dplyr,
kableExtra,
shinyjs,
shinyWidgets,
rapFigurer,
rapbase
Remotes:
Expand Down
2 changes: 2 additions & 0 deletions NAMESPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ export(gjsn_prepost_server)
export(gjsn_prepost_ui)
export(indikatorFigRaterGrVar)
export(indikatorFigRaterGrVar_basis)
export(indikatorfig_server)
export(indikatorfig_ui)
export(lastShinyData)
export(nraApp)
export(nraBeregnAndeler)
Expand Down
3 changes: 2 additions & 1 deletion R/appServer.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ appServer <- function(input, output, session) {
nra::gjsn_prepost_server("gjsn_prepost_id", reshID = user$org,
RegData = RegData, hvd_session = session)


nra::indikatorfig_server("indikator_id", RegData = RegData,
hvd_session = session)
# Eksport ###################################################################
rapbase::exportUCServer("nraExport", "nra")

Expand Down
7 changes: 3 additions & 4 deletions R/appUi.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,24 @@ appUi <- function() {

nra::startside_ui("startside")
),

shiny::tabPanel(
"Fordelingsfigurer",
nra::fordelingsfig_ui("fordelingsfig")
),

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")
),

tabPanel("Gjennomsnitt/andeler før og etter operasjon",
gjsn_prepost_ui(id = "gjsn_prepost_id")
),
tabPanel("Indikatorer",
indikatorfig_ui(id = "indikator_id")
),

shiny::navbarMenu(
"Verktøy",
Expand Down
40 changes: 19 additions & 21 deletions R/modul_gjsn_prepost.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ gjsn_prepost_server <- function(id, reshID, RegData, hvd_session){
'Andel (%)' = as.numeric(TabellData$PlotMatrise),
N = TabellData$Ngr) %>%
knitr::kable("html", digits = c(0,0,1,0)) %>%
kable_styling("hover", full_width = F)
kableExtra::kable_styling("hover", full_width = F)
} else {
if (as.numeric(input$sammenlign) == 1) {
Tabell1 <- dplyr::tibble(
Expand All @@ -177,8 +177,8 @@ gjsn_prepost_server <- function(id, reshID, RegData, hvd_session){
'Andel (%)' = as.numeric(TabellData$PlotMatrise[2,]),
N = TabellData$Ngr, .name_repair = "minimal") %>%
knitr::kable("html", digits = c(0,0,1,0,1,0)) %>%
kable_styling("hover", full_width = F) %>%
add_header_above(c(" ", "Før intervensjon" = 2,
kableExtra::kable_styling("hover", full_width = F) %>%
kableExtra::add_header_above(c(" ", "Før intervensjon" = 2,
"1-årskontroll" = 2, " "))
} else {
if (as.numeric(input$sammenlign) == 2) {
Expand All @@ -195,8 +195,8 @@ gjsn_prepost_server <- function(id, reshID, RegData, hvd_session){
'Andel (%)' = as.numeric(TabellData$PlotMatrise[3,]),
N = TabellData$Ngr, .name_repair = "minimal") %>%
knitr::kable("html", digits = c(0,0,1,0,1,0,1,0)) %>%
kable_styling("hover", full_width = F) %>%
add_header_above(c(" ", "Før intervensjon" = 2,
kableExtra::kable_styling("hover", full_width = F) %>%
kableExtra::add_header_above(c(" ", "Før intervensjon" = 2,
"1-årskontroll" = 2,
"5-årskontroll" = 2, " "))
} else {
Expand All @@ -211,8 +211,8 @@ gjsn_prepost_server <- function(id, reshID, RegData, hvd_session){
'Andel (%)' = as.numeric(TabellData$PlotMatrise[2,]),
N = TabellData$Ngr, .name_repair = "minimal") %>%
knitr::kable("html", digits = c(0,0,1,0,1,0)) %>%
kable_styling("hover", full_width = F) %>%
add_header_above(c(" ", "Før intervensjon" = 2,
kableExtra::kable_styling("hover", full_width = F) %>%
kableExtra::add_header_above(c(" ", "Før intervensjon" = 2,
"5-årskontroll" = 2, " "))
} else {
if (as.numeric(input$sammenlign) == 4) {
Expand All @@ -223,7 +223,7 @@ gjsn_prepost_server <- function(id, reshID, RegData, hvd_session){
'Andel (%)' = as.numeric(TabellData$PlotMatrise),
N = TabellData$Ngr) %>%
knitr::kable("html", digits = c(0,0,1,0)) %>%
kable_styling("hover", full_width = F)
kableExtra::kable_styling("hover", full_width = F)
} else {
if (as.numeric(input$sammenlign) == 5) {
Tabell1 <- dplyr::tibble(
Expand All @@ -234,7 +234,7 @@ gjsn_prepost_server <- function(id, reshID, RegData, hvd_session){
TabellData$PlotMatrise),
N = TabellData$Ngr) %>%
knitr::kable("html", digits = c(0,0,1,0)) %>%
kable_styling("hover", full_width = F)
kableExtra::kable_styling("hover", full_width = F)
}
}
}
Expand All @@ -251,7 +251,7 @@ gjsn_prepost_server <- function(id, reshID, RegData, hvd_session){
sprintf("%.1f", as.numeric(TabellData$KIopp))),
N = TabellData$Ngr) %>%
knitr::kable("html", digits = c(0,1,0,0)) %>%
kable_styling("hover", full_width = F)
kableExtra::kable_styling("hover", full_width = F)
} else {
if (as.numeric(input$sammenlign) == 1) {
Tabell1 <- dplyr::tibble(
Expand All @@ -266,8 +266,8 @@ gjsn_prepost_server <- function(id, reshID, RegData, hvd_session){
as.numeric(TabellData$KIopp[2,]))),
N = TabellData$Ngr, .name_repair = "minimal") %>%
knitr::kable("html", digits = c(0,1,0,1,0,0)) %>%
kable_styling("hover", full_width = F) %>%
add_header_above(c(" ", "Før intervensjon" = 2,
kableExtra::kable_styling("hover", full_width = F) %>%
kableExtra::add_header_above(c(" ", "Før intervensjon" = 2,
"1-årskontroll" = 2, " "))
} else {
if (as.numeric(input$sammenlign) == 2) {
Expand All @@ -287,8 +287,8 @@ gjsn_prepost_server <- function(id, reshID, RegData, hvd_session){
sprintf("%.1f", as.numeric(TabellData$KIopp[3,]))),
N = TabellData$Ngr, .name_repair = "minimal") %>%
knitr::kable("html", digits = c(0,1,0,1,0,1,0,0)) %>%
kable_styling("hover", full_width = F) %>%
add_header_above(c(" ", "Før intervensjon" = 2,
kableExtra::kable_styling("hover", full_width = F) %>%
kableExtra::add_header_above(c(" ", "Før intervensjon" = 2,
"1-årskontroll" = 2,
"5-årskontroll" = 2, " "))
} else {
Expand All @@ -305,8 +305,8 @@ gjsn_prepost_server <- function(id, reshID, RegData, hvd_session){
sprintf("%.1f", as.numeric(TabellData$KIopp[2,]))),
N = TabellData$Ngr, .name_repair = "minimal") %>%
knitr::kable("html", digits = c(0,1,0,1,0,0)) %>%
kable_styling("hover", full_width = F) %>%
add_header_above(c(" ", "Før intervensjon" = 2,
kableExtra::kable_styling("hover", full_width = F) %>%
kableExtra::add_header_above(c(" ", "Før intervensjon" = 2,
"5-årskontroll" = 2, " "))
} else {
if (as.numeric(input$sammenlign) == 4) {
Expand All @@ -318,7 +318,7 @@ gjsn_prepost_server <- function(id, reshID, RegData, hvd_session){
sprintf("%.1f", as.numeric(TabellData$KIopp))),
N = TabellData$Ngr) %>%
knitr::kable("html", digits = c(0,1,0,0)) %>%
kable_styling("hover", full_width = F)
kableExtra::kable_styling("hover", full_width = F)
} else {
if (as.numeric(input$sammenlign) == 5) {
Tabell1 <- dplyr::tibble(
Expand All @@ -329,7 +329,7 @@ gjsn_prepost_server <- function(id, reshID, RegData, hvd_session){
sprintf("%.1f", as.numeric(TabellData$KIopp))),
N = TabellData$Ngr) %>%
knitr::kable("html", digits = c(0,1,0,0)) %>%
kable_styling("hover", full_width = F)
kableExtra::kable_styling("hover", full_width = F)
}
}
}
Expand Down Expand Up @@ -389,9 +389,7 @@ gjsn_prepost_server <- function(id, reshID, RegData, hvd_session){
Antall = round(as.numeric(
TabellData$PlotMatrise[2,])*TabellData$Ngr/100),
'Andel (%)' = as.numeric(TabellData$PlotMatrise[2,]),
N = TabellData$Ngr, .name_repair = "minimal") %>%
knitr::kable("html", digits = c(0,0,1,0,1,0)) %>%
kable_styling("hover", full_width = F)
N = TabellData$Ngr, .name_repair = "minimal")
} else {
if (as.numeric(input$sammenlign) == 4) {
Tabell1 <- dplyr::tibble(
Expand Down
Loading

0 comments on commit e7e02c6

Please sign in to comment.