From 034e5324ef744f20e36aab0d4b55cec9dd66803a Mon Sep 17 00:00:00 2001 From: kevinthon Date: Mon, 13 Nov 2023 15:54:32 +0100 Subject: [PATCH] Fiks av obligatoriske op-gr --- R/modul_admtab.R | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/R/modul_admtab.R b/R/modul_admtab.R index 3d591a9..ffd611f 100644 --- a/R/modul_admtab.R +++ b/R/modul_admtab.R @@ -180,7 +180,7 @@ admtab <- function(input, output, session, reshID, RegData, userRole, if (input$kun_oblig) { # tmp <- tmp[tmp$ForlopsID %in% RegData$ForlopsID[RegData$Op_gr %in% 1:7], ] - tmp <- tmp[tmp$Op_gr %in% 1:7, ] + tmp <- tmp[tmp$Op_gr %in% 1:8, ] } tmp$SkjemaStatus[tmp$SkjemaStatus==-1] <- 0 @@ -262,7 +262,7 @@ admtab <- function(input, output, session, reshID, RegData, userRole, by = 'ForlopsID', all.x = T, suffixes = c('', '_oppf')) if (input$kun_oblig) { - tmp <- tmp[tmp$Op_gr %in% 1:7, ] + tmp <- tmp[tmp$Op_gr %in% 1:8, ] } tmp$SkjemaStatus[tmp$SkjemaStatus==-1] <- 0 @@ -295,7 +295,7 @@ admtab <- function(input, output, session, reshID, RegData, userRole, if (input$kun_oblig) { # tmp <- tmp[tmp$ForlopsID %in% RegData$ForlopsID[RegData$Op_gr %in% 1:7], ] - tmp <- tmp[tmp$Op_gr %in% 1:7, ] + tmp <- tmp[tmp$Op_gr %in% 1:8, ] } tmp$SkjemaStatus[tmp$SkjemaStatus==-1] <- 0