diff --git a/media/js/discipline/rating/common.js b/media/js/discipline/rating/common.js index 18bae7493eba8e80828d6b337385ab8cf6e15074..46c3f14502899e0825a0f9ec210a28dc9b249659 100644 --- a/media/js/discipline/rating/common.js +++ b/media/js/discipline/rating/common.js @@ -315,6 +315,7 @@ function Rating() { var postRate = function (rate, $this, oldRate, rateResult, studentID, submoduleID) { const disciplineID = settings.disciplineID; + let [col, row] = cursor.get(); $.postJSON(URLdir + 'handler/rating/setRate', {studentID, disciplineID, submoduleID, rate}) .success(() => { let correctRate = (rateResult > 100) ? '100+' : rateResult; @@ -322,7 +323,6 @@ function Rating() { // Открываем доступ к след. ячейке добора баллов if ($this.hasClass('additionalCell')) { - let [col, row] = cursor.get(); let nextAdditionalCell = $(`#col_row_${col + 1}_${row}`); let placeholderMaxVal = (rateResult < 60) ? (60 - rateResult) : 0; diff --git a/~dev_rating/application/classes/Model/Rating.php b/~dev_rating/application/classes/Model/Rating.php index 49cdfc0b772d45ec41dc41899484198fa5fa0564..314917b5fd1f23053d1768cb5691f639534520d8 100644 --- a/~dev_rating/application/classes/Model/Rating.php +++ b/~dev_rating/application/classes/Model/Rating.php @@ -408,20 +408,18 @@ class RateStatesModel public static function checkTransitionForExam($ratesBySubmodules, $change) { // определить предыдущее состояние $model = new RateStatesModel(); - $model->fillForExam($ratesBySubmodules['regular'], $ratesBySubmodules['extra'], + $model->fillForExam($ratesBySubmodules['regular'], $ratesBySubmodules['extra1'], [$ratesBySubmodules['exam1'], $ratesBySubmodules['exam2'], $ratesBySubmodules['exam3']]); $previousState = $model->forward; -// echo Debug::vars($ratesByType); -// echo Debug::vars('Forward: ', $model); // определить текущее состояние $ratesBySubmodules[$change['type']] += $change['rate']; if ($ratesBySubmodules[$change['type']] == -1) { $ratesBySubmodules[$change['type']] = null; } - $model->fillForExam($ratesBySubmodules['regular'], $ratesBySubmodules['extra'], + $model->fillForExam($ratesBySubmodules['regular'], $ratesBySubmodules['extra1'], [$ratesBySubmodules['exam1'], $ratesBySubmodules['exam2'], $ratesBySubmodules['exam3']]); -// echo Debug::vars('Backward: ', $model); + // анализ ошибок return $model->checkTransitionPermission($previousState); }