typo fix, rework prof due to backend change
This commit is contained in:
@@ -59,7 +59,7 @@ class ElsaDialog(QtWidgets.QDialog, Ui_Dialog):
|
|||||||
data.btn_zs.click()
|
data.btn_zs.click()
|
||||||
elif mediatype == "Herausgeberwerke":
|
elif mediatype == "Herausgeberwerke":
|
||||||
data.btn_hg.click()
|
data.btn_hg.click()
|
||||||
elif mediatype == "Monograpfien":
|
elif mediatype == "Monografien":
|
||||||
data.btn_mono.click()
|
data.btn_mono.click()
|
||||||
|
|
||||||
data.exec()
|
data.exec()
|
||||||
@@ -69,8 +69,13 @@ class ElsaDialog(QtWidgets.QDialog, Ui_Dialog):
|
|||||||
self.elsa_cancel_create.setEnabled(True)
|
self.elsa_cancel_create.setEnabled(True)
|
||||||
self.dokument_list_elsa.setRowCount(0)
|
self.dokument_list_elsa.setRowCount(0)
|
||||||
profs = self.db.getProfs()
|
profs = self.db.getProfs()
|
||||||
|
profs = [f"{prof.lastname}, {prof.firstnameP}" for prof in profs]
|
||||||
|
elsa_profs = self.db.getElsaProfs()
|
||||||
|
profs.extend(elsa_profs)
|
||||||
|
profs = list(set(profs))
|
||||||
|
profs.sort()
|
||||||
for prof in profs:
|
for prof in profs:
|
||||||
self.elsa_prof.addItem(f"{prof.lastname}, {prof.firstname}")
|
self.elsa_prof.addItem(prof)
|
||||||
self.elsa_prof.setCurrentText("")
|
self.elsa_prof.setCurrentText("")
|
||||||
self.elsa_date.setText("")
|
self.elsa_date.setText("")
|
||||||
self.elsa_semester.setText("")
|
self.elsa_semester.setText("")
|
||||||
@@ -129,8 +134,11 @@ class ElsaDialog(QtWidgets.QDialog, Ui_Dialog):
|
|||||||
prof = self.elsa_prof.currentText()
|
prof = self.elsa_prof.currentText()
|
||||||
semester = self.elsa_semester.text()
|
semester = self.elsa_semester.text()
|
||||||
date = self.elsa_date.text()
|
date = self.elsa_date.text()
|
||||||
|
prof_id = self.db.getElsaProfId(prof)
|
||||||
self.db.createElsaApparat(date, prof, semester)
|
if prof_id is None:
|
||||||
|
self.db.createElsaProf(prof)
|
||||||
|
prof_id = self.db.getElsaProfId(prof)
|
||||||
|
self.db.createElsaApparat(date, prof_id, semester)
|
||||||
self.cancel_elsa_creation()
|
self.cancel_elsa_creation()
|
||||||
self.refresh_elsa_table()
|
self.refresh_elsa_table()
|
||||||
self.elsa_prof.clear()
|
self.elsa_prof.clear()
|
||||||
@@ -147,7 +155,7 @@ class ElsaDialog(QtWidgets.QDialog, Ui_Dialog):
|
|||||||
self.elsa_table.insertRow(0)
|
self.elsa_table.insertRow(0)
|
||||||
date = apparat[1]
|
date = apparat[1]
|
||||||
semester = apparat[2]
|
semester = apparat[2]
|
||||||
prof = apparat[3]
|
prof = self.db.getElsaProf(apparat[3])
|
||||||
self.elsa_table.setItem(0, 0, QtWidgets.QTableWidgetItem(prof))
|
self.elsa_table.setItem(0, 0, QtWidgets.QTableWidgetItem(prof))
|
||||||
self.elsa_table.setItem(0, 1, QtWidgets.QTableWidgetItem(date))
|
self.elsa_table.setItem(0, 1, QtWidgets.QTableWidgetItem(date))
|
||||||
self.elsa_table.setItem(0, 2, QtWidgets.QTableWidgetItem(semester))
|
self.elsa_table.setItem(0, 2, QtWidgets.QTableWidgetItem(semester))
|
||||||
|
|||||||
Reference in New Issue
Block a user