From c0076a576de00b1cdef1876a39899ffa88197f26 Mon Sep 17 00:00:00 2001 From: Anton Kamalov Date: Thu, 28 Nov 2024 20:37:58 +0300 Subject: [PATCH 01/11] New css for Auth --- App/Auth/templates/auth.html | 82 +++++++++++++++++++++++++----------- 1 file changed, 57 insertions(+), 25 deletions(-) diff --git a/App/Auth/templates/auth.html b/App/Auth/templates/auth.html index 08ef3c2..0672e62 100644 --- a/App/Auth/templates/auth.html +++ b/App/Auth/templates/auth.html @@ -1,28 +1,60 @@ - - - + + + + + + Авторизация - - - - -

Авторизация

-
-
- - - -
-

- Уровень доступа: - -

- -
-
- + + + + + + + + + +
+
+

Авторизация

+ +
+ + +
+
+ + +
+ +
+ +
+ +
+
+ From fa97f6d6cb4c15822db45ec92456b78e7b9a79fa Mon Sep 17 00:00:00 2001 From: Anton Kamalov Date: Fri, 29 Nov 2024 01:49:30 +0300 Subject: [PATCH 02/11] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/Auth/templates/auth.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/App/Auth/templates/auth.html b/App/Auth/templates/auth.html index 0672e62..986bdaa 100644 --- a/App/Auth/templates/auth.html +++ b/App/Auth/templates/auth.html @@ -22,7 +22,7 @@
-
+

Авторизация

@@ -47,13 +47,13 @@
-
- +
From 6867da5c06671eacb8ebc5049a50e4da63406fac Mon Sep 17 00:00:00 2001 From: Anton Kamalov Date: Fri, 29 Nov 2024 01:49:51 +0300 Subject: [PATCH 03/11] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20css=20=D0=B3=D0=BB=D0=B0=D0=B2?= =?UTF-8?q?=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BC=D0=B5=D0=BD=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/templates/main_menu.html | 39 +++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/App/templates/main_menu.html b/App/templates/main_menu.html index 74b872b..99ca57e 100644 --- a/App/templates/main_menu.html +++ b/App/templates/main_menu.html @@ -4,22 +4,47 @@ Главное меню + + + - - {% if 'role' in ses %} -
- + +
+
+
+ {% if 'role' in ses %} + + {% else %} + + {% endif %}
+
+ {% if 'role' in ses %} + + {% else %} + + {% endif %} +
+
+ +
{% else %} - +
@@ -30,6 +55,6 @@

Здравствуйте!

Для использования системы, пожалуйста, пройдите процедуру авторизации

- {% endif %} + {% endif %} --> \ No newline at end of file From c7c3f3b14f06e0f2c9ce7f952cbd04ae6cc213c0 Mon Sep 17 00:00:00 2001 From: Anton Kamalov Date: Fri, 29 Nov 2024 02:07:38 +0300 Subject: [PATCH 04/11] =?UTF-8?q?css=20=D0=B4=D0=BB=D1=8F=20=D0=B2=D1=8B?= =?UTF-8?q?=D0=B2=D0=BE=D0=B4=D0=B0=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C?= =?UTF-8?q?=D1=82=D0=B0=D1=82=D0=B8=D0=B2=D0=BD=D0=BE=D0=B9=20=D1=82=D0=B0?= =?UTF-8?q?=D0=B1=D0=BB=D0=B8=D1=86=D1=8B=20(=D1=82=D1=80=D0=B5=D0=B1?= =?UTF-8?q?=D1=83=D0=B5=D1=82=D1=81=D1=8F=20=D0=B4=D0=BE=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/templates/output.html | 62 +++++++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 19 deletions(-) diff --git a/App/templates/output.html b/App/templates/output.html index 269fc09..e793af9 100644 --- a/App/templates/output.html +++ b/App/templates/output.html @@ -3,30 +3,54 @@ {{ header }} - - + + + -
- +
+
+
+ +
+
+ +
-

{{ header }}

{% if items %} - - - {% for key in items[0].keys() %} - - {% endfor %} - - {% for item in items %} - - {% for value in item.values() %} - - {% endfor %} - - {% endfor %} -
{{ key }}
{{ value }}
+
+
+
+ + + + {% for key in items[0].keys() %} + + {% endfor %} + + + + {% for item in items %} + + {% for value in item.values() %} + + {% endfor %} + + {% endfor %} + +
{{ key }}
{{ value }}
+
+
+
+ + {% else %}

Информации не найдено

{% endif %} From e326f4b74d0a07f8e5bbd96ee0ef0f06819a220b Mon Sep 17 00:00:00 2001 From: Anton Kamalov Date: Sat, 30 Nov 2024 15:53:48 +0300 Subject: [PATCH 05/11] =?UTF-8?q?Css=20=D0=B4=D0=BB=D1=8F=20=D0=B2=D1=8B?= =?UTF-8?q?=D0=B2=D0=BE=D0=B4=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?= =?UTF-8?q?=20=D0=B2=20=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/templates/error.html | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/App/templates/error.html b/App/templates/error.html index 78d23eb..5f035c9 100644 --- a/App/templates/error.html +++ b/App/templates/error.html @@ -3,12 +3,16 @@ Ошибка - - + + - -

Сожалеем

-

{{ error_message }}

- + +
+
+

Сожалеем

+

{{ error_message }}

+ +
+
From 251f6deec6deb7bffaca9ded895f25abe2a774ad Mon Sep 17 00:00:00 2001 From: Anton Kamalov Date: Sat, 30 Nov 2024 18:11:25 +0300 Subject: [PATCH 06/11] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=20=D0=BE=D1=81=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=BD=D0=BE=D0=BC=20=D0=BC=D0=B5=D0=BD=D1=8E=20?= =?UTF-8?q?=D0=B8=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=D0=B5=20=D1=80=D0=B5?= =?UTF-8?q?=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/templates/main_menu.html | 47 +++++++++++++++++++++++++++- App/templates/output.html | 59 ++++++++++++++++++------------------ 2 files changed, 76 insertions(+), 30 deletions(-) diff --git a/App/templates/main_menu.html b/App/templates/main_menu.html index 99ca57e..d001b60 100644 --- a/App/templates/main_menu.html +++ b/App/templates/main_menu.html @@ -3,7 +3,6 @@ Главное меню - +
@@ -32,6 +32,51 @@ {% endif %}
+ +
+
+ {% if ses['access_user'] == 'internal_users' %} +
+
+
+
+

Запросы

+ + + + +
+
+
+

Отчёты

+ + + + +
+
+
+ {% else %} +
+
+
+ {% endif %} +
+
{% if items %} -
-
-
- - - - {% for key in items[0].keys() %} - +
+
+
+
{{ key }}
+ + + {% for key in items[0].keys() %} + + {% endfor %} + + + + {% for item in items %} + + {% for value in item.values() %} + + {% endfor %} + {% endfor %} - - - - {% for item in items %} - - {% for value in item.values() %} - - {% endfor %} - - {% endfor %} - -
{{ key }}
{{ value }}
{{ value }}
+ + +
+
-
- - - {% else %} -

Информации не найдено

+
+

Информации не найдено

+
{% endif %} -
- -
+
+ +
+ \ No newline at end of file From e7ba0aef7881c2eee382aabbd626e46985a509ed Mon Sep 17 00:00:00 2001 From: Anton Kamalov Date: Sat, 30 Nov 2024 18:11:42 +0300 Subject: [PATCH 07/11] =?UTF-8?q?=D0=92=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=BE?= =?UTF-8?q?=D0=B1=20=D1=83=D1=81=D0=BF=D0=B5=D1=88=D0=BD=D0=BE=D0=BC=20?= =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B8=20=D0=BE=D1=82?= =?UTF-8?q?=D1=87=D1=91=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/Report/templates/OK.html | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/App/Report/templates/OK.html b/App/Report/templates/OK.html index bbb836c..459137f 100644 --- a/App/Report/templates/OK.html +++ b/App/Report/templates/OK.html @@ -3,13 +3,19 @@ Успех - - + + - -

Успешно!

-

Отчет успешно добавлен в базу данных!

- - + +
+
+

Успешно!

+

Отчет успешно добавлен в базу данных!

+
+ + +
+
+
\ No newline at end of file From 30508b2221960e19959f04b6421000f16fe4d5c3 Mon Sep 17 00:00:00 2001 From: Anton Kamalov Date: Sat, 30 Nov 2024 21:00:18 +0300 Subject: [PATCH 08/11] =?UTF-8?q?=D0=9E=D0=BF=D1=82=D0=B8=D0=BC=D0=B8?= =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BE=D1=81=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BD=D0=BE=D0=B3=D0=BE=20css=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/static/css/main.css | 57 +---------------------------------------- 1 file changed, 1 insertion(+), 56 deletions(-) diff --git a/App/static/css/main.css b/App/static/css/main.css index eeb65be..37f8b78 100644 --- a/App/static/css/main.css +++ b/App/static/css/main.css @@ -1,55 +1,3 @@ -h1, h2 { - text-align: center; -} - -body { - background-color: #87CEEB; -} - -button { - background-color: #067936; - border-radius: 10px; - padding: 10px 20px; - border: none; - color: white; - cursor: pointer; - margin-top: 10px; -} - -input[type=submit] { - background-color: #f2c464; -} - -div.logout, div.login { - position: absolute; - right: 2%; - text-align: center; -} - -div.buttons_menu{ - text-align: center; - margin: 20px 0; -} - -div.logout button { - margin-top: -5px; - background-color: #ff0000; -} - -div.login button { - margin-top: -5px; - background-color: #176917; -} - -div.return { - text-align: center; - margin: 20px 0; -} - -div.return button { - background-color: chocolate; -} - div.form { margin-left: 30%; margin-right: 30%; @@ -58,6 +6,7 @@ div.form { padding: 20px; border-radius: 10px; box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2); + color: black; } div.form label { @@ -75,7 +24,3 @@ div.form select, div.form input[type=number] { width: 100%; box-sizing: border-box; } - -div.form button { - margin-top: 15px; -} From 0076444a02c4881c6e26cf1beacb71132f2f5b65 Mon Sep 17 00:00:00 2001 From: Anton Kamalov Date: Sat, 30 Nov 2024 21:00:34 +0300 Subject: [PATCH 09/11] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=BA=D0=B0=20css=20=D0=BE=D1=82=D1=87=D1=91?= =?UTF-8?q?=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/Report/templates/OK.html | 2 +- App/Report/templates/report_basic.html | 41 +++++++++++++++-------- App/Report/templates/report_menu.html | 46 +++++++++++++++++++------- 3 files changed, 63 insertions(+), 26 deletions(-) diff --git a/App/Report/templates/OK.html b/App/Report/templates/OK.html index 459137f..5361c46 100644 --- a/App/Report/templates/OK.html +++ b/App/Report/templates/OK.html @@ -1,5 +1,5 @@ - + Успех diff --git a/App/Report/templates/report_basic.html b/App/Report/templates/report_basic.html index 42bcdeb..bea0f07 100644 --- a/App/Report/templates/report_basic.html +++ b/App/Report/templates/report_basic.html @@ -1,21 +1,35 @@ - + {{ title }} + + + - -
- + +
+
+
+

{{ title }}

+
+
+ +
-

{{ title }}

-
+
- {% for item in items.keys() %} {% endfor %} @@ -23,7 +37,7 @@
- @@ -37,18 +51,19 @@ - +
{% if is_write %} - + {% else %} - + {% endif %}
-
- + +
+
diff --git a/App/Report/templates/report_menu.html b/App/Report/templates/report_menu.html index 7af3b21..8b4e859 100644 --- a/App/Report/templates/report_menu.html +++ b/App/Report/templates/report_menu.html @@ -1,21 +1,43 @@ - + Меню отчетов + + + - -
- + +
+
+
+ +
+
+ +
-

Выберите вариант отчетов

-
- - -
-
- +
+
+
+
+ + +
+
+
+
+
+ +
+
- \ No newline at end of file + From d57de5b1a38d07ce354fcc3348ee600f89c60ddb Mon Sep 17 00:00:00 2001 From: Anton Kamalov Date: Sat, 30 Nov 2024 21:00:49 +0300 Subject: [PATCH 10/11] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=BA=D0=B0=20css=20=D0=B7=D0=B0=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D1=81=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/Requests/templates/sellers_ship.html | 63 +++++++++++++++-------- App/Requests/templates/zagotovki.html | 65 ++++++++++++++++-------- App/Requests/templates/zapros_menu.html | 49 +++++++++++++----- 3 files changed, 119 insertions(+), 58 deletions(-) diff --git a/App/Requests/templates/sellers_ship.html b/App/Requests/templates/sellers_ship.html index 629f9fc..998a5bd 100644 --- a/App/Requests/templates/sellers_ship.html +++ b/App/Requests/templates/sellers_ship.html @@ -1,30 +1,49 @@ - + Поставки поставщиком + + + + - -
- -
- -

Поставки поставщиком

-
-

Выберите поставщика

-
- - -
-
- + +
+
+
+
+

Поставки поставщиком

+
+
+ +
-
+ + +
+
+
+ + + +
+
+ +
+
+
+ - - + \ No newline at end of file diff --git a/App/Requests/templates/zagotovki.html b/App/Requests/templates/zagotovki.html index fab9e65..3d8f662 100644 --- a/App/Requests/templates/zagotovki.html +++ b/App/Requests/templates/zagotovki.html @@ -1,32 +1,53 @@ - + Количество заготовок на складе + + + + - -
- -
- -

Количество заготовок на складе

-
-
-

Выберите материал

- - -
-
- + +
+
+
+
+

Количество заготовок на складе

+
+
+ +
-
+ + + +
+
+
+ + + +
+
+ +
+
+
+ diff --git a/App/Requests/templates/zapros_menu.html b/App/Requests/templates/zapros_menu.html index 2030feb..0aa606c 100644 --- a/App/Requests/templates/zapros_menu.html +++ b/App/Requests/templates/zapros_menu.html @@ -1,22 +1,43 @@ - + Запросы - + + + - -
- + +
+
+
+ +
+
+ +
-

Выберите вариант запроса

-
- {% for point in options %} - - {% endfor %} -
-
- +
+
+
+
+ {% for point in options %} + + {% endfor %} +
+
+
+
+
+ +
+
- \ No newline at end of file + From 90889614963f0f1a86586325417019bb95d0c4da Mon Sep 17 00:00:00 2001 From: Anton Kamalov Date: Sat, 30 Nov 2024 21:01:04 +0300 Subject: [PATCH 11/11] =?UTF-8?q?=D0=9E=D1=81=D0=BD=D0=BE=D0=B2=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D1=8B=20-?= =?UTF-8?q?=20css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/templates/error.html | 2 +- App/templates/main_menu.html | 4 ++-- App/templates/output.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/App/templates/error.html b/App/templates/error.html index 5f035c9..2813469 100644 --- a/App/templates/error.html +++ b/App/templates/error.html @@ -1,5 +1,5 @@ - + Ошибка diff --git a/App/templates/main_menu.html b/App/templates/main_menu.html index d001b60..8fd8fc8 100644 --- a/App/templates/main_menu.html +++ b/App/templates/main_menu.html @@ -1,5 +1,5 @@ - + Главное меню @@ -14,7 +14,7 @@ -
diff --git a/App/templates/output.html b/App/templates/output.html index 643c6f6..224e921 100644 --- a/App/templates/output.html +++ b/App/templates/output.html @@ -1,5 +1,5 @@ - + {{ header }}