From fe944f487587eb26d6344f9c8b4ae2702a007cda Mon Sep 17 00:00:00 2001
From: Artyom Kravchenko <krav-88@mail.ru>
Date: Sat, 6 Mar 2021 01:36:19 +0300
Subject: [PATCH 1/3] Fixed info bug on page

---
 main/templates/pages/work.html |  4 ++--
 main/views.py                  | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/main/templates/pages/work.html b/main/templates/pages/work.html
index 2fcb4cf..a588ef5 100644
--- a/main/templates/pages/work.html
+++ b/main/templates/pages/work.html
@@ -22,13 +22,13 @@
             <h6 class="table-title">Список сотрудников с правами инженера</h6>
             <table class="light-table">
                 <thead>
-                    <th>ID</th>
+                    <th>Email</th>
                     <th>Name</th>
                 </thead>
                 <tbody>
                     {% for engineer in engineers %}
                         <tr>
-                            <td>{{ engineer.id }}</td>
+                            <td>{{ engineer.email }}</td>
                             <td>{{ engineer.name }}</td>
                         </tr>
                     {% endfor %}
diff --git a/main/views.py b/main/views.py
index ca8c9c2..0008255 100644
--- a/main/views.py
+++ b/main/views.py
@@ -128,10 +128,20 @@ def auth_user(request):
 
 @login_required()
 def work_page(request, id):
+    users = get_users_list()
     if request.user.id == id:
+        engineers = []
+        light_agents = []
+        for user in users:
+
+            if user.custom_role_id == ZENDESK_ROLES['engineer']:
+                engineers.append((user))
+            elif user.custom_role_id == ZENDESK_ROLES['light_agent']:
+                light_agents.append(user)
+
         context = {
-            'engineers': UserProfile.objects.filter(role="admin"),
-            'agents': UserProfile.objects.filter(role="agent"),
+            'engineers': engineers,
+            'agents': light_agents,
             'pagename': 'Управление правами'
         }
         return render(request, 'pages/work.html', context)

From 7ee8cc96af1f5b8e15b3eca57fcdc15fb21d707f Mon Sep 17 00:00:00 2001
From: Artyom Kravchenko <krav-88@mail.ru>
Date: Sun, 7 Mar 2021 23:08:56 +0300
Subject: [PATCH 2/3] fixed get and end engineer role fuctions

---
 main/views.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/main/views.py b/main/views.py
index 0008255..3ec1319 100644
--- a/main/views.py
+++ b/main/views.py
@@ -135,7 +135,7 @@ def work_page(request, id):
         for user in users:
 
             if user.custom_role_id == ZENDESK_ROLES['engineer']:
-                engineers.append((user))
+                engineers.append(user)
             elif user.custom_role_id == ZENDESK_ROLES['light_agent']:
                 light_agents.append(user)
 
@@ -151,8 +151,9 @@ def work_page(request, id):
 @login_required()
 def work_hand_over(request):
     zenpy_user, admin = auth_user(request)
-    if zenpy_user.role == "admin" or zenpy_user.role == "end-user":
-        zenpy_user.role = "agent"
+
+    if zenpy_user.custom_role_id == ZENDESK_ROLES['engineer']:
+        zenpy_user.custom_role_id = ZENDESK_ROLES['light_agent']
         admin.users.update(zenpy_user)
         request.user.userprofile.role = "agent"
         request.user.userprofile.save()
@@ -162,10 +163,10 @@ def work_hand_over(request):
 @login_required()
 def work_become_engineer(request):
     zenpy_user, admin = auth_user(request)
-    if zenpy_user.role == "agent" or zenpy_user.role == "end-user":
-        zenpy_user.role = "admin"
+    if zenpy_user.custom_role_id == ZENDESK_ROLES['light_agent']:
+        zenpy_user.custom_role_id = ZENDESK_ROLES['engineer']
         admin.users.update(zenpy_user)
-        request.user.userprofile.role = "admin"
+        request.user.userprofile.role = "agent"
         request.user.userprofile.save()
     return HttpResponseRedirect(reverse('work', args=(request.user.id,)))
 

From b01f5fb236f5e822607cc31208a32ef39da3afc7 Mon Sep 17 00:00:00 2001
From: Artyom Kravchenko <krav-88@mail.ru>
Date: Mon, 8 Mar 2021 02:28:00 +0300
Subject: [PATCH 3/3] add button from menu for engineer rules request

---
 main/templates/base/menu.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/main/templates/base/menu.html b/main/templates/base/menu.html
index f64ceb3..a389341 100644
--- a/main/templates/base/menu.html
+++ b/main/templates/base/menu.html
@@ -13,6 +13,8 @@
         <a class="btn btn-secondary" href="{% url 'profile' %}">Профиль</a>
         {% if perms.main.has_control_access %}
         <a class="btn btn-secondary" href="{% url 'control' %}">Управление</a>
+        {% else %}
+        <a class="btn btn-secondary" href="{% url 'work' request.user.id %}">Запрос прав</a>
         {% endif %}
         <a class="btn btn-secondary" href="{% url 'logout' %}">Выйти</a>
       </div>