Skip to content
Snippets Groups Projects
Commit a434294c authored by PavelBegunkov's avatar PavelBegunkov
Browse files

1) missing credits in disciplines list

2) forbid exam for students with <38
parent 56c36e59
Branches
Tags
No related merge requests found
...@@ -620,8 +620,8 @@ BEGIN ...@@ -620,8 +620,8 @@ BEGIN
LEFT JOIN `disciplines_groups` ON disciplines_groups.DisciplineID = disciplines_teachers.DisciplineID LEFT JOIN `disciplines_groups` ON disciplines_groups.DisciplineID = disciplines_teachers.DisciplineID
# left -> inner join with maybe NULL ? # left -> inner join with maybe NULL ?
LEFT JOIN `view_groups` ON view_groups.GroupID = disciplines_groups.GroupID LEFT JOIN `view_groups` ON view_groups.GroupID = disciplines_groups.GroupID
INNER JOIN `view_disciplines` ON disciplines_teachers.DisciplineID = view_disciplines.DisciplineID LEFT 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_results` ON view_disciplines_results.DisciplineID = view_disciplines.DisciplineID
WHERE disciplines_teachers.TeacherID = pTeacherID AND WHERE disciplines_teachers.TeacherID = pTeacherID AND
view_disciplines.SemesterID = @CurrentSemesterID view_disciplines.SemesterID = @CurrentSemesterID
ORDER BY view_disciplines.GradeID ASC, ORDER BY view_disciplines.GradeID ASC,
......
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
{% set td_class = 'additionalCell' %} {% set td_class = 'additionalCell' %}
{% endif %} {% 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 }}"> <td class="staticCell {{ td_class }}" id="col_{{ col }}_row_{{ row }}">
<input type="text" value="{{ r.Rate }}" disabled="disabled"> <input type="text" value="{{ r.Rate }}" disabled="disabled">
</td> </td>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment