fix(annotations): update field names

Closes #555, #484, #491, #535
NCI-GDC · Mar 13, 2015 · 616ff86 · 616ff86
1 parent d2e50aa
commit 616ff86
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 30 deletions.
diff --git a/app/scripts/annotations/annotations.controllers.ts b/app/scripts/annotations/annotations.controllers.ts
@@ -17,7 +17,6 @@ module ngApp.annotations.controllers {
   class AnnotationsController implements IAnnotationsController {
     annotations: IAnnotations;
 
-
     /* @ngInject */
     constructor(private $scope: IAnnotationsScope, private AnnotationsService: IAnnotationsService,
                 private CoreService: ICoreService, private AnnotationsTableModel:TableiciousConfig) {
@@ -37,13 +36,13 @@ module ngApp.annotations.controllers {
       this.AnnotationsService.getAnnotations({
         fields: this.AnnotationsTableModel.fields,
         facets: [
+          "annotation_id",
           "classification",
           "category",
           "created_datetime",
           "creator",
           "status",
-          "item_type",
-          "item",
+          "entity_type",
           "classification",
           "project.primary_site",
           "project.program.name",

diff --git a/app/scripts/annotations/annotations.services.ts b/app/scripts/annotations/annotations.services.ts
@@ -50,7 +50,7 @@ module ngApp.annotations.services {
       var defaults = {
         size: paging.size,
         from: paging.from,
-        sort: paging.sort || 'item_type:asc',
+        sort: paging.sort || 'entity_type:asc',
         filters: this.LocationService.filters()
       };
 

diff --git a/app/scripts/annotations/annotations.table.model.ts b/app/scripts/annotations/annotations.table.model.ts
@@ -3,7 +3,7 @@ module ngApp.projects.models {
 
     var AnnotationsTableModel:TableiciousConfig = {
         title: "Annotations",
-        order: ['annotation_id', 'participant_id', 'project.program.name', 'project.project_id', 'barcode', 'item_type', 'category', 'classification', 'dateCreated', 'creator', 'status'],
+        order: ['annotation_id', 'participant_id', 'project.program.name', 'project.project_id', 'entity_id', 'entity_type', 'category', 'classification', 'dateCreated', 'creator', 'status', 'submitter_id'],
         headings: [{
             displayName: "ID",
             id: "annotation_id",
@@ -52,27 +52,27 @@ module ngApp.projects.models {
             sortable: true
         },
         {
-            displayName: "Item Type",
-            id: "item_type",
+            displayName: "Entity Type",
+            id: "entity_type",
             template: function (field, row, scope, $filter) {
-                return $filter("humanify")(field && field.val || "tbc");
+                return $filter("humanify")(field && field.val || "--");
             },
             sortable: true
         },
         {
-            displayName: "Item ID",
-            id: "item_id",
-            template: function (x) {
-                return x && x.val || "tbc";
+            displayName: "Entity ID",
+            id: "entity_id",
+            template: function (field) {
+                return field && field.val || "--";
             },
             sortable: true
         },
         {
-            displayName: "Item Barcode",
-            id: "barcode",
+            displayName: "Entity Barcode",
+            id: "submitter_id",
             sortable: true,
-            template: function() {
-              return "tbd";
+            template: function(field) {
+                return field && field.val || "--";
             }
         },
         {
@@ -116,8 +116,9 @@ module ngApp.projects.models {
           "created_datetime",
           "creator",
           "status",
-          "item_type",
-          "item_id",
+          "entity_type",
+          "entity_id",
+          "submitter_id",
           "notes",
           "classification",
           "project.program.name",

diff --git a/app/scripts/annotations/module.ts b/app/scripts/annotations/module.ts
@@ -26,8 +26,9 @@ module ngApp.annotations {
                 "category",
                 "creator",
                 "status",
-                "item_type",
-                "item_id",
+                "entity_type",
+                "entity_id",
+                "submitter_id",
                 "classification",
                 "notes",
                 "created_datetime",

diff --git a/app/scripts/annotations/templates/annotation.html b/app/scripts/annotations/templates/annotation.html
@@ -16,16 +16,16 @@ <h3 class="panel-title" data-translate>Summary</h3>
             <td>{{ ::ac.annotation.annotation_id  }}</td>
           </tr>
           <tr>
-            <th data-translate scope="row">Item UUID</th>
-            <td>{{ ::ac.annotation.item_id }}</td>
+            <th data-translate scope="row">Entity ID</th>
+            <td>{{ ::ac.annotation.entity_id || "--" }}</td>
           </tr>
           <tr>
-            <th data-translate scope="row">Item Barcode</th>
-            <td>tbd {{ ::ac.annotation.barcode }}</td>
+            <th data-translate scope="row">Entity Barcode</th>
+            <td>{{ ::ac.annotation.submitter_id || "--" }}</td>
           </tr>
           <tr>
-            <th data-translate scope="row">Item Type</th>
-            <td>{{ ::ac.annotation.item_type | humanify }}</td>
+            <th data-translate scope="row">Entity Type</th>
+            <td>{{ ::ac.annotation.entity_type | humanify }}</td>
           </tr>
           <tr>
             <th data-translate scope="row">Participant ID</th>

diff --git a/app/scripts/annotations/templates/annotations.html b/app/scripts/annotations/templates/annotations.html
@@ -18,9 +18,9 @@ <h3 class="panel-title pull-left">Facets</h3>
           <terms data-name="annotations.project.primary_site"
                  data-title="Primary Site"
                  data-facet="asc.annotations.aggregations['project.primary_site']" data-collapsed="true"></terms>
-          <terms data-name="annotations.item_type"
-                 data-title="Item Type"
-                 data-facet="asc.annotations.aggregations.item_type"></terms>
+          <terms data-name="annotations.entity_type"
+                 data-title="Entity Type"
+                 data-facet="asc.annotations.aggregations['entity_type']"></terms>
           <terms data-name="annotations.category"
                  data-title="Annotation Category"
                  data-facet="asc.annotations.aggregations.category"></terms>

diff --git a/app/scripts/annotations/tests/annotations.tests.js b/app/scripts/annotations/tests/annotations.tests.js
@@ -15,7 +15,7 @@ describe('Annotations:', function () {
       sinon.spy(AnnotationsService.ds, 'get');
 
       var fs = {hits: [], facets: [], pagination: {}};
-      httpBackend.whenGET("/annotations?filters=%7B%7D&from=1&size=10&sort=item_type:asc").respond(fs);
+      httpBackend.whenGET("/annotations?filters=%7B%7D&from=1&size=10&sort=entity_type:asc").respond(fs);
 
       AnnotationsService.getAnnotations();
       httpBackend.flush();