diff --git a/~dev_rating/application/views/admin/teachers/handler/listOutput.twig b/~dev_rating/application/views/admin/teachers/handler/listOutput.twig index fd0f507139bbe7ec3ac9f07da9f7bcff5476fe90..03414238cb1ecbf3c2aa4b8d14cf4d9181e20f64 100644 --- a/~dev_rating/application/views/admin/teachers/handler/listOutput.twig +++ b/~dev_rating/application/views/admin/teachers/handler/listOutput.twig @@ -10,13 +10,15 @@ {% endif %} <div class="search_item"> <div class="search_item_info"> - <div class="search_item_firstLine">{{ row.LastName }} {{ row.FirstName }} {{ row.SecondName }}</div> + <div class="search_item_firstLine"><a href="#">{{ row.LastName }} {{ row.FirstName }} {{ row.SecondName }}</a></div> <div class="search_item_secondLine">{{ row.JobPositionName }}, {{ row.DepartmentName }}</div> </div> <div class="search_item_actions"> - <a href="#">Удалить</a> + <a href="#">Редактировать</a> </div> </div> +{% else %} + Нет результатов! {% endfor %} </div> diff --git a/~dev_rating/application/views/admin/teachers/index.twig b/~dev_rating/application/views/admin/teachers/index.twig index ae458dd58287899f30e43efc8f62627be578b37d..5fef921bfe4d58d8d495f2b6ebef2f8cc2b722ff 100644 --- a/~dev_rating/application/views/admin/teachers/index.twig +++ b/~dev_rating/application/views/admin/teachers/index.twig @@ -4,6 +4,7 @@ {{ HTML.script('media/js/admin/teachers/index.js')|raw }} {% endblock %} +{% block title %}Преподаватели{% endblock %} {% block main_top_title %}Управление преподавателями{% endblock %} {% block main_content %} @@ -33,17 +34,10 @@ </div> </div> <div class='search_results'> - <div class='search_results_title'> + <div class='search_results_title' id="search_title"> </div> - <div class='results' id='results'> - <div class='item'> - <div class='item_title'></div> - <div class='item_actions'></div> - </div> - </div> - <div class='paginator'> - + <div class='results' id='search_results'> </div> </div> </div> diff --git a/~dev_rating/media/css/admin/base.css b/~dev_rating/media/css/admin/base.css index 26cb40eab2d30ee61856fdafe74cc0bafec48b2e..d4a02616916875d4a7d80b49758a2bfb669a9574 100644 --- a/~dev_rating/media/css/admin/base.css +++ b/~dev_rating/media/css/admin/base.css @@ -251,7 +251,7 @@ a:hover { background: #fff; } -.search_item .search_item_firstLine +.search_item .search_item_firstLine a { font-size: 18px; } diff --git a/~dev_rating/media/js/admin/teachers/index.js b/~dev_rating/media/js/admin/teachers/index.js index 390fbfe227b2e24168e3b6e067bd85093d5048bc..1de918011e6c7976f6fe4f57e7175581e0280c22 100644 --- a/~dev_rating/media/js/admin/teachers/index.js +++ b/~dev_rating/media/js/admin/teachers/index.js @@ -1,29 +1,37 @@ $(function() { + $("#facultySelect [value='0']").attr('selected', 'selected'); + $('#departmentSelect').attr('disabled', 'disabled'); + $("#departmentSelect [value='0']").attr('selected', 'selected'); // Выбор факультета $('#facultySelect').change(function(){ if (($('#facultySelect option:selected').val()!= '0')) { + $("#search_results").html(''); $("#departmentSelect").html('<option value="0">--- Кафедра ---</option>'); - + $('#departmentSelect').attr('disabled', 'disabled'); $.post('/~dev_rating/handler/admTeachers/getTeachersList', {'facultyID': $('#facultySelect option:selected').val(), 'departmentID': '0'}, function(data){ - $("#results").html(data); + $("#search_results").html(data); }); - $.post('/~dev_rating/handler/admTeachers/getDepartmentsList', {'facultyID': $('#facultySelect option:selected').val()}, function(data){ $.each(data, function(i){ $("#departmentSelect").append('<option value="'+data[i].ID+'">'+data[i].Name+'</option>'); }); + $("#departmentSelect").removeAttr("disabled"); }, "json"); - + } + else + { + $('#departmentSelect').attr('disabled', 'disabled'); } }); // Выбор кафедры $('#departmentSelect').change(function(){ + $("#search_results").html(''); if (($('#departmentSelect option:selected').val()!= '0')) { $.post('/~dev_rating/handler/admTeachers/getTeachersList', {'facultyID': '0', 'departmentID': $('#departmentSelect option:selected').val()}, function(data){ - $("#results").html(data); + $("#search_results").html(data); }); } });