Merge pull request #233 from OHDSI/develop

Release V 2.1.2
OHDSI · Feb 13, 2024 · 1c0db9e · 1c0db9e
2 parents f3dc393 + 9cecd7a
commit 1c0db9e
Show file tree

Hide file tree

Showing 25 changed files with 2,968 additions and 693 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: OhdsiShinyModules
 Type: Package
 Title: Repository of Shiny Modules for OHDSI Result Viewers
-Version: 2.1.1
+Version: 2.1.2
 Author: Jenna Reps
 Maintainer: Jenna Reps <reps@ohdsi.org>
 Description: Install this package to access useful shiny modules for building shiny apps to explore results using the OHDSI tools .

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+OhdsiShinyModules v2.1.2
+========================
+Fixed bug in cohort diagnostics incidence rate plots not showing for different strata
+
 OhdsiShinyModules v2.1.1
 ========================
 Fixed bug in cohort diagnostics load up of orphan concepts server causing app to crash on load

diff --git a/R/characterization-dechallengeRechallenge.R b/R/characterization-dechallengeRechallenge.R
@@ -191,9 +191,10 @@ characterizationDechallengeRechallengeServer <- function(
               connectionHandler = connectionHandler,
               resultDatabaseSettings = resultDatabaseSettings
             )
-            print(result)
             failData(result)
             # module to show failed plots
+
+            if(nrow(result) > 0){
             shiny::showModal(
               shiny::modalDialog(
                 title = paste0("Failed Plots: "),
@@ -203,6 +204,9 @@ characterizationDechallengeRechallengeServer <- function(
                 footer = NULL
               )
             )
+            } else{
+              showNotification("No fails to display")
+            }
           }
         }
       })
@@ -292,7 +296,7 @@ getDechalRechalInputsData <- function(
 
   shiny::withProgress(message = 'Extracting DECHALLENGE_RECHALLENGE data', value = 0, {
 
-  sql <- "SELECT d.CDM_SOURCE_ABBREVIATION as database_name, dr.*
+  sql <- "SELECT distinct d.CDM_SOURCE_ABBREVIATION as database_name, dr.*
           FROM @schema.@c_table_prefixDECHALLENGE_RECHALLENGE dr 
           inner join @schema.@database_table d
           on dr.database_id = d.database_id