From 0456584218495ce1699d0cd54ea4d836c24bde31 Mon Sep 17 00:00:00 2001
From: Roman Steinberg <roman.accs@gmail.com>
Date: Sun, 25 Sep 2016 15:30:38 +0300
Subject: [PATCH] FIX: processing of extra; FIX: placeholder positioning

---
 media/js/discipline/rating/common.js             | 2 +-
 ~dev_rating/application/classes/Model/Rating.php | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/media/js/discipline/rating/common.js b/media/js/discipline/rating/common.js
index 18bae7493..46c3f1450 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 49cdfc0b7..314917b5f 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);
     }
-- 
GitLab