X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=models%2Fassessment.js;h=8bc08d5b7c5a37768f9cafcb703586502c09bcf0;hb=db5571d67f6b6b3b841fa1eeaf2099cecf2bcffc;hp=d5bd3a1b6138e69681bae97ae7242ead55035583;hpb=29c8b391bcdf6ffca53545178e2ad194287a1bdc;p=qomet.git diff --git a/models/assessment.js b/models/assessment.js index d5bd3a1..8bc08d5 100644 --- a/models/assessment.js +++ b/models/assessment.js @@ -123,7 +123,7 @@ const AssessmentModel = //increment discoCount, reset discoTime to NULL, update totalDisco AssessmentEntity.getDiscoTime(aid, number, (err,discoTime) => { if (!!discoTime) - AssessmentEntity.addDisco(aid, number, discoTime - Date.now()); + AssessmentEntity.addDisco(aid, number, Date.now() - discoTime); }); }, @@ -132,9 +132,6 @@ const AssessmentModel = AssessmentEntity.endAssessment(aid, number, password, (err,ret) => { if (!!err || !ret) return cb(err,ret); - AssessmentEntity.getConclusion(aid, (err2,conclusion) => { - cb(err2, {conclusion:conclusion}); - }); }); }, };