From 587b19d79520c2d474bb45e4c72118252cb08b86 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, 30 Aug 2014 14:21:18 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B0=D0=B2=D1=82=D0=BE=D1=80=D0=B0=20=D0=B4?=
=?UTF-8?q?=D0=B8=D1=81=D1=86=D0=B8=D0=BF=D0=BB=D0=B8=D0=BD=D1=8B=20=D0=BD?=
=?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=B7=D1=8F=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B8?=
=?UTF-8?q?=D1=82=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
~dev_rating/application/classes/Controller/Teacher/Map.php | 1 +
~dev_rating/application/views/teacher/map/EditTeachers.twig | 6 +++++-
~dev_rating/application/views/teacher/setRate.twig | 2 +-
~dev_rating/media/js/construct/edit.js | 4 ++--
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/~dev_rating/application/classes/Controller/Teacher/Map.php b/~dev_rating/application/classes/Controller/Teacher/Map.php
index 2fdfaedc4..c0d1964a7 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 25acf4f47..212edcf1e 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 0e7a68dfe..7d0cc4cbf 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 bb328b043..688d5f0d3 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) {
--
GitLab