fix(query): fixes summary tab

NCI-GDC · May 27, 2015 · 946b040 · 946b040
1 parent 0509a52
commit 946b040
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 36 deletions.
diff --git a/app/scripts/query/query.controllers.ts b/app/scripts/query/query.controllers.ts
@@ -55,7 +55,8 @@ module ngApp.query.controllers {
                 private UserService: IUserService,
                 private CoreService: ICoreService,
                 private SearchTableFilesModel: TableiciousConfig,
-                private SearchTableParticipantsModel: TableiciousConfig) {
+                private SearchTableParticipantsModel: TableiciousConfig,
+                SearchChartConfigs) {
       var data = $state.current.data || {};
       this.QState.setActive(data.tab, "active");
       CoreService.setPageTitle("Query");
@@ -72,25 +73,8 @@ module ngApp.query.controllers {
       $scope.fileTableConfig = this.SearchTableFilesModel;
       $scope.participantTableConfig = this.SearchTableParticipantsModel;
 
-      this.projectIdChartConfig = {
-        key: "project_id",
-        textValue: "file_size.value",
-        textFilter: "size",
-        label: "file",
-        sortKey: "doc_count",
-        defaultText: "project"
-      };
-
-      this.primarySiteChartConfig = {
-        key: "primary_site",
-        textValue: "file_size.value",
-        textFilter: "size",
-        label: "file",
-        sortKey: "doc_count",
-        defaultText: "primary site"
-      };
-
       this.refresh();
+      this.chartConfigs = SearchChartConfigs;
     }
 
     refresh() {

diff --git a/app/scripts/query/templates/query.summary.html b/app/scripts/query/templates/query.summary.html
@@ -8,27 +8,46 @@
 </div>
 
 <div class="row">
-  <div class="col-lg-4">
-    <count-card title="Files" icon="fa-file-o" data="qc.files.pagination.total"></count-card>
+  <div class="col-sm-4">
+    <count-card title="Files" icon="fa-file-o" data="qc.files.pagination.total | number"></count-card>
   </div>
-  <div class="col-lg-4">
-    <count-card title="Cases" icon="fa-user" data="qc.participants.pagination.total"></count-card>
+  <div class="col-sm-4">
+    <count-card title="Cases" icon="fa-user" data="qc.participants.pagination.total | number"></count-card>
   </div>
-  <div class="col-lg-4">
-    <count-card title="File Size" icon="fa-save" data="qc.summary.fs.value"
-                data-filter="true"></count-card>
+  <div class="col-sm-4">
+    <count-card title="File Size" icon="fa-save" data="qc.summary.fs.value | size"></count-card>
   </div>
 </div>
 
 <div class="row">
-  <div class="col-lg-6">
-    <donut-chart data="qc.summary.participants['participants.project.project_id'].buckets"
-                 height="400" data-filter="true" config="qc.projectIdChartConfig"
-                 data-title="File Counts by Project"></donut-chart>
-  </div>
-  <div class="col-lg-6">
-    <donut-chart data="qc.summary.participants['participants.project.primary_site'].buckets"
-                 height="400" data-filter="true" config="qc.primarySiteChartConfig"
-                 data-title="File Counts by Primary Site"></donut-chart>
+  <div class="col-lg-4 col-sm-6">
+    <pie-chart data="qc.summary.participants['participants.project.project_id'].buckets"
+                 height="300" config="qc.chartConfigs.projectIdChartConfig"
+                 data-title="File Counts by Project"></pie-chart>
+  </div>
+  <div class="col-lg-4 col-sm-6">
+    <pie-chart data="qc.summary.participants['participants.project.primary_site'].buckets"
+                 height="300" config="qc.chartConfigs.primarySiteChartConfig"
+                 data-title="File Counts by Primary Site"></pie-chart>
+  </div>
+  <div class="col-lg-4 col-sm-6">
+    <pie-chart data="qc.summary.access.buckets"
+                 height="300" config="qc.chartConfigs.accessChartConfig"
+                 data-title="File Counts by Access Level"></pie-chart>
+  </div>
+  <div class="col-lg-4 col-sm-6">
+    <pie-chart data="qc.summary.data_type.buckets"
+                 height="300" config="qc.chartConfigs.dataTypeChartConfig"
+                 data-title="File Counts by Data Type"></pie-chart>
+  </div>
+  <div class="col-lg-4 col-sm-6">
+    <pie-chart data="qc.summary.data_format.buckets"
+                 height="300" config="qc.chartConfigs.dataFormatChartConfig"
+                 data-title="File Counts by Data Format"></pie-chart>
+  </div>
+  <div class="col-lg-4 col-sm-6">
+    <pie-chart data="qc.summary.experimental_strategy.buckets"
+                 height="300" config="qc.chartConfigs.expStratChartConfig"
+                 data-title="File Counts by Experimental Strategy"></pie-chart>
   </div>
 </div>
diff --git a/app/scripts/query/tests/query.tests.js b/app/scripts/query/tests/query.tests.js
@@ -1,7 +1,8 @@
 describe('Query:', function () {
 
   // Initialization of the AngularJS application before each test case
-  beforeEach(module('ngApp.query', 'ngProgressLite', 'lz-string'));
+  beforeEach(module('ngApp.query', 'ngProgressLite', 'lz-string',
+                    "core.filters"));
 
   beforeEach(module(function ($provide) {
       $provide.value('RestFullResponse', {});