fix issues caused by dropped commit

src/ui/userInterface.py

@@ -37,7 +37,7 @@ from src.logic import (
 )
 from src.ui import (
     About,
-    App_Ext_Dialog,
+    ApparatExtendDialog,
     CalendarEntry,
     DataGraph,
     FilePicker,
@@ -546,6 +546,7 @@ class Ui(Ui_Semesterapparat):
     def get_apparats(self):
         alist = self.db.getAllAparats(deleted=0)
         alist = natsorted(alist, key=lambda x: x[4], reverse=True)
+        self.tableWidget_apparate.setRowCount(0)
         for apparat in alist:
             self.insert_apparat_into_table(apparat)
         return alist
@@ -1001,7 +1002,8 @@ class Ui(Ui_Semesterapparat):
             and (
                 (self.sem_sommer.isChecked() or self.sem_winter.isChecked())
                 and self.sem_year.text() != ""
-                and len(self.sem_year.text()) >= 4
+                and len(self.sem_year.text())
+                >= 2  # check if the year is at least 2 digits long
             )
             or self.check_eternal_app.isChecked()
         ):
@@ -1729,6 +1731,7 @@ class Ui(Ui_Semesterapparat):
         def __dauer_check(apparat):
             return "Ja" if apparat[7] == 1 else "Nein"
 
+        semester = apparat[8] if apparat[8] is not None else apparat[5]
         self.tableWidget_apparate.insertRow(0)
         self.tableWidget_apparate.setItem(
             0, 0, QtWidgets.QTableWidgetItem(str(apparat[4]))
@@ -1746,9 +1749,7 @@ class Ui(Ui_Semesterapparat):
         self.tableWidget_apparate.setItem(
             0,
             3,
-            QtWidgets.QTableWidgetItem(
+            QtWidgets.QTableWidgetItem(str(semester)),
-                str(apparat[8]) if apparat[8] is not None else apparat[5]
-            ),
         )
         self.tableWidget_apparate.setItem(
             0, 4, QtWidgets.QTableWidgetItem(__dauer_check(apparat))
@@ -1784,11 +1785,9 @@ class Ui(Ui_Semesterapparat):
 
     def reminder(self):
         self.logger.log_info("Opening reminder dialog")
-        dialog = QtWidgets.QDialog()
         reminder = reminder_ui()
-        reminder.setupUi(dialog)
+        reminder.exec()
-        dialog.exec()
+        if reminder.result() == QtWidgets.QDialog.DialogCode.Accepted:
-        if dialog.result() == QtWidgets.QDialog.DialogCode.Accepted:
             data = reminder.return_message()
             print(data)
             self.db.addMessage(
@@ -1946,14 +1945,11 @@ class Ui(Ui_Semesterapparat):
                     self.update_app_media_list()
 
     def extend_apparat(self):
-        framework = QtWidgets.QDialog()
+        framework = ApparatExtendDialog()
-        frame = App_Ext_Dialog()
-        frame.setupUi(framework)
-        frame.sem_year.setText(str(QtCore.QDate.currentDate().year()))
         framework.exec()
         # return data from dialog if ok is pressed
         if framework.result() == QtWidgets.QDialog.DialogCode.Accepted:
-            data = frame.get_data()
+            data = framework.get_data()
             print(data)
             # return data
             selected_apparat_id = self.tableWidget_apparate.item(
@@ -1964,6 +1960,8 @@ class Ui(Ui_Semesterapparat):
             self.db.setNewSemesterDate(
                 selected_apparat_id, data["semester"], dauerapp=data["dauerapp"]
             )
+            # update the table
+            self.get_apparats()
         else:
             return