PHB/SemesterapparatsManager
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

update ui related files & functions

Browse Source
This commit is contained in:
WorldTeacher
2024-01-31 15:31:25 +01:00
parent 4ff37d9452
commit c03865dcbd
5 changed files with 259 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/ui/Ui_semesterapparat_ui.py
View File

@@ -1,4 +1,4 @@
# Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\Semesterapparate-refactor\src\ui\semesterapparat_ui.ui'
# Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\SemesterapparatsManager\src\ui\semesterapparat_ui.ui'
#
# Created by: PyQt6 UI code generator 6.3.1
#
@@ -183,15 +183,6 @@ class Ui_MainWindow(object):
self.frame.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel)
self.frame.setFrameShadow(QtWidgets.QFrame.Shadow.Raised)
self.frame.setObjectName("frame")
self.drpdwn_prof_title = QtWidgets.QComboBox(self.frame)
self.drpdwn_prof_title.setGeometry(QtCore.QRect(110, 50, 69, 22))
font = QtGui.QFont()
font.setPointSize(9)
font.setBold(False)
font.setWeight(50)
self.drpdwn_prof_title.setFont(font)
self.drpdwn_prof_title.setEditable(True)
self.drpdwn_prof_title.setObjectName("drpdwn_prof_title")
self.label_5 = QtWidgets.QLabel(self.frame)
self.label_5.setGeometry(QtCore.QRect(250, 20, 91, 21))
font = QtGui.QFont()
@@ -487,12 +478,27 @@ class Ui_MainWindow(object):
self.gridLayout_6.setContentsMargins(0, 0, 0, 0)
self.gridLayout_6.setObjectName("gridLayout_6")
self.app_fach = QtWidgets.QComboBox(self.gridLayoutWidget_5)
self.app_fach.setMaximumSize(QtCore.QSize(16777215, 20))
font = QtGui.QFont()
font.setPointSize(9)
font.setBold(False)
font.setWeight(50)
self.app_fach.setFont(font)
self.app_fach.setObjectName("app_fach")
self.gridLayout_6.addWidget(self.app_fach, 0, 0, 1, 1)
spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
self.gridLayout_6.addItem(spacerItem2, 0, 1, 1, 1)
self.prof_title = QtWidgets.QLineEdit(self.frame)
self.prof_title.setGeometry(QtCore.QRect(110, 50, 71, 20))
font = QtGui.QFont()
font.setPointSize(9)
font.setBold(False)
font.setWeight(50)
self.prof_title.setFont(font)
self.prof_title.setFocusPolicy(QtCore.Qt.FocusPolicy.StrongFocus)
self.prof_title.setObjectName("prof_title")
self.mail_mand.raise_()
self._mand.raise_()
self.drpdwn_prof_title.raise_()
self.label_5.raise_()
self.sem_winter.raise_()
self.label_4.raise_()
@@ -508,7 +514,6 @@ class Ui_MainWindow(object):
self.label_8.raise_()
self.label_9.raise_()
self.label_10.raise_()
self.mail_mand.raise_()
self.telnr_mand.raise_()
self.profname_mand.raise_()
self.appname_mand.raise_()
@@ -523,6 +528,7 @@ class Ui_MainWindow(object):
self.formLayoutWidget_2.raise_()
self.check_send_mail.raise_()
self.frame_3.raise_()
self.prof_title.raise_()
self.frame.raise_()
self.dokument_list.raise_()
self.gridLayout_2.addWidget(self.app_group_box, 1, 0, 1, 1)
@@ -729,8 +735,6 @@ class Ui_MainWindow(object):
self.stackedWidget_4.setObjectName("stackedWidget_4")
self.stackedWidget_4Page1 = QtWidgets.QWidget()
self.stackedWidget_4Page1.setObjectName("stackedWidget_4Page1")
#set focus to page 1
self.stackedWidget_4.setCurrentIndex(0)
self.tabWidget_3 = QtWidgets.QTabWidget(self.stackedWidget_4Page1)
self.tabWidget_3.setGeometry(QtCore.QRect(780, 10, 441, 441))
self.tabWidget_3.setObjectName("tabWidget_3")
@@ -954,7 +958,7 @@ class Ui_MainWindow(object):
spacerItem14 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
self.gridLayout_11.addItem(spacerItem14, 0, 4, 1, 1)
self.edit_faculty_member = QtWidgets.QFrame(self.tab_5)
self.edit_faculty_member.setGeometry(QtCore.QRect(10, 60, 1051, 191))
self.edit_faculty_member.setGeometry(QtCore.QRect(10, 60, 1051, 241))
self.edit_faculty_member.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel)
self.edit_faculty_member.setFrameShadow(QtWidgets.QFrame.Shadow.Raised)
self.edit_faculty_member.setObjectName("edit_faculty_member")
@@ -970,6 +974,7 @@ class Ui_MainWindow(object):
self.label_43.setObjectName("label_43")
self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_43)
self.edit_faculty_member_new_title = QtWidgets.QComboBox(self.gridLayoutWidget_11)
self.edit_faculty_member_new_title.setEditable(True)
self.edit_faculty_member_new_title.setObjectName("edit_faculty_member_new_title")
self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.edit_faculty_member_new_title)
self.label_44 = QtWidgets.QLabel(self.gridLayoutWidget_11)
@@ -1021,12 +1026,12 @@ class Ui_MainWindow(object):
self.label_48 = QtWidgets.QLabel(self.gridLayoutWidget_11)
self.label_48.setObjectName("label_48")
self.formLayout_5.setWidget(1, QtWidgets.QFormLayout.ItemRole.LabelRole, self.label_48)
self.lineEdit = QtWidgets.QLineEdit(self.gridLayoutWidget_11)
self.lineEdit.setObjectName("lineEdit")
self.formLayout_5.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.lineEdit)
self.lineEdit_5 = QtWidgets.QLineEdit(self.gridLayoutWidget_11)
self.lineEdit_5.setObjectName("lineEdit_5")
self.formLayout_5.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.lineEdit_5)
self.user_faculty_member_new_mail = QtWidgets.QLineEdit(self.gridLayoutWidget_11)
self.user_faculty_member_new_mail.setObjectName("user_faculty_member_new_mail")
self.formLayout_5.setWidget(0, QtWidgets.QFormLayout.ItemRole.FieldRole, self.user_faculty_member_new_mail)
self.user_faculty_member_new_telnr = QtWidgets.QLineEdit(self.gridLayoutWidget_11)
self.user_faculty_member_new_telnr.setObjectName("user_faculty_member_new_telnr")
self.formLayout_5.setWidget(1, QtWidgets.QFormLayout.ItemRole.FieldRole, self.user_faculty_member_new_telnr)
self.gridLayout_12.addLayout(self.formLayout_5, 2, 4, 1, 1)
self.label_41 = QtWidgets.QLabel(self.gridLayoutWidget_11)
self.label_41.setObjectName("label_41")
@@ -1150,7 +1155,7 @@ class Ui_MainWindow(object):
self.btn_copy_adis_command.setAccessibleDescription("")
self.btn_copy_adis_command.setAutoFillBackground(False)
icon = QtGui.QIcon()
icon.addPixmap(QtGui.QPixmap("c:\\Users\\aky547\\GitHub\\Semesterapparate-refactor\\src\\ui\\../../../.designer/backup/icons/information.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
icon.addPixmap(QtGui.QPixmap("c:\\Users\\aky547\\GitHub\\SemesterapparatsManager\\src\\ui\\../../../.designer/backup/icons/information.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off)
self.btn_copy_adis_command.setIcon(icon)
self.btn_copy_adis_command.setCheckable(False)
self.btn_copy_adis_command.setChecked(False)
@@ -1226,8 +1231,7 @@ class Ui_MainWindow(object):
self.stackedWidget_4.setCurrentIndex(1)
self.tabWidget_3.setCurrentIndex(1)
QtCore.QMetaObject.connectSlotsByName(MainWindow)
MainWindow.setTabOrder(self.drpdwn_app_nr, self.drpdwn_prof_title)
MainWindow.setTabOrder(self.drpdwn_prof_title, self.drpdwn_prof_name)
MainWindow.setTabOrder(self.drpdwn_app_nr, self.drpdwn_prof_name)
MainWindow.setTabOrder(self.drpdwn_prof_name, self.prof_mail)
MainWindow.setTabOrder(self.prof_mail, self.prof_tel_nr)
MainWindow.setTabOrder(self.prof_tel_nr, self.app_name)
@@ -1265,9 +1269,9 @@ class Ui_MainWindow(object):
MainWindow.setTabOrder(self.faculty_member_oldmail, self.edit_faculty_member_new_title)
MainWindow.setTabOrder(self.edit_faculty_member_new_title, self.edit_faculty_member_new_surname)
MainWindow.setTabOrder(self.edit_faculty_member_new_surname, self.user_faculty_member_new_name)
MainWindow.setTabOrder(self.user_faculty_member_new_name, self.lineEdit)
MainWindow.setTabOrder(self.lineEdit, self.lineEdit_5)
MainWindow.setTabOrder(self.lineEdit_5, self.update_faculty_member)
MainWindow.setTabOrder(self.user_faculty_member_new_name, self.user_faculty_member_new_mail)
MainWindow.setTabOrder(self.user_faculty_member_new_mail, self.user_faculty_member_new_telnr)
MainWindow.setTabOrder(self.user_faculty_member_new_telnr, self.update_faculty_member)
MainWindow.setTabOrder(self.update_faculty_member, self.box_fach)
MainWindow.setTabOrder(self.box_fach, self.box_person)
MainWindow.setTabOrder(self.box_person, self.btn_search)

3
src/ui/dialogs/Ui_login.py
View File

@@ -71,7 +71,7 @@ class Ui_Dialog(object):
hashed_password = hashlib.sha256(
password.encode()
).hexdigest()
if len(db.get_users()) == 0:
if len(db.getUsers()) == 0:
AdminCommands().create_admin()
self.lresult = 1 # Indicate successful login
self.lusername = username
@@ -80,7 +80,6 @@ class Ui_Dialog(object):
self.lresult = 1 # Indicate successful login
self.lusername = username
self.dialog.accept()
db.close()
else:
# Credentials are invalid, display a warning
if username == "" or password == "":

77
src/ui/semesterapparat_ui.ui
View File

@@ -376,26 +376,6 @@
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<widget class="QComboBox" name="drpdwn_prof_title">
<property name="geometry">
<rect>
<x>110</x>
<y>50</y>
<width>69</width>
<height>22</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="editable">
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="label_5">
<property name="geometry">
<rect>
@@ -1099,7 +1079,21 @@
</property>
<layout class="QGridLayout" name="gridLayout_6">
<item row="0" column="0">
<widget class="QComboBox" name="app_fach"/>
<widget class="QComboBox" name="app_fach">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>20</height>
</size>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
</widget>
</item>
<item row="0" column="1">
<spacer name="horizontalSpacer_7">
@@ -1117,8 +1111,28 @@
</layout>
</widget>
</widget>
<widget class="QLineEdit" name="prof_title">
<property name="geometry">
<rect>
<x>110</x>
<y>50</y>
<width>71</width>
<height>20</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
</widget>
<zorder>mail_mand</zorder>
<zorder>_mand</zorder>
<zorder>drpdwn_prof_title</zorder>
<zorder>label_5</zorder>
<zorder>sem_winter</zorder>
<zorder>label_4</zorder>
@@ -1134,7 +1148,6 @@
<zorder>label_8</zorder>
<zorder>label_9</zorder>
<zorder>label_10</zorder>
<zorder>mail_mand</zorder>
<zorder>telnr_mand</zorder>
<zorder>profname_mand</zorder>
<zorder>appname_mand</zorder>
@@ -1149,6 +1162,7 @@
<zorder>formLayoutWidget_2</zorder>
<zorder>check_send_mail</zorder>
<zorder>frame_3</zorder>
<zorder>prof_title</zorder>
</widget>
<zorder>frame</zorder>
<zorder>dokument_list</zorder>
@@ -2230,7 +2244,7 @@
<x>10</x>
<y>60</y>
<width>1051</width>
<height>191</height>
<height>241</height>
</rect>
</property>
<property name="frameShape">
@@ -2259,7 +2273,11 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="edit_faculty_member_new_title"/>
<widget class="QComboBox" name="edit_faculty_member_new_title">
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_44">
@@ -2354,10 +2372,10 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit"/>
<widget class="QLineEdit" name="user_faculty_member_new_mail"/>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineEdit_5"/>
<widget class="QLineEdit" name="user_faculty_member_new_telnr"/>
</item>
</layout>
</item>
@@ -2832,7 +2850,6 @@
</widget>
<tabstops>
<tabstop>drpdwn_app_nr</tabstop>
<tabstop>drpdwn_prof_title</tabstop>
<tabstop>drpdwn_prof_name</tabstop>
<tabstop>prof_mail</tabstop>
<tabstop>prof_tel_nr</tabstop>
@@ -2871,8 +2888,8 @@
<tabstop>edit_faculty_member_new_title</tabstop>
<tabstop>edit_faculty_member_new_surname</tabstop>
<tabstop>user_faculty_member_new_name</tabstop>
<tabstop>lineEdit</tabstop>
<tabstop>lineEdit_5</tabstop>
<tabstop>user_faculty_member_new_mail</tabstop>
<tabstop>user_faculty_member_new_telnr</tabstop>
<tabstop>update_faculty_member</tabstop>
<tabstop>box_fach</tabstop>
<tabstop>box_person</tabstop>

2
src/ui/widgets/Ui_message_widget.py
View File

@@ -64,4 +64,4 @@ class Ui_Form(object):
def delete_message(self):
db = Database()
print("deleting message")
db.delete_message(self.hidden_id.text())
db.deleteMessage(self.hidden_id.text())