rework logging, add more dataclasses, reworked config
This commit is contained in:
@@ -3,7 +3,7 @@ from PyQt6 import QtWidgets, QtCore
|
||||
from PyQt6.QtCore import pyqtSignal
|
||||
from icecream import ic
|
||||
from src.backend import Database
|
||||
|
||||
from src.logic import Prof
|
||||
class EditProf(QtWidgets.QDialog, Ui_Dialog):
|
||||
def __init__(self):
|
||||
super(EditProf, self).__init__()
|
||||
@@ -19,7 +19,21 @@ class EditProf(QtWidgets.QDialog, Ui_Dialog):
|
||||
|
||||
def gather_data(self):
|
||||
self.add_faculty_member_data()
|
||||
|
||||
apparats = self.db.getApparatsByProf(
|
||||
self.db.getProfId(
|
||||
Prof(fullname=self.edit_faculty_member_select_member.currentText())
|
||||
)
|
||||
)
|
||||
if len(apparats) == 0:
|
||||
self.delete_faculty_member.setEnabled(True)
|
||||
for apparat in apparats:
|
||||
if apparat.deleted == 0:
|
||||
self.delete_faculty_member.setEnabled(False)
|
||||
self.delete_faculty_member.setToolTip(
|
||||
"Professoren mit Apparaten können nicht gelöscht werden"
|
||||
)
|
||||
break
|
||||
|
||||
def add_faculty_member_data(self):
|
||||
faculty_members = self.db.getFacultyMembers()
|
||||
names = [f"{member[5]}" for member in faculty_members]
|
||||
@@ -43,22 +57,19 @@ class EditProf(QtWidgets.QDialog, Ui_Dialog):
|
||||
self.faculty_member_oldmail.setText("")
|
||||
self.edit_faculty_member_title.setText("")
|
||||
else:
|
||||
# title = data[1]
|
||||
# if title is None:
|
||||
# title = ""
|
||||
# self.edit_faculty_member_title.setText(title)
|
||||
self.faculty_member_old_telnr.setText(data[6])
|
||||
self.faculty_member_oldmail.setText(data[5])
|
||||
self.faculty_member_old_telnr.setText(data.telnr)
|
||||
self.faculty_member_oldmail.setText(data.mail)
|
||||
ic(data)
|
||||
(
|
||||
self.edit_faculty_member_title.setText(data[1])
|
||||
if data[1] is not None
|
||||
self.edit_faculty_member_title.setText(data.title)
|
||||
if data.title is not None
|
||||
else self.edit_faculty_member_title.setText("")
|
||||
)
|
||||
|
||||
def edit_faculty_member_action(self):
|
||||
def __gen_fullname(fname, lname, data):
|
||||
if fname == "" and lname == "":
|
||||
return data[3]
|
||||
return data[0]
|
||||
if fname == "" and lname != "":
|
||||
return f"{lname} {data[1]}"
|
||||
if fname != "" and lname == "":
|
||||
@@ -69,13 +80,13 @@ class EditProf(QtWidgets.QDialog, Ui_Dialog):
|
||||
# get the data and use new value if it is not none and does not mach the old value
|
||||
if self.edit_faculty_member_select_member.currentText() == "":
|
||||
return
|
||||
olddata = self.db.getFacultyMember(
|
||||
olddata = self.db.getProfByName(
|
||||
self.edit_faculty_member_select_member.currentText()
|
||||
)
|
||||
ic(olddata)
|
||||
data = olddata
|
||||
oldlname = data[2]
|
||||
oldfname = data[1]
|
||||
oldlname = data.lastname
|
||||
oldfname = data.firstname
|
||||
# take data except first and last entry
|
||||
|
||||
titel = (
|
||||
@@ -86,16 +97,12 @@ class EditProf(QtWidgets.QDialog, Ui_Dialog):
|
||||
fname = (
|
||||
self.edit_faculty_member_new_surname.text()
|
||||
if self.edit_faculty_member_new_surname.text() != ""
|
||||
else self.edit_faculty_member_select_member.currentText()
|
||||
.split(" ")[1]
|
||||
.strip()
|
||||
else self.edit_faculty_member_select_member.currentText().strip()
|
||||
)
|
||||
lname = (
|
||||
self.user_faculty_member_new_name.text()
|
||||
if self.user_faculty_member_new_name.text() != ""
|
||||
else self.edit_faculty_member_select_member.currentText()
|
||||
.split(" ")[0]
|
||||
.strip()
|
||||
else self.edit_faculty_member_select_member.currentText().strip()
|
||||
)
|
||||
fullname = __gen_fullname(fname, lname, data)
|
||||
telnr = self.user_faculty_member_new_telnr.text()
|
||||
|
||||
Reference in New Issue
Block a user