diff --git a/src/ui/user.py b/src/ui/user.py index 1c59e99..86ca5b2 100644 --- a/src/ui/user.py +++ b/src/ui/user.py @@ -58,11 +58,11 @@ class UserUI(QtWidgets.QMainWindow, Ui_MainWindow): extend.exec() if extend.result() == 1: extendDate = extend.extendDate.toString() - # print columns of selected rows + # # print columns of selected rows for item in self.UserMediaTable.selectedItems(): if item.column() == 1: signature = item.text() - print(signature) + # print(signature) self.db.extendLoanDuration(signature, extendDate) self.userMedia = [] break @@ -78,7 +78,7 @@ class UserUI(QtWidgets.QMainWindow, Ui_MainWindow): self.UserMediaTable.setRowCount(0) for loan in self.userMedia: - print("looping loans") + # print("looping loans") fielddata = eval(f"loan.{searchfield}") if isinstance(fielddata, str): fielddata = fielddata.lower() @@ -105,6 +105,15 @@ class UserUI(QtWidgets.QMainWindow, Ui_MainWindow): self.mail.setText(self.usermail) def saveChanges(self): + username = self.name.text() + userno = int(self.user_no.text()) + usermail = self.mail.text() + self.db.updateUser(username, userno, usermail) + self.username = username + self.userno = userno + self.usermail = usermail + self.frame.hide() + self.discardChanges() pass def discardChanges(self): @@ -119,12 +128,12 @@ class UserUI(QtWidgets.QMainWindow, Ui_MainWindow): if self.radio_currentlyLoaned.isChecked() else "overdue" ) - print(mode) + # print(mode) if self.userMedia == []: books = self.db.getAllMedia(self.userno) for book in books: self.userMedia.append(book) - print(self.userMedia) + # print(self.userMedia) self.UserMediaTable.setRowCount(0) for book in self.userMedia: @@ -157,10 +166,28 @@ class UserUI(QtWidgets.QMainWindow, Ui_MainWindow): ) self.UserMediaTable.setItem(0, 1, QtWidgets.QTableWidgetItem(book.signature)) self.UserMediaTable.setItem(0, 2, QtWidgets.QTableWidgetItem(book.title)) - self.UserMediaTable.setItem(0, 3, QtWidgets.QTableWidgetItem(book.loan_from)) - self.UserMediaTable.setItem(0, 4, QtWidgets.QTableWidgetItem(book.loan_to)) self.UserMediaTable.setItem( - 0, 5, QtWidgets.QTableWidgetItem(book.returned_date) + 0, + 3, + QtWidgets.QTableWidgetItem( + stringToDate(book.loan_from).toString("dd.MM.yyyy") + ), + ) + self.UserMediaTable.setItem( + 0, + 4, + QtWidgets.QTableWidgetItem( + stringToDate(book.loan_to).toString("dd.MM.yyyy") + ), + ) + self.UserMediaTable.setItem( + 0, + 5, + QtWidgets.QTableWidgetItem( + "" + if book.returned_date is None + else stringToDate(book.returned_date).toString("dd.MM.yyyy") + ), )