From a434294c3fea9c3391b10f470c0d841113160462 Mon Sep 17 00:00:00 2001
From: PavelBegunkov <asml.Silence@gmail.com>
Date: Sun, 17 May 2015 12:55:11 +0300
Subject: [PATCH] 1) missing credits in disciplines list 2) forbid exam for
students with <38
---
db/StoredProcedures.sql | 4 ++--
~dev_rating/application/views/teacher/exam.twig | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql
index bba0bfaff..f874f972b 100644
--- a/db/StoredProcedures.sql
+++ b/db/StoredProcedures.sql
@@ -620,8 +620,8 @@ BEGIN
LEFT JOIN `disciplines_groups` ON disciplines_groups.DisciplineID = disciplines_teachers.DisciplineID
# left -> inner join with maybe NULL ?
LEFT JOIN `view_groups` ON view_groups.GroupID = disciplines_groups.GroupID
- INNER JOIN `view_disciplines` ON disciplines_teachers.DisciplineID = view_disciplines.DisciplineID
- INNER JOIN `view_disciplines_results` ON view_disciplines_results.DisciplineID = view_disciplines.DisciplineID
+ LEFT JOIN `view_disciplines` ON disciplines_teachers.DisciplineID = view_disciplines.DisciplineID
+ LEFT JOIN `view_disciplines_results` ON view_disciplines_results.DisciplineID = view_disciplines.DisciplineID
WHERE disciplines_teachers.TeacherID = pTeacherID AND
view_disciplines.SemesterID = @CurrentSemesterID
ORDER BY view_disciplines.GradeID ASC,
diff --git a/~dev_rating/application/views/teacher/exam.twig b/~dev_rating/application/views/teacher/exam.twig
index 6bdbf7044..8f993d58f 100644
--- a/~dev_rating/application/views/teacher/exam.twig
+++ b/~dev_rating/application/views/teacher/exam.twig
@@ -150,7 +150,7 @@
{% set td_class = 'additionalCell' %}
{% endif %}
- {% if r.Block == 'True' %}
+ {% if r.Block == 'True' or (r.ModuleType != 'extra' and student.RateResult < 38) %}
<td class="staticCell {{ td_class }}" id="col_{{ col }}_row_{{ row }}">
<input type="text" value="{{ r.Rate }}" disabled="disabled">
</td>
--
GitLab