diff --git a/DESCRIPTION b/DESCRIPTION index b8e917e..edc3a64 100644 --- 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", , "schuemie@ohdsi.org", 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 index bc3bc3d..b31d3dc 100644 --- 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 index 9f4e23f..aa6eabc 100644 --- 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 index b6b36d6..09e0ddb 100644 --- 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

  • ParallelLogger

    Support for parallel computation with logging to console, disk, or e-mail.
    Learn more...

  • ResultModelManager

    A lightweight utility for data migrations allowing old results to work with new shiny apps and data visualisations.
    Learn more...

  • ROhdsiWebApi

    Interact with OHDSI WebAPI web services.
    Learn more...
    • +

  • ShinyAppBuilder

    Interactively view analysis results across different types of analyses.
    Learn more...

  • SqlRender

    Generate SQL on the fly for the various SQL dialects.
    Learn more...
    • diff --git a/Rmd/support.Rmd b/Rmd/support.Rmd index 3485977..6cddc0a 100644 --- 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 index e2b7f13..663763a 100644 --- a/docs/codeStyle.html +++ b/docs/codeStyle.html @@ -13,7 +13,7 @@ Code Style - + @@ -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,8 +185,8 @@ 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; @@ -190,16 +194,9 @@ } .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before { - content: ""; - 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 index 1206a12..a7766d8 100644 --- a/docs/community.html +++ b/docs/community.html @@ -13,7 +13,7 @@ Development Community - + @@ -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,8 +185,8 @@ 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; @@ -190,16 +194,9 @@ } .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before { - content: ""; - 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 index d3708b4..8e5d4c6 100644 --- a/docs/connecting.html +++ b/docs/connecting.html @@ -13,7 +13,7 @@ Connecting to a Database - + @@ -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,8 +185,8 @@ 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; @@ -190,16 +194,9 @@ } .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before { - content: ""; - 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 index 2165885..fc6240b 100644 --- a/docs/contribute.html +++ b/docs/contribute.html @@ -13,7 +13,7 @@ Contribute - + @@ -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,8 +185,8 @@ 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; @@ -190,16 +194,9 @@ } .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before { - content: ""; - 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 index 5be1a83..8af5f97 100644 --- a/docs/developerGuidelines.html +++ b/docs/developerGuidelines.html @@ -13,7 +13,7 @@ Developer Guidelines - + @@ -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,8 +185,8 @@ 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; @@ -190,16 +194,9 @@ } .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before { - content: ""; - 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/developmentRoadmap.html b/docs/developmentRoadmap.html index add8736..cbdc31d 100644 --- a/docs/developmentRoadmap.html +++ b/docs/developmentRoadmap.html @@ -13,7 +13,7 @@ Development Roadmap - + @@ -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,8 +185,8 @@ 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; @@ -190,16 +194,9 @@ } .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before { - content: ""; - 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 { @@ -505,6 +502,8 @@

    Package milestones

    +

    +

    diff --git a/docs/index.html b/docs/index.html index a41b06c..c743232 100644 --- a/docs/index.html +++ b/docs/index.html @@ -13,7 +13,7 @@ HADES - + @@ -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,8 +185,8 @@ 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; @@ -190,16 +194,9 @@ } .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before { - content: ""; - 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/installingHades.html b/docs/installingHades.html index e91e54a..e645a5b 100644 --- a/docs/installingHades.html +++ b/docs/installingHades.html @@ -13,7 +13,7 @@ Installing HADES - + @@ -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,8 +185,8 @@ 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; @@ -190,16 +194,9 @@ } .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before { - content: ""; - 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/packageRequirements.html b/docs/packageRequirements.html index 258a436..6bb149c 100644 --- a/docs/packageRequirements.html +++ b/docs/packageRequirements.html @@ -13,7 +13,7 @@ HADES Package Requirements - + @@ -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,8 +185,8 @@ 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; @@ -190,16 +194,9 @@ } .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before { - content: ""; - 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/packageStatuses.html b/docs/packageStatuses.html index 62ad2d3..dd52028 100644 --- a/docs/packageStatuses.html +++ b/docs/packageStatuses.html @@ -13,7 +13,7 @@ Package statuses - + @@ -145,11 +145,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; @@ -178,8 +182,8 @@ 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; @@ -187,16 +191,9 @@ } .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before { - content: ""; - 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 { @@ -700,6 +697,16 @@

    Package statuses

    codecov.io +ShinyAppBuilder +Version +Jenna Reps +GitHub +Open issues +Open pull-requests +Build Status +codecov.io + + SqlRender Version Martijn Schuemie diff --git a/docs/packages.html b/docs/packages.html index 40bff21..0a45b99 100644 --- a/docs/packages.html +++ b/docs/packages.html @@ -13,7 +13,7 @@ Packages - + @@ -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,8 +185,8 @@ 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; @@ -190,16 +194,9 @@ } .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before { - content: ""; - 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 { @@ -654,6 +651,12 @@

  • + ShinyAppBuilder +

    +Interactively view analysis results across different types of analyses.
    Learn more… +
    • +
  • +

    SqlRender

    Generate SQL on the fly for the various SQL dialects.
    Learn more… diff --git a/docs/publications.html b/docs/publications.html index b2f14c3..093dde2 100644 --- a/docs/publications.html +++ b/docs/publications.html @@ -13,7 +13,7 @@ Publications - + @@ -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,8 +185,8 @@ 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; @@ -190,16 +194,9 @@ } .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before { - content: ""; - 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/rSetup.html b/docs/rSetup.html index 012a3b1..5643c65 100644 --- a/docs/rSetup.html +++ b/docs/rSetup.html @@ -13,7 +13,7 @@ Setting up the R environment - + @@ -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,8 +185,8 @@ 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; @@ -190,16 +194,9 @@ } .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before { - content: ""; - 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 { @@ -532,6 +529,7 @@

    Verifying the installation

    install.packages("SqlRender")
 library(SqlRender)
 translate("SELECT TOP 10 * FROM person;", "postgresql")
    +
    ## Warning: package 'SqlRender' was built under R version 4.1.3
    ## [1] "SELECT  * FROM person LIMIT 10;"
 ## attr(,"sqlDialect")
 ## [1] "postgresql"
    diff --git a/docs/releaseProcess.html b/docs/releaseProcess.html index 3cf6367..7555b38 100644 --- a/docs/releaseProcess.html +++ b/docs/releaseProcess.html @@ -13,7 +13,7 @@ Release Process - + @@ -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,8 +185,8 @@ 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; @@ -190,16 +194,9 @@ } .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before { - content: ""; - 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/renv.html b/docs/renv.html index ab0ff42..8327b66 100644 --- a/docs/renv.html +++ b/docs/renv.html @@ -13,7 +13,7 @@ Using Renv for Dependencies - + @@ -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,8 +185,8 @@ 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; @@ -190,16 +194,9 @@ } .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before { - content: ""; - 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/site_libs/header-attrs-2.14/header-attrs.js b/docs/site_libs/header-attrs-2.20/header-attrs.js similarity index 100% rename from docs/site_libs/header-attrs-2.14/header-attrs.js rename to docs/site_libs/header-attrs-2.20/header-attrs.js diff --git a/docs/support.html b/docs/support.html index 5dd9f1d..ef40751 100644 --- a/docs/support.html +++ b/docs/support.html @@ -13,7 +13,7 @@ Questions and Bug Reports - + @@ -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,8 +185,8 @@ 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; @@ -190,16 +194,9 @@ } .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before { - content: ""; - 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 { @@ -479,6 +476,7 @@

    Bug reports

  • ROhdsiWebApi issue tracker

  • SelfControlledCaseSeries issue tracker

  • SelfControlledCohort issue tracker

    • +

  • ShinyAppBuilder issue tracker

  • SqlRender issue tracker

    • diff --git a/docs/validation.html b/docs/validation.html index 7294244..7f3a1e7 100644 --- a/docs/validation.html +++ b/docs/validation.html @@ -13,7 +13,7 @@ Validation & Evaluation - + @@ -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,8 +185,8 @@ 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; @@ -190,16 +194,9 @@ } .tabset-dropdown > .nav-tabs.nav-tabs-open > li.active:before { - content: ""; - 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/extras/packages.csv b/extras/packages.csv index 063fbf1..483d512 100644 --- a/extras/packages.csv +++ b/extras/packages.csv @@ -29,4 +29,5 @@ order,name,section,description,inCran,pages,maintainers,CRON 28,ParallelLogger,Supporting packages,"Support for parallel computation with logging to console, disk, or e-mail.",TRUE,TRUE,Martijn Schuemie ,0 10 * * 0 29,ResultModelManager,Supporting packages,A lightweight utility for data migrations allowing old results to work with new shiny apps and data visualisations.,FALSE,TRUE,Jamie Gilbert,0 13 * * 0 30,ROhdsiWebApi,Supporting packages,Interact with OHDSI WebAPI web services.,FALSE,TRUE,Gowtham Rao,0 11 * * 0 -31,SqlRender,Supporting packages,Generate SQL on the fly for the various SQL dialects.,TRUE,TRUE,Martijn Schuemie ,0 12 * * 0 +31,ShinyAppBuilder,Supporting packages,Interactively view analysis results across different types of analyses.,FALSE,TRUE,Jenna Reps,0 15 * * 0 +32,SqlRender,Supporting packages,Generate SQL on the fly for the various SQL dialects.,TRUE,TRUE,Martijn Schuemie ,0 12 * * 0