Adding ShinyAppBuilder to HADES

OHDSI · Feb 8, 2023 · 1376e82 · 1376e82
1 parent d91046f
commit 1376e82
Show file tree

Hide file tree

Showing 24 changed files with 277 additions and 294 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: Hades
 Type: Package
 Title: Health Analytics Data-to-Evidence Suite
-Version: 1.9.0
-Date: 2023-01-11
+Version: 1.10.0
+Date: 2023-02-08
 Authors@R: c(
   person("Martijn", "Schuemie", , "[email protected]", role = c("aut", "cre")),
   person("Observational Health Data Science and Informatics", role = c("cph"))
@@ -43,7 +43,8 @@ Imports:
   IterativeHardThresholding,
   OhdsiShinyModules,
   ResultModelManager,
-  Characterization
+  Characterization,
+  ShinyAppBuilder 
 Remotes:
   ohdsi/BigKnn,
   ohdsi/ROhdsiWebApi,
@@ -67,7 +68,8 @@ Remotes:
   ohdsi/CohortExplorer,
   ohdsi/OhdsiShinyModules,
   ohdsi/ResultModelManager,
-  ohdsi/Characterization
+  ohdsi/Characterization,
+  ohdsi/ShinyAppBuilder 
 LazyData: false
 RoxygenNote: 7.2.0
 Encoding: UTF-8
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,10 @@
+HADES 1.10.0
+============
+
+Changes
+
+- Adding ShinyAppBuilder to HADES
+
 HADES 1.9.0
 ===========
 

diff --git a/Rmd/packageStatuses.Rmd b/Rmd/packageStatuses.Rmd
@@ -48,4 +48,5 @@ The table below lists, for each of the HADES packages, the following details:
 | [ROhdsiWebApi](https://github.com/OHDSI/ROhdsiWebApi) | [![Version](https://img.shields.io/github/r-package/v/ohdsi/ROhdsiWebApi?label=%20)](https://ohdsi.github.io/ROhdsiWebApi/) | Gowtham Rao | GitHub | [![Open issues](https://img.shields.io/github/issues-raw/OHDSI/ROhdsiWebApi?label=%20)](https://github.com/OHDSI/ROhdsiWebApi/issues) | [![Open pull-requests](https://img.shields.io/github/issues-pr-raw/OHDSI/ROhdsiWebApi?label=%20)](https://github.com/OHDSI/ROhdsiWebApi/pulls) | [![Build Status](https://github.com/OHDSI/ROhdsiWebApi/workflows/R-CMD-check/badge.svg)](https://github.com/OHDSI/ROhdsiWebApi/actions?query=workflow%3AR-CMD-check) | [![codecov.io](https://codecov.io/github/OHDSI/ROhdsiWebApi/coverage.svg?branch=main)](https://codecov.io/github/OHDSI/ROhdsiWebApi?branch=main) |
 | [SelfControlledCaseSeries](https://github.com/OHDSI/SelfControlledCaseSeries) | [![Version](https://img.shields.io/github/r-package/v/ohdsi/SelfControlledCaseSeries?label=%20)](https://ohdsi.github.io/SelfControlledCaseSeries/) | Martijn Schuemie  | GitHub | [![Open issues](https://img.shields.io/github/issues-raw/OHDSI/SelfControlledCaseSeries?label=%20)](https://github.com/OHDSI/SelfControlledCaseSeries/issues) | [![Open pull-requests](https://img.shields.io/github/issues-pr-raw/OHDSI/SelfControlledCaseSeries?label=%20)](https://github.com/OHDSI/SelfControlledCaseSeries/pulls) | [![Build Status](https://github.com/OHDSI/SelfControlledCaseSeries/workflows/R-CMD-check/badge.svg)](https://github.com/OHDSI/SelfControlledCaseSeries/actions?query=workflow%3AR-CMD-check) | [![codecov.io](https://codecov.io/github/OHDSI/SelfControlledCaseSeries/coverage.svg?branch=main)](https://codecov.io/github/OHDSI/SelfControlledCaseSeries?branch=main) |
 | [SelfControlledCohort](https://github.com/OHDSI/SelfControlledCohort) | [![Version](https://img.shields.io/github/r-package/v/ohdsi/SelfControlledCohort?label=%20)](https://ohdsi.github.io/SelfControlledCohort/) | Jamie Gilbert | GitHub | [![Open issues](https://img.shields.io/github/issues-raw/OHDSI/SelfControlledCohort?label=%20)](https://github.com/OHDSI/SelfControlledCohort/issues) | [![Open pull-requests](https://img.shields.io/github/issues-pr-raw/OHDSI/SelfControlledCohort?label=%20)](https://github.com/OHDSI/SelfControlledCohort/pulls) | [![Build Status](https://github.com/OHDSI/SelfControlledCohort/workflows/R-CMD-check/badge.svg)](https://github.com/OHDSI/SelfControlledCohort/actions?query=workflow%3AR-CMD-check) | [![codecov.io](https://codecov.io/github/OHDSI/SelfControlledCohort/coverage.svg?branch=main)](https://codecov.io/github/OHDSI/SelfControlledCohort?branch=main) |
+| [ShinyAppBuilder](https://github.com/OHDSI/ShinyAppBuilder) | [![Version](https://img.shields.io/github/r-package/v/ohdsi/ShinyAppBuilder?label=%20)](https://ohdsi.github.io/ShinyAppBuilder/) | Jenna Reps | GitHub | [![Open issues](https://img.shields.io/github/issues-raw/OHDSI/ShinyAppBuilder?label=%20)](https://github.com/OHDSI/ShinyAppBuilder/issues) | [![Open pull-requests](https://img.shields.io/github/issues-pr-raw/OHDSI/ShinyAppBuilder?label=%20)](https://github.com/OHDSI/ShinyAppBuilder/pulls) | [![Build Status](https://github.com/OHDSI/ShinyAppBuilder/workflows/R-CMD-check/badge.svg)](https://github.com/OHDSI/ShinyAppBuilder/actions?query=workflow%3AR-CMD-check) | [![codecov.io](https://codecov.io/github/OHDSI/ShinyAppBuilder/coverage.svg?branch=main)](https://codecov.io/github/OHDSI/ShinyAppBuilder?branch=main) |
 | [SqlRender](https://github.com/OHDSI/SqlRender) | [![Version](https://img.shields.io/github/r-package/v/ohdsi/SqlRender?label=%20)](https://ohdsi.github.io/SqlRender/) | Martijn Schuemie  | CRAN | [![Open issues](https://img.shields.io/github/issues-raw/OHDSI/SqlRender?label=%20)](https://github.com/OHDSI/SqlRender/issues) | [![Open pull-requests](https://img.shields.io/github/issues-pr-raw/OHDSI/SqlRender?label=%20)](https://github.com/OHDSI/SqlRender/pulls) | [![Build Status](https://github.com/OHDSI/SqlRender/workflows/R-CMD-check/badge.svg)](https://github.com/OHDSI/SqlRender/actions?query=workflow%3AR-CMD-check) | [![codecov.io](https://codecov.io/github/OHDSI/SqlRender/coverage.svg?branch=main)](https://codecov.io/github/OHDSI/SqlRender?branch=main) |
diff --git a/Rmd/packages.Rmd b/Rmd/packages.Rmd
@@ -56,5 +56,6 @@ Below are the packages included in HADES. For each package a link is provided wi
 <li><h4><i class="fas  fa-cube "></i> <a href="https://ohdsi.github.io/ParallelLogger">ParallelLogger</a></h4>Support for parallel computation with logging to console, disk, or e-mail.</br><a href="https://ohdsi.github.io/ParallelLogger">Learn more...</a></li>
 <li><h4><i class="fas  fa-cube "></i> <a href="https://ohdsi.github.io/ResultModelManager">ResultModelManager</a></h4>A lightweight utility for data migrations allowing old results to work with new shiny apps and data visualisations.</br><a href="https://ohdsi.github.io/ResultModelManager">Learn more...</a></li>
 <li><h4><i class="fas  fa-cube "></i> <a href="https://ohdsi.github.io/ROhdsiWebApi">ROhdsiWebApi</a></h4>Interact with OHDSI WebAPI web services.</br><a href="https://ohdsi.github.io/ROhdsiWebApi">Learn more...</a></li>
+<li><h4><i class="fas  fa-cube "></i> <a href="https://ohdsi.github.io/ShinyAppBuilder">ShinyAppBuilder</a></h4>Interactively view analysis results across different types of analyses.</br><a href="https://ohdsi.github.io/ShinyAppBuilder">Learn more...</a></li>
 <li><h4><i class="fas  fa-cube "></i> <a href="https://ohdsi.github.io/SqlRender">SqlRender</a></h4>Generate SQL on the fly for the various SQL dialects.</br><a href="https://ohdsi.github.io/SqlRender">Learn more...</a></li>
 </ul>
diff --git a/Rmd/support.Rmd b/Rmd/support.Rmd
@@ -74,5 +74,7 @@ Bug reports should be files using the issue tracker of the misbehaving package:
 
 - [SelfControlledCohort issue tracker](https://github.com/OHDSI/SelfControlledCohort/issues)
 
+- [ShinyAppBuilder issue tracker](https://github.com/OHDSI/ShinyAppBuilder/issues)
+
 - [SqlRender issue tracker](https://github.com/OHDSI/SqlRender/issues)
 
diff --git a/docs/codeStyle.html b/docs/codeStyle.html
@@ -13,7 +13,7 @@
 
 <title>Code Style</title>
 
-<script src="site_libs/header-attrs-2.14/header-attrs.js"></script>
+<script src="site_libs/header-attrs-2.20/header-attrs.js"></script>
 <script src="site_libs/jquery-3.6.0/jquery-3.6.0.min.js"></script>
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <link href="site_libs/bootstrap-3.3.5/css/cosmo.min.css" rel="stylesheet" />
@@ -148,11 +148,15 @@
     href = "index.html";
   var menuAnchor = $('a[href="' + href + '"]');
 
-  // mark it active
-  menuAnchor.tab('show');
-
-  // if it's got a parent navbar menu mark it active as well
-  menuAnchor.closest('li.dropdown').addClass('active');
+  // mark the anchor link active (and if it's in a dropdown, also mark that active)
+  var dropdown = menuAnchor.closest('li.dropdown');
+  if (window.bootstrap) { // Bootstrap 4+
+    menuAnchor.addClass('active');
+    dropdown.find('> .dropdown-toggle').addClass('active');
+  } else { // Bootstrap 3
+    menuAnchor.parent().addClass('active');
+    dropdown.addClass('active');
+  }
 
   // Navbar adjustments
   var navHeight = $(".navbar").first().height() + 15;
@@ -181,25 +185,18 @@
   border-radius: 4px;
 }
 
-.tabset-dropdown > .nav-tabs > li.active:before {
-  content: "";
+.tabset-dropdown > .nav-tabs > li.active:before, .tabset-dropdown > .nav-tabs.nav-tabs-open:before {
+  content: "\e259";
   font-family: 'Glyphicons Halflings';
   display: inline-block;
   padding: 10px;
   border-right: 1px solid #ddd;
 }
 
 .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before {
-  content: "&#xe258;";
-  border: none;
-}
-
-.tabset-dropdown > .nav-tabs.nav-tabs-open:before {
-  content: "";
+  content: "\e258";
   font-family: 'Glyphicons Halflings';
-  display: inline-block;
-  padding: 10px;
-  border-right: 1px solid #ddd;
+  border: none;
 }
 
 .tabset-dropdown > .nav-tabs > li.active {

diff --git a/docs/community.html b/docs/community.html
@@ -13,7 +13,7 @@
 
 <title>Development Community</title>
 
-<script src="site_libs/header-attrs-2.14/header-attrs.js"></script>
+<script src="site_libs/header-attrs-2.20/header-attrs.js"></script>
 <script src="site_libs/jquery-3.6.0/jquery-3.6.0.min.js"></script>
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <link href="site_libs/bootstrap-3.3.5/css/cosmo.min.css" rel="stylesheet" />
@@ -148,11 +148,15 @@
     href = "index.html";
   var menuAnchor = $('a[href="' + href + '"]');
 
-  // mark it active
-  menuAnchor.tab('show');
-
-  // if it's got a parent navbar menu mark it active as well
-  menuAnchor.closest('li.dropdown').addClass('active');
+  // mark the anchor link active (and if it's in a dropdown, also mark that active)
+  var dropdown = menuAnchor.closest('li.dropdown');
+  if (window.bootstrap) { // Bootstrap 4+
+    menuAnchor.addClass('active');
+    dropdown.find('> .dropdown-toggle').addClass('active');
+  } else { // Bootstrap 3
+    menuAnchor.parent().addClass('active');
+    dropdown.addClass('active');
+  }
 
   // Navbar adjustments
   var navHeight = $(".navbar").first().height() + 15;
@@ -181,25 +185,18 @@
   border-radius: 4px;
 }
 
-.tabset-dropdown > .nav-tabs > li.active:before {
-  content: "";
+.tabset-dropdown > .nav-tabs > li.active:before, .tabset-dropdown > .nav-tabs.nav-tabs-open:before {
+  content: "\e259";
   font-family: 'Glyphicons Halflings';
   display: inline-block;
   padding: 10px;
   border-right: 1px solid #ddd;
 }
 
 .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before {
-  content: "&#xe258;";
-  border: none;
-}
-
-.tabset-dropdown > .nav-tabs.nav-tabs-open:before {
-  content: "";
+  content: "\e258";
   font-family: 'Glyphicons Halflings';
-  display: inline-block;
-  padding: 10px;
-  border-right: 1px solid #ddd;
+  border: none;
 }
 
 .tabset-dropdown > .nav-tabs > li.active {

diff --git a/docs/connecting.html b/docs/connecting.html
@@ -13,7 +13,7 @@
 
 <title>Connecting to a Database</title>
 
-<script src="site_libs/header-attrs-2.14/header-attrs.js"></script>
+<script src="site_libs/header-attrs-2.20/header-attrs.js"></script>
 <script src="site_libs/jquery-3.6.0/jquery-3.6.0.min.js"></script>
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <link href="site_libs/bootstrap-3.3.5/css/cosmo.min.css" rel="stylesheet" />
@@ -148,11 +148,15 @@
     href = "index.html";
   var menuAnchor = $('a[href="' + href + '"]');
 
-  // mark it active
-  menuAnchor.tab('show');
-
-  // if it's got a parent navbar menu mark it active as well
-  menuAnchor.closest('li.dropdown').addClass('active');
+  // mark the anchor link active (and if it's in a dropdown, also mark that active)
+  var dropdown = menuAnchor.closest('li.dropdown');
+  if (window.bootstrap) { // Bootstrap 4+
+    menuAnchor.addClass('active');
+    dropdown.find('> .dropdown-toggle').addClass('active');
+  } else { // Bootstrap 3
+    menuAnchor.parent().addClass('active');
+    dropdown.addClass('active');
+  }
 
   // Navbar adjustments
   var navHeight = $(".navbar").first().height() + 15;
@@ -181,25 +185,18 @@
   border-radius: 4px;
 }
 
-.tabset-dropdown > .nav-tabs > li.active:before {
-  content: "";
+.tabset-dropdown > .nav-tabs > li.active:before, .tabset-dropdown > .nav-tabs.nav-tabs-open:before {
+  content: "\e259";
   font-family: 'Glyphicons Halflings';
   display: inline-block;
   padding: 10px;
   border-right: 1px solid #ddd;
 }
 
 .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before {
-  content: "&#xe258;";
-  border: none;
-}
-
-.tabset-dropdown > .nav-tabs.nav-tabs-open:before {
-  content: "";
+  content: "\e258";
   font-family: 'Glyphicons Halflings';
-  display: inline-block;
-  padding: 10px;
-  border-right: 1px solid #ddd;
+  border: none;
 }
 
 .tabset-dropdown > .nav-tabs > li.active {

diff --git a/docs/contribute.html b/docs/contribute.html
@@ -13,7 +13,7 @@
 
 <title>Contribute</title>
 
-<script src="site_libs/header-attrs-2.14/header-attrs.js"></script>
+<script src="site_libs/header-attrs-2.20/header-attrs.js"></script>
 <script src="site_libs/jquery-3.6.0/jquery-3.6.0.min.js"></script>
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <link href="site_libs/bootstrap-3.3.5/css/cosmo.min.css" rel="stylesheet" />
@@ -148,11 +148,15 @@
     href = "index.html";
   var menuAnchor = $('a[href="' + href + '"]');
 
-  // mark it active
-  menuAnchor.tab('show');
-
-  // if it's got a parent navbar menu mark it active as well
-  menuAnchor.closest('li.dropdown').addClass('active');
+  // mark the anchor link active (and if it's in a dropdown, also mark that active)
+  var dropdown = menuAnchor.closest('li.dropdown');
+  if (window.bootstrap) { // Bootstrap 4+
+    menuAnchor.addClass('active');
+    dropdown.find('> .dropdown-toggle').addClass('active');
+  } else { // Bootstrap 3
+    menuAnchor.parent().addClass('active');
+    dropdown.addClass('active');
+  }
 
   // Navbar adjustments
   var navHeight = $(".navbar").first().height() + 15;
@@ -181,25 +185,18 @@
   border-radius: 4px;
 }
 
-.tabset-dropdown > .nav-tabs > li.active:before {
-  content: "";
+.tabset-dropdown > .nav-tabs > li.active:before, .tabset-dropdown > .nav-tabs.nav-tabs-open:before {
+  content: "\e259";
   font-family: 'Glyphicons Halflings';
   display: inline-block;
   padding: 10px;
   border-right: 1px solid #ddd;
 }
 
 .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before {
-  content: "&#xe258;";
-  border: none;
-}
-
-.tabset-dropdown > .nav-tabs.nav-tabs-open:before {
-  content: "";
+  content: "\e258";
   font-family: 'Glyphicons Halflings';
-  display: inline-block;
-  padding: 10px;
-  border-right: 1px solid #ddd;
+  border: none;
 }
 
 .tabset-dropdown > .nav-tabs > li.active {

diff --git a/docs/developerGuidelines.html b/docs/developerGuidelines.html
@@ -13,7 +13,7 @@
 
 <title>Developer Guidelines</title>
 
-<script src="site_libs/header-attrs-2.14/header-attrs.js"></script>
+<script src="site_libs/header-attrs-2.20/header-attrs.js"></script>
 <script src="site_libs/jquery-3.6.0/jquery-3.6.0.min.js"></script>
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <link href="site_libs/bootstrap-3.3.5/css/cosmo.min.css" rel="stylesheet" />
@@ -148,11 +148,15 @@
     href = "index.html";
   var menuAnchor = $('a[href="' + href + '"]');
 
-  // mark it active
-  menuAnchor.tab('show');
-
-  // if it's got a parent navbar menu mark it active as well
-  menuAnchor.closest('li.dropdown').addClass('active');
+  // mark the anchor link active (and if it's in a dropdown, also mark that active)
+  var dropdown = menuAnchor.closest('li.dropdown');
+  if (window.bootstrap) { // Bootstrap 4+
+    menuAnchor.addClass('active');
+    dropdown.find('> .dropdown-toggle').addClass('active');
+  } else { // Bootstrap 3
+    menuAnchor.parent().addClass('active');
+    dropdown.addClass('active');
+  }
 
   // Navbar adjustments
   var navHeight = $(".navbar").first().height() + 15;
@@ -181,25 +185,18 @@
   border-radius: 4px;
 }
 
-.tabset-dropdown > .nav-tabs > li.active:before {
-  content: "";
+.tabset-dropdown > .nav-tabs > li.active:before, .tabset-dropdown > .nav-tabs.nav-tabs-open:before {
+  content: "\e259";
   font-family: 'Glyphicons Halflings';
   display: inline-block;
   padding: 10px;
   border-right: 1px solid #ddd;
 }
 
 .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before {
-  content: "&#xe258;";
-  border: none;
-}
-
-.tabset-dropdown > .nav-tabs.nav-tabs-open:before {
-  content: "";
+  content: "\e258";
   font-family: 'Glyphicons Halflings';
-  display: inline-block;
-  padding: 10px;
-  border-right: 1px solid #ddd;
+  border: none;
 }
 
 .tabset-dropdown > .nav-tabs > li.active {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -74,5 +74,7 @@ Bug reports should be files using the issue tracker of the misbehaving package:

		- [SelfControlledCohort issue tracker](https://github.com/OHDSI/SelfControlledCohort/issues)

		- [ShinyAppBuilder issue tracker](https://github.com/OHDSI/ShinyAppBuilder/issues)

		- [SqlRender issue tracker](https://github.com/OHDSI/SqlRender/issues)