updated displaying of sql button

DESCRIPTION

 Package: DQAgui
 Title: DQA GUI
-Version: 0.1.4.9005
+Version: 0.1.4.9006
 Authors@R: 
     c(person(given = "Lorenz A.",
              family = "Kapsner",
@@ -21,7 +21,7 @@ LazyData: true
 URL: https://github.com/miracum/dqa-dqagui
 BugReports: https://github.com/miracum/dqa-dqagui/issues
 Encoding: UTF-8
-Date: 2020-08-24
+Date: 2020-08-25
 Imports: 
     data.table,
     magrittr,
@@ -38,5 +38,6 @@ Suggests:
     testthat,
     processx,
     lintr
-Remotes:  
+Remotes: 
     url::https://gitlab.miracum.org/miracum/dqa/dqastats/-/archive/development/dqastats-development.zip
+RoxygenNote: 7.1.1

R/moduleDashboard.R

@@ -132,14 +132,16 @@ module_dashboard_server <-
 
         # calculate descriptive results
         rv$results_descriptive <-
-          DQAstats::descriptive_results(rv = rv,
-                                        headless = rv$headless)
+          DQAstats::descriptive_results(
+            rv = shiny::reactiveValuesToList(rv),
+            headless = rv$headless
+          )
 
         if (!is.null(rv$data_plausibility$atemporal)) {
           # calculate plausibilites
           rv$results_plausibility_atemporal <-
             DQAstats::atemp_pausi_results(
-              rv = rv,
+              rv = shiny::reactiveValuesToList(rv),
               atemp_vars = rv$data_plausibility$atemporal,
               mdr = rv$mdr,
               headless = rv$headless
@@ -148,7 +150,7 @@ module_dashboard_server <-
 
         if (nrow(rv$pl$uniq_vars) != 0 && rv$pl$uniq_possible) {
           rv$results_plausibility_unique <- DQAstats::uniq_plausi_results(
-            rv = rv,
+            rv = shiny::reactiveValuesToList(rv),
             uniq_vars = rv$pl$uniq_vars,
             mdr = rv$mdr,
             headless = rv$headless
@@ -158,7 +160,7 @@ module_dashboard_server <-
         # conformance
         rv$conformance$value_conformance <-
           DQAstats::value_conformance(
-            rv = rv,
+            rv = shiny::reactiveValuesToList(rv),
             scope = "descriptive",
             results = rv$results_descriptive,
             logfile_dir = rv$log$logfile_dir,
@@ -186,7 +188,7 @@ module_dashboard_server <-
 
         if (!is.null(rv$results_plausibility_atemporal)) {
           add_value_conformance <- DQAstats::value_conformance(
-            rv = rv,
+            rv = shiny::reactiveValuesToList(rv),
             scope = "plausibility",
             results = rv$results_plausibility_atemporal,
             logfile_dir = rv$log$logfile_dir,

R/moduleDescriptive.R

@@ -429,7 +429,10 @@ module_descriptive_ui <- function(id) {
                  ),
                  tableOutput(
                    ns("descr_selection_counts_source")
-                 ))),
+                 ),
+                 tags$hr(),
+                 uiOutput(ns("descr_source_sql"))
+                 )),
         fluidRow(
           column(8,
                  h5(
@@ -442,9 +445,7 @@ module_descriptive_ui <- function(id) {
             4,
             conditionalPanel(
               condition = "output['moduleDescriptive-got_valueset_s']",
-              uiOutput(ns("descr_checks_source"))),
-            tags$hr(),
-            uiOutput(ns("descr_source_sql"))
+              uiOutput(ns("descr_checks_source")))
           ))
       ),
       box(
@@ -464,7 +465,10 @@ module_descriptive_ui <- function(id) {
                  ),
                  tableOutput(
                    ns("descr_selection_counts_target")
-                 ))),
+                 ),
+                 tags$hr(),
+                 uiOutput(ns("descr_target_sql"))
+                 )),
         fluidRow(
           column(8,
                  h5(
@@ -477,9 +481,7 @@ module_descriptive_ui <- function(id) {
             4,
             conditionalPanel(
               condition = "output['moduleDescriptive-got_valueset_t']",
-              uiOutput(ns("descr_checks_target"))),
-            tags$hr(),
-            uiOutput(ns("descr_target_sql"))
+              uiOutput(ns("descr_checks_target")))
           ))
       )
     ))

data-raw/devstuffs.R

@@ -28,7 +28,7 @@ my_desc$set_authors(c(
 # Remove some author fields
 my_desc$del("Maintainer")
 # Set the version
-my_desc$set_version("0.1.4.9005")
+my_desc$set_version("0.1.4.9006")
 # The title of your package
 my_desc$set(Title = "DQA GUI")
 # The description of your package