refactor: clean up unused imports and improve code organization
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user