From 1be9165e5304c5953992ed8a8e1b54b73cd8ec4c Mon Sep 17 00:00:00 2001 From: PavelBegunkov <asml.silence@gmail.com> Date: Fri, 12 Aug 2016 11:35:03 +0300 Subject: [PATCH] #135 cut out invalid\unimplemented gui parts --- deploy/phpConfig/sidePanel/admin.json | 2 +- media/js/discipline/createDiscipline.js | 18 ++++++++--------- .../views/teacher/discipline/create.twig | 20 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/deploy/phpConfig/sidePanel/admin.json b/deploy/phpConfig/sidePanel/admin.json index b1e7aec32..66fddee1b 100644 --- a/deploy/phpConfig/sidePanel/admin.json +++ b/deploy/phpConfig/sidePanel/admin.json @@ -2,7 +2,7 @@ { "Title": "Структура ЮФУ", "Items": [ - { "Title": "Подразделения", "Anchor": "faculties" }, + { "Title": "Подразделения", "Anchor": "faculties", "Disabled": "true" }, { "Title": "Кафедры", "Anchor": "departments", "Disabled": "true" }, { "Title": "Направления подготовки", "Anchor": "specializations", "Disabled": "true" } ] diff --git a/media/js/discipline/createDiscipline.js b/media/js/discipline/createDiscipline.js index ca447bded..41c1802ef 100644 --- a/media/js/discipline/createDiscipline.js +++ b/media/js/discipline/createDiscipline.js @@ -5,7 +5,7 @@ $(function() { var jSubjectInput = $("input.InputSubject "); var jGradeSelect = $("select.SelectGrade"); var jExamTypeRadio = $("input.ExamType"); - var jCompoundSelect = $("select.SelectCompound"); + // var jCompoundSelect = $("select.SelectCompound"); // Рзменения базовых параметров дисциплины $(".AddDiscipline").click(function() @@ -27,7 +27,7 @@ $(function() { ++errCount; } - var CompoundID = parseInt(jCompoundSelect.val()); + // var CompoundID = parseInt(jCompoundSelect.val()); var examType = jExamTypeRadio.filter(":radio:checked").val(); if (examType === undefined) { @@ -75,13 +75,13 @@ $(function() { jGradeSelect.change(function() { if (parseInt($(this).val()) > 0) { jGradeSelect.css("border-color", INPUT_BORDER_COLOR); - jCompoundSelect.prop("disabled", false); - $.post(g_URLdir + "handler/discipline/getCompounds", {'gradeID' : parseInt($(this).val()) }, - function(data){ - jCompoundSelect.html(data.response); - }, "json"); - }else{ - jCompoundSelect.prop("disabled", true); + // jCompoundSelect.prop("disabled", false); + // $.post(g_URLdir + "handler/discipline/getCompounds", {'gradeID' : parseInt($(this).val()) }, + // function(data){ + // jCompoundSelect.html(data.response); + // }, "json"); + } else { + // jCompoundSelect.prop("disabled", true); } }); diff --git a/~dev_rating/application/views/teacher/discipline/create.twig b/~dev_rating/application/views/teacher/discipline/create.twig index a8b5ab6d3..7179825fa 100644 --- a/~dev_rating/application/views/teacher/discipline/create.twig +++ b/~dev_rating/application/views/teacher/discipline/create.twig @@ -65,17 +65,17 @@ </div> </div> </div> - <div class="LayerSection"> - <div class="itemBlock"> - <div class="title">Р’ составе объединенной дисциплины:</div> - <div class="field"> - <select class="SelectCompound defaultForm" disabled> - <option value="0">-- Нет --</option> + {#<div class="LayerSection">#} + {#<div class="itemBlock">#} + {#<div class="title">Р’ составе объединенной дисциплины:</div>#} + {#<div class="field">#} + {#<select class="SelectCompound defaultForm" disabled>#} + {#<option value="0">-- Нет --</option>#} - </select> - </div> - </div> - </div> + {#</select>#} + {#</div>#} + {#</div>#} + {#</div>#} <div class="LayerSection"> <div class="itemBlock"> <div class="title">Бонусные баллы:</div> -- GitLab