diff --git a/~dev_rating/application/views/teacher/exam.twig b/~dev_rating/application/views/teacher/exam.twig index 57ab9a8ab89881eec334a3989a3bb7d2cebe7f2e..d1205bd63af2b66d0194bfbb5ad1aca12230515b 100644 --- a/~dev_rating/application/views/teacher/exam.twig +++ b/~dev_rating/application/views/teacher/exam.twig @@ -69,7 +69,7 @@ <tr class="RatingTableSubmodulesHeadMaxRate"> {% set columnsCount = 4 %} {# студенты, итог за семестр, бонусы, итог #} - {% set col = 0 %} + {% set col = 1 %} <td class="title">Макс. балл</td> {% for i in 1..headerRate.ModulesCount %} {% set columnsCount = columnsCount + headerRate[i].SubmodulesCount %} @@ -155,8 +155,16 @@ </td> {% else %} <td class="commonCell {{ td_class }}" id="col_{{ col }}_row_{{ row }}"> - <input type="text" value="{{ r.Rate }}" {% if r.ModuleType == 'extra' %} - placeholder="{% if r.MaxRate > 0 %} макс. {{r.MaxRate}} {% else %} --- {% endif %}"{% endif %}> + <input type="text" value="{{ r.Rate }}" + {% if r.ModuleType == 'extra' %} + {% if r.MaxRate > 0 %} + placeholder="макс. {{r.MaxRate}}" + {% else %} + placeholder="---" + disabled="disabled" + {% endif %} + {% endif %} + > </td> {% endif %} diff --git a/~dev_rating/media/js/rating.js b/~dev_rating/media/js/rating.js index 889d39a26b3d7c3dcd6ac9a1b698651d143f3764..5d95c7dca8ebc63eb221f379fc16f904664d6673 100644 --- a/~dev_rating/media/js/rating.js +++ b/~dev_rating/media/js/rating.js @@ -133,7 +133,9 @@ $(function() { function TdInfo(jThis) { var disciplineType = json_settings.ExamType; - var disciplinePassRate = 0; + var disciplinePassRate = 60; // credit pass rate + if (disciplineType == "exam") + disciplinePassRate = 38; // Получаем подмодуль g_submoduleID = parseInt($(".RatingTableSubmodulesInfo .col_"+g_col+":first").attr("id"));