Исправления в основном меню и выводе результатов
This commit is contained in:
@@ -3,7 +3,6 @@
|
|||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<title>Главное меню</title>
|
<title>Главное меню</title>
|
||||||
<link href="static/css/main.css" type="text/css" rel="stylesheet">
|
|
||||||
<link
|
<link
|
||||||
href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css"
|
href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css"
|
||||||
rel="stylesheet"
|
rel="stylesheet"
|
||||||
@@ -15,6 +14,7 @@
|
|||||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
|
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
|
||||||
</head>
|
</head>
|
||||||
<body class="p-3 m-0 border-0 bd-example m-0 border-0">
|
<body class="p-3 m-0 border-0 bd-example m-0 border-0">
|
||||||
|
<header
|
||||||
<div class="row flex-nowrap justify-content-between">
|
<div class="row flex-nowrap justify-content-between">
|
||||||
<div class="col-1 pt-1"></div>
|
<div class="col-1 pt-1"></div>
|
||||||
<div class="col-10 text-center">
|
<div class="col-10 text-center">
|
||||||
@@ -32,6 +32,51 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</header>
|
||||||
|
<main class="flex-shrink-0">
|
||||||
|
<div class="d-flex gap-2 justify-content-center py-5">
|
||||||
|
{% if ses['access_user'] == 'internal_users' %}
|
||||||
|
<div class="d-flex justify-content-center">
|
||||||
|
<div class="feature col">
|
||||||
|
<div
|
||||||
|
class="feature-icon d-inline-flex align-items-center justify-content-center text-bg-primary bg-gradient fs-2 mb-3"
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
<h3 class="fs-2 text-body-emphasis">Запросы</h3>
|
||||||
|
<!-- <p>
|
||||||
|
Paragraph of text beneath the heading to explain the heading. We'll
|
||||||
|
add onto it with another sentence and probably just keep going until
|
||||||
|
we run out of words.
|
||||||
|
</p> -->
|
||||||
|
<a href="{{ url_for('requests_bp.requests') }}">
|
||||||
|
<button class="btn btn-primary">Перейти</button>
|
||||||
|
</a>
|
||||||
|
<div class="feature col">
|
||||||
|
<div
|
||||||
|
class="feature-icon d-inline-flex align-items-center justify-content-center text-bg-primary bg-gradient fs-2 mb-3"
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
<h3 class="fs-2 text-body-emphasis">Отчёты</h3>
|
||||||
|
<!-- <p>
|
||||||
|
Paragraph of text beneath the heading to explain the heading. We'll
|
||||||
|
add onto it with another sentence and probably just keep going until
|
||||||
|
we run out of words.
|
||||||
|
</p> -->
|
||||||
|
<a href="{{ url_for('report_bp.menu') }}">
|
||||||
|
<button class="btn btn-primary">Перейти</button>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% else %}
|
||||||
|
<div class="feature col">
|
||||||
|
<div
|
||||||
|
class="feature-icon d-inline-flex align-items-center justify-content-center text-bg-primary bg-gradient fs-2 mb-3"
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
<!-- {% if 'role' in ses %}
|
<!-- {% if 'role' in ses %}
|
||||||
|
|
||||||
<label class="display-5 fw-bold">Добро пожаловать, username</label>
|
<label class="display-5 fw-bold">Добро пожаловать, username</label>
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
/>
|
/>
|
||||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
|
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body class="p-3 m-0 border-0 bd-example m-0 border-0">
|
||||||
<div class="row flex-nowrap justify-content-between">
|
<div class="row flex-nowrap justify-content-between">
|
||||||
<div class="col-1 pt-1"></div>
|
<div class="col-1 pt-1"></div>
|
||||||
<div class="col-10 text-center">
|
<div class="col-10 text-center">
|
||||||
@@ -25,36 +25,37 @@
|
|||||||
</div>
|
</div>
|
||||||
<!-- Output -->
|
<!-- Output -->
|
||||||
{% if items %}
|
{% if items %}
|
||||||
<div class="row flex-nowrap justify-content-between">
|
<div class="row flex-nowrap justify-content-between py-5">
|
||||||
<div class="col-3"></div>
|
<div class="col-3"></div>
|
||||||
<div class="col-6">
|
<div class="col-6">
|
||||||
<table class="table">
|
<table class="table">
|
||||||
<thead class="table-dark">
|
<thead class="table-dark">
|
||||||
<tr>
|
<tr>
|
||||||
{% for key in items[0].keys() %}
|
{% for key in items[0].keys() %}
|
||||||
<th>{{ key }}</th>
|
<th>{{ key }}</th>
|
||||||
|
{% endfor %}
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{% for item in items %}
|
||||||
|
<tr>
|
||||||
|
{% for value in item.values() %}
|
||||||
|
<td>{{ value }}</td>
|
||||||
|
{% endfor %}
|
||||||
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tr>
|
</tbody>
|
||||||
</thead>
|
</table>
|
||||||
<tbody>
|
</div>
|
||||||
{% for item in items %}
|
<div class="col-3"></div>
|
||||||
<tr>
|
|
||||||
{% for value in item.values() %}
|
|
||||||
<td>{{ value }}</td>
|
|
||||||
{% endfor %}
|
|
||||||
</tr>
|
|
||||||
{% endfor %}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-3"></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
{% else %}
|
{% else %}
|
||||||
<p>Информации не найдено</p>
|
<div class="d-flex justify-content-center gap-2 py-5">
|
||||||
|
<p>Информации не найдено</p>
|
||||||
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<div class="return">
|
<div class="d-flex justify-content-center gap-2">
|
||||||
<a href="{{ link }}"><button>Вернуться в меню выбора</button></a>
|
<a href="{{ link }}"><button class="btn btn-primary">Вернуться в меню выбора</button></a>
|
||||||
</div></body>
|
</div>
|
||||||
|
</body>
|
||||||
</html>
|
</html>
|
||||||
Reference in New Issue
Block a user