Merge branch 'develop' into feature/periodic

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

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