feat(app): blacklist data_categories in summary

NCI-GDC · Apr 21, 2016 · 0a46414 · 0a46414
1 parent f444fe9
commit 0a46414
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 9 deletions.
diff --git a/app/scripts/components/summary-card/summary-card.directives.ts b/app/scripts/components/summary-card/summary-card.directives.ts
@@ -109,6 +109,7 @@ module ngApp.components.summaryCard.directives {
           if (newVal) {
             // Ensure pie chart data is always sorted highest to lowest
             // for tables
+
             if (config.sortData) {
               newVal.sort(function(a, b) {
                 if (a[config.sortKey] > b[config.sortKey]) {
@@ -128,7 +129,11 @@ module ngApp.components.summaryCard.directives {
               item.color = color(index);
             });
 
-            $scope.tableData = newVal;
+            $scope.tableData = newVal.filter(x =>
+              !config.blacklist.some(y =>
+                y.toLowerCase() === x.data_category.toLowerCase()
+              )
+            );
           }
         });
       }
@@ -195,7 +200,11 @@ module ngApp.components.summaryCard.directives {
               item.color = color(index);
             });
 
-            $scope.tableData = newVal;
+            $scope.tableData = newVal.filter(x =>
+              !config.blacklist.some(y =>
+                y.toLowerCase() === x.data_category.toLowerCase()
+              )
+            );
           }
         });
       }

diff --git a/app/scripts/participant/participants.controllers.ts b/app/scripts/participant/participants.controllers.ts
@@ -120,6 +120,7 @@ module ngApp.participants.controllers {
         state: {
           name: "search.files"
         },
+        blacklist: ["structural rearrangement", "dna methylation"],
         filters: {
           "default": {
             params: {

diff --git a/app/scripts/projects/projects.controller.ts b/app/scripts/projects/projects.controller.ts
@@ -217,6 +217,7 @@ module ngApp.projects.controllers {
         state: {
           name: "search.files"
         },
+        blacklist: ["structural rearrangement", "dna methylation"],
         filters: {
           "default": {
             params: {

diff --git a/app/scripts/projects/projects.githut.config.ts b/app/scripts/projects/projects.githut.config.ts
@@ -163,7 +163,7 @@ angular.module('projects.githut.config', [])
     },
     {
       id:'Clinical',
-      display_name:['Clin.'],
+      display_name:['Clinical'],
       scale:'ordinal',
       is_subtype:true,
       dimensional:true,
@@ -172,8 +172,8 @@ angular.module('projects.githut.config', [])
     },
     // Biospecimen
     {
-      id:'Other',
-      display_name:['Bio.'],
+      id:'Biospecimen',
+      display_name:['Biospecimen'],
       scale:'ordinal',
       is_subtype:true,
       dimensional:true,
@@ -275,7 +275,7 @@ angular.module('projects.githut.config', [])
       },
       superhead:{
         start:'Clinical',
-        end:'Other',
+        end:'Biospecimen',
         text: ProjectsService.getTableHeading() //Case count per data type
       },
 

diff --git a/app/scripts/projects/projects.table.model.ts b/app/scripts/projects/projects.table.model.ts
@@ -211,10 +211,10 @@ module ngApp.projects.models {
           }, {
             name: 'Biospecimen',
             id: 'biospecimen',
-            td: (row, $scope) => dataCategoryWithFilters("Other", row, $scope.$filter),
+            td: (row, $scope) => dataCategoryWithFilters("Biospecimen", row, $scope.$filter),
             thClassName: 'text-right',
             tdClassName: 'text-right',
-            total: (data, $scope) => dataCategoryTotalWithFilters('Other', data, $scope.$filter)
+            total: (data, $scope) => dataCategoryTotalWithFilters('Biospecimen', data, $scope.$filter)
           }
         ]
       }, {

diff --git a/app/scripts/search/search.participants.table.model.ts b/app/scripts/search/search.participants.table.model.ts
@@ -122,7 +122,7 @@ module ngApp.search.models {
           }, {
             name: 'Biospecimen',
             id: 'biospecimen',
-            td: (row, $scope) => dataCategoryWithFilters("Other", row, $scope.$filter),
+            td: (row, $scope) => dataCategoryWithFilters("Biospecimen", row, $scope.$filter),
             thClassName: 'text-right',
             tdClassName: 'text-right'
           }