diff --git a/media/js/requests.js b/media/js/requests.js index ce17c51441194ba7fc96dc81d4e52c58120445c2..8a2a6de0a22cbd000f459f32003d6bdf8c6050e0 100644 --- a/media/js/requests.js +++ b/media/js/requests.js @@ -1,4 +1,7 @@ $(function () { + + var $statusFilter = $("#statusFilter"); + $(".RequestTitle").click(function (e) { var currentID = e.target.id; var descriptionID = currentID.replace('requestTitle', '#requestContent'); @@ -6,7 +9,7 @@ $(function () { }); - $("#statusFilter").change(function () { + $statusFilter.change(function () { location.href = "?filter=" + $(this).val(); } ); @@ -15,8 +18,10 @@ $(function () { $(".RequestStatus").change(function (e) { var requestId = e.target.id.replace('requestStatus', ''); var status = $(this).val(); - var statusSelect = $(this); - statusSelect.prop( "disabled", true ); + var filter = $statusFilter.val(); + var $statusSelect = $(this); + var $issue = $("#requestIssue".concat(requestId)); + $statusSelect.prop( "disabled", true ); $.ajax({ type: "POST", url: URLdir + "handler/RequestsProcessing/setStatus", @@ -32,8 +37,21 @@ $(function () { else { EventInspector.error('Ошибка!'); } - statusSelect.prop( "disabled", false ); + $statusSelect.prop( "disabled", false ); } }); + + if (filter != 'all' && status != filter) { + $issue.attr('style', 'border: 3px solid #B70400'); + } + else { + $issue.attr('style', ''); + } + + }); + + $(".RefreshButton").click(function () { + $(this).attr('class', 'fa fa-refresh fa-spin fa-md RefreshButton'); + $statusFilter.change(); }); }); diff --git a/media/less/support/requests.less b/media/less/support/requests.less index 673934fbb50bed39d83eab0bc65dc5152c648b34..9921c7a45eb85d5c60a8f71bb3815d571f63da1f 100644 --- a/media/less/support/requests.less +++ b/media/less/support/requests.less @@ -1,7 +1,15 @@ +@import (reference) "../common.less"; + .StatusFilter { margin-left: 10px; } +.RefreshButton { + margin: 8px 10px; + cursor: pointer; + color: @ColorLightBlue; +} + .RequestsPage { height: 650px; padding-right: 10px; diff --git a/~dev_rating/application/views/office/support/requests.twig b/~dev_rating/application/views/office/support/requests.twig index e192a0f502df7468787b62bb3ec2efc5a94fbff6..b65cf728080c302439a87c806e7617daae9b3d36 100644 --- a/~dev_rating/application/views/office/support/requests.twig +++ b/~dev_rating/application/views/office/support/requests.twig @@ -18,11 +18,12 @@ <option value="processed" {% if Filter == 'processed'%}selected{% endif %}>В процессе</option> <option value="closed" {% if Filter == 'closed'%}selected{% endif %}>Закрытые</option> </select> + <i class="fa fa-refresh fa-md RefreshButton" title="Обновить"></i> </div> <div class="RequestsPage"> {% for req in Requests %} - <div class="goodClearFix RequestIssue"> + <div id="{{ "requestIssue"~req.ID }}" class="goodClearFix RequestIssue"> <div class="defaultForm FLeft P1Width"> <div id="{{ "requestTitle"~req.ID }}" class="RequestTitle">{{ req.Title }}</div> {% if req.UserRoleID == 1 %}{% set role = "students/" %}{% else %}{% set role = "teachers/" %}{% endif %}