refactor: clean up unused imports and improve code organization

src/ui/Ui_switchtest.py

@@ -6,7 +6,7 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt6 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtWidgets
 
 
 class Ui_MainWindow(object):
@@ -44,7 +44,9 @@ class Ui_MainWindow(object):
     def retranslateUi(self, MainWindow):
         _translate = QtCore.QCoreApplication.translate
         MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow"))
-        self.select_action_box.setItemText(0, _translate("MainWindow", "Aktion auswählen"))
+        self.select_action_box.setItemText(
+            0, _translate("MainWindow", "Aktion auswählen")
+        )
         self.select_action_box.setItemText(1, _translate("MainWindow", "edit_prof"))
         self.select_action_box.setItemText(2, _translate("MainWindow", "add_user"))
         self.select_action_box.setItemText(3, _translate("MainWindow", "edit_user"))

src/ui/dialogs/about.py

@@ -2,7 +2,6 @@ from .dialog_sources.Ui_about import Ui_about
 from PyQt6 import QtWidgets
 from PyQt6.QtCore import PYQT_VERSION_STR
 from src import Icon, __version__, __author__
-from omegaconf import OmegaConf
 
 
 class About(QtWidgets.QDialog, Ui_about):

src/ui/dialogs/app_ext.py

@@ -1,7 +1,6 @@
 from PyQt6 import QtWidgets
 from .dialog_sources.Ui_apparat_extend import Ui_Dialog
 from src import Icon
-from src.backend import Semester
 
 
 class ApparatExtendDialog(QtWidgets.QDialog, Ui_Dialog):

src/ui/dialogs/bookdata.py

@@ -1,9 +1,8 @@
-from PyQt6 import QtCore, QtWidgets
+from PyQt6 import QtWidgets
 
 from src.logic.dataclass import BookData
 
 from .dialog_sources.Ui_edit_bookdata import Ui_Dialog
-from src import Icon
 
 
 class BookDataUI(QtWidgets.QDialog, Ui_Dialog):

src/ui/dialogs/dialog_sources/Ui_app_status.py

@@ -6,7 +6,7 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt6 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore
 
 
 class Ui_Form(object):

src/ui/dialogs/dialog_sources/Ui_confirm_extend.py

@@ -6,7 +6,7 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt6 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtWidgets
 
 
 class Ui_extend_confirm(object):

src/ui/dialogs/dialog_sources/Ui_elsa_add_table_entry.py

@@ -6,7 +6,7 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt6 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtWidgets
 
 
 class Ui_Dialog(object):

src/ui/dialogs/dialog_sources/Ui_newMailTemplateDesigner.py

@@ -6,7 +6,7 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt6 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtWidgets
 
 
 class Ui_Dialog(object):

src/ui/dialogs/dialog_sources/Ui_reminder.py

@@ -6,7 +6,7 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt6 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtWidgets
 
 
 class Ui_Erinnerung(object):

src/ui/dialogs/dialog_sources/settings_ui.py

@@ -6,7 +6,7 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt6 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtWidgets
 
 
 class Ui_Dialog(object):

src/ui/dialogs/elsa_gen_confirm.py

@@ -1,5 +1,5 @@
 from .dialog_sources.Ui_elsa_generator_confirm import Ui_Dialog
-from PyQt6 import QtCore, QtWidgets, QtGui
+from PyQt6 import QtWidgets
 
 
 class ElsaGenConfirm(QtWidgets.QDialog, Ui_Dialog):

src/ui/dialogs/fileparser.py

@@ -1,5 +1,4 @@
 from PyQt6 import QtWidgets
-from PyQt6.QtCore import Qt
 
 from src.logic.webrequest import BibTextTransformer, WebRequest
 

src/ui/dialogs/login.py

@@ -1,6 +1,6 @@
 import hashlib
 
-from PyQt6 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtWidgets
 
 from src import Icon, logger
 from src.backend.admin_console import AdminCommands

src/ui/dialogs/new_subject_ui.py

@@ -6,7 +6,7 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt6 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtWidgets
 
 
 class Ui_Dialog(object):

src/ui/dialogs/parsed_titles.py

@@ -1,4 +1,4 @@
-from PyQt6 import QtCore, QtWidgets
+from PyQt6 import QtWidgets
 
 from src.backend import AutoAdder
 

src/ui/dialogs/popup_confirm.py

@@ -6,7 +6,7 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt6 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtWidgets
 
 from src import Icon
 

src/ui/userInterface.py

@@ -906,7 +906,8 @@ class Ui(Ui_Semesterapparat):
                 ).setToolTip("Das Medium wurde nicht im Apparat gefunden")
 
         # make table link clickable
-        self.tableWidget_apparat_media.itemClicked.connect(self.open_link)
+        #self.tableWidget_apparat_media.itemClicked.connect(self.open_link)
+        # self.tableWidget_apparat_media.
 
     def open_link(self, item):
         def __openLink(link):
@@ -924,7 +925,8 @@ class Ui(Ui_Semesterapparat):
         if columnname == "Link":
             link = __openLink(item.text())
             if link is not None:
-                os.system("start " + link)
+                webbrowser.open(link)
+                #os.system("start " + link)
                 return
         else:
             pass

src/ui/widgets/admin_create_user.py

@@ -1,4 +1,4 @@
-from PyQt6 import QtWidgets, QtCore, QtGui
+from PyQt6 import QtWidgets
 from PyQt6.QtCore import pyqtSignal
 from .widget_sources.Ui_admin_create_user import Ui_Dialog
 from src.backend import AdminCommands, Database

src/ui/widgets/admin_edit_prof.py

@@ -1,6 +1,5 @@
 from .widget_sources.Ui_admin_edit_prof import Ui_Dialog  #
-from PyQt6 import QtWidgets, QtCore
-from PyQt6.QtCore import pyqtSignal
+from PyQt6 import QtWidgets
 from src import logger
 from src.logic import Prof
 from src.backend import Database

src/ui/widgets/admin_edit_user.py

@@ -1,6 +1,5 @@
 from .widget_sources.Ui_admin_edit_user import Ui_Dialog
-from PyQt6 import QtWidgets, QtCore
-from PyQt6.QtCore import pyqtSignal
+from PyQt6 import QtWidgets
 from src.backend import Database
 from src.backend import AdminCommands
 

src/ui/widgets/calendar_entry.py

@@ -1,6 +1,6 @@
 from .widget_sources.Ui_calendar_entry import Ui_Dialog
-from PyQt6 import QtWidgets, QtCore
-from PyQt6.QtCore import pyqtSignal, QDate
+from PyQt6 import QtWidgets
+from PyQt6.QtCore import pyqtSignal
 from src.backend.database import Database
 from src import Icon
 

src/ui/widgets/elsa_main.py

@@ -134,7 +134,7 @@ class ElsaDialog(QtWidgets.QDialog, Ui_Dialog):
         return profs
 
     def elsa_context_menu(self, position):
-        menu = QtWidgets.QMenu()
+        QtWidgets.QMenu()
         # TODO: add functions
         pass
 

src/ui/widgets/iconLine.py

@@ -1,6 +1,5 @@
 from .widget_sources.Ui_icon_widget import Ui_Dialog
-from PyQt6 import QtWidgets, QtCore, QtGui
-from PyQt6.QtCore import Qt
+from PyQt6 import QtWidgets
 from src import logger
 
 

src/ui/widgets/searchPage.py

@@ -4,7 +4,7 @@ from PyQt6.QtCore import pyqtSignal
 from src.backend import Database, Semester
 from src import logger
 from src.logic import custom_sort, Prof, sort_semesters_list
-from src.ui.dialogs import Mail_Dialog, ApparatExtendDialog
+from src.ui.dialogs import Mail_Dialog, ApparatExtendDialog, reminder_ui
 from src.ui.widgets import DataGraph, StatusWidget
 
 from natsort import natsorted
@@ -19,6 +19,7 @@ class SearchStatisticPage(QtWidgets.QDialog, Ui_Dialog):
     apparat_open = pyqtSignal(str)
     reloadSignal = pyqtSignal()
     refreshSignal = pyqtSignal()
+    updateCalendar = pyqtSignal(int, list)
 
     def __init__(self):
         logger.info("SearchStatisticPage started")
@@ -46,7 +47,8 @@ class SearchStatisticPage(QtWidgets.QDialog, Ui_Dialog):
         self.tableWidget.resizeColumnsToContents()
         self.tableWidget.resizeRowsToContents()
         self.db = Database()
-        self.box_appnrs.addItems(str(i) for i in self.db.getUnavailableApparatNumbers())
+        self.appnrs = self.db.getUnavailableApparatNumbers()
+        self.box_appnrs.addItems(str(i) for i in self.appnrs)
         self.splitter = QtWidgets.QSplitter(QtCore.Qt.Orientation.Horizontal)
         # insert splitter in apparatResult to allow resizing of the columns
         self.splitter.addWidget(self.app_results)
@@ -54,6 +56,8 @@ class SearchStatisticPage(QtWidgets.QDialog, Ui_Dialog):
         self.apparatResult.layout().removeWidget(self.stats)
         self.apparatResult.layout().removeWidget(self.app_results)
         self.apparatResult.layout().addWidget(self.splitter)
+        # set tableWidget column 0 to be 50px wide
+        self.tableWidget.setColumnWidth(0, 50)
         self.semester = Semester().value
         self.populate_tab()
 
@@ -83,9 +87,12 @@ class SearchStatisticPage(QtWidgets.QDialog, Ui_Dialog):
         menu = QtWidgets.QMenu()
         restore_action = menu.addAction("Wiederherstellen")
         extend_action = menu.addAction("Verlängern")
+        remind_action = menu.addAction("Erinnerung")
+
         menu.addAction(restore_action)
         restore_action.triggered.connect(self.restore_apparat)
         extend_action.triggered.connect(self.extend_apparat)
+        remind_action.triggered.connect(self.reminder)
         menu.exec(self.tableWidget.mapToGlobal(position))
 
     def extend_apparat(self):
@@ -101,6 +108,23 @@ class SearchStatisticPage(QtWidgets.QDialog, Ui_Dialog):
             self.tableWidget.removeRow(self.tableWidget.currentRow())
             self.refreshSignal.emit()
 
+    def reminder(self):
+        logger.info("Opening reminder dialog")
+        reminder = reminder_ui()
+        reminder.exec()
+        tableposition = self.tableWidget.currentRow()
+        appnr = self.tableWidget.item(tableposition, 2).text()
+        if reminder.result() == QtWidgets.QDialog.DialogCode.Accepted:
+            data = reminder.return_message()
+            # #print(data)
+            self.db.addMessage(
+                data,
+                "admin",
+                appnr,
+            )
+            self.updateCalendar.emit(data)
+            logger.info("committed message to database")
+
     def tabW2_changed(self):
         if self.tabWidget_2.currentIndex() == 0:
             self.stackedWidget_4.setCurrentIndex(0)
@@ -228,7 +252,7 @@ class SearchStatisticPage(QtWidgets.QDialog, Ui_Dialog):
         self.box_dauerapp.addItems(["Ja", "Nein", ""])
         self.box_dauerapp.setCurrentText("")
         # add custom vaules
-        appnrs = self.db.getUnavailableApparatNumbers()
+        appnrs = self.appnrs
         apparats = natsorted(appnrs)
         apparats = [str(apparat) for apparat in apparats]
         self.box_appnrs.addItems(apparats)

src/ui/widgets/widget_sources/Ui_admin_create_user.py

@@ -6,7 +6,7 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt6 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtWidgets
 
 
 class Ui_Dialog(object):

src/ui/widgets/widget_sources/Ui_admin_edit_prof.py

@@ -6,7 +6,7 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt6 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtWidgets
 
 
 class Ui_Dialog(object):

src/ui/widgets/widget_sources/Ui_admin_edit_user.py

@@ -6,7 +6,7 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt6 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtWidgets
 
 
 class Ui_Dialog(object):

src/ui/widgets/widget_sources/Ui_calendar_entry.py

@@ -6,7 +6,7 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt6 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtWidgets
 
 
 class Ui_Dialog(object):

src/ui/widgets/widget_sources/Ui_elsa_maindialog.py

@@ -6,7 +6,7 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt6 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtWidgets
 
 
 class Ui_Dialog(object):

src/ui/widgets/widget_sources/Ui_icon_widget.py

@@ -6,7 +6,7 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt6 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtWidgets
 
 
 class Ui_Dialog(object):

src/ui/widgets/widget_sources/Ui_search_statistic_page.py

@@ -6,7 +6,7 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt6 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtWidgets
 
 
 class Ui_Dialog(object):