From 7c2adecf64fd5504cdbe61fd145f737a306c70da 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: Mon, 22 Dec 2014 01:06:18 +0300 Subject: [PATCH] fix js and css --- ~dev_rating/media/css/rating.css | 2 +- ~dev_rating/media/js/rating.js | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/~dev_rating/media/css/rating.css b/~dev_rating/media/css/rating.css index 4852c3fd2..a9350bc8f 100644 --- a/~dev_rating/media/css/rating.css +++ b/~dev_rating/media/css/rating.css @@ -15,7 +15,7 @@ margin-left: 1.5%; padding-top: 5px; - font-size: 18px; + font-size: 16px; } .studentsRate { diff --git a/~dev_rating/media/js/rating.js b/~dev_rating/media/js/rating.js index 7d7b5af97..0a571c345 100644 --- a/~dev_rating/media/js/rating.js +++ b/~dev_rating/media/js/rating.js @@ -84,9 +84,12 @@ $(function() { g_submoduleTitle = 'Бонусные баллы'; g_submoduleMaxRate = parseInt($(".RatingTableSubmodulesHeadMaxRate #"+g_submoduleID).children("input").val()); - if (jThis.attr("class").indexOf("additionalCell") >= 0) + if (jThis.attr("class").indexOf("additionalCell") >= 0) { - g_submoduleMaxRate = 38 - parseInt(jThis.siblings(".semesterRateResultCell").text()); + var t = parseInt(jThis.siblings(".semesterRateResultCell").text()); + if (t > 31 && t < 39) + g_submoduleMaxRate = 38 - t; + else g_submoduleMaxRate = 0; } // Получаем студента -- GitLab