Merge branch 'master' of https://github.com/ImagingDataCommons/IDC-WebApp into idc-test-sp

Author: s-paquette

shell/database-setup.sh

@@ -78,7 +78,6 @@ else
     mysql -u$MYSQL_ROOT_USER -h $MYSQL_DB_HOST -p$MYSQL_ROOT_PASSWORD -D$DATABASE_NAME < ${HOMEROOT}/scripts/${METADATA_SQL_FILE}
 fi
 
-
 echo "Adding Django site IDs..."
 python3 ${HOMEROOT}/scripts/add_site_ids.py
 

static/js/explore.js

@@ -170,8 +170,7 @@ require([
     });
 
     tippy('.tooltip_filter_info',{
-        content: 'Each chart below reports the number of cases (or patients) for all values within a given attribute. '+
-            'For certain attributes (e.g. Modality) several distinct values may apply to the same case.',
+        content: 'Each chart below reports the number of cases (or patients) for all values within a given attribute, given the currently defined filter set. Once a case is selected, all series for that case, including those that do not meet the search criteria, are included. For example, cases selected based on the presence of CT modality may also contain PET modality, and thus counts for both values will appear in the chart, and the manifest.',
         theme: 'light',
         placement: 'right-end',
         arrow: false

static/js/image_search.js

@@ -1464,7 +1464,10 @@ require([
                             if ('attributes' in data.derived_set[facetSet]){
 
                                 dicofdic = {'unfilt': data.derived_set[facetSet].attributes, 'filt': ''}
-                                if (isFiltered){
+                                if (isFiltered && data.filtered_counts.hasOwnProperty('derived_set')
+                                    && data.filtered_counts.derived_set.hasOwnProperty(facetSet)
+                                    && data.filtered_counts.derived_set[facetSet].hasOwnProperty('attributes')
+                                ) {
                                     dicofdic['filt'] = data.filtered_counts.derived_set[facetSet].attributes;
                                 }
                                 else{

static/js/sapien.js

@@ -88,8 +88,20 @@ require([
         var groups = [];
         var filters = [];
         var values = [];
-        id.site === "Head and Neck"? values.push("Head-Neck") : values.push(id.site);
-        id.site === "Colorectal"? values.push("Colon") : values.push(id.site);
+
+        if (id.site === "Head and Neck" || id.site === "Head-and-Neck")
+        {
+            values.push("Head-Neck");
+        }
+        else if (id.site == "Colorectal")
+        {
+            values.push("Colon");
+        }
+        else
+        {
+            values.push(id.site)
+        }
+
         filters.push(
         {
             'id': '128',