Merged develop into current

access_controller/settings.py

@@ -135,7 +135,6 @@ ACCOUNT_ACTIVATION_DAYS = 7
 LOGIN_REDIRECT_URL = '/'
 LOGOUT_REDIRECT_URL = '/'
 
-
 #  Название_приложения.Название_файла.Название_класса_обработчика
 AUTHENTICATION_BACKENDS = [
     'access_controller.auth.EmailAuthBackend',
@@ -149,3 +148,5 @@ ZENDESK_ROLES = {
     'engineer': 360005209000,
     'light_agent': 360005208980,
 }
+
+ONE_DAY = 12  # Количество часов в 1 рабочем дне

access_controller/urls.py

@@ -19,6 +19,8 @@ from django.urls import path, include
 from main.views import work_page, work_hand_over, work_become_engineer, AdminPageView
 
 from main.views import main_page, profile_page, CustomRegistrationView, CustomLoginView
+from main.views import work_page, work_hand_over, work_become_engineer, \
+    AdminPageView, statistic_page
 
 urlpatterns = [
     path('admin/', admin.site.urls, name='admin'),
@@ -31,9 +33,8 @@ urlpatterns = [
     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/login/', include('django.contrib.auth.urls')),
-    path('control/', AdminPageView.as_view(), name='control')
+    path('control/', AdminPageView.as_view(), name='control'),
+    path('statistic/', statistic_page, name='statistic')
     ]
 
 urlpatterns += [