From 6e857a842d9aeb114ecc7ec6d3340bd4ec8fcd63 Mon Sep 17 00:00:00 2001 From: andrei Date: Wed, 15 Jan 2025 22:42:02 +0500 Subject: [PATCH] ._. --- API/data/connect.py | 20 ++ Desktop/1.py | 4 - Desktop/data/connect.py | 21 +++ Desktop/ui/employee_dialog_window.ui | 264 ++++++++++++++------------- Desktop/ui/events_dialog_window.ui | 117 +++++++----- Erd.drawio | 176 +++++++++++++++++- 6 files changed, 429 insertions(+), 173 deletions(-) diff --git a/API/data/connect.py b/API/data/connect.py index 6727512..06ea978 100644 --- a/API/data/connect.py +++ b/API/data/connect.py @@ -183,6 +183,26 @@ class WorkingCalendar(base): isworkingday = Column(Boolean) +class Attendance(base): + __tablename__ = 'attendances' + + id = Column(Integer, primary_key=True, autoincrement=True) + date = Column(Date) + is_attended = Column(Boolean) + + user = Column(Integer, ForeignKey('users.id')) + + +class VacationTimetable(base): + __tablename__ = 'vacation_timetable' + + id = Column(Integer, primary_key=True, autoincrement=True) + start_date = Column(Date) + end_date = Column(Date) + + user = Column(Integer, ForeignKey('users.id')) + + def init_db(): eng = create_engine( 'postgresql+psycopg2://postgres:2509@localhost:5432/prb1' diff --git a/Desktop/1.py b/Desktop/1.py index 24ee04a..e69de29 100644 --- a/Desktop/1.py +++ b/Desktop/1.py @@ -1,4 +0,0 @@ -# 0, 1, 2, 3, 4 -# -3 -2 -1 -a = [1, 2, 3, 4, 5] -print(a[-1]) \ No newline at end of file diff --git a/Desktop/data/connect.py b/Desktop/data/connect.py index 6727512..74f9e00 100644 --- a/Desktop/data/connect.py +++ b/Desktop/data/connect.py @@ -183,6 +183,27 @@ class WorkingCalendar(base): isworkingday = Column(Boolean) +class Attendance(base): + __tablename__ = 'attendances' + + id = Column(Integer, primary_key=True, autoincrement=True) + date = Column(Date) + is_attended = Column(Boolean) + reason = Column(Text) + + user = Column(Integer, ForeignKey('users.id')) + + +class VacationTimetable(base): + __tablename__ = 'vacation_timetable' + + id = Column(Integer, primary_key=True, autoincrement=True) + start_date = Column(Date) + end_date = Column(Date) + + user = Column(Integer, ForeignKey('users.id')) + + def init_db(): eng = create_engine( 'postgresql+psycopg2://postgres:2509@localhost:5432/prb1' diff --git a/Desktop/ui/employee_dialog_window.ui b/Desktop/ui/employee_dialog_window.ui index 33fd6d5..dbbadd8 100644 --- a/Desktop/ui/employee_dialog_window.ui +++ b/Desktop/ui/employee_dialog_window.ui @@ -6,14 +6,14 @@ 0 0 - 718 - 579 + 723 + 600 - 400 - 400 + 500 + 600 @@ -32,41 +32,15 @@ background-color: #2f9836; } - - - - Qt::Vertical - - - - 20 - 40 - - - - - - + + - Отчество - - - - - - - +7 (000) 000-00-00 - - - 18 + Фамилия - - Qt::Horizontal - 40 @@ -75,25 +49,35 @@ background-color: #2f9836; - + + + + dd.MM.yyyy + + + true + + + + + + + + 40 + 20 + + + + + Рабочий телефон - - - - true - - - - + - - Qt::Vertical - 20 @@ -102,14 +86,14 @@ background-color: #2f9836; - - + + - Прочая информация + Электронная почта - + @@ -119,6 +103,30 @@ background-color: #2f9836; + + + + Департамент + + + + + + + + 40 + 20 + + + + + + + + Назад + + + @@ -132,7 +140,40 @@ background-color: #2f9836; - + + + + + 20 + 40 + + + + + + + + + + + 10 + + + Кабинет + + + + + + + + 40 + 20 + + + + + Сохранить @@ -146,43 +187,34 @@ background-color: #2f9836; - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + + - Назад + Помощник - + - Должности + Должность + + + + + + + Отчество + + + + + + + +7 (000) 000-00-00 + + + 18 @@ -193,60 +225,45 @@ background-color: #2f9836; - - - - - - - Помошник - - - - - + + - Фамилия + Прочая информация - - - - - - Электронная почта + + + + + + Дата рождения - - - - 10 - - - Кабинет - - - - - - - Qt::Horizontal - - + + + - 40 - 20 + 80 + 80 + + + + + 80 + 80 - - - - - Департамент + + + + ../res/Logo.png + + + true @@ -261,7 +278,6 @@ background-color: #2f9836; lineEdit_5 comboBox comboBox_2 - lineEdit_6 lineEdit_7 lineEdit_8 lineEdit_9 diff --git a/Desktop/ui/events_dialog_window.ui b/Desktop/ui/events_dialog_window.ui index 8d4c269..06a2492 100644 --- a/Desktop/ui/events_dialog_window.ui +++ b/Desktop/ui/events_dialog_window.ui @@ -41,9 +41,6 @@ background-color: #2f9836; - - Qt::Horizontal - 40 @@ -54,9 +51,6 @@ background-color: #2f9836; - - Qt::Horizontal - 40 @@ -96,47 +90,87 @@ background-color: #2f9836; 529 - - - - 0 - 10 - 371 - 71 - - - - - - - Прошедшие + + + + + + + Прошедшие + + + + + + + Текущие + + + + + + + Будущие + + + + + + + + + true + + + + + 0 + 0 + 365 + 477 + + + + + + Обучения + + + + + + + + + + Отгулы + + + + + + + + + + Отпуска + + + + + + + - - - - - Текущие - - - - - - - Будущие - - - - - + + + - - Qt::Horizontal - 40 @@ -147,9 +181,6 @@ background-color: #2f9836; - - Qt::Horizontal - 40 diff --git a/Erd.drawio b/Erd.drawio index 080214d..05ab5de 100644 --- a/Erd.drawio +++ b/Erd.drawio @@ -1,6 +1,6 @@ - + - + @@ -1051,6 +1051,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +