Merge pull request #44 from Rapporteket/v1.11.4

V1.11.4

.lintr

@@ -0,0 +1,4 @@
+linters: with_defaults(
+  object_name_linter(c("camelCase", "snake_case")),
+  cyclocomp_linter(complexity_limit = 25),
+  line_length_linter(80))

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: rapbase
 Type: Package
 Title: Base Functions and Resources for Rapporteket
-Version: 1.11.3.9000
-Date: 2020-10-06
+Version: 1.11.4
+Date: 2020-10-08
 Authors@R: c(
     person(given = "Are",
            family = "Edvardsen",
@@ -34,16 +34,16 @@ Imports:
     knitr,
     magrittr,
     markdown,
+    purrr,
     readr,
     remotes,
     RMariaDB,
     sendmailR,
     shiny,
     utils,
     withr,
-    yaml,
-    purrr
-RoxygenNote: 7.0.2
+    yaml
+RoxygenNote: 7.1.1
 URL: http://github.com/Rapporteket/rapbase
 BugReports: http://github.com/Rapporteket/rapbase/issues
 Suggests:

NAMESPACE

@@ -2,11 +2,8 @@
 
 export(.getFun)
 export(.testAutoReport)
-export(HalloRapporteket)
 export(LoadRegData)
 export(MakeMessage)
-export(PushGist)
-export(RunNoweb)
 export(appNavbarUserWidget)
 export(createAutoReport)
 export(deleteAutoReport)
@@ -26,18 +23,24 @@ export(getUserName)
 export(getUserPhone)
 export(getUserReshId)
 export(getUserRole)
+export(halloRapporteket)
 export(howWeDealWithPersonalData)
 export(installGithubPackage)
 export(isPkgRapReg)
 export(isRapContext)
+export(loadRegData)
+export(makeMessage)
 export(makeRunDayOfYearSequence)
 export(makeUserSubscriptionTab)
+export(makeUserSubscriptionTabV2)
 export(makeUserSubscriptionTab_v2)
 export(noOptOutOk)
+export(pushGist)
 export(rapCloseDbConnection)
 export(rapOpenDbConnection)
 export(readAutoReportData)
 export(runAutoReport)
+export(runNoweb)
 export(runShinyApp)
 export(selectByOrganization)
 export(selectByOwner)

NEWS.md

@@ -1,3 +1,7 @@
+# rapbase 1.11.4
+
+* clean-up code also deprecating some function for v1.12
+
 # rapbase 1.11.3
 
 * Remove rJava dependency

R/AppNavbarUserWidget.R

@@ -1,9 +1,9 @@
 #' Create widget for registry apps at Rapporteket
-#' 
+#'
 #' Provides a widget-like information and utility block to be applied to all
 #' registry apps at Rapporteket. Contains the user name, organization and
 #' logout/exit as hyperlinked text.
-#' 
+#'
 #' Normally, user information will be be provided through the session parameter
 #' and hence this will have to be provided from the server. The "rendering" of
 #' this info must hence be done within a layout element at the client such as
@@ -19,18 +19,19 @@
 #'   output$appUserOrg <- renderText(getUserReshId(session))
 #'   ...
 #' }
-#' 
+#'
 #' ui <- tagList(
 #'   navbarPage(
 #'     ...,
 #'     tabPanel(...,
-#'     appNavbarUserWidget(user = uiOutput(appUserName), organization = textOutput(appUserOrg))
+#'     appNavbarUserWidget(user = uiOutput(appUserName),
+#'     organization = textOutput(appUserOrg))
 #'     ),
 #'     ...
 #'   )
 #' )
 #' }
-#' 
+#'
 #' @param user String providing the name of the user
 #' @param organization String providing the organization of the user
 #' @param addUserInfo Logical defining wether a user data pop-up is to be part
@@ -45,7 +46,7 @@
 appNavbarUserWidget <- function(user = "Undefined person",
                                 organization = "Undefined organization",
                                 addUserInfo = FALSE) {
-  
+
   if (addUserInfo) {
   userInfo <- shiny::tags$a(
     id = "userInfo",
@@ -55,15 +56,16 @@ appNavbarUserWidget <- function(user = "Undefined person",
   } else {
     userInfo <- character()
   }
-  
+
   txtWidget <-
     paste0("var header = $('.navbar> .container-fluid');\n",
-         "header.append('<div class=\"navbar-brand\" style=\"float:right;vertical-align:super;font-size:65%\">",
+         "header.append('<div class=\"navbar-brand\" ",
+         "style=\"float:right;vertical-align:super;font-size:65%\">",
          userInfo,
          user,
          organization,
          "</div>');\n",
          "console.log(header)")
-  
+
   shiny::tags$script(shiny::HTML(txtWidget))
 }