diff --git a/DQA_Tool/app/_utilities/RMD/DQA_report.Rmd b/DQA_Tool/app/_utilities/RMD/DQA_report.Rmd
index 440bfeabb1685013165bf0c98e8b4437dddcc5f0..db533880ee2644fb2c6d5633bb7efa3a1b33cd91 100644
--- a/DQA_Tool/app/_utilities/RMD/DQA_report.Rmd
+++ b/DQA_Tool/app/_utilities/RMD/DQA_report.Rmd
@@ -1,5 +1,5 @@
---
-# script by Lorenz Kapsner
+# (c) 2019 Lorenz Kapsner
title: |
| Datenqualitätsanalyse des §21-Datensatzes:
| Überprüfung der ETL-Strecken zwischen Quellsystem (exportierte §21 Rohdaten) und Zielsystem (i2b2 Datenbank)
diff --git a/DQA_Tool/app/reset.js b/DQA_Tool/app/_utilities/reset.js
similarity index 100%
rename from DQA_Tool/app/reset.js
rename to DQA_Tool/app/_utilities/reset.js
diff --git a/DQA_Tool/app/tests/testthat/test-headless.R b/DQA_Tool/app/tests/testthat/test-headless.R
index 0ad9bf76c3ee2ea44f74bb68514c5bf6466af39d..8028dddc5caa37744e8684c8a8ba04090c7db688 100644
--- a/DQA_Tool/app/tests/testthat/test-headless.R
+++ b/DQA_Tool/app/tests/testthat/test-headless.R
@@ -46,8 +46,5 @@ test_that("correct functioning of headless function",{
expect_s3_class(rv$list_source[["OPS.CSV"]], "data.table")
expect_known_hash(rv$list_source[["ICD.CSV"]], "8dda050b3d")
expect_s3_class(rv$list_source[["ICD.CSV"]], "data.table")
-
-
-
})
diff --git a/DQA_Tool/app/ui.R b/DQA_Tool/app/ui.R
index 32242ab37edea55ee40fa31bed7586efa53d5400..b97f6b314b838bd87894c37bda5dd233be20079c 100644
--- a/DQA_Tool/app/ui.R
+++ b/DQA_Tool/app/ui.R
@@ -5,67 +5,67 @@ shinyUI(dashboardPage(skin = "black",
dashboardHeader(title = "MIRACUM DQA"),
dashboardSidebar(
-
- # Include shinyjs in the UI Sidebar
- shinyjs::useShinyjs(),
- extendShinyjs(script = "reset.js", functions = "reset"), # Add the js code to the page
-
- #Sidebar Panel
- sidebarMenu(id = "tabs",
- menuItem("Dashboard", tabName = "tab_dashboard", icon = icon("tachometer-alt")),
- sidebarMenuOutput("menu"),
- menuItem("Settings", tabName = "tab_config", icon = icon("cogs")),
- menuItem("DQ MDR", tabName = "tab_mdr", icon = icon("database")),
- tags$hr(),
- actionButton("reset", "Reset DQA Tool")
- )),
+
+ # Include shinyjs in the UI Sidebar
+ shinyjs::useShinyjs(),
+ extendShinyjs(script = "./_utilities/reset.js", functions = "reset"), # Add the js code to the page
+
+ #Sidebar Panel
+ sidebarMenu(id = "tabs",
+ menuItem("Dashboard", tabName = "tab_dashboard", icon = icon("tachometer-alt")),
+ sidebarMenuOutput("menu"),
+ menuItem("Settings", tabName = "tab_config", icon = icon("cogs")),
+ menuItem("DQ MDR", tabName = "tab_mdr", icon = icon("database")),
+ tags$hr(),
+ actionButton("reset", "Reset DQA Tool")
+ )),
dashboardBody(
+
+ # Include shinyjs in the UI Body
+ shinyjs::useShinyjs(),
+
+ # js reset function
+ # https://stackoverflow.com/questions/25062422/restart-shiny-session
+ extendShinyjs(script = "./_utilities/reset.js", functions = "reset"), # Add the js code to the page
+
+ tabItems(
+ tabItem(tabName = "tab_dashboard",
+ moduleDashboardUI("moduleDashboard")
+ ),
+
+ tabItem(tabName = "tab_config",
+ moduleConfigUI("moduleConfig")
+ ),
+
+ tabItem(tabName = "tab_rawdata1",
+ moduleRawdata1UI("moduleRawdata1")
+ ),
- # Include shinyjs in the UI Body
- shinyjs::useShinyjs(),
+ tabItem(tabName = "tab_numerical",
+ moduleNumericalUI("moduleNumerical")
+ ),
- # js reset function
- # https://stackoverflow.com/questions/25062422/restart-shiny-session
- extendShinyjs(script = "reset.js", functions = "reset"), # Add the js code to the page
+ tabItem(tabName = "tab_categorical",
+ moduleCategoricalUI("moduleCategorical")
+ ),
- tabItems(
- tabItem(tabName = "tab_dashboard",
- moduleDashboardUI("moduleDashboard")
- ),
-
- tabItem(tabName = "tab_config",
- moduleConfigUI("moduleConfig")
- ),
-
- tabItem(tabName = "tab_rawdata1",
- moduleRawdata1UI("moduleRawdata1")
- ),
-
- tabItem(tabName = "tab_numerical",
- moduleNumericalUI("moduleNumerical")
- ),
-
- tabItem(tabName = "tab_categorical",
- moduleCategoricalUI("moduleCategorical")
- ),
-
- tabItem(tabName = "tab_plausibility",
- modulePlausibilityUI("modulePlausibility")
- ),
-
- tabItem(tabName = "tab_visualizations",
- moduleVisualizationsUI("moduleVisulizations")
- ),
-
- tabItem(tabName = "tab_report",
- moduleReportUI("moduleReport")
- ),
-
- tabItem(tabName = "tab_mdr",
- moduleMDRUI("moduleMDR")
- )
-
+ tabItem(tabName = "tab_plausibility",
+ modulePlausibilityUI("modulePlausibility")
+ ),
+
+ tabItem(tabName = "tab_visualizations",
+ moduleVisualizationsUI("moduleVisulizations")
+ ),
+
+ tabItem(tabName = "tab_report",
+ moduleReportUI("moduleReport")
+ ),
+
+ tabItem(tabName = "tab_mdr",
+ moduleMDRUI("moduleMDR")
)
+
+ )
)
))