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

remove unneeded frame

Browse Source
This commit is contained in:
WorldTeacher
2024-06-05 13:35:30 +02:00
parent 0c17ddef83
commit bc48c4ea9f
2 changed files with 965 additions and 1057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/logic/userInterface.py
View File

@@ -115,7 +115,7 @@ class Ui(Ui_Semesterapparat):
self.MainWindow = MainWindow self.MainWindow = MainWindow
# set the window title # set the window title
MainWindow.setWindowTitle("Semesterapparatsmanagement") MainWindow.setWindowTitle("Semesterapparatsmanagement")
MainWindow.setWindowIcon(Icon("logo", "ico").icon) MainWindow.setWindowIcon(Icon("logo").icon)
self.db = Database() self.db = Database()
# self.show() # self.show()
@@ -219,7 +219,7 @@ class Ui(Ui_Semesterapparat):
# Set visibility/enabled state of certain entries # Set visibility/enabled state of certain entries
self.chkbx_show_del_media.setEnabled(False) self.chkbx_show_del_media.setEnabled(False)
self.label_info.hide() self.label_info.hide()
self.frame.setEnabled(False) self.app_group_box.setEnabled(False)
self.line_2.hide() self.line_2.hide()
self.progress_label.hide() self.progress_label.hide()
self.message_frame.hide() self.message_frame.hide()
@@ -293,7 +293,7 @@ class Ui(Ui_Semesterapparat):
self.elsa_save.clicked.connect(self.save_elsa) self.elsa_save.clicked.connect(self.save_elsa)
self.elsa_date_today.clicked.connect(self.generateTodayDateElsa) self.elsa_date_today.clicked.connect(self.generateTodayDateElsa)
self.active_semester.clicked.connect(self.addSemester) self.active_semester.clicked.connect(self.addSemester)
Icon("semap", "png").set_icon(self.active_semester) Icon("semap").set_icon(self.active_semester)
self.elsa_table.doubleClicked.connect(self.open_elsa) self.elsa_table.doubleClicked.connect(self.open_elsa)
self.btn_add_document_elsa.clicked.connect(self.addDokumentElsa) self.btn_add_document_elsa.clicked.connect(self.addDokumentElsa)
self.check_file_elsa.clicked.connect(self.parseDokumentElsa) self.check_file_elsa.clicked.connect(self.parseDokumentElsa)
@@ -1199,7 +1199,7 @@ class Ui(Ui_Semesterapparat):
self.check_eternal_app.setChecked(appdata.dauerapp) self.check_eternal_app.setChecked(appdata.dauerapp)
self.prof_id_adis.setText(str(appdata.prof_adis_id)) self.prof_id_adis.setText(str(appdata.prof_adis_id))
self.apparat_id_adis.setText(str(appdata.apparat_adis_id)) self.apparat_id_adis.setText(str(appdata.apparat_adis_id))
self.frame.setEnabled(True) self.app_group_box.setEnabled(True)
self.groupBox_2.hide() self.groupBox_2.hide()
self.groupBox.hide() self.groupBox.hide()
self.validateLoadedData() self.validateLoadedData()
@@ -1267,7 +1267,7 @@ class Ui(Ui_Semesterapparat):
self.check_eternal_app.stateChanged.connect(self.validate_semester) self.check_eternal_app.stateChanged.connect(self.validate_semester)
def validate_prof_name(self): def validate_prof_name(self):
if self.frame.isEnabled(): if self.app_group_box.isEnabled():
if "," in self.drpdwn_prof_name.currentText(): if "," in self.drpdwn_prof_name.currentText():
self.drpdwn_prof_name.setStyleSheet("border: 1px solid green;") self.drpdwn_prof_name.setStyleSheet("border: 1px solid green;")
self.profname_mand.setText("") self.profname_mand.setText("")
@@ -1281,7 +1281,7 @@ class Ui(Ui_Semesterapparat):
# self.drpdwn_prof_name.setStyleSheet("border: 1px solid black;") # self.drpdwn_prof_name.setStyleSheet("border: 1px solid black;")
def validate_prof_mail(self): def validate_prof_mail(self):
if self.frame.isEnabled(): if self.app_group_box.isEnabled():
if self.prof_mail.hasAcceptableInput(): if self.prof_mail.hasAcceptableInput():
self.prof_mail.setStyleSheet("border: 1px solid green;") self.prof_mail.setStyleSheet("border: 1px solid green;")
self.mail_mand.setText("") self.mail_mand.setText("")
@@ -1294,7 +1294,7 @@ class Ui(Ui_Semesterapparat):
self.prof_mail.setStyleSheet("border: 1px solid black;") self.prof_mail.setStyleSheet("border: 1px solid black;")
def validate_prof_tel(self): def validate_prof_tel(self):
if self.frame.isEnabled(): if self.app_group_box.isEnabled():
if self.prof_tel_nr.text() != "": if self.prof_tel_nr.text() != "":
self.prof_tel_nr.setStyleSheet("border: 1px solid green;") self.prof_tel_nr.setStyleSheet("border: 1px solid green;")
self.telnr_mand.setText("") self.telnr_mand.setText("")
@@ -1305,7 +1305,7 @@ class Ui(Ui_Semesterapparat):
self.change_state(2, 0) self.change_state(2, 0)
def validate_app_name(self): def validate_app_name(self):
if self.frame.isEnabled(): if self.app_group_box.isEnabled():
if self.app_name.hasAcceptableInput(): if self.app_name.hasAcceptableInput():
self.app_name.setStyleSheet("border: 1px solid green;") self.app_name.setStyleSheet("border: 1px solid green;")
self.appname_mand.setText("") self.appname_mand.setText("")
@@ -1316,7 +1316,7 @@ class Ui(Ui_Semesterapparat):
self.change_state(3, 0) self.change_state(3, 0)
def validate_app_fach(self): def validate_app_fach(self):
if self.frame.isEnabled(): if self.app_group_box.isEnabled():
if self.app_fach.currentText() != "": if self.app_fach.currentText() != "":
self.app_fach.setStyleSheet("border: 1px solid green;") self.app_fach.setStyleSheet("border: 1px solid green;")
self.fach_mand.setText("") self.fach_mand.setText("")
@@ -1327,7 +1327,7 @@ class Ui(Ui_Semesterapparat):
self.change_state(4, 0) self.change_state(4, 0)
def validate_semester(self): def validate_semester(self):
if self.frame.isEnabled(): if self.app_group_box.isEnabled():
if ( if (
(self.sem_sommer.isChecked() or self.sem_winter.isChecked()) (self.sem_sommer.isChecked() or self.sem_winter.isChecked())
and self.sem_year.hasAcceptableInput() and self.sem_year.hasAcceptableInput()
@@ -1363,7 +1363,7 @@ class Ui(Ui_Semesterapparat):
# def req_fields_filled(self): # def req_fields_filled(self):
# # check if all required fields are filled # # check if all required fields are filled
# values = [] # values = []
# for item in self.frame.findChildren(QtWidgets.QLabel): # for item in self.app_group_box.findChildren(QtWidgets.QLabel):
# # if label name contains "req" and the text is empty, return false # # if label name contains "req" and the text is empty, return false
# if "mand" in item.objectName() and item.text() == "": # if "mand" in item.objectName() and item.text() == "":
# values.append(True) # values.append(True)
@@ -1444,8 +1444,8 @@ class Ui(Ui_Semesterapparat):
# # remove all rows from table # # remove all rows from table
# #get all # #get all
# self.tableWidget_apparate.sortItems(0, QtCore.Qt.SortOrder.AscendingOrder) # self.tableWidget_apparate.sortItems(0, QtCore.Qt.SortOrder.AscendingOrder)
# self.frame.setDisabled(True) # self.app_group_box.setDisabled(True)
# for child in self.frame.findChildren(QtWidgets.QLineEdit): # for child in self.app_group_box.findChildren(QtWidgets.QLineEdit):
# child.clear() # child.clear()
def btn_create_new_apparat(self): def btn_create_new_apparat(self):
@@ -1457,7 +1457,7 @@ class Ui(Ui_Semesterapparat):
# clear dokumemt_list # clear dokumemt_list
self.dokument_list.setRowCount(0) self.dokument_list.setRowCount(0)
self.cancel_active_selection.setEnabled(True) self.cancel_active_selection.setEnabled(True)
self.frame.setEnabled(True) self.app_group_box.setEnabled(True)
self.sem_year.setEnabled(True) self.sem_year.setEnabled(True)
self.sem_sommer.setEnabled(True) self.sem_sommer.setEnabled(True)
@@ -1469,7 +1469,7 @@ class Ui(Ui_Semesterapparat):
if self.tableWidget_apparat_media.rowCount() > 0: if self.tableWidget_apparat_media.rowCount() > 0:
self.tableWidget_apparat_media.setRowCount(0) self.tableWidget_apparat_media.setRowCount(0)
# clear all fields # clear all fields
for item in self.frame.findChildren(QtWidgets.QLineEdit): for item in self.app_group_box.findChildren(QtWidgets.QLineEdit):
item.clear() item.clear()
self.drpdwn_app_nr.clear() self.drpdwn_app_nr.clear()
self.prof_title.clear() self.prof_title.clear()
@@ -1499,7 +1499,7 @@ class Ui(Ui_Semesterapparat):
self.label_info.hide() self.label_info.hide()
def btn_add_medium(self): def btn_add_medium(self):
if not self.frame.isEnabled(): if not self.app_group_box.isEnabled():
self.confirm_popup("Bitte erst einen Apparat auswählen!") self.confirm_popup("Bitte erst einen Apparat auswählen!")
return return
@@ -1614,7 +1614,7 @@ class Ui(Ui_Semesterapparat):
# clear the rows of the table # clear the rows of the table
self.tableWidget_apparat_media.setRowCount(0) self.tableWidget_apparat_media.setRowCount(0)
self.dokument_list.setRowCount(0) self.dokument_list.setRowCount(0)
self.frame.setEnabled(False) self.app_group_box.setEnabled(False)
self.app_fach.setCurrentText("") self.app_fach.setCurrentText("")
self.chkbx_show_del_media.hide() self.chkbx_show_del_media.hide()
self.check_send_mail.hide() self.check_send_mail.hide()
@@ -1626,7 +1626,7 @@ class Ui(Ui_Semesterapparat):
self.sem_sommer.setChecked(False) self.sem_sommer.setChecked(False)
self.sem_winter.setChecked(False) self.sem_winter.setChecked(False)
for child in self.frame.findChildren(QtWidgets.QLineEdit): for child in self.app_group_box.findChildren(QtWidgets.QLineEdit):
child.clear() child.clear()
def update_app_media_list(self): def update_app_media_list(self):
@@ -1982,7 +1982,7 @@ class Ui(Ui_Semesterapparat):
self.apparat_id_adis.clear() self.apparat_id_adis.clear()
self.drpdwn_prof_name.clear() self.drpdwn_prof_name.clear()
self.tableWidget_apparat_media.setRowCount(0) self.tableWidget_apparat_media.setRowCount(0)
self.frame.setEnabled(False) self.app_group_box.setEnabled(False)
self.groupBox_2.hide() self.groupBox_2.hide()
self.groupBox.hide() self.groupBox.hide()
self.check_send_mail.setChecked(False) self.check_send_mail.setChecked(False)
@@ -2170,7 +2170,6 @@ class Ui(Ui_Semesterapparat):
appnr = message["appnr"] appnr = message["appnr"]
appnr = "/" if appnr is None else str(appnr) appnr = "/" if appnr is None else str(appnr)
self.line_app_info.setText(appnr) self.line_app_info.setText(appnr)
def __delete_message(): def __delete_message():
message = messages[self.spin_select_message.value() - 1] message = messages[self.spin_select_message.value() - 1]
self.db.deleteMessage(message["id"]) self.db.deleteMessage(message["id"])
@@ -2206,11 +2205,9 @@ class Ui(Ui_Semesterapparat):
self.btn_delete_message.clicked.connect(__delete_message) self.btn_delete_message.clicked.connect(__delete_message)
def open_settings(self): def open_settings(self):
dialog = QtWidgets.QDialog()
settings = settings_ui(self.active_user) settings = settings_ui(self.active_user)
settings.setupUi(dialog) settings.exec()
dialog.exec() if settings.result() == QtWidgets.QDialog.DialogCode.Accepted:
if dialog.result() == QtWidgets.QDialog.DialogCode.Accepted:
data = settings.return_data() data = settings.return_data()
print(data) print(data)
OmegaConf.save(data, "config.yaml") OmegaConf.save(data, "config.yaml")

1977
src/ui/semesterapparat_ui.ui
View File

File diff suppressed because it is too large Load Diff