Changed 'answer' property of AnswerItem model to 'answered'

labibramadhan · Jan 28, 2017 · 2bca9b3 · 2bca9b3
1 parent 34a9be5
commit 2bca9b3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/app/components/controllers/grade/answer/view.js b/app/components/controllers/grade/answer/view.js
@@ -95,21 +95,21 @@ angular.module('app')
           let answer = _.find(vm.answer.answerItems, {
             question_id: cell.id
           });
-          if (answer.answer === null || answer.answer === '') {
+          if (answer.answered === null || answer.answered === '') {
             return;
           }
           let directions = [];
           switch (type) {
             case 'down':
               directions = _.range(cell.startRow, cell.endRow + 1);
               _.each(directions, (d, idx) => {
-                vm.values[d][cell.startCol] = answer.answer[idx];
+                vm.values[d][cell.startCol] = answer.answered[idx];
               });
               break;
             case 'across':
               directions = _.range(cell.startCol, cell.endCol + 1);
               _.each(directions, (d, idx) => {
-                vm.values[cell.startRow][d] = answer.answer[idx];
+                vm.values[cell.startRow][d] = answer.answered[idx];
               });
               break;
           }
@@ -124,7 +124,7 @@ angular.module('app')
         let answer = _.find(vm.answer.answerItems, {
           question_id: cell.id
         });
-        if (!answer.answer) {
+        if (!answer.answered) {
           return -1;
         }
         return answer.remark;
@@ -137,7 +137,7 @@ angular.module('app')
         if (_.isUndefined(answer) || !answer) {
           return false;
         }
-        return answer.answer === cell.word;
+        return answer.answered === cell.word;
       };
     },
   ]);
diff --git a/app/components/controllers/test/finish.js b/app/components/controllers/test/finish.js
@@ -88,21 +88,21 @@ angular.module('app')
           let answer = _.find(vm.answer.answerItems, {
             question_id: cell.id
           });
-          if (answer.answer === null || answer.answer === '') {
+          if (answer.answered === null || answer.answered === '') {
             return;
           }
           let directions = [];
           switch (type) {
             case 'down':
               directions = _.range(cell.startRow, cell.endRow + 1);
               _.each(directions, (d, idx) => {
-                vm.values[d][cell.startCol] = answer.answer[idx];
+                vm.values[d][cell.startCol] = answer.answered[idx];
               });
               break;
             case 'across':
               directions = _.range(cell.startCol, cell.endCol + 1);
               _.each(directions, (d, idx) => {
-                vm.values[cell.startRow][d] = answer.answer[idx];
+                vm.values[cell.startRow][d] = answer.answered[idx];
               });
               break;
           }
@@ -117,7 +117,7 @@ angular.module('app')
         let answer = _.find(vm.answer.answerItems, {
           question_id: cell.id
         });
-        if (!answer.answer) {
+        if (!answer.answered) {
           return -1;
         }
         return answer.remark;
@@ -130,7 +130,7 @@ angular.module('app')
         if (!_.get(answer)) {
           return false;
         }
-        return answer.answer === cell.word;
+        return answer.answered === cell.word;
       };
     },
   ]);