remove extra step in end assessment process

[qomet.git] / models / assessment.js

diff --git a/models/assessment.js b/models/assessment.js
index 9ab92ba..d0e0d0b 100644 (file)
--- a/models/assessment.js
+++ b/models/assessment.js
@@ -115,14 +115,15 @@ const AssessmentModel =
                });
        },
 
-       endSession: function(aid, number, password, cb)
+       // NOTE: no callbacks for 2 next functions, failures are not so important
+       // (because monitored: teachers can see what's going on)
+
+       newConnection: function(aid, number)
        {
-               AssessmentEntity.endAssessment(aid, number, password, (err,ret) => {
-                       if (!!err || !ret)
-                               return cb(err,ret);
-                       AssessmentEntity.getConclusion(aid, (err2,conclusion) => {
-                               cb(err2, {conclusion:conclusion});
-                       });
+               //increment discoCount, reset discoTime to NULL, update totalDisco
+               AssessmentEntity.getDiscoTime(aid, number, (err,discoTime) => {
+                       if (!!discoTime)
+                               AssessmentEntity.addDisco(aid, number, Date.now() - discoTime);
                });
        },
 };