Fix looking of profile, work and control pages

This commit is contained in:
Dmitriy Andreev 2021-05-26 17:05:48 +03:00
parent bdd5a68b26
commit 72030040b8
4 changed files with 74 additions and 69 deletions

View File

@ -39,10 +39,10 @@
<div class="row justify-content-center new-section">
<div class="col-10">
<h6 class="table-title">Список сотрудников</h6>
<h3 class="py-4 text-center font-weight-bold">Список сотрудников</h3>
{% block table %}
<table class="table table-dark light-table">
<table class="table table-dark">
<thead>
<th>
@ -71,7 +71,7 @@
<div class="info">
<div class="info-row">
<div class="info-target">Инженеров:</div>
<div class="info-target px-4"><h6>Инженеров:</h6></div>
<div class="info-quantity">
<div class="status-circle-small light-green"></div>
<span class="info-quantity-value">{{ engineers }}</span>
@ -79,7 +79,7 @@
</div>
<div class="info-row">
<div class="info-target">Легких агентов:</div>
<div class="info-target px-4"><h6>Легких агентов:</h6></div>
<div class="info-quantity">
<div class="status-circle-small light-yellow"></div>
<span class="info-quantity-value">{{ light_agents }}</span>
@ -93,11 +93,11 @@
{% block buttons %}
<div class="col-5">
<button type="submit" name="engineer" class="request-acess-button default-button">
<button type="submit" name="engineer" class="btn default-button btn-warning btn-block btn-sm py-3">
Назначить выбранных на роль инженера
</button>
<button type="submit" name="light_agent" class="hand-over-acess-button default-button">
<button type="submit" name="light_agent" class="btn default-button btn-warning btn-block btn-sm py-3">
Назначить выбранных на роль легкого агента
</button>
</div>

View File

@ -32,7 +32,7 @@
>
</div>
<div class="px-3 py-5">
<a href="{%url 'password_change' %}" class="btn btn-light px-1 py-1">Сменить пароль</a>
<a href="{%url 'password_change' %}" class="btn btn-info">Сменить пароль</a>
</div>
</div>
<div class="col">
@ -54,7 +54,7 @@
<br>
<div align="center" >
<form action="">
<a href="{% url 'work' profile.user.id %}" class="btn btn-primary btn-lg px-3 py-3">Запросить права доступа</a>
<a href="{% url 'work' profile.user.id %}" type="submit" class="btn default-button btn-success btn-lg px-4 py-3">Запросить права доступа</a>
</form>
</div>
{% endblock %}

View File

@ -16,66 +16,73 @@
{% endblock %}
{% block content %}
<div class="container-md">
<div class="new-section">
<p class="row page-description">Свободных Мест: {{ licences_remaining }}</p>
</div>
<p class="row page-description">Свободных Мест: {{ licences_remaining }}</p>
<div class="row justify-content-center new-section">
<div class="col-10">
<h6 class="table-title">Список сотрудников с правами инженера</h6>
<table class="light-table">
<thead>
<th>Email</th>
<th>Name</th>
</thead>
<tbody>
{% for engineer in engineers %}
<tr>
<td>{{ engineer.email }}</td>
<td>{{ engineer.name }}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
<div class="row justify-content-center new-section">
<div class="col-5">
<div class="info">
<div class="info-row">
<div class="info-target">инженеров: </div>
<div class="info-quantity">
<div class="status-circle-small light-green"></div>
<span class="info-quantity-value">{{ engineers|length }}</span>
</div>
</div>
<div class="info-row">
<div class="info-target">легких агентов:</div>
<div class="info-quantity">
<div class="status-circle-small light-yellow"></div>
<span class="info-quantity-value">{{ agents|length }}</span>
</div>
</div>
</div>
</div>
<div class="col-5">
<a href="/work/become_engineer" class="request-acess-button default-button">Получить права инженера</a>
<a href="/work/hand_over" class="hand-over-acess-button default-button">Сдать права инженера</a>
</div>
<div class="col-10">
<form method="post" action="{% url 'work_get_tickets' %}">
{% csrf_token %}
{{ get_tickets_form.count_tickets }}
<button type="submit" class="default-button">Взять тикеты в работу</button>
</form>
</div>
{% for message in messages %}
<script>create_notification('{{message}}','','{{message.tags}}',2000)</script>
{% endfor %}
</div>
<div class="row justify-content-center new-section">
<div class="col-10 py-3">
<h3 class="py-4 text-center font-weight-bold">Список сотрудников с правами инженера</h3>
<table class="table table-dark">
<thead>
<th>Email</th>
<th>Name</th>
</thead>
<tbody>
{% for engineer in engineers %}
<tr>
<td>{{ engineer.email }}</td>
<td>{{ engineer.name }}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
<div class="row justify-content-center new-section">
<div class="col-5">
<div class="info">
<div class="info-row">
<div class="info-target px-4"><h6>инженеров:</h6></div>
<div class="info-quantity">
<div class="status-circle-small light-green"></div>
<span class="info-quantity-value">{{ engineers|length }}</span>
</div>
</div>
<div class="info-row">
<div class="info-target px-4"><h6>легких агентов:</h6></div>
<div class="info-quantity">
<div class="status-circle-small light-yellow"></div>
<span class="info-quantity-value">{{ agents|length }}</span>
</div>
</div>
</div>
</div>
<div class="col-5 mb-3 py-1">
<div class="row mb-2">
<div class="col">
<a href="/work/become_engineer" class="btn btn-success btn-block py-3">Получить права инженера</a>
</div>
</div>
<div class="row mb-2 py-1">
<div class="col">
<a href="/work/hand_over" class="btn btn-danger btn-block py-3">Сдать права инженера</a>
</div>
</div>
<form class="row g-3 align-items-center" method="GET" action="/work/get_tickets">
<div class="col-2">
<input class="form-control" type="number" min="1" value="1" name="count_tickets">
</div>
<div class="col-10">
<button type="submit" class="btn default-button btn-warning btn-block btn-sm py-3">Взять тикеты в работу</button>
</div>
</form>
</div>
</div>
{% for message in messages %}
<script>create_notification('{{message}}','','{{message.tags}}',5000)</script>
{% endfor %}
{% endblock %}

View File

@ -21,9 +21,7 @@ class ModelUserTableRow extends React.Component {
name="users"
/>
</td>
<td>
<a href="#">{this.props.user.name}</a>
</td>
<td>{this.props.user.name}</td>
<td>{this.props.user.user.email}</td>
<td>{this.props.user.zendesk_role}</td>
</tr>