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

Refactor code to improve readability, try diff threads

Browse Source
This commit is contained in:
WorldTeacher
2024-02-09 13:17:15 +01:00
parent ae9bb40166
commit cbd3ae80c7
1 changed files with 77 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/logic/userInterface.py
View File

@@ -123,7 +123,6 @@ class MessageCalendar(QtWidgets.QCalendarWidget):
) )
class Ui(Ui_Semesterapparat): class Ui(Ui_Semesterapparat):
# use the Ui_MainWindow class from mainwindow.py # use the Ui_MainWindow class from mainwindow.py
def __init__(self, MainWindow, username: str) -> None: def __init__(self, MainWindow, username: str) -> None:
@@ -320,7 +319,6 @@ class Ui(Ui_Semesterapparat):
self.tabWidget_2.setCurrentIndex(1) self.tabWidget_2.setCurrentIndex(1)
self.tabWidget_2.setCurrentIndex(0) self.tabWidget_2.setCurrentIndex(0)
def search_book(self): def search_book(self):
self.book_search_result.setRowCount(0) self.book_search_result.setRowCount(0)
signature = self.seach_by_signature.text() signature = self.seach_by_signature.text()
@@ -342,7 +340,6 @@ class Ui(Ui_Semesterapparat):
print(book[1]) print(book[1])
self.book_search_result.setItem(0,2,QtWidgets.QTableWidgetItem(self.db.getApparatName(book[1],book[2]))) self.book_search_result.setItem(0,2,QtWidgets.QTableWidgetItem(self.db.getApparatName(book[1],book[2])))
def edit_faculty_member_set_data(self): def edit_faculty_member_set_data(self):
# get the selected member # get the selected member
name = self.edit_faculty_member_select_member.currentText() name = self.edit_faculty_member_select_member.currentText()
@@ -363,7 +360,6 @@ class Ui(Ui_Semesterapparat):
self.faculty_member_oldmail.setText(data[5]) self.faculty_member_oldmail.setText(data[5])
self.edit_faculty_member_title.setText(data[1]) if data[1] != None else self.edit_faculty_member_title.setText("") self.edit_faculty_member_title.setText(data[1]) if data[1] != None else self.edit_faculty_member_title.setText("")
# self.edit_faculty_member_name.setText(f"{data[3]} {data[2]}") # self.edit_faculty_member_name.setText(f"{data[3]} {data[2]}")
# self.edit_faculty_member_title.setCurrentText(data[1]) # self.edit_faculty_member_title.setCurrentText(data[1])
# self.edit_faculty_member_mail.setText(data[4]) # self.edit_faculty_member_mail.setText(data[4])
@@ -496,7 +492,6 @@ class Ui(Ui_Semesterapparat):
self.add_faculty_member_data() self.add_faculty_member_data()
self.edit_faculty_member_new_title.addItems(PROF_TITLES) self.edit_faculty_member_new_title.addItems(PROF_TITLES)
else: else:
self.hide_all() self.hide_all()
return return
@@ -795,8 +790,6 @@ class Ui(Ui_Semesterapparat):
"Dieser Semesterapparat kann nicht gelöscht werden, da er bereits gelöscht wurde" "Dieser Semesterapparat kann nicht gelöscht werden, da er bereits gelöscht wurde"
) )
def populate_frame(self, appdata: ApparatData): def populate_frame(self, appdata: ApparatData):
# populate the frame with the data from the database # populate the frame with the data from the database
ic(appdata) ic(appdata)
@@ -870,8 +863,6 @@ class Ui(Ui_Semesterapparat):
self.update_app_media_list() self.update_app_media_list()
self.cancel_active_selection.click() self.cancel_active_selection.click()
def confirm_popup(self, message: str): def confirm_popup(self, message: str):
dial = QtWidgets.QDialog() dial = QtWidgets.QDialog()
popup = popus_confirm() popup = popus_confirm()
@@ -1109,12 +1100,14 @@ class Ui(Ui_Semesterapparat):
text = f"Medium {curr}/{total}" text = f"Medium {curr}/{total}"
self.logger.log_info(text) self.logger.log_info(text)
self.progress_label.setText(text) self.progress_label.setText(text)
self.MainWindow.setStatusTip(f"Medien werden hinzugefügt, bitte warten... {curr}/{total}")
# update tableWidget_apparat_media # update tableWidget_apparat_media
self.update_app_media_list() self.update_app_media_list()
def hide_progress_label(self): def hide_progress_label(self):
self.logger.log_info("Finished adding media, hiding progress label") self.logger.log_info("Finished adding media, hiding progress label")
self.progress_label.hide() self.progress_label.hide()
self.progress_label.setText("Bitte warten...")
self.line_2.hide() self.line_2.hide()
self.label_info.hide() self.label_info.hide()
@@ -1148,9 +1141,12 @@ class Ui(Ui_Semesterapparat):
# create apparat # create apparat
self.btn_save_apparat() self.btn_save_apparat()
# create a thread that updates the progress label after each medium # create a thread that updates the progress label after each medium
count = len(data)
thread = QThread() thread = QThread()
grabber = BookGrabber(mode, data, app_id, prof_id) grabber = BookGrabber(mode=mode, app_id=app_id, prof_id=prof_id, data=data)
# grabber.mode = mode
# grabber.data = data
# grabber.app_id = app_id
# grabber.prof_id = prof_id
grabber.moveToThread(thread) grabber.moveToThread(thread)
grabber.finished.connect(thread.quit) grabber.finished.connect(thread.quit)
grabber.finished.connect(grabber.deleteLater) grabber.finished.connect(grabber.deleteLater)
@@ -1388,7 +1384,6 @@ class Ui(Ui_Semesterapparat):
# path = path.replace("~", str(Path.home())) # path = path.replace("~", str(Path.home()))
# path = Path(path) # path = Path(path)
def add_media_from_file(self): def add_media_from_file(self):
def __open_dialog(signatures): def __open_dialog(signatures):
dialog = QtWidgets.QDialog() dialog = QtWidgets.QDialog()
@@ -1539,7 +1534,11 @@ class Ui(Ui_Semesterapparat):
ic(signatures) ic(signatures)
print("starting thread") print("starting thread")
thread = QThread() thread = QThread()
grabber = BookGrabber("ARRAY", signatures, app_id, prof_id) grabber = BookGrabber(mode = "ARRAY", app_id = app_id,prof_id = prof_id,data = signatures)
# grabber.mode = "ARRAY"
# grabber.data = signatures
# grabber.app_id = app_id
# grabber.prof_id = prof_id
grabber.moveToThread(thread) grabber.moveToThread(thread)
self.label_info.show() self.label_info.show()
self.progress_label.show() self.progress_label.show()