Merge branch 'feature/work/backend' into 'develop'

Feature/work/backend

See merge request 2020-2021/online/s101/group-02/access_controller!24
This commit is contained in:
Кравченко Артем 2021-03-02 18:15:16 +00:00
commit 5f3684ef64
4 changed files with 80 additions and 26 deletions

View File

@ -17,7 +17,10 @@ from django.contrib import admin
from django.contrib.auth.views import LoginView from django.contrib.auth.views import LoginView
from django.contrib.auth import views as auth_views from django.contrib.auth import views as auth_views
from django.urls import path, include from django.urls import path, include
from main.views import main_page, profile_page, CustomRegistrationView, AdminPageView from access_controller import settings
from access_controller.settings import DEBUG
from main.views import main_page, profile_page, CustomRegistrationView, work_page, work_hand_over, work_become_engineer, AdminPageView
urlpatterns = [ urlpatterns = [
path('admin/', admin.site.urls, name='admin'), path('admin/', admin.site.urls, name='admin'),
@ -26,6 +29,10 @@ urlpatterns = [
path('accounts/register/', CustomRegistrationView.as_view(), name='registration'), path('accounts/register/', CustomRegistrationView.as_view(), name='registration'),
path('accounts/login/', LoginView.as_view(extra_context={}), name='login'), # TODO add extra context path('accounts/login/', LoginView.as_view(extra_context={}), name='login'), # TODO add extra context
path('accounts/', include('django.contrib.auth.urls')), path('accounts/', include('django.contrib.auth.urls')),
path('accounts/', include('django_registration.backends.one_step.urls')),
path('work/<int:id>', work_page, name="work"),
path('work/hand_over/', work_hand_over, name="work_hand_over"),
path('work/become_engineer/', work_become_engineer, name="work_become_engineer"),
path('accounts/', include('django_registration.backends.activation.urls')), path('accounts/', include('django_registration.backends.activation.urls')),
path('accounts/login/', include('django.contrib.auth.urls')), path('accounts/login/', include('django.contrib.auth.urls')),
path('control/', AdminPageView.as_view(), name='control') path('control/', AdminPageView.as_view(), name='control')
@ -52,4 +59,5 @@ urlpatterns += [
auth_views.PasswordResetCompleteView.as_view(), auth_views.PasswordResetCompleteView.as_view(),
name='password_reset_complete' name='password_reset_complete'
), ),
] ]

View File

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

View File

@ -4,7 +4,7 @@
{% block title %}{{ pagename }}{% endblock %} {% block title %}{{ pagename }}{% endblock %}
{% block heading %}Управление{% endblock %} {% block heading %}Управление правами{% endblock %}
{% block extra_css %} {% block extra_css %}
<link rel="stylesheet" href="{% static 'main/css/work.css' %}"> <link rel="stylesheet" href="{% static 'main/css/work.css' %}">
@ -23,24 +23,15 @@
<table class="light-table"> <table class="light-table">
<thead> <thead>
<th>ID</th> <th>ID</th>
<th>email</th> <th>Name</th>
<th>Expiration Date</th>
<th>Name(link to profile)</th>
</thead> </thead>
<tbody> <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> </tbody>
</table> </table>
</div> </div>
@ -52,23 +43,24 @@
<div class="info-target">инженеров: </div> <div class="info-target">инженеров: </div>
<div class="info-quantity"> <div class="info-quantity">
<div class="status-circle-small light-green"></div> <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> </div>
<div class="info-row"> <div class="info-row">
<div class="info-target">легких агентов:</div> <div class="info-target">легких агентов:</div>
<div class="info-quantity"> <div class="info-quantity">
<div class="status-circle-small light-yellow"></div> <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> </div>
</div> </div>
<div class="col-5"> <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> </div>
</div> </div>
{% endblock %} {% endblock %}

View File

@ -1,3 +1,6 @@
from django.shortcuts import render, redirect, reverse
from django.http import HttpResponseRedirect
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.contrib.auth.forms import PasswordResetForm from django.contrib.auth.forms import PasswordResetForm
from django.contrib.auth.models import User from django.contrib.auth.models import User
@ -6,7 +9,6 @@ from django.shortcuts import render, get_list_or_404
from django.urls import reverse_lazy from django.urls import reverse_lazy
from django.views.generic import FormView from django.views.generic import FormView
from django_registration.backends.one_step.views import RegistrationView from django_registration.backends.one_step.views import RegistrationView
from access_controller.settings import EMAIL_HOST_USER from access_controller.settings import EMAIL_HOST_USER
from main.extra_func import check_user_exist, update_profile, get_user_organization, \ from main.extra_func import check_user_exist, update_profile, get_user_organization, \
make_engineer, make_light_agent, get_users_list make_engineer, make_light_agent, get_users_list
@ -21,6 +23,12 @@ from django.core.exceptions import PermissionDenied
import logging import logging
from zenpy import Zenpy
from zenpy.lib.api_objects import User as ZenpyUser
from .models import UserProfile
import os
from access_controller.settings import ZENDESK_ROLES from access_controller.settings import ZENDESK_ROLES
@ -88,12 +96,58 @@ def profile_page(request):
'email': user_profile.user.email, 'email': user_profile.user.email,
'name': user_profile.name, 'name': user_profile.name,
'role': user_profile.role, 'role': user_profile.role,
'id': user_profile.id,
'image_url': user_profile.image, 'image_url': user_profile.image,
'pagename': 'Страница профиля' 'pagename': 'Страница профиля'
} }
return render(request, 'pages/profile.html', context) return render(request, 'pages/profile.html', context)
def auth_user(request):
admin_creds = {
'email': os.environ.get('ACCESS_CONTROLLER_API_EMAIL'),
'subdomain': 'ngenix1612197338',
'token': os.environ.get('ACCESS_CONTROLLER_API_TOKEN'),
}
admin = Zenpy(**admin_creds)
zenpy_user: ZenpyUser = admin.users.search(request.user.email).values[0]
return zenpy_user, admin
@login_required()
def work_page(request, id):
if request.user.id == id:
context = {
'engineers': UserProfile.objects.filter(role="admin"),
'agents': UserProfile.objects.filter(role="agent"),
'pagename': 'Управление правами'
}
return render(request, 'pages/work.html', context)
return redirect("login")
@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"
admin.users.update(zenpy_user)
request.user.userprofile.role = "agent"
request.user.userprofile.save()
return HttpResponseRedirect(reverse('work', args=(request.user.id,)))
@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"
admin.users.update(zenpy_user)
request.user.userprofile.role = "admin"
request.user.userprofile.save()
return HttpResponseRedirect(reverse('work', args=(request.user.id,)))
def main_page(request): def main_page(request):
logger = logging.getLogger('main.index') logger = logging.getLogger('main.index')
logger.info('Index page opened') logger.info('Index page opened')