rework icons, codechanges, bugfixes, typofixes

This commit is contained in:
WorldTeacher
2024-10-09 08:47:48 +02:00
parent cd74214c17
commit 2746b917eb
58 changed files with 142 additions and 89 deletions

View File

@@ -1,5 +1,7 @@
import pathlib
from .Ui_semesterapparat_ui import Ui_MainWindow as Ui_Semesterapparat
from .dialogs import (
ApparatExtendDialog,
Mail_Dialog,
@@ -13,16 +15,18 @@ from .dialogs import (
About,
ElsaAddEntry,
)
from .Ui_semesterapparat_ui import Ui_MainWindow as Ui_Semesterapparat
from .widgets import (
DataGraph,
FilePicker,
StatusWidget,
CalendarEntry,
MessageCalendar,
SearchStatisticPage, #
DataGraph,
ElsaDialog,
UserCreate,
EditUser,
EditProf,
)
path = pathlib.Path(__file__).parent.absolute()
# from .mainwindow import Ui_MainWindow as Ui_MainWindow
# from .sap import Ui_MainWindow as MainWindow_SAP

View File

@@ -74,7 +74,7 @@
<enum>Qt::NoFocus</enum>
</property>
<property name="currentIndex">
<number>0</number>
<number>2</number>
</property>
<widget class="QWidget" name="createApparat">
<property name="sizePolicy">

View File

@@ -59,7 +59,7 @@ class ElsaDialog(QtWidgets.QDialog, Ui_Dialog):
data.btn_zs.click()
elif mediatype == "Herausgeberwerke":
data.btn_hg.click()
elif mediatype == "Monographie":
elif mediatype == "Monograpfien":
data.btn_mono.click()
data.exec()
@@ -70,7 +70,7 @@ class ElsaDialog(QtWidgets.QDialog, Ui_Dialog):
self.dokument_list_elsa.setRowCount(0)
profs = self.db.getProfs()
for prof in profs:
self.elsa_prof.addItem(f"{prof[3]}, {prof[2]}")
self.elsa_prof.addItem(f"{prof.lastname}, {prof.firstname}")
self.elsa_prof.setCurrentText("")
self.elsa_date.setText("")
self.elsa_semester.setText("")
@@ -155,6 +155,7 @@ class ElsaDialog(QtWidgets.QDialog, Ui_Dialog):
def open_elsa(self):
prof = self.elsa_table.item(self.elsa_table.currentRow(), 0).text()
print(prof)
date = self.elsa_table.item(self.elsa_table.currentRow(), 1).text()
semester = self.elsa_table.item(self.elsa_table.currentRow(), 2).text()
self.elsa_update.setEnabled(True)

View File

@@ -84,6 +84,7 @@ class Ui_Dialog(object):
self.label_2.setObjectName("label_2")
self.gridLayout_2.addWidget(self.label_2, 1, 0, 1, 1)
self.elsa_prof = QtWidgets.QComboBox(parent=self.create_frame_elsa)
self.elsa_prof.setEditable(True)
self.elsa_prof.setObjectName("elsa_prof")
self.gridLayout_2.addWidget(self.elsa_prof, 0, 1, 1, 1)
self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
@@ -101,7 +102,7 @@ class Ui_Dialog(object):
self.dokument_list_elsa = QtWidgets.QTableWidget(parent=self.create_frame_elsa)
self.dokument_list_elsa.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
self.dokument_list_elsa.setObjectName("dokument_list_elsa")
self.dokument_list_elsa.setColumnCount(3)
self.dokument_list_elsa.setColumnCount(4)
self.dokument_list_elsa.setRowCount(0)
item = QtWidgets.QTableWidgetItem()
self.dokument_list_elsa.setHorizontalHeaderItem(0, item)
@@ -109,6 +110,8 @@ class Ui_Dialog(object):
self.dokument_list_elsa.setHorizontalHeaderItem(1, item)
item = QtWidgets.QTableWidgetItem()
self.dokument_list_elsa.setHorizontalHeaderItem(2, item)
item = QtWidgets.QTableWidgetItem()
self.dokument_list_elsa.setHorizontalHeaderItem(3, item)
self.dokument_list_elsa.horizontalHeader().setDefaultSectionSize(116)
self.dokument_list_elsa.horizontalHeader().setMinimumSectionSize(43)
self.dokument_list_elsa.verticalHeader().setMinimumSectionSize(25)
@@ -223,6 +226,8 @@ class Ui_Dialog(object):
item.setText(_translate("Dialog", "Dateityp"))
item = self.dokument_list_elsa.horizontalHeaderItem(2)
item.setText(_translate("Dialog", "Neu?"))
item = self.dokument_list_elsa.horizontalHeaderItem(3)
item.setText(_translate("Dialog", "File"))
self.btn_add_document_elsa.setText(_translate("Dialog", "Dokument hinzufügen"))
self.btn_open_document_elsa.setText(_translate("Dialog", "Dokument öffnen"))
self.check_file_elsa.setText(_translate("Dialog", "Medien aus Dokument\n"

View File

@@ -174,7 +174,11 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="elsa_prof"/>
<widget class="QComboBox" name="elsa_prof">
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_4">
@@ -238,6 +242,11 @@
<string>Neu?</string>
</property>
</column>
<column>
<property name="text">
<string>File</string>
</property>
</column>
</widget>
</item>
<item>