Merge branch 'develop' into feature/periodic

# Conflicts:
#	access_controller/settings.py
#	access_controller/urls.py
#	main/extra_func.py
#	main/views.py

main/templates/base/menu.html

@@ -3,16 +3,18 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
-  <nav class="navbar navbar-light" style="background-color: #00FF00;">
+  <nav class="navbar navbar-light" style="background-color: #113A60;">
     <a class="navbar-brand" href="{% url 'index' %}">
-      <img src="{% static 'main/img/logo.png' %}" width="30" height="30" class="d-inline-block align-top" alt="" loading="lazy">
-      Access Controller
+      <img src="{% static 'main/img/logo_real.png' %}" width="107" height="22" class="d-inline-block align-top" alt="" loading="lazy">
+      <t style="color:#FFFFFF">Access Controller</t>
     </a>
     {% if request.user.is_authenticated %}
       <div class="btn-group" role="group" aria-label="Basic example">
         <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>

main/templates/django_registration/registration_complete.html

@@ -10,5 +10,5 @@
 
 {% block content %}
     <br>
-    <h4> Регистрация прошла успешно. <a href="/login/">Войти сейчас</a></h4>
+    <h4> Регистрация прошла успешно. <a href="{% url 'login'%}">Войти сейчас</a></h4>
 {% endblock %}

main/templates/pages/stat.html

@@ -0,0 +1,49 @@
+{% extends 'base/base.html' %}
+
+{% load static %}
+
+{% block title %}{{ pagename }}{% endblock %}
+
+{% block heading %} Пример страницы статистики(палками не бейти плиз){% endblock %}
+
+{% block extra_css %}
+<link rel="stylesheet" href="{% static 'main/css/work.css' %}">
+{% endblock %}
+
+{% block content %}
+<div>
+  <form action="" method="post">
+    {% csrf_token %}
+    {% for field in form %}
+      {{field.label}}
+      {{field}}
+      <br>
+    {% endfor %}
+    <input type="submit">
+  </form>
+  <ul>
+    {% for error in errors %}
+      <li><span class="badge bg-danger">{{error}}</span></li>
+    {% endfor %}
+  </ul>
+  {%if form.errors%}
+  <ul>
+    {% for field, errors in form.errors.items %}
+      {% for error in errors %}
+        <li><span class="badge bg-danger">{{error}}</span></li>
+      {% endfor %}
+    {% endfor %}
+  </ul>
+  {%endif%}
+  <ul>
+    {% for warning in warnings %}
+        <li><span class="badge bg-warning">{{warning}}</span></li>
+    {% endfor %}
+  </ul>
+  {% for key,val in log_stats.items %}
+  <h3>{{key}}  <b>|</b>  {{val}}</h3>
+  <br>
+  {% endfor %}
+</div>
+{% endblock %}
+

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 %}