diff --git a/~dev_rating/application/classes/Controller/Teacher/Map.php b/~dev_rating/application/classes/Controller/Teacher/Map.php index 2fdfaedc41b77e07532d6212bdc52dced8ce8340..c0d1964a77f1b27524fa9aca3ca1ec2615b7b527 100644 --- a/~dev_rating/application/classes/Controller/Teacher/Map.php +++ b/~dev_rating/application/classes/Controller/Teacher/Map.php @@ -333,6 +333,7 @@ class Controller_Teacher_Map extends Controller_UserEnvi { $TeachersHandled[$i]['FacultyID'] = $row['FacultyID']; $TeachersHandled[$i]['FacultyName'] = $row['FacultyName']; $TeachersHandled[$i]['FacultyAbbreviation'] = $row['FacultyAbbreviation']; + $TeachersHandled[$i]['isAuthor'] = $row['isAuthor']; } diff --git a/~dev_rating/application/views/teacher/map/EditTeachers.twig b/~dev_rating/application/views/teacher/map/EditTeachers.twig index 25acf4f477aaee4f6f276bafd506009cef4bd3dc..212edcf1e98a8cf435d46a703282fa31d61b24c8 100644 --- a/~dev_rating/application/views/teacher/map/EditTeachers.twig +++ b/~dev_rating/application/views/teacher/map/EditTeachers.twig @@ -11,7 +11,11 @@ {% for Teacher in BindTeachersList %} <div class="Teacher" id="{{ Teacher.TeacherID }}"> <div class="Name">{{ Teacher.TeacherLast }} {{ Teacher.TeacherFirst }} {{ Teacher.TeacherSecond }}</div> - <div class="Action_UnbindTeacher Action">Отсоединить</div> + {% if Teacher.isAuthor == 0 %} + <div class="Action_UnbindTeacher Action">Отсоединить</div> + {% else %} + <div class="Action">Автор дисциплины</div> + {% endif %} </div> {% endfor %} </div> diff --git a/~dev_rating/application/views/teacher/setRate.twig b/~dev_rating/application/views/teacher/setRate.twig index 0e7a68dfedfd474a85ee7eddbbccc15f15d2acf9..7d0cc4cbf2470f48d3f1f70c9613eb234d46633b 100644 --- a/~dev_rating/application/views/teacher/setRate.twig +++ b/~dev_rating/application/views/teacher/setRate.twig @@ -14,7 +14,7 @@ {% block main_top_title %}Выставление баллов{% endblock %} {% block main_content %} <h2 style="margin-left: 2.5%; font-weight: normal; color: #3399CC;">{{ headerRate.SubjectName }}</h2> - <p style="font-size: 15px; margin-left: 2.5%">Обратить внимание, что пустая клетка эквивалентна нулю</p> + <p class="notification">Обратить внимание, что пустая клетка эквивалентна нулю</p> <table class="studentsRate" border="0" cellspacing="0" cellpadding="0"> <tr class="RatingTableModulesHead"> <td class="title" width="150px">Модуль</td> diff --git a/~dev_rating/media/js/construct/edit.js b/~dev_rating/media/js/construct/edit.js index bb328b0430c27f1571116f69b55402dd3d39fc3d..688d5f0d392102ebfd1a9449286aafea1a039449 100644 --- a/~dev_rating/media/js/construct/edit.js +++ b/~dev_rating/media/js/construct/edit.js @@ -107,7 +107,7 @@ $(function() { if (thisObj.val() != '') NewMaxRate = parseInt(thisObj.val()); - /* + // Ограничение 100 баллов var currentControl = 0; $('.moduleHead .currentControl').each(function(){ @@ -127,7 +127,7 @@ $(function() { thisObj.val(OldMaxRate); return 0; } - */ + // Меняем max балл if (NewMaxRate != OldMaxRate) {