From d5765558368e450c9fdb6322a156140f5b589a34 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: Sat, 6 Sep 2014 19:22:29 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B3=D1=80=D0=B0=D0=BD=D0=B8=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20100/60=20=D0=B1=D0=B0=D0=BB=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ~dev_rating/media/js/discipline/edit.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/~dev_rating/media/js/discipline/edit.js b/~dev_rating/media/js/discipline/edit.js
index 237cf258b..c3f082b5a 100644
--- a/~dev_rating/media/js/discipline/edit.js
+++ b/~dev_rating/media/js/discipline/edit.js
@@ -107,8 +107,10 @@ $(function() {
 		if (thisObj.val() != '')
 			NewMaxRate = parseInt(thisObj.val());
 		
-		/*
 		// Ограничение 100 баллов
+		var MaxSumRate = 100;
+		if ($('div').is('.ExamModule')) MaxSumRate = 60;
+		
 		var currentControl = 0;
 		$('.moduleHead .currentControl').each(function(){
 			currentControl += parseInt($(this).text());
@@ -122,12 +124,17 @@ $(function() {
 			subtract = parseInt(thisObj.parent().siblings('.currentControl').children().val());
 		if (thisObj.parent().attr('class').indexOf('currentControl') + 1 > 0)
 			subtract = parseInt(thisObj.parent().siblings('.landmarkControl').children().val());
-		if (currentControl + landmarkControl + NewMaxRate - subtract - OldMaxRate > 100) {
-			EventInspector_ShowMsg('Сумма баллов превышает 100', 'error');
+		if (currentControl + landmarkControl + NewMaxRate - subtract - OldMaxRate > MaxSumRate) {
+			EventInspector_ShowMsg('Сумма баллов превышает максимум', 'error');
 			thisObj.val(OldMaxRate);
+			if (NewMaxRate == 0) {
+				thisObj.val('0');
+				// Подсчет текущего и рубежного контроля после изменений
+				CountCurrentControl(subModulesDiv);
+				CountLandmarkControl(subModulesDiv);
+			}
 			return 0;
 		}
-		*/
 		
 		// Меняем max балл
 		if (NewMaxRate != OldMaxRate) {
-- 
GitLab