добавил детальный вид итема, пока недопиленый
All checks were successful
Deploy MES Core / deploy (push) Successful in 8s

This commit is contained in:
tertelius
2026-03-29 02:49:28 +03:00
parent a4ba577206
commit b256bec04b
15 changed files with 539 additions and 226 deletions

View File

@@ -1,7 +1,8 @@
<footer class="mt-auto py-3 bg-body-tertiary border-top">
<footer class="footer-custom mt-auto py-3">
<div class="container-fluid text-center">
<span class="text-muted small">
Система учета сменных заданий, разработана <strong>ACK</strong> &copy; 2026
<i class="bi bi-cpu ms-2 text-accent"></i>
</span>
</div>
</footer>

View File

@@ -0,0 +1,61 @@
<nav class="navbar navbar-expand-lg border-bottom shadow-sm">
<div class="container-fluid">
<a class="navbar-brand fw-bold text-accent" href="/">
<i class="bi bi-gear-fill me-2"></i>ShiftFlow
</a>
<button class="navbar-toggler text-light border-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav">
<span class="navbar-toggler-icon" style="filter: invert(1);"></span>
</button>
<div class="collapse navbar-collapse">
<ul class="navbar-nav me-auto">
<li class="nav-item">
<a class="nav-link {% if request.resolver_match.url_name == 'items_list' %}active{% endif %}" href="{% url 'registry' %}">Реестр</a>
</li>
{% if user_role in 'admin,technologist' %}
<li class="nav-item"><a class="nav-link" href="#">Планирование</a></li>
{% endif %}
{% if user_role in 'admin,technologist,master,operator' %}
<li class="nav-item"><a class="nav-link" href="#">Закрытие</a></li>
{% endif %}
{% if user_role in 'admin,technologist,clerk' %}
<li class="nav-item"><a class="nav-link" href="#">Списание</a></li>
{% endif %}
</ul>
<div class="d-flex align-items-center gap-3">
<span class="badge bg-secondary opacity-75 px-3 py-2 fw-normal">
<i class="bi bi-person-circle me-1"></i>
{% if user_role == 'admin' %}Админ
{% elif user_role == 'technologist' %}Технолог
{% elif user_role == 'master' %}Мастер
{% elif user_role == 'operator' %}Оператор
{% elif user_role == 'clerk' %}Учетчик
{% endif %}
({{ request.user.username|upper }})
</span>
{% if user_role == 'admin' %}
<a href="/admin/" class="btn btn-link text-decoration-none text-reset p-0" title="Админка">
<i class="bi bi-shield-lock fs-5"></i>
</a>
{% endif %}
<button class="btn btn-link text-reset p-0" onclick="toggleTheme()" title="Сменить тему">
<i id="theme-icon" class="bi fs-5"></i>
</button>
<form action="{% url 'logout' %}" method="post" class="d-inline">
{% csrf_token %}
<button type="submit" class="btn btn-link text-danger p-0 ms-2" title="Выйти">
<i class="bi bi-box-arrow-right fs-5"></i>
</button>
</form>
</div>
</div>
</div>
</nav>

View File

@@ -4,10 +4,14 @@
<i class="bi bi-gear-fill me-2"></i>ShiftFlow
</a>
<div class="collapse navbar-collapse">
<button class="navbar-toggler border-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon" style="filter: invert(1);"></span> </button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav me-auto">
<li class="nav-item">
<a class="nav-link {% if request.resolver_match.url_name == 'items_list' %}active{% endif %}" href="{% url 'registry' %}">Реестр</a>
<a class="nav-link {% if request.resolver_match.url_name == 'registry' %}active{% endif %}" href="{% url 'registry' %}">Реестр</a>
</li>
{% if user_role in 'admin,technologist' %}
@@ -23,26 +27,19 @@
{% endif %}
</ul>
<div class="d-flex align-items-center gap-3">
<span class="badge bg-secondary opacity-75 px-3 py-2 fw-normal">
<i class="bi bi-person-circle me-1"></i>
{% if user_role == 'admin' %}Админ
{% elif user_role == 'technologist' %}Технолог
{% elif user_role == 'master' %}Мастер
{% elif user_role == 'operator' %}Оператор
{% elif user_role == 'clerk' %}Учетчик
{% endif %}
({{ request.user.username|upper }})
</span>
<div class="d-flex align-items-center gap-2 mt-lg-0 mt-3">
{% if user_role == 'admin' %}
<a href="/admin/" class="btn btn-link text-decoration-none text-reset p-0" title="Админка">
<i class="bi bi-shield-lock fs-5"></i>
</a>
<a href="/admin/" class="btn btn-link text-decoration-none text-reset p-0 me-1" title="Админка">
<i class="bi bi-shield-lock fs-5 text-accent"></i> </a>
{% endif %}
<span class="badge bg-secondary opacity-75 px-3 py-2 fw-normal">
<i class="bi bi-person-circle me-1"></i> ({{ request.user.username|upper }})
</span>
<button class="btn btn-link text-reset p-0" onclick="toggleTheme()" title="Сменить тему">
<i id="theme-icon" class="bi fs-5"></i>
<i id="theme-icon" class="bi fs-5 text-accent"></i>
</button>
<form action="{% url 'logout' %}" method="post" class="d-inline">