From 1b14d09bf02d5d8104498ad7829e3cf9a16f39d1 Mon Sep 17 00:00:00 2001 From: WorldTeacher <41587052+WorldTeacher@users.noreply.github.com> Date: Thu, 27 Jun 2024 13:19:30 +0200 Subject: [PATCH] update main ui, add new feature to generate ilias data --- src/ui/Ui_semesterapparat_ui.py | 85 +++++++++---- src/ui/semesterapparat_ui.ui | 214 ++++++++++++++++++-------------- src/ui/userInterface.py | 192 ++++++++++++++-------------- 3 files changed, 281 insertions(+), 210 deletions(-) diff --git a/src/ui/Ui_semesterapparat_ui.py b/src/ui/Ui_semesterapparat_ui.py index 414cbdf..a076e29 100644 --- a/src/ui/Ui_semesterapparat_ui.py +++ b/src/ui/Ui_semesterapparat_ui.py @@ -592,8 +592,8 @@ class Ui_MainWindow(object): self.elsa = QtWidgets.QWidget() self.elsa.setObjectName("elsa") self.create_frame_elsa = QtWidgets.QFrame(parent=self.elsa) - self.create_frame_elsa.setEnabled(False) - self.create_frame_elsa.setGeometry(QtCore.QRect(20, 200, 1221, 201)) + self.create_frame_elsa.setEnabled(True) + self.create_frame_elsa.setGeometry(QtCore.QRect(20, 200, 1231, 201)) self.create_frame_elsa.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) self.create_frame_elsa.setFrameShadow(QtWidgets.QFrame.Shadow.Raised) self.create_frame_elsa.setObjectName("create_frame_elsa") @@ -642,6 +642,7 @@ class Ui_MainWindow(object): self.dokument_list_elsa.horizontalHeader().setMinimumSectionSize(41) self.dokument_list_elsa.verticalHeader().setDefaultSectionSize(30) self.check_file_elsa = QtWidgets.QPushButton(parent=self.create_frame_elsa) + self.check_file_elsa.setEnabled(True) self.check_file_elsa.setGeometry(QtCore.QRect(1060, 120, 131, 51)) font = QtGui.QFont() font.setPointSize(9) @@ -684,7 +685,7 @@ class Ui_MainWindow(object): self.elsa_date.setObjectName("elsa_date") self.gridLayout_7.addWidget(self.elsa_date, 1, 1, 1, 1) self.active_semester = QtWidgets.QPushButton(parent=self.gridLayoutWidget_6) - self.active_semester.setEnabled(False) + self.active_semester.setEnabled(True) self.active_semester.setText("") self.active_semester.setIconSize(QtCore.QSize(20, 16)) self.active_semester.setFlat(True) @@ -704,13 +705,16 @@ class Ui_MainWindow(object): self.elsa_semester.setClearButtonEnabled(True) self.elsa_semester.setObjectName("elsa_semester") self.gridLayout_7.addWidget(self.elsa_semester, 2, 1, 1, 1) + self.elsa_update = QtWidgets.QPushButton(parent=self.create_frame_elsa) + self.elsa_update.setGeometry(QtCore.QRect(100, 160, 75, 24)) + self.elsa_update.setObjectName("elsa_update") self.table_elsa_list = QtWidgets.QTableWidget(parent=self.elsa) - self.table_elsa_list.setGeometry(QtCore.QRect(20, 410, 771, 301)) + self.table_elsa_list.setGeometry(QtCore.QRect(20, 430, 771, 281)) self.table_elsa_list.setFrameShape(QtWidgets.QFrame.Shape.StyledPanel) self.table_elsa_list.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken) self.table_elsa_list.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) self.table_elsa_list.setObjectName("table_elsa_list") - self.table_elsa_list.setColumnCount(6) + self.table_elsa_list.setColumnCount(12) self.table_elsa_list.setRowCount(0) item = QtWidgets.QTableWidgetItem() self.table_elsa_list.setHorizontalHeaderItem(0, item) @@ -724,7 +728,22 @@ class Ui_MainWindow(object): self.table_elsa_list.setHorizontalHeaderItem(4, item) item = QtWidgets.QTableWidgetItem() self.table_elsa_list.setHorizontalHeaderItem(5, item) - self.table_elsa_list.horizontalHeader().setStretchLastSection(True) + item = QtWidgets.QTableWidgetItem() + self.table_elsa_list.setHorizontalHeaderItem(6, item) + item = QtWidgets.QTableWidgetItem() + self.table_elsa_list.setHorizontalHeaderItem(7, item) + item = QtWidgets.QTableWidgetItem() + self.table_elsa_list.setHorizontalHeaderItem(8, item) + item = QtWidgets.QTableWidgetItem() + self.table_elsa_list.setHorizontalHeaderItem(9, item) + item = QtWidgets.QTableWidgetItem() + self.table_elsa_list.setHorizontalHeaderItem(10, item) + item = QtWidgets.QTableWidgetItem() + self.table_elsa_list.setHorizontalHeaderItem(11, item) + self.table_elsa_list.horizontalHeader().setVisible(True) + self.table_elsa_list.horizontalHeader().setDefaultSectionSize(64) + self.table_elsa_list.horizontalHeader().setStretchLastSection(False) + self.table_elsa_list.verticalHeader().setVisible(True) self.elsa_statistic_frame = QtWidgets.QFrame(parent=self.elsa) self.elsa_statistic_frame.setGeometry(QtCore.QRect(800, 410, 451, 321)) self.elsa_statistic_frame.setObjectName("elsa_statistic_frame") @@ -733,8 +752,9 @@ class Ui_MainWindow(object): self.elsa_statistics.setObjectName("elsa_statistics") self.tab_9 = QtWidgets.QWidget() self.tab_9.setObjectName("tab_9") + self.horizontalLayout_3 = QtWidgets.QHBoxLayout(self.tab_9) + self.horizontalLayout_3.setObjectName("horizontalLayout_3") self.elsa_statistics_table = QtWidgets.QTableWidget(parent=self.tab_9) - self.elsa_statistics_table.setGeometry(QtCore.QRect(0, 0, 441, 271)) self.elsa_statistics_table.setFocusPolicy(QtCore.Qt.FocusPolicy.WheelFocus) self.elsa_statistics_table.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff) self.elsa_statistics_table.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) @@ -748,6 +768,7 @@ class Ui_MainWindow(object): self.elsa_statistics_table.setHorizontalHeaderItem(1, item) self.elsa_statistics_table.horizontalHeader().setDefaultSectionSize(220) self.elsa_statistics_table.horizontalHeader().setSortIndicatorShown(True) + self.horizontalLayout_3.addWidget(self.elsa_statistics_table) self.elsa_statistics.addTab(self.tab_9, "") self.elsa_cancel_create = QtWidgets.QPushButton(parent=self.elsa) self.elsa_cancel_create.setEnabled(False) @@ -757,7 +778,8 @@ class Ui_MainWindow(object): self.elsa_add_new.setGeometry(QtCore.QRect(30, 50, 91, 24)) self.elsa_add_new.setObjectName("elsa_add_new") self.elsa_table = QtWidgets.QTableWidget(parent=self.elsa) - self.elsa_table.setGeometry(QtCore.QRect(140, 10, 1031, 181)) + self.elsa_table.setGeometry(QtCore.QRect(140, 10, 1111, 181)) + self.elsa_table.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff) self.elsa_table.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) self.elsa_table.setObjectName("elsa_table") self.elsa_table.setColumnCount(3) @@ -769,7 +791,10 @@ class Ui_MainWindow(object): item = QtWidgets.QTableWidgetItem() self.elsa_table.setHorizontalHeaderItem(2, item) self.elsa_table.horizontalHeader().setCascadingSectionResizes(False) - self.elsa_table.horizontalHeader().setDefaultSectionSize(216) + self.elsa_table.horizontalHeader().setDefaultSectionSize(370) + self.quote_entry = QtWidgets.QPushButton(parent=self.elsa) + self.quote_entry.setGeometry(QtCore.QRect(20, 400, 121, 24)) + self.quote_entry.setObjectName("quote_entry") self.tabWidget.addTab(self.elsa, "") self.admin = QtWidgets.QWidget() self.admin.setObjectName("admin") @@ -797,12 +822,12 @@ class Ui_MainWindow(object): self.horizontalLayout_8.setObjectName("horizontalLayout_8") spacerItem8 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_8.addItem(spacerItem8) - self.pushButton = QtWidgets.QPushButton(parent=self.deleteUserBox) + self.btn_delete_user = QtWidgets.QPushButton(parent=self.deleteUserBox) font = QtGui.QFont() font.setBold(False) - self.pushButton.setFont(font) - self.pushButton.setObjectName("pushButton") - self.horizontalLayout_8.addWidget(self.pushButton) + self.btn_delete_user.setFont(font) + self.btn_delete_user.setObjectName("btn_delete_user") + self.horizontalLayout_8.addWidget(self.btn_delete_user) spacerItem9 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout_8.addItem(spacerItem9) self.gridLayout_8.addLayout(self.horizontalLayout_8, 1, 1, 1, 1) @@ -1283,8 +1308,6 @@ class Ui_MainWindow(object): self.retranslateUi(MainWindow) self.tabWidget.setCurrentIndex(0) - self.elsa_semester.textChanged['QString'].connect(self.active_semester.show) # type: ignore - self.elsa_semester.textChanged['QString'].connect(self.active_semester.hide) # type: ignore QtCore.QMetaObject.connectSlotsByName(MainWindow) MainWindow.setTabOrder(self.drpdwn_app_nr, self.prof_title) MainWindow.setTabOrder(self.prof_title, self.drpdwn_prof_name) @@ -1321,8 +1344,8 @@ class Ui_MainWindow(object): MainWindow.setTabOrder(self.prof_id_adis, self.apparat_id_adis) MainWindow.setTabOrder(self.apparat_id_adis, self.user_create_frame_username) MainWindow.setTabOrder(self.user_create_frame_username, self.user_delete_confirm) - MainWindow.setTabOrder(self.user_delete_confirm, self.pushButton) - MainWindow.setTabOrder(self.pushButton, self.update_user) + MainWindow.setTabOrder(self.user_delete_confirm, self.btn_delete_user) + MainWindow.setTabOrder(self.btn_delete_user, self.update_user) MainWindow.setTabOrder(self.update_user, self.user_create_frame_password) MainWindow.setTabOrder(self.user_create_frame_password, self.edit_faculty_member_title) MainWindow.setTabOrder(self.edit_faculty_member_title, self.elsa_save) @@ -1455,18 +1478,31 @@ class Ui_MainWindow(object): self.label_27.setText(_translate("MainWindow", "Professor")) self.elsa_prof.setPlaceholderText(_translate("MainWindow", "Vollständiger Name")) self.label_28.setText(_translate("MainWindow", "Auftragsdatum")) + self.elsa_update.setText(_translate("MainWindow", "Aktualisieren")) item = self.table_elsa_list.horizontalHeaderItem(0) - item.setText(_translate("MainWindow", "Kapiteltitel")) + item.setText(_translate("MainWindow", "Autor(en) des Werks")) item = self.table_elsa_list.horizontalHeaderItem(1) - item.setText(_translate("MainWindow", "Autor(en)")) + item.setText(_translate("MainWindow", "Autor(en) des Beitrags")) item = self.table_elsa_list.horizontalHeaderItem(2) - item.setText(_translate("MainWindow", "Buchtitel")) + item.setText(_translate("MainWindow", "Jahr")) item = self.table_elsa_list.horizontalHeaderItem(3) - item.setText(_translate("MainWindow", "Signatur")) + item.setText(_translate("MainWindow", "Heft")) item = self.table_elsa_list.horizontalHeaderItem(4) - item.setText(_translate("MainWindow", "Seite")) + item.setText(_translate("MainWindow", "Auflage")) item = self.table_elsa_list.horizontalHeaderItem(5) - item.setText(_translate("MainWindow", "Herausgeber")) + item.setText(_translate("MainWindow", "Titel des Werkes")) + item = self.table_elsa_list.horizontalHeaderItem(6) + item.setText(_translate("MainWindow", "Beitragstitel")) + item = self.table_elsa_list.horizontalHeaderItem(7) + item.setText(_translate("MainWindow", "Seiten")) + item = self.table_elsa_list.horizontalHeaderItem(8) + item.setText(_translate("MainWindow", "Ort")) + item = self.table_elsa_list.horizontalHeaderItem(9) + item.setText(_translate("MainWindow", "Verlag")) + item = self.table_elsa_list.horizontalHeaderItem(10) + item.setText(_translate("MainWindow", "Signatur")) + item = self.table_elsa_list.horizontalHeaderItem(11) + item.setText(_translate("MainWindow", "Art")) item = self.elsa_statistics_table.horizontalHeaderItem(0) item.setText(_translate("MainWindow", "Semester")) item = self.elsa_statistics_table.horizontalHeaderItem(1) @@ -1480,6 +1516,7 @@ class Ui_MainWindow(object): item.setText(_translate("MainWindow", "Datum")) item = self.elsa_table.horizontalHeaderItem(2) item.setText(_translate("MainWindow", "Semester")) + self.quote_entry.setText(_translate("MainWindow", "Eintrag zitieren")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.elsa), _translate("MainWindow", "ELSA")) self.label_21.setText(_translate("MainWindow", "Aktion:")) self.select_action_box.setItemText(0, _translate("MainWindow", "Nutzer anlegen")) @@ -1487,7 +1524,7 @@ class Ui_MainWindow(object): self.select_action_box.setItemText(2, _translate("MainWindow", "Nutzer aktualisieren")) self.select_action_box.setItemText(3, _translate("MainWindow", "Lehrperson bearbeiten")) self.deleteUserBox.setTitle(_translate("MainWindow", "Nutzer löschen")) - self.pushButton.setText(_translate("MainWindow", "Nutzer löschen")) + self.btn_delete_user.setText(_translate("MainWindow", "Nutzer löschen")) self.label_34.setText(_translate("MainWindow", "Nutzername")) self.user_delete_confirm.setText(_translate("MainWindow", "Wirklich löschen?")) self.userCreateBox.setTitle(_translate("MainWindow", "Nutzer anlegen")) diff --git a/src/ui/semesterapparat_ui.ui b/src/ui/semesterapparat_ui.ui index c5951c2..eb1e7cb 100644 --- a/src/ui/semesterapparat_ui.ui +++ b/src/ui/semesterapparat_ui.ui @@ -1503,13 +1503,13 @@ - false + true 20 200 - 1221 + 1231 201 @@ -1621,6 +1621,9 @@ + + true + 1060 @@ -1737,7 +1740,7 @@ - false + true @@ -1792,14 +1795,27 @@ + + + + 100 + 160 + 75 + 24 + + + + Aktualisieren + + 20 - 410 + 430 771 - 301 + 281 @@ -1811,22 +1827,66 @@ QAbstractItemView::NoEditTriggers + + true + + + 64 + + false + + true - Kapiteltitel + Autor(en) des Werks - Autor(en) + Autor(en) des Beitrags - Buchtitel + Jahr + + + + + Heft + + + + + Auflage + + + + + Titel des Werkes + + + + + Beitragstitel + + + + + Seiten + + + + + Ort + + + + + Verlag @@ -1836,12 +1896,7 @@ - Seite - - - - - Herausgeber + Art @@ -1867,44 +1922,40 @@ Tabelle - - - - 0 - 0 - 441 - 271 - - - - Qt::WheelFocus - - - Qt::ScrollBarAlwaysOff - - - QAbstractItemView::NoEditTriggers - - - Qt::ElideRight - - - 220 - - - true - - - - Semester - - - - - Zugang - - - + + + + + Qt::WheelFocus + + + Qt::ScrollBarAlwaysOff + + + QAbstractItemView::NoEditTriggers + + + Qt::ElideRight + + + 220 + + + true + + + + Semester + + + + + Zugang + + + + + @@ -1942,10 +1993,13 @@ 140 10 - 1031 + 1111 181 + + Qt::ScrollBarAlwaysOff + QAbstractItemView::NoEditTriggers @@ -1953,7 +2007,7 @@ false - 216 + 370 @@ -1971,6 +2025,19 @@ + + + + 20 + 400 + 121 + 24 + + + + Eintrag zitieren + + @@ -2055,7 +2122,7 @@ - + false @@ -3103,7 +3170,7 @@ apparat_id_adis user_create_frame_username user_delete_confirm - pushButton + btn_delete_user update_user user_create_frame_password edit_faculty_member_title @@ -3135,38 +3202,5 @@ - - - elsa_semester - textChanged(QString) - active_semester - show() - - - 242 - 331 - - - 444 - 342 - - - - - elsa_semester - textChanged(QString) - active_semester - hide() - - - 242 - 331 - - - 444 - 342 - - - - + diff --git a/src/ui/userInterface.py b/src/ui/userInterface.py index a6bf221..41e84fa 100644 --- a/src/ui/userInterface.py +++ b/src/ui/userInterface.py @@ -271,7 +271,7 @@ class Ui(Ui_Semesterapparat): self.btn_add_document_elsa.clicked.connect(self.addDokumentElsa) self.check_file_elsa.clicked.connect(self.parseDokumentElsa) self.btn_open_document_elsa.clicked.connect(self.openDocumentElsa) - self.add_entry.clicked.connect(self.elsa_table_entry) + self.quote_entry.clicked.connect(self.elsa_table_entry) # admin buttons self.user_frame_addUser.clicked.connect(self.add_user) @@ -306,54 +306,21 @@ class Ui(Ui_Semesterapparat): dtt = DictToTable() zot = ZoteroController() data = ElsaAddEntry() + selected_row = self.elsa_table.currentRow() + # print all rows in the table + for i in range(self.elsa_table.rowCount()): + print(self.elsa_table.item(i, 0).text()) + mediatype = self.table_elsa_list.item(selected_row, 11).text() + signature = self.table_elsa_list.item(selected_row, 10).text() + data.searchIdent.setText(signature) + if mediatype == "Zeitschriftenaufsätze": + data.btn_zs.click() + elif mediatype == "Herausgeberwerke": + data.btn_hg.click() + elif mediatype == "Monographie": + data.btn_mono.click() + data.exec() - data = data.data - table = dtt.transform(data) - - if data is None: - return - res_key = None - if table["type"] == "zs": - res_key = zot.createJournalArticle( - zot.createBook(table["signature"]), table - ) - elif table["type"] == "book": - res_key = zot.createBookSection(zot.createBook(table["signature"]), table) - elif table["type"] == "hg": - res_key = zot.createHGSection(zot.createBook(table["signature"]), table) - - if res_key: - citation = zot.get_citation(res_key) - zot.deleteItem(res_key) - print(citation) - print(table) - self.table_elsa_list.insertRow(0) - self.table_elsa_list.setItem( - 0, 0, QtWidgets.QTableWidgetItem(table["work_author"]) - ) - self.table_elsa_list.setItem( - 0, 1, QtWidgets.QTableWidgetItem(table["chapter_title"]) - ) - self.table_elsa_list.setItem(0, 2, QtWidgets.QTableWidgetItem(table["year"])) - self.table_elsa_list.setItem(0, 3, QtWidgets.QTableWidgetItem(table["issue"])) - self.table_elsa_list.setItem(0, 4, QtWidgets.QTableWidgetItem(table["edition"])) - self.table_elsa_list.setItem( - 0, 5, QtWidgets.QTableWidgetItem(table["work_title"]) - ) - self.table_elsa_list.setItem( - 0, 6, QtWidgets.QTableWidgetItem(table["chapter_title"]) - ) - self.table_elsa_list.setItem(0, 7, QtWidgets.QTableWidgetItem(table["pages"])) - self.table_elsa_list.setItem( - 0, 8, QtWidgets.QTableWidgetItem(table["location"]) - ) - self.table_elsa_list.setItem( - 0, 9, QtWidgets.QTableWidgetItem(table["publisher"]) - ) - self.table_elsa_list.setItem( - 0, 10, QtWidgets.QTableWidgetItem(table["signature"]) - ) - self.table_elsa_list.setItem(0, 11, QtWidgets.QTableWidgetItem(table["type"])) def add_new_elsa(self): self.create_frame_elsa.setEnabled(True) @@ -465,29 +432,48 @@ class Ui(Ui_Semesterapparat): 0, 3, QtWidgets.QTableWidgetItem("Database") ) scans = self.db.getElsaMedia(elsa_id) + ic(scans) if scans == []: self.create_frame_elsa.setEnabled(True) else: + pass for scan in scans: - chapter = scan[1] - title = scan[2] - signature = scan[3] - pages = scan[4] - text_author = scan[5] - book_author = scan[6] - art_type = scan[7] self.table_elsa_list.insertRow(0) - self.table_elsa_list.setItem(0, 0, QtWidgets.QTableWidgetItem(chapter)) self.table_elsa_list.setItem( - 0, 1, QtWidgets.QTableWidgetItem(text_author) + 0, 0, QtWidgets.QTableWidgetItem(scan["work_author"]) ) - self.table_elsa_list.setItem(0, 2, QtWidgets.QTableWidgetItem(title)) self.table_elsa_list.setItem( - 0, 3, QtWidgets.QTableWidgetItem(signature) + 0, 1, QtWidgets.QTableWidgetItem(scan["section_author"]) ) - self.table_elsa_list.setItem(0, 4, QtWidgets.QTableWidgetItem(pages)) self.table_elsa_list.setItem( - 0, 5, QtWidgets.QTableWidgetItem(book_author) + 0, 2, QtWidgets.QTableWidgetItem(scan["year"]) + ) + self.table_elsa_list.setItem( + 0, 3, QtWidgets.QTableWidgetItem(scan["issue"]) + ) + self.table_elsa_list.setItem( + 0, 4, QtWidgets.QTableWidgetItem(scan["edition"]) + ) + self.table_elsa_list.setItem( + 0, 5, QtWidgets.QTableWidgetItem(scan["work_title"]) + ) + self.table_elsa_list.setItem( + 0, 6, QtWidgets.QTableWidgetItem(scan["chapter_title"]) + ) + self.table_elsa_list.setItem( + 0, 7, QtWidgets.QTableWidgetItem(scan["pages"]) + ) + self.table_elsa_list.setItem( + 0, 8, QtWidgets.QTableWidgetItem(scan["location"]) + ) + self.table_elsa_list.setItem( + 0, 9, QtWidgets.QTableWidgetItem(scan["publisher"]) + ) + self.table_elsa_list.setItem( + 0, 10, QtWidgets.QTableWidgetItem(scan["signature"]) + ) + self.table_elsa_list.setItem( + 0, 11, QtWidgets.QTableWidgetItem(scan["type"]) ) self.create_frame_elsa.setEnabled(True) def addDokumentElsa(self): @@ -518,11 +504,20 @@ class Ui(Ui_Semesterapparat): ) print(elsa_id) if elsa_id is None: - # get length of elsa table - rows = self.elsa_table.rowCount() - elsa_id = rows + 1 + # create elsa + self.db.createElsaApparat( + self.elsa_date.text(), + self.elsa_prof.currentText(), + self.elsa_semester.text(), + ) + elsa_id = self.db.getElsaId( + self.elsa_prof.currentText(), + self.elsa_semester.text(), + self.elsa_date.text(), + ) self.db.insertElsaFile(datalist, elsa_id) - # self.elsa_save.click() + self.elsa_save.setEnabled(False) + self.refresh_elsa_table() def parseDokumentElsa(self): if self.dokument_list_elsa.rowCount() == 0: @@ -541,47 +536,52 @@ class Ui(Ui_Semesterapparat): ) print(file) data, doctype = elsa_word_to_csv(file) + elsa_id = self.db.getElsaId( + self.elsa_prof.currentText(), + self.elsa_semester.text(), + self.elsa_date.text(), + ) for row in data: self.table_elsa_list.insertRow(0) ic(row) - chapter_title = row[2] - author = row[0] - book_author = row[3] - book_title = row[4] - signature = row[7] - pages = row[6] - data = { - "chapter": chapter_title, - "book_author": book_author, - "text_author": author, - "title": book_title, - "signature": signature, - "pages": pages, - "type": doctype, - } self.table_elsa_list.setItem( - 0, 0, QtWidgets.QTableWidgetItem(chapter_title) - ) - self.table_elsa_list.setItem(0, 1, QtWidgets.QTableWidgetItem(author)) - self.table_elsa_list.setItem( - 0, 2, QtWidgets.QTableWidgetItem(book_title) + 0, 0, QtWidgets.QTableWidgetItem(row["work_author"]) ) self.table_elsa_list.setItem( - 0, 3, QtWidgets.QTableWidgetItem(signature) + 0, 1, QtWidgets.QTableWidgetItem(row["section_author"]) ) - self.table_elsa_list.setItem(0, 4, QtWidgets.QTableWidgetItem(pages)) self.table_elsa_list.setItem( - 0, 5, QtWidgets.QTableWidgetItem(book_author) + 0, 2, QtWidgets.QTableWidgetItem(row["year"]) ) - self.table_elsa_list.setItem(0, 6, QtWidgets.QTableWidgetItem(doctype)) - self.db.addElsaMedia( - data, - self.db.getElsaId( - self.elsa_prof.currentText(), - self.elsa_semester.text(), - self.elsa_date.text(), - ), + self.table_elsa_list.setItem( + 0, 3, QtWidgets.QTableWidgetItem(row["issue"]) ) + self.table_elsa_list.setItem( + 0, 4, QtWidgets.QTableWidgetItem(row["edition"]) + ) + self.table_elsa_list.setItem( + 0, 5, QtWidgets.QTableWidgetItem(row["chapter_title"]) + ) + self.table_elsa_list.setItem( + 0, 6, QtWidgets.QTableWidgetItem(row["work_title"]) + ) + self.table_elsa_list.setItem( + 0, 7, QtWidgets.QTableWidgetItem(row["pages"]) + ) + self.table_elsa_list.setItem( + 0, 8, QtWidgets.QTableWidgetItem(row["location"]) + ) + self.table_elsa_list.setItem( + 0, 9, QtWidgets.QTableWidgetItem(row["publisher"]) + ) + self.table_elsa_list.setItem( + 0, 10, QtWidgets.QTableWidgetItem(row["signature"]) + ) + self.table_elsa_list.setItem( + 0, 11, QtWidgets.QTableWidgetItem(row["type"]) + ) + + self.db.addElsaMedia(row, elsa_id) def openDocumentElsa(self): # open the selected document