Merge pull request #154 from RhoInc/v3.4.1

v3.4.1

build/aeTable.js

@@ -1747,13 +1747,19 @@
         /////////////////////////////////////
         //Check to make sure there is some data
         if (!chart.data.major.length) {
-            chart.wrap
-                .select('.SummaryTable')
-                .append('div')
-                .attr('class', 'wc-alert')
-                .text(
-                    'Error: No AEs found for the current filters. Update the filters to see results.'
-                );
+            chart.wrap.select('.SummaryTable').append('div').attr('class', 'wc-alert').text(
+                !chart.population_data.length
+                    ? 'Error: No subjects found for the current filters. Update the filters to see results.'
+                    : 'Error: No AEs found for the ' +
+                          d3
+                              .set(
+                                  chart.population_data.map(function(d) {
+                                      return d[chart.config.variables.id];
+                                  })
+                              )
+                              .values().length +
+                          ' subjects selected by the current filters. Update the filters to see results.'
+            );
             throw new Error('No data found in the column specified for major category. ');
         }
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "aeexplorer",
-    "version": "3.4.0",
+    "version": "3.4.1",
     "description": "An interactive tool that allows users to dynamically query adverse event data in real time.",
     "keywords": [
         "adverse",

scripts/configuration.md

@@ -1,5 +1,5 @@
 # Renderer-specific settings
-The sections below describe each aeexplorer setting as of version 3.4.0.
+The sections below describe each aeexplorer setting as of version 3.4.1.
 
 ## settings.variables
 `object`

settings-schema.json

@@ -1,7 +1,7 @@
 {
     "title": "config",
     "description": "JSON Schema for AE Explorer configuration. Last updated with v3.1.1 release.",
-    "version": "3.4.0",
+    "version": "3.4.1",
     "type": "object",
     "properties": {
         "variables": {

src/chart/AETable/init.js

@@ -88,7 +88,12 @@ export function init(chart) {
             .append('div')
             .attr('class', 'wc-alert')
             .text(
-                'Error: No AEs found for the current filters. Update the filters to see results.'
+                !chart.population_data.length
+                    ? 'Error: No subjects found for the current filters. Update the filters to see results.'
+                    : `Error: No AEs found for the ${d3
+                          .set(chart.population_data.map(d => d[chart.config.variables.id]))
+                          .values()
+                          .length} subjects selected by the current filters. Update the filters to see results.`
             );
         throw new Error('No data found in the column specified for major category. ');
     }

test-page/index.js

@@ -5,7 +5,19 @@ d3.csv(
 
         var settings = {
             variables: {
-                group: 'ARM'
+                group: 'ARM',
+                filters: [
+                    {
+                        value_col: 'SITE',
+                        label: 'Site',
+                        type: 'participant'
+                    },
+                    {
+                        value_col: 'AESER',
+                        label: 'Serious',
+                        type: 'event'
+                    }
+                ]
             },
             variableOptions: {
                 group: ['SEX', 'RACE', 'SITE', 'ARM']