Merge branch 'feat_new_coreds' of...

Merge branch 'feat_new_coreds' of https://gitlab.miracum.org/miracum/dqa/dqagui into feat_new_coreds

DESCRIPTION

 Package: DQAgui
 Title: DQA GUI
-Version: 0.1.6.9004
+Version: 0.1.6.9005
 Authors@R: c(
     person("Lorenz A.", "Kapsner", , "lorenz.kapsner@uk-erlangen.de", role = c("cre", "aut"),
            comment = c(ORCID = "0000-0003-1866-860X")),
@@ -14,7 +14,7 @@ License: GPL-3
 URL: https://github.com/miracum/dqa-dqagui
 BugReports: https://github.com/miracum/dqa-dqagui/issues
 Encoding: UTF-8
-Date: 2021-10-20
+Date: 2021-12-01
 Imports: 
     data.table,
     daterangepicker,

R/app_utils.R

@@ -279,7 +279,7 @@ fix_sql_display <- function(text) {
 #'
 #'
 check_load_data_button <- function(rv, session) {
-  debugging <- FALSE
+  debugging <- TRUE
   if (debugging) {
     systems <- c("csv", "postgres", "oracle")
   } else {

R/moduleConfig.R

@@ -31,7 +31,13 @@
 module_config_server <-
   function(input, output, session, rv, input_re) {
     # filepath roots dir
-    roots <- c(home = "/home/")
+    roots <- c(
+      # home = "/home/",
+      home = "~",
+      source = Sys.getenv("EXAMPLECSV_SOURCE_PATH"),
+      target = Sys.getenv("EXAMPLECSV_TARGET_PATH")
+    )
+
 
     ## Mapping between system_type and tab_name:
     system_types_mapping <-
@@ -45,6 +51,8 @@ module_config_server <-
       input = input,
       id = "config_sourcedir_in",
       roots = roots,
+      defaultRoot = ifelse(roots[["source"]] == "", "home", "source"),
+      allowDirCreate = FALSE,
       session = session
     )
 
@@ -52,12 +60,16 @@ module_config_server <-
       input = input,
       id = "config_targetdir_in",
       roots = roots,
+      defaultRoot = ifelse(roots[["target"]] == "", "home", "target"),
+      allowDirCreate = FALSE,
       session = session
     )
 
     # observe click button event
     observeEvent(
       eventExpr = input$config_sourcedir_in,
+      ignoreInit = TRUE,
+      ignoreNULL = TRUE,
       handlerExpr = {
         rv$csv_dir_src_clicked <- FALSE
         rv$csv_dir_src <- as.character(
@@ -101,6 +113,8 @@ module_config_server <-
     )
     observeEvent(
       eventExpr = input$config_targetdir_in,
+      ignoreInit = TRUE,
+      ignoreNULL = TRUE,
       handlerExpr = {
         rv$csv_dir_tar_clicked <- FALSE
         rv$csv_dir_tar <- as.character(
@@ -1157,8 +1171,7 @@ module_config_ui <- function(id) {
                 div(
                   paste(
                     "Please choose the directory of your",
-                    "\u00A7",
-                    "21 source data in csv format (default: '/home/input')."
+                    " source data in csv format (default: '/home/input')."
                   )
                 ),
                 br(),
@@ -1345,8 +1358,7 @@ module_config_ui <- function(id) {
                 div(
                   paste(
                     "Please choose the directory of your",
-                    "\u00A7",
-                    "21 target data in csv format (default: '/home/input')."
+                    " target data in csv format (default: '/home/input')."
                   )
                 ),
                 br(),

R/moduleDashboard.R

@@ -220,7 +220,8 @@ module_dashboard_server <-
               "Loading target data ..."))
 
             ## load target_data
-            if (length(setdiff(rv$source$settings, rv$target$settings)) == 0) {
+            # if (length(setdiff(rv$source$settings, rv$target$settings)) == 0) {
+            if (isTRUE(rv$target_is_source)) {
               DIZutils::feedback(
                 print_this = paste0(
                   "Source and Target settings are identical.",
@@ -425,6 +426,8 @@ module_dashboard_server <-
           name = "module_dashboard_server -> rv$start",
           logfile_dir = rv$log$logfile_dir
         )
+      } else {
+        rv$start <- NULL
       }
     })
 

data-raw/debugging_info.R

@@ -3,10 +3,10 @@ output_dir = "output/"
 
 ## debugging the MIRACUM stuff (JM):
 ## ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓
-utils_path = DIZutils::clean_path_name(system.file("application/_utilities",
-                                                   package = "miRacumDQA"))
-mdr_filename = "mdr.csv"
-logfile_dir = "~/share/logfiles/"
+# utils_path = DIZutils::clean_path_name(system.file("application/_utilities",
+#                                                    package = "miRacumDQA"))
+# mdr_filename = "mdr.csv"
+# logfile_dir = "~/share/logfiles/"
 ##	↑	↑	↑	↑	↑	↑	↑	↑	↑	↑	↑
 
 
@@ -21,10 +21,10 @@ logfile_dir = "~/share/logfiles/"
 
 ## debugging testdata:
 ## ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓
-# utils_path = system.file("demo_data/utilities",
-#                          package = "DQAstats")
-# mdr_filename = "mdr_example_data.csv"
-# logfile_dir <- tempdir()
+utils_path = system.file("demo_data/utilities",
+                         package = "DQAstats")
+mdr_filename = "mdr_example_data.csv"
+logfile_dir <- tempdir()
 ##	↑	↑	↑	↑	↑	↑	↑	↑	↑	↑	↑
 ##
 ##

data-raw/debugging_testdata.R

+# remotes::install_git(url = "https://gitlab.miracum.org/miracum/misc/dizutils", ref = "development")
+# remotes::install_git(url = "https://gitlab.miracum.org/miracum/dqa/dqastats", ref = "feat_new_coreds")
+# remotes::install_git(url = "https://gitlab.miracum.org/miracum/dqa/dqagui", ref = "feat_new_coreds")
+
+port = 3838
+output_dir = "output/"
+
+
+Sys.setenv("EXAMPLECSV_SOURCE_PATH" = system.file("demo_data", package = "DQAstats"))
+Sys.setenv("EXAMPLECSV_TARGET_PATH" = system.file("demo_data", package = "DQAstats"))
+
+
+## debugging testdata:
+## ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓ ↓
+utils_path = system.file("demo_data/utilities",
+                         package = "DQAstats")
+mdr_filename = "mdr_example_data.csv"
+logfile_dir <- tempdir()
+##	↑	↑	↑	↑	↑	↑	↑	↑	↑	↑	↑
+
+devtools::load_all()
+logfile_dir = tempdir()
+parallel = FALSE
+ncores = 4
+
+launch_app(
+  port = port,
+  utils_path = utils_path,
+  mdr_filename = mdr_filename,
+  logfile_dir = logfile_dir
+)

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.6.9004")
+my_desc$set_version("0.1.6.9005")
 # The title of your package
 my_desc$set(Title = "DQA GUI")
 # The description of your package