Fix page html code

main/templates/pages/profile.html

@@ -45,7 +45,7 @@
 </div>
 <div align="center">
   <form action="">
-    <button class="btn btn-primary"><big>Запросить права доступа</big></button>
+    <a href="/work/{{ id }}" class="btn btn-primary"><big>Запросить права доступа</big></a>
   </form>
 </div>
 {% endblock %}

main/templates/pages/work.html

@@ -2,39 +2,10 @@
 
 {% load static %}
 
-
-
 {% block title %}{{ pagename }}{% endblock %}
 
-
 {% block heading %}Управление правами{% endblock %}
 
-{% block content %}
-<br>
-<h3>Инженеры</h3>
-{%for engineer in engineers%}
-    {{ engineer.name }}
-{% endfor %}
-
-<h3>Агенты</h3>
-{%for agent in agents%}
-    {{ agent.name }}
-{% endfor %}
-
-<br>
-
-{% if role == "admin" %}
-    <a href="/work/hand_over">Сдать смену</a>
-{% else %}
-    <a href="/work/become_engineer">Запросить права инженера</a>
-{% endif %}
-
-{% endblock %}
-
-{% block title %}{{ pagename }}{% endblock %}
-
-{% block heading %}Управление{% endblock %}
-
 {% block extra_css %}
 <link rel="stylesheet" href="{% static 'main/css/work.css' %}">
 {% endblock %}
@@ -52,24 +23,15 @@
             <table class="light-table">
                 <thead>
                     <th>ID</th>
-                    <th>email</th>
+                    <th>Name</th>
-                    <th>Expiration Date</th>
-                    <th>Name(link to profile)</th>
                 </thead>
                 <tbody>
-
+                    {% for engineer in engineers %}
-                    <tr>
+                        <tr>
-                        <td>1</td>
+                            <td>{{ engineer.id }}</td>
-                        <td>big_boss123@example.ru</td>
+                            <td>{{ engineer.name }}</td>
-                        <td>19:30 18.02.21</td>
+                        </tr>
-                        <td><a href="#">Иван Иванов</a></td>
+                    {% endfor %}
-                    </tr>
-                    <tr>
-                        <td>2</td>
-                        <td>gachi_cool456@example.ru</td>
-                        <td>21:00 18.02.21</td>
-                        <td><a href="#">Пётр Петров</a></td>
-                    </tr>
                </tbody>
             </table>
         </div>
@@ -81,22 +43,22 @@
                     <div class="info-target">инженеров: </div>
                     <div class="info-quantity">
                         <div class="status-circle-small light-green"></div>
-                        <span class="info-quantity-value">13</span>
+                        <span class="info-quantity-value">{{ engineers|length }}</span>
                     </div>
                 </div>
                 <div class="info-row">
                     <div class="info-target">легких агентов:</div>
                     <div class="info-quantity">
                         <div class="status-circle-small light-yellow"></div>
-                        <span class="info-quantity-value">22</span>
+                        <span class="info-quantity-value">{{ agents|length }}</span>
                     </div>
 
                 </div>
             </div>
         </div>
         <div class="col-5">
-            <button class="request-acess-button default-button">Получить права инженера</button>
+            <a href="/work/become_engineer" class="request-acess-button default-button">Получить права инженера</a>
-            <button class="hand-over-acess-button default-button">Сдать права инженера</button>
+            <a href="/work/hand_over" class="hand-over-acess-button default-button">Сдать права инженера</a>
         </div>
     </div>
 </div>

main/views.py

@@ -88,6 +88,7 @@ def profile_page(request):
         'email': user_profile.user.email,
         'name': user_profile.name,
         'role': user_profile.role,
+        'id': user_profile.id,
         'image_url': user_profile.image,
         'pagename': 'Страница профиля'
     }
@@ -107,13 +108,10 @@ def auth_user(request):
 
 @login_required()
 def work_page(request, id):
-    if request.user.is_authenticated and request.user.id == id:
+    if request.user.id == id:
-        zenpy_user, _ = auth_user(request)
-
         context = {
-            'engineers': UserProfile.objects.filter(role=1),
+            'engineers': UserProfile.objects.filter(role="admin"),
-            'agents': UserProfile.objects.filter(role=0),
+            'agents': UserProfile.objects.filter(role="agent"),
-            'role': zenpy_user.role,
             'pagename': 'Управление правами'
         }
         return render(request, 'pages/work.html', context)
@@ -123,10 +121,10 @@ def work_page(request, id):
 @login_required()
 def work_hand_over(request):
     zenpy_user, admin = auth_user(request)
-    if zenpy_user.role == "admin":
+    if zenpy_user.role == "admin" or zenpy_user.role == "end-user":
         zenpy_user.role = "agent"
         admin.users.update(zenpy_user)
-        request.user.userprofile.role = 0
+        request.user.userprofile.role = "agent"
         request.user.userprofile.save()
     return HttpResponseRedirect(reverse('work', args=(request.user.id,)))
 
@@ -134,10 +132,10 @@ def work_hand_over(request):
 @login_required()
 def work_become_engineer(request):
     zenpy_user, admin = auth_user(request)
-    if zenpy_user.role == "agent":
+    if zenpy_user.role == "agent" or zenpy_user.role == "end-user":
         zenpy_user.role = "admin"
         admin.users.update(zenpy_user)
-        request.user.userprofile.role = 1
+        request.user.userprofile.role = "admin"
         request.user.userprofile.save()
     return HttpResponseRedirect(reverse('work', args=(request.user.id,)))