diff --git a/access_controller/urls.py b/access_controller/urls.py index e174717..17d4a09 100644 --- a/access_controller/urls.py +++ b/access_controller/urls.py @@ -18,7 +18,7 @@ from django.contrib.auth import views as auth_views from django.urls import path, include from main.views import main_page, profile_page, CustomRegistrationView, CustomLoginView -from main.views import work_page, work_hand_over, work_become_engineer, \ +from main.views import work_page, work_hand_over, work_become_engineer, work_get_tickets, \ AdminPageView, statistic_page from main.urls import router @@ -34,6 +34,7 @@ urlpatterns = [ path('work/', 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('work/get_tickets', work_get_tickets, name='work_get_tickets'), path('accounts/', include('django_registration.backends.activation.urls')), path('accounts/login/', include('django.contrib.auth.urls')), path('control/', AdminPageView.as_view(), name='control'), diff --git a/main/templates/pages/work.html b/main/templates/pages/work.html index 67c5846..d9043b4 100644 --- a/main/templates/pages/work.html +++ b/main/templates/pages/work.html @@ -60,6 +60,12 @@ Получить права инженера Сдать права инженера +
+
+ + +
+
{% include 'base/success_messages.html' %} diff --git a/main/views.py b/main/views.py index 2c00277..494b38c 100644 --- a/main/views.py +++ b/main/views.py @@ -126,7 +126,7 @@ def work_page(request, 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']: @@ -167,6 +167,18 @@ def work_become_engineer(request): user_update(zenpy_user, admin, request) return HttpResponseRedirect(reverse('work', args=(request.user.id,))) +@login_required() +def work_get_tickets(request): + zenpy_user, admin = auth_user(request) + count_tickets = int(request.GET["count_tickets"]) + tickets = [ticket for ticket in 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_user + admin.tickets.update(tickets[i]) + return HttpResponseRedirect(reverse('work', args=(request.user.id,))) + def main_page(request): """ diff --git a/static/main/css/work.css b/static/main/css/work.css index 790ac6d..59b807d 100644 --- a/static/main/css/work.css +++ b/static/main/css/work.css @@ -125,4 +125,5 @@ padding: 10px; background: #3B91D4; color: white; + width: 100%; } \ No newline at end of file