From 9fe11b12cc6b02c97b66f2f30104a36571da6c66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=A8=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=BC=D0=BE=D0=B2?= <solidovic@gmail.com> Date: Sun, 30 Nov 2014 10:45:20 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=82=D0=BE=D0=B3=20=D0=BD=D0=B5=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B5=D0=B2=D1=8B=D1=88=D0=B0=D0=B5=D1=82=20100=20?= =?UTF-8?q?=D0=B1=D0=B0=D0=BB=D0=BB=D0=BE=D0=B2=20(=D0=B1=D0=BE=D0=BD?= =?UTF-8?q?=D1=83=D1=81=20=D0=B2=20100=20=D0=B1=D0=B0=D0=BB=D0=BB=D0=BE?= =?UTF-8?q?=D0=B2=20=D1=82=D0=BE=D0=B6=D0=B5=20=D0=B2=D1=85=D0=BE=D0=B4?= =?UTF-8?q?=D0=B8=D1=82)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ~dev_rating/media/js/rating.js | 58 +++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/~dev_rating/media/js/rating.js b/~dev_rating/media/js/rating.js index 59394a8d3..20a18f011 100644 --- a/~dev_rating/media/js/rating.js +++ b/~dev_rating/media/js/rating.js @@ -109,33 +109,41 @@ $(function() { newRate = parseInt(jThis.children("input").val()); //var maxRate = parseInt($(".RatingTableSubmodulesHeadMaxRate #"+g_submoduleID).children("input").val()); - if (newRate <= g_submoduleMaxRate) + var rateResult = parseInt(jThis.siblings(".RateResult").text()) - oldRate + newRate; + if (rateResult > 100) { + jThis.children("input").val(oldRate); + EventInspector_ShowMsg("Сумма баллов не может привышать 100", "error"); + } + else { - $.post( - URLdir + "handler/rating/setRate", - { - "student": g_studentID, - "submodule": g_submoduleID, - "rate": newRate - }, - function(data){ - data = $.parseJSON(data); - if(data.success === true) { - jThis.siblings(".RateResult").text(parseInt(jThis.siblings(".RateResult").text()) - oldRate + newRate); - EventInspector_ShowMsg("Балл добавлен/изменен", "success"); + if (newRate <= g_submoduleMaxRate) + { + $.post( + URLdir + "handler/rating/setRate", + { + "student": g_studentID, + "submodule": g_submoduleID, + "rate": newRate + }, + function(data){ + data = $.parseJSON(data); + if(data.success === true) { + jThis.siblings(".RateResult").text(rateResult); + EventInspector_ShowMsg("Балл добавлен/изменен", "success"); + } + else EventInspector_ShowMsg("Не удалось добавить/изменить балл", "error"); + jThis.children("input").removeAttr("disabled"); } - else EventInspector_ShowMsg("Не удалось добавить/изменить балл", "error"); - jThis.children("input").removeAttr("disabled"); - } - ); - } - else { - if (oldRate <= g_submoduleMaxRate) - jThis.children("input").val(oldRate); - else - jThis.children("input").val("0"); - EventInspector_ShowMsg("Текущий балл превышает максимальный для данного модуля", "error"); - jThis.children("input").removeAttr("disabled"); + ); + } + else { + if (oldRate <= g_submoduleMaxRate) + jThis.children("input").val(oldRate); + else + jThis.children("input").val("0"); + EventInspector_ShowMsg("Текущий балл превышает максимальный для данного модуля", "error"); + jThis.children("input").removeAttr("disabled"); + } } } -- GitLab