fix(citizenScienceLabels): changed labels model structure to allow mu…

…ltiple examples as array
QutEcoacoustics · Feb 9, 2017 · ea6683f · ea6683f
1 parent 1c4afe7
commit ea6683f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/app/citizenScience/bristlebird/bristlebird.js b/src/app/citizenScience/bristlebird/bristlebird.js
@@ -61,23 +61,23 @@ class BristlebirdController {
         $scope.labels = [{
                 "tags": ["ebb", "type1"],
                 "label": "Eastern Bristlebird",
-                "example": {
+                "examples": [{
                     "annotationId": 12121
-                }
+                }]
             },
             {
                 "tags": ["ground_parrot", "type1"],
                 "label": "Ground Parrot",
-                "example": {
+                "examples": [{
                     "annotationId": 12122
-                }
+                }]
             },
             {
                 "tags": ["quoll", "type1"],
                 "label": "Spotted Quoll",
-                "example": {
+                "examples": [{
                     "annotationId": 12123
-                }
+                }]
             }];
 
         self.getSamples = CitizenScienceCommon.bindGetSamples($scope);

diff --git a/src/app/citizenScience/labels/citizenScienceLabels.js b/src/app/citizenScience/labels/citizenScienceLabels.js
@@ -44,20 +44,20 @@ angular.module("bawApp.components.citizenScienceLabels", ["bawApp.citizenScience
                 };
 
                 /**
-                 * given an array of arrays "containingArray", and an array "arr",
+                 * given an array of arrays "outerArray", and an array "arr",
                  * returns the index of containingArray that matches arr
                  */
-                self.indexOfArray = function (containingArray, arr) {
+                self.indexOfArray = function (outerArray, arr) {
                     var i,j,curSame;
                     arr = arr.sort();
-                    for (i = 0; i < containingArray.length; i++) {
-                        if(arr.length !== containingArray[i].length) {
+                    for (i = 0; i < outerArray.length; i++) {
+                        if(arr.length !== outerArray[i].length) {
                             continue;
                         }
-                        containingArray[i] = containingArray[i].sort();
+                        outerArray[i] = outerArray[i].sort();
                         curSame = true;
                         for(j = arr.length; j--;) {
-                            if(arr[j] !== containingArray[i][j]) {
+                            if(arr[j] !== outerArray[i][j]) {
                                 curSame = false;
                                 break;
                             }
@@ -71,7 +71,7 @@ angular.module("bawApp.components.citizenScienceLabels", ["bawApp.citizenScience
                 };
 
                 /**
-                 * Whether the all tags in the label have been attached to the current sample
+                 * Whether the label has been attached to the current sample
                  * @param label Object
                  * @returns Boolean
                  */