diff --git a/src/logic/thread_bookgrabber.py b/src/logic/thread_bookgrabber.py
index 1572e36..3b3dd24 100644
--- a/src/logic/thread_bookgrabber.py
+++ b/src/logic/thread_bookgrabber.py
@@ -49,12 +49,15 @@ class BookGrabber(QThread):
signature = str(entry)
self.logger.log_info("Processing entry: " + signature)
- webdata = WebRequest(self.appnr).get_ppn(entry).get_data()
+ webdata = WebRequest().set_apparat(self.appnr).get_ppn(entry).get_data()
+
if webdata == "error":
continue
bd = BibTextTransformer(self.mode).get_data(webdata).return_data()
+ if bd is None:
+ continue
bd.signature = entry
transformer = (
BibTextTransformer("RDS").get_data(webdata).return_data("rds_data")
diff --git a/src/ui/dialogs/app_ext.py b/src/ui/dialogs/app_ext.py
index a16dde0..6947b4b 100644
--- a/src/ui/dialogs/app_ext.py
+++ b/src/ui/dialogs/app_ext.py
@@ -1,7 +1,7 @@
from PyQt6 import QtWidgets
from .dialog_sources.Ui_apparat_extend import Ui_Dialog
from src import Icon
-
+from src.backend import generateSemesterByDate, generateSemesterByOffset
class ApparatExtendDialog(QtWidgets.QDialog, Ui_Dialog):
def __init__(
self,
diff --git a/src/ui/dialogs/dialog_sources/Ui_elsa_add_table_entry.py b/src/ui/dialogs/dialog_sources/Ui_elsa_add_table_entry.py
index 9e9ff58..a6f937f 100644
--- a/src/ui/dialogs/dialog_sources/Ui_elsa_add_table_entry.py
+++ b/src/ui/dialogs/dialog_sources/Ui_elsa_add_table_entry.py
@@ -271,37 +271,70 @@ class Ui_Dialog(object):
self.label_32 = QtWidgets.QLabel(parent=self.page)
self.label_32.setObjectName("label_32")
self.gridLayout_5.addWidget(self.label_32, 0, 0, 1, 1)
+ spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
+ self.gridLayout_5.addItem(spacerItem2, 7, 0, 1, 1)
self.file_desc_edit = QtWidgets.QTextEdit(parent=self.page)
self.file_desc_edit.setReadOnly(True)
self.file_desc_edit.setObjectName("file_desc_edit")
- self.gridLayout_5.addWidget(self.file_desc_edit, 5, 0, 1, 1)
- spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
- self.gridLayout_5.addItem(spacerItem2, 6, 0, 1, 1)
- self.copy_filename = QtWidgets.QToolButton(parent=self.page)
- self.copy_filename.setLayoutDirection(QtCore.Qt.LayoutDirection.LeftToRight)
- self.copy_filename.setAutoFillBackground(False)
- self.copy_filename.setObjectName("copy_filename")
- self.gridLayout_5.addWidget(self.copy_filename, 1, 1, 1, 1)
- self.copy_qoute = QtWidgets.QToolButton(parent=self.page)
- self.copy_qoute.setObjectName("copy_qoute")
- self.gridLayout_5.addWidget(self.copy_qoute, 5, 1, 1, 1)
- self.label_33 = QtWidgets.QLabel(parent=self.page)
- self.label_33.setObjectName("label_33")
- self.gridLayout_5.addWidget(self.label_33, 4, 0, 1, 1)
+ self.gridLayout_5.addWidget(self.file_desc_edit, 6, 0, 1, 1)
+ self.label_34 = QtWidgets.QLabel(parent=self.page)
+ self.label_34.setObjectName("label_34")
+ self.gridLayout_5.addWidget(self.label_34, 3, 0, 1, 1)
self.filename_edit = QtWidgets.QTextEdit(parent=self.page)
self.filename_edit.setReadOnly(True)
self.filename_edit.setObjectName("filename_edit")
self.gridLayout_5.addWidget(self.filename_edit, 1, 0, 1, 1)
- self.label_34 = QtWidgets.QLabel(parent=self.page)
- self.label_34.setObjectName("label_34")
- self.gridLayout_5.addWidget(self.label_34, 2, 0, 1, 1)
+ self.label_33 = QtWidgets.QLabel(parent=self.page)
+ self.label_33.setObjectName("label_33")
+ self.gridLayout_5.addWidget(self.label_33, 5, 0, 1, 1)
self.ilias_filename = QtWidgets.QTextEdit(parent=self.page)
self.ilias_filename.setReadOnly(True)
self.ilias_filename.setObjectName("ilias_filename")
- self.gridLayout_5.addWidget(self.ilias_filename, 3, 0, 1, 1)
+ self.gridLayout_5.addWidget(self.ilias_filename, 4, 0, 1, 1)
+ self.verticalLayout_2 = QtWidgets.QVBoxLayout()
+ self.verticalLayout_2.setObjectName("verticalLayout_2")
+ spacerItem3 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
+ self.verticalLayout_2.addItem(spacerItem3)
+ self.copy_filename = QtWidgets.QToolButton(parent=self.page)
+ self.copy_filename.setLayoutDirection(QtCore.Qt.LayoutDirection.LeftToRight)
+ self.copy_filename.setAutoFillBackground(False)
+ self.copy_filename.setObjectName("copy_filename")
+ self.verticalLayout_2.addWidget(self.copy_filename)
+ self.filename_edit_label = QtWidgets.QLabel(parent=self.page)
+ self.filename_edit_label.setText("")
+ self.filename_edit_label.setObjectName("filename_edit_label")
+ self.verticalLayout_2.addWidget(self.filename_edit_label)
+ spacerItem4 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
+ self.verticalLayout_2.addItem(spacerItem4)
+ self.gridLayout_5.addLayout(self.verticalLayout_2, 1, 1, 1, 1)
+ self.verticalLayout_3 = QtWidgets.QVBoxLayout()
+ self.verticalLayout_3.setObjectName("verticalLayout_3")
+ spacerItem5 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
+ self.verticalLayout_3.addItem(spacerItem5)
self.copy_ilias_filename = QtWidgets.QToolButton(parent=self.page)
self.copy_ilias_filename.setObjectName("copy_ilias_filename")
- self.gridLayout_5.addWidget(self.copy_ilias_filename, 3, 1, 1, 1)
+ self.verticalLayout_3.addWidget(self.copy_ilias_filename)
+ self.ilias_filename_label = QtWidgets.QLabel(parent=self.page)
+ self.ilias_filename_label.setText("")
+ self.ilias_filename_label.setObjectName("ilias_filename_label")
+ self.verticalLayout_3.addWidget(self.ilias_filename_label)
+ spacerItem6 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
+ self.verticalLayout_3.addItem(spacerItem6)
+ self.gridLayout_5.addLayout(self.verticalLayout_3, 4, 1, 1, 1)
+ self.verticalLayout_4 = QtWidgets.QVBoxLayout()
+ self.verticalLayout_4.setObjectName("verticalLayout_4")
+ spacerItem7 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
+ self.verticalLayout_4.addItem(spacerItem7)
+ self.copy_qoute = QtWidgets.QToolButton(parent=self.page)
+ self.copy_qoute.setObjectName("copy_qoute")
+ self.verticalLayout_4.addWidget(self.copy_qoute)
+ self.file_desc_edit_label = QtWidgets.QLabel(parent=self.page)
+ self.file_desc_edit_label.setText("")
+ self.file_desc_edit_label.setObjectName("file_desc_edit_label")
+ self.verticalLayout_4.addWidget(self.file_desc_edit_label)
+ spacerItem8 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
+ self.verticalLayout_4.addItem(spacerItem8)
+ self.gridLayout_5.addLayout(self.verticalLayout_4, 6, 1, 1, 1)
self.stackedWidget.addWidget(self.page)
self.verticalLayout.addWidget(self.stackedWidget)
self.buttonBox = QtWidgets.QDialogButtonBox(parent=Dialog)
@@ -368,8 +401,8 @@ class Ui_Dialog(object):
self.label_18.setText(_translate("Dialog", "Signatur"))
self.zs_author.setToolTip(_translate("Dialog", "Bei mehreren Autoren mit ; trennen"))
self.label_32.setText(_translate("Dialog", "Dateiname"))
- self.copy_filename.setText(_translate("Dialog", "Kopieren"))
- self.copy_qoute.setText(_translate("Dialog", "Kopieren"))
- self.label_33.setText(_translate("Dialog", "ILIAS Dateibeschreibung"))
self.label_34.setText(_translate("Dialog", "ILIAS Name"))
+ self.label_33.setText(_translate("Dialog", "ILIAS Dateibeschreibung"))
+ self.copy_filename.setText(_translate("Dialog", "Kopieren"))
self.copy_ilias_filename.setText(_translate("Dialog", "Kopieren"))
+ self.copy_qoute.setText(_translate("Dialog", "Kopieren"))
diff --git a/src/ui/dialogs/dialog_sources/elsa_add_table_entry.ui b/src/ui/dialogs/dialog_sources/elsa_add_table_entry.ui
index 8bdaf08..07ce0db 100644
--- a/src/ui/dialogs/dialog_sources/elsa_add_table_entry.ui
+++ b/src/ui/dialogs/dialog_sources/elsa_add_table_entry.ui
@@ -493,14 +493,7 @@ Nachname, Vorname
- -
-
-
- true
-
-
-
- -
+
-
Qt::Vertical
@@ -513,30 +506,17 @@ Nachname, Vorname
- -
-
-
- Qt::LeftToRight
-
-
- false
-
-
- Kopieren
+
-
+
+
+ true
- -
-
+
-
+
- Kopieren
-
-
-
- -
-
-
- ILIAS Dateibeschreibung
+ ILIAS Name
@@ -547,26 +527,157 @@ Nachname, Vorname
- -
-
+
-
+
- ILIAS Name
+ ILIAS Dateibeschreibung
- -
+
-
true
- -
-
-
- Kopieren
-
-
+
-
+
+
-
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ Qt::LeftToRight
+
+
+ false
+
+
+ Kopieren
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ Kopieren
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ Kopieren
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
diff --git a/src/ui/dialogs/elsa_add_entry.py b/src/ui/dialogs/elsa_add_entry.py
index a6a5dd8..1e0f23f 100644
--- a/src/ui/dialogs/elsa_add_entry.py
+++ b/src/ui/dialogs/elsa_add_entry.py
@@ -172,7 +172,6 @@ class ElsaAddEntry(QtWidgets.QDialog, Ui_Dialog):
bib = BibTextTransformer("ARRAY")
bib.get_data(data)
data = bib.return_data()
- print(data)
self.setdata(data)
def setdata(self, data):