Merge branch 'develop' into feature/refactor

main/extra_func.py

@@ -4,6 +4,7 @@ from typing import Optional
 
 from django.contrib.auth.models import User
 from django.core.exceptions import ObjectDoesNotExist
+from django.shortcuts import redirect
 from django.utils import timezone
 from zenpy import Zenpy
 from zenpy.lib.exception import APIException
@@ -549,3 +550,13 @@ def log(user, admin=0):
         logger.addHandler(csvhandler)
     logger.setLevel('INFO')
     logger.info(users)
+
+
+def set_session_params_for_work_page(request, count=None, is_confirm=True):
+    """
+    Функция для страницы получения прав
+    Устанавливает данные сессии о успешности запроса и количестве назначенных тикетов
+    """
+    request.session['is_confirm'] = is_confirm
+    request.session['count_tickets'] = count
+    return redirect('work', request.user.id)

main/templates/base/success_messages.html

@@ -1,14 +0,0 @@
-<div class="mt-5">
-  {% for message in messages %}
-    <div
-      class="alert alert-{{ message.tags }} alert-dismissible fade show p-2"
-      role="alert"
-      style="display: flex; align-items: center; justify-content: space-between;"
-    >
-      {{ message }}
-      <div>
-        <button type="button" class="btn btn-light p-2" data-bs-dismiss="alert" aria-label="Close">X</button>
-      </div>
-    </div>
-  {% endfor %}
-</div>

main/templates/pages/adm_ruleset.html

@@ -7,8 +7,8 @@
 {% block heading %}Управление{% endblock %}
 
 {% block extra_css %}
-<link rel="stylesheet" href="{% static 'main/css/work.css' %}"/>
-
+<link rel="stylesheet" href="{% static 'main/css/work.css' %}" xmlns="http://www.w3.org/1999/html">
+<link rel="stylesheet" href="{% static 'modules/notifications/dist/notifications.css' %}">
 {% endblock %}
 
 {% block extra_scripts %}
@@ -16,8 +16,11 @@
 <script src="https://unpkg.com/react-dom@17/umd/react-dom.development.js" crossorigin></script>
 <script src="https://unpkg.com/babel-standalone@6/babel.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
-{% endblock%}
 
+<script src="{% static 'modules/notifications/dist/notifications.js' %}"></script>
+<script src="{% static 'main/js/control.js'%}" type="text/babel"></script>
+<script src="{% static 'main/js/notifications.js' %}"></script>
+{% endblock%}
 {% block content %}
 <div class="container-md">
 
@@ -25,6 +28,10 @@
         <p class="row page-description" id="licences_remaining">Свободных Мест:</p>
     </div>
 
+  {% for message in messages %}
+  <script>create_notification('{{message}}','','{{message.tags}}',5000)</script>
+  {% endfor %}
+
   {% block form %}
   <form method="post">
     {% csrf_token %}
@@ -100,9 +107,6 @@
   </form>
   {% endblock %}
 
-  {% include 'base/success_messages.html' %}
 </div>
 
-<script src="{% static 'main/js/control.js'%}" type="text/babel"></script>
-
 {% endblock %}

main/templates/pages/work.html

@@ -7,7 +7,12 @@
 {% block heading %}Управление правами{% endblock %}
 
 {% block extra_css %}
-<link rel="stylesheet" href="{% static 'main/css/work.css' %}">
+<link rel="stylesheet" href="{% static 'main/css/work.css' %}" xmlns="http://www.w3.org/1999/html">
+<link rel="stylesheet" href="{% static 'modules/notifications/dist/notifications.css' %}">
+{% endblock %}
+{% block extra_scripts %}
+<script src="{% static 'modules/notifications/dist/notifications.js' %}"></script>
+<script src="{% static 'main/js/notifications.js' %}"></script>
 {% endblock %}
 
 {% block content %}
@@ -66,8 +71,10 @@
                 <button type="submit" class="default-button">Взять тикеты в работу</button>
             </form>
         </div>
+      {% for message in messages %}
+  <script>create_notification('{{message}}','','{{message.tags}}',5000)</script>
+  {% endfor %}
     </div>
-  {% include 'base/success_messages.html' %}
 </div>
 {% endblock %}
 

main/views.py

@@ -23,7 +23,7 @@ from rest_framework.response import Response
 from access_controller.settings import DEFAULT_FROM_EMAIL, ZENDESK_ROLES, ZENDESK_MAX_AGENTS
 from main.extra_func import check_user_exist, update_profile, get_user_organization, \
     make_engineer, make_light_agent, get_users_list, update_users_in_model, count_users, \
-    StatisticData, log
+    StatisticData, log, set_session_params_for_work_page
 from main.zendesk_admin import zenpy
 from main.forms import AdminPageUsers, CustomRegistrationForm, CustomAuthenticationForm, StatisticForm
 from main.serializers import ProfileSerializer, ZendeskUserSerializer
@@ -169,6 +169,16 @@ def work_page(request: WSGIRequest, id: int) -> HttpResponse:
     """
     users = get_users_list()
     if request.user.id == id:
+        if request.session.get('is_confirm', None):
+            messages.success(request, 'Изменения были применены')
+        elif request.session.get('is_confirm', None) is not None:
+            messages.error(request, 'Изменения не были применены')
+        count = request.session.get('count_tickets', None)
+        if count is not None:
+            messages.success(request, f'{count} тикетов назначено')
+        request.session['is_confirm'] = None
+        request.session['count_tickets'] = None
+
         engineers = []
         light_agents = []
         for user in users:
@@ -176,21 +186,20 @@ def work_page(request: WSGIRequest, id: int) -> HttpResponse:
                 engineers.append(user)
             elif user.custom_role_id == ZENDESK_ROLES['light_agent']:
                 light_agents.append(user)
-
         context = setup_context(work_lit=True)
         context.update({
             'engineers': engineers,
             'agents': light_agents,
             'messages': messages.get_messages(request),
             'licences_remaining': max(0, ZENDESK_MAX_AGENTS - len(engineers)),
-            'pagename': 'Управление правами'
+            'pagename': 'Управление правами',
         })
         return render(request, 'pages/work.html', context)
     return redirect("login")
 
 
 @login_required()
-def work_hand_over(request: WSGIRequest) -> HttpResponseRedirect:
+def work_hand_over(request: WSGIRequest):
     """
     Функция позволяет текущему пользователю сдать права, а именно сменить в Zendesk роль с "engineer" на "light_agent"
 
@@ -198,7 +207,7 @@ def work_hand_over(request: WSGIRequest) -> HttpResponseRedirect:
     :return: перезагрузка текущей страницы после выполнения смены роли
     """
     make_light_agent(request.user.userprofile, request.user)
-    return HttpResponseRedirect(reverse('work', args=(request.user.id,)))
+    return set_session_params_for_work_page(request)
 
 
 @login_required()
@@ -211,20 +220,24 @@ def work_become_engineer(request: WSGIRequest) -> HttpResponseRedirect:
     """
 
     make_engineer(request.user.userprofile, request.user)
-    return HttpResponseRedirect(reverse('work', args=(request.user.id,)))
+    return set_session_params_for_work_page(request)
 
 
 @login_required()
 def work_get_tickets(request):
-    count_tickets = int(request.GET["count_tickets"])
-    tickets = [ticket for ticket in zenpy.admin.search(type="ticket") if
-               ticket.group.name == 'Сменная группа' and ticket.assignee is None]
-    for i in range(len(tickets)):
-        if i == count_tickets:
-            return HttpResponseRedirect(reverse('work', args=(request.user.id,)))
-        tickets[i].assignee = zenpy.get_user(request.user.email)
-        zenpy.admin.tickets.update(tickets[i])
-    return HttpResponseRedirect(reverse('work', args=(request.user.id,)))
+    zenpy_user = zenpy.get_user(request.user.email)
+    if zenpy_user.role == 'admin' or zenpy_user.custom_role_id == ZENDESK_ROLES['engineer']:
+        tickets = [ticket for ticket in zenpy.admin.search(type="ticket") if
+                   ticket.group.name == 'Сменная группа' and ticket.assignee is None]
+        count = 0
+        for i in range(len(tickets)):
+            if i == int(request.GET.get('count_tickets')):
+                return set_session_params_for_work_page(request, count)
+            tickets[i].assignee = zenpy_user
+            zenpy.admin.tickets.update(tickets[i])
+            count += 1
+        return set_session_params_for_work_page(request, count)
+    return set_session_params_for_work_page(request, is_confirm=False)
 
 
 def main_page(request: WSGIRequest) -> HttpResponse: