update

bazzil29 · Dec 27, 2018 · 44ac3b4 · 44ac3b4
1 parent 1ca3dfa
commit 44ac3b4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/controller/admin.controller.js b/controller/admin.controller.js
@@ -352,15 +352,11 @@ module.exports = {
 
             let count = 0;
 
-            studentSurveys.forEach(e => {
-                if (surveyChecker.verify(e)) {
-                    count++;
-                }
-            })
-
-
             if (studentSurveys) {
                 studentSurveys.forEach(e => {
+                    if (surveyChecker.verify(e)) {
+                        count++;
+                    }
                     if (!!e.comment) {
                         comments.push(e.comment);
                     }

diff --git a/controller/teacher.controller.js b/controller/teacher.controller.js
@@ -3,6 +3,7 @@ const ClassSurvey = require('../models/classSurvey.model');
 const Class = require('../models/class.model');
 const StudentSurvey = require('../models/studentSurvey.model');
 
+const surveyChecker = require('../common/validateSurvey');
 const response = require('../common/response');
 
 module.exports = {
@@ -41,15 +42,21 @@ module.exports = {
             const isHaveClass = teacherClasses.find(e => e.id === classId);
             const studentSurveys = await StudentSurvey.find({ class: classId });
             const comments = [];
+            let count = 0;
 
             if (studentSurveys) {
                 studentSurveys.forEach(e => {
+                    if (surveyChecker.verify(e)) {
+                        count++;
+                    }
+
                     if (!!e.comment) {
                         comments.push(e.comment);
                     }
                 })
             }
 
+
             if (isHaveClass) {
                 const classSurvey = await ClassSurvey.findById(classId);
                 console.log(classSurvey);
@@ -61,7 +68,7 @@ module.exports = {
                     last_modify: classSurvey.last_modify,
                     deadline: classSurvey.deadline,
                     comments: comments,
-                    count_of_students: studentSurveys.length
+                    count_of_students: count
                 }
                 response.success(res, classSurveyTmp);
             }
@@ -86,7 +93,7 @@ module.exports = {
                     id: classId,
                     name: isExistClass.name
                 });
-                teachers.findEach(e => {
+                teachers.forEach(e => {
                     if (e.id !== userId) {
                         for (let i = 0; i < e.class.length; i++) {
                             if (e.class[i].id === classId) {