Merge branch 'develop' into feature/statistic/main

# Conflicts:
#	main/models.py
#	main/views.py
This commit is contained in:
Sokurov Idar
2021-03-29 21:45:07 +03:00
30 changed files with 783 additions and 199 deletions

View File

@@ -20,6 +20,10 @@
{% block content %}
<div class="container-md">
<div class="new-section">
<p class="row page-description">Свободных Мест: {{ licences_remaining }}</p>
</div>
{% block form %}
<form method="post">
{% csrf_token %}
@@ -97,12 +101,13 @@
<button type="submit" name="light_agent" class="hand-over-acess-button default-button">
Назначить выбранных на роль легкого агента
</button>
</div>
</div>
{% endblock %}
</form>
{% endblock %}
{% include 'base/success_messages.html' %}
</div>
<script src="{% static 'main/js/control.js'%}" type="text/babel"></script>

View File

@@ -14,7 +14,7 @@
<div class="container-md">
<div class="new-section">
<p class="row page-description">Основаная информация о странице</p>
<p class="row page-description">Свободных Мест: {{ licences_remaining }}</p>
</div>
<div class="row justify-content-center new-section">
@@ -61,6 +61,7 @@
<a href="/work/hand_over" class="hand-over-acess-button default-button">Сдать права инженера</a>
</div>
</div>
{% include 'base/success_messages.html' %}
</div>
{% endblock %}