Skip to content
Snippets Groups Projects
Commit 034ffaad authored by ViolettaShevchenko's avatar ViolettaShevchenko Committed by PavelBegunkov
Browse files

Add refresh btn in requests

Merged branch 'issue-87'
parent 716b4fdc
Branches
Tags
No related merge requests found
$(function () { $(function () {
var $statusFilter = $("#statusFilter");
$(".RequestTitle").click(function (e) { $(".RequestTitle").click(function (e) {
var currentID = e.target.id; var currentID = e.target.id;
var descriptionID = currentID.replace('requestTitle', '#requestContent'); var descriptionID = currentID.replace('requestTitle', '#requestContent');
...@@ -6,7 +9,7 @@ $(function () { ...@@ -6,7 +9,7 @@ $(function () {
}); });
$("#statusFilter").change(function () { $statusFilter.change(function () {
location.href = "?filter=" + $(this).val(); location.href = "?filter=" + $(this).val();
} }
); );
...@@ -15,8 +18,10 @@ $(function () { ...@@ -15,8 +18,10 @@ $(function () {
$(".RequestStatus").change(function (e) { $(".RequestStatus").change(function (e) {
var requestId = e.target.id.replace('requestStatus', ''); var requestId = e.target.id.replace('requestStatus', '');
var status = $(this).val(); var status = $(this).val();
var statusSelect = $(this); var filter = $statusFilter.val();
statusSelect.prop( "disabled", true ); var $statusSelect = $(this);
var $issue = $("#requestIssue".concat(requestId));
$statusSelect.prop( "disabled", true );
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: URLdir + "handler/RequestsProcessing/setStatus", url: URLdir + "handler/RequestsProcessing/setStatus",
...@@ -32,8 +37,21 @@ $(function () { ...@@ -32,8 +37,21 @@ $(function () {
else { else {
EventInspector.error('Ошибка!'); 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();
}); });
}); });
@import (reference) "../common.less";
.StatusFilter { .StatusFilter {
margin-left: 10px; margin-left: 10px;
} }
.RefreshButton {
margin: 8px 10px;
cursor: pointer;
color: @ColorLightBlue;
}
.RequestsPage { .RequestsPage {
height: 650px; height: 650px;
padding-right: 10px; padding-right: 10px;
......
...@@ -18,11 +18,12 @@ ...@@ -18,11 +18,12 @@
<option value="processed" {% if Filter == 'processed'%}selected{% endif %}>В процессе</option> <option value="processed" {% if Filter == 'processed'%}selected{% endif %}>В процессе</option>
<option value="closed" {% if Filter == 'closed'%}selected{% endif %}>Закрытые</option> <option value="closed" {% if Filter == 'closed'%}selected{% endif %}>Закрытые</option>
</select> </select>
<i class="fa fa-refresh fa-md RefreshButton" title="Обновить"></i>
</div> </div>
<div class="RequestsPage"> <div class="RequestsPage">
{% for req in Requests %} {% for req in Requests %}
<div class="goodClearFix RequestIssue"> <div id="{{ "requestIssue"~req.ID }}" class="goodClearFix RequestIssue">
<div class="defaultForm FLeft P1Width"> <div class="defaultForm FLeft P1Width">
<div id="{{ "requestTitle"~req.ID }}" class="RequestTitle">{{ req.Title }}</div> <div id="{{ "requestTitle"~req.ID }}" class="RequestTitle">{{ req.Title }}</div>
{% if req.UserRoleID == 1 %}{% set role = "students/" %}{% else %}{% set role = "teachers/" %}{% endif %} {% if req.UserRoleID == 1 %}{% set role = "students/" %}{% else %}{% set role = "teachers/" %}{% endif %}
......
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