PHB/SemesterapparatsManager
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

Refactor logging setup across multiple modules to use loguru with consistent configuration

Browse Source 
- Updated logging initialization in MessageCalendar, admin_edit_prof, elsa_main, graph, iconLine, searchPage, and richtext modules to use loguru.
- Changed log rotation and retention settings for log files to improve log management.
- Replaced logger.debug/info calls with log.debug/info for consistency.
- Fixed a typo in the searchPage UI and updated related references in the UI files.
- Removed unused imports and cleaned up code for better readability.
This commit is contained in:
WorldTeacher
2025-05-13 15:49:52 +02:00
parent 4a3a95623a
commit f7c499ea6e
32 changed files with 412 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/create_file.py
View File

@@ -4,18 +4,17 @@ from pathlib import Path
from src.backend.database import Database from src.backend.database import Database
db = Database()
import loguru import loguru
import sys import sys
log = loguru.logger log = loguru.logger
log.remove() log.remove()
log.add("application.log", rotation="1 week", retention="1 month") log.add(sys.stdout)
log.add( log.add("logs/application.log", rotation="1 MB", retention="10 days")
sys.stdout,
)
db = Database()
def recreateFile(name: str, app_id: int, filetype: str, open: bool = True) -> Path: def recreateFile(name: str, app_id: int, filetype: str, open: bool = True) -> Path:
""" """
recreateFile creates a file from the database and opens it in the respective program, if the open parameter is set to True. recreateFile creates a file from the database and opens it in the respective program, if the open parameter is set to True.

100
src/backend/database.py
View File

@@ -24,18 +24,14 @@ from src.logic import ApparatData, BookData, Prof, Apparat, ELSA
from src.logic.constants import SEMAP_MEDIA_ACCOUNTS from src.logic.constants import SEMAP_MEDIA_ACCOUNTS
from .semester import Semester from .semester import Semester
from string import ascii_lowercase as lower, digits, punctuation from string import ascii_lowercase as lower, digits, punctuation
import loguru
import sys import sys
from loguru import logger as log
logger = log log = loguru.logger
logger.remove() log.remove()
logger.add("logs/application.log", rotation="1 week", retention="1 month", enqueue=True) log.add(sys.stdout)
log.add( log.add("logs/application.log", rotation="1 MB", retention="10 days")
"logs/database.log",
)
# logger.add(sys.stderr, format="{time} {level} {message}", level="INFO")
logger.add(sys.stdout)
ascii_lowercase = lower + digits + punctuation ascii_lowercase = lower + digits + punctuation
@@ -58,7 +54,7 @@ class Database:
if db_path is None: if db_path is None:
self.db_path = self.database.path + self.database.name self.db_path = self.database.path + self.database.name
self.db_path = self.db_path.replace("~", str(Path.home())) self.db_path = self.db_path.replace("~", str(Path.home()))
logger.debug(self.db_path) log.debug(self.db_path)
else: else:
self.db_path = db_path self.db_path = db_path
self.checkDatabaseStatus() self.checkDatabaseStatus()
@@ -69,10 +65,10 @@ class Database:
path = os.path.abspath(path) path = os.path.abspath(path)
if not os.path.exists(path): if not os.path.exists(path):
# create path # create path
# logger.debug(path) # log.debug(path)
os.makedirs(path) os.makedirs(path)
if self.get_db_contents() == []: if self.get_db_contents() == []:
logger.critical("Database does not exist, creating tables") log.critical("Database does not exist, creating tables")
self.create_tables() self.create_tables()
self.insertSubjects() self.insertSubjects()
@@ -155,12 +151,12 @@ class Database:
""" """
conn = self.connect() conn = self.connect()
cursor = conn.cursor() cursor = conn.cursor()
logger.debug(f"Inserting {params} into database with query {query}") log.debug(f"Inserting {params} into database with query {query}")
cursor.execute(query, params) cursor.execute(query, params)
conn.commit() conn.commit()
self.close_connection(conn) self.close_connection(conn)
@logger.catch @log.catch
def query_db( def query_db(
self, self,
query: str, query: str,
@@ -195,7 +191,7 @@ class Database:
# log_message = f"Querying database with query {query}" # log_message = f"Querying database with query {query}"
if "INTO user" in query: if "INTO user" in query:
log_message = f"Querying database with query {query}" log_message = f"Querying database with query {query}"
# logger.debug(f"DB Query: {log_message}") # log.debug(f"DB Query: {log_message}")
log.debug(log_message) log.debug(log_message)
try: try:
cursor.execute(query, args) cursor.execute(query, args)
@@ -203,7 +199,7 @@ class Database:
conn.commit() conn.commit()
self.close_connection(conn) self.close_connection(conn)
except sql.OperationalError as e: except sql.OperationalError as e:
logger.error(f"Error in query: {e}") log.error(f"Error in query: {e}")
return None return None
return (rv[0] if rv else None) if one else rv return (rv[0] if rv else None) if one else rv
@@ -219,7 +215,7 @@ class Database:
app_id (str): The apparat id where the book should be added to app_id (str): The apparat id where the book should be added to
prof_id (str): The id of the professor where the book should be added to. prof_id (str): The id of the professor where the book should be added to.
""" """
logger.info(f"Adding book {bookdata.signature} to database") log.info(f"Adding book {bookdata.signature} to database")
if app_id is None or prof_id is None: if app_id is None or prof_id is None:
raise ValueError("Apparate ID or Prof ID is None") raise ValueError("Apparate ID or Prof ID is None")
conn = self.connect() conn = self.connect()
@@ -227,12 +223,12 @@ class Database:
t_query = ( t_query = (
f"SELECT bookdata FROM media WHERE app_id={app_id} AND prof_id={prof_id}" f"SELECT bookdata FROM media WHERE app_id={app_id} AND prof_id={prof_id}"
) )
logger.debug(t_query) log.debug(t_query)
# # logger.debug(t_query) # # log.debug(t_query)
result = cursor.execute(t_query).fetchall() result = cursor.execute(t_query).fetchall()
result = [BookData().from_string(i[0]) for i in result] result = [BookData().from_string(i[0]) for i in result]
if bookdata in result: if bookdata in result:
# logger.debug("Bookdata already in database") # log.debug("Bookdata already in database")
# check if the book was deleted in the apparat # check if the book was deleted in the apparat
query = ( query = (
"SELECT deleted FROM media WHERE app_id=? AND prof_id=? AND bookdata=?" "SELECT deleted FROM media WHERE app_id=? AND prof_id=? AND bookdata=?"
@@ -240,7 +236,7 @@ class Database:
params = (app_id, prof_id, json.dumps(asdict(bookdata), ensure_ascii=False)) params = (app_id, prof_id, json.dumps(asdict(bookdata), ensure_ascii=False))
result = cursor.execute(query, params).fetchone() result = cursor.execute(query, params).fetchone()
if result[0] == 1: if result[0] == 1:
# logger.debug("Book was deleted, updating bookdata") # log.debug("Book was deleted, updating bookdata")
query = "UPDATE media SET deleted=0 WHERE app_id=? AND prof_id=? AND bookdata=?" query = "UPDATE media SET deleted=0 WHERE app_id=? AND prof_id=? AND bookdata=?"
params = ( params = (
app_id, app_id,
@@ -258,7 +254,7 @@ class Database:
params = (converted, app_id, prof_id, 0) params = (converted, app_id, prof_id, 0)
cursor.execute(query, params) cursor.execute(query, params)
logMessage = f"Added book with signature {bookdata.signature} to database, data: {converted}" logMessage = f"Added book with signature {bookdata.signature} to database, data: {converted}"
logger.info(logMessage) log.info(logMessage)
conn.commit() conn.commit()
self.close_connection(conn) self.close_connection(conn)
@@ -327,7 +323,7 @@ class Database:
list[tuple[BookData, int]]: A list of tuples containing the wrapped Metadata and the id of the book list[tuple[BookData, int]]: A list of tuples containing the wrapped Metadata and the id of the book
""" """
rdata = self.query_db("SELECT * FROM media WHERE deleted=0") rdata = self.query_db("SELECT * FROM media WHERE deleted=0")
# logger.debug(rdata, len(rdata)) # log.debug(rdata, len(rdata))
mode = 0 mode = 0
if len(data) == 1: if len(data) == 1:
if "signature" in data.keys(): if "signature" in data.keys():
@@ -355,7 +351,7 @@ class Database:
and data["title"] in bookdata.title and data["title"] in bookdata.title
): ):
ret.append((bookdata, app_id, prof_id)) ret.append((bookdata, app_id, prof_id))
# logger.debug(ret) # log.debug(ret)
return ret return ret
def setAvailability(self, book_id: str, available: str): def setAvailability(self, book_id: str, available: str):
@@ -516,7 +512,7 @@ class Database:
delete=False, dir=tempdir_path, mode="wb", suffix=f".{filetype}" delete=False, dir=tempdir_path, mode="wb", suffix=f".{filetype}"
) )
file.write(blob) file.write(blob)
# logger.debug("file created") # log.debug("file created")
return file.name return file.name
def getFiles(self, app_id: Union[str, int], prof_id: int) -> list[tuple]: def getFiles(self, app_id: Union[str, int], prof_id: int) -> list[tuple]:
@@ -544,7 +540,7 @@ class Database:
return [i[0] for i in data] return [i[0] for i in data]
def insertSubjects(self): def insertSubjects(self):
# logger.debug("Inserting subjects") # log.debug("Inserting subjects")
subjects = [ subjects = [
"Biologie", "Biologie",
"Chemie", "Chemie",
@@ -660,7 +656,7 @@ class Database:
Args: Args:
message_id (str): the id of the message message_id (str): the id of the message
""" """
logger.debug(f"Deleting message with id {message_id}") log.debug(f"Deleting message with id {message_id}")
self.query_db("DELETE FROM messages WHERE id=?", (message_id,)) self.query_db("DELETE FROM messages WHERE id=?", (message_id,))
# Prof data # Prof data
@@ -827,7 +823,7 @@ class Database:
) )
numbers = [i[0] for i in numbers] numbers = [i[0] for i in numbers]
numbers.sort() numbers.sort()
logger.info(f"Currently used apparat numbers: {numbers}") log.info(f"Currently used apparat numbers: {numbers}")
return numbers return numbers
def setNewSemesterDate(self, app_id: Union[str, int], newDate, dauerapp=False): def setNewSemesterDate(self, app_id: Union[str, int], newDate, dauerapp=False):
@@ -881,22 +877,22 @@ class Database:
Returns: Returns:
Optional[int]: the id of the apparat Optional[int]: the id of the apparat
""" """
logger.debug(apparat) log.debug(apparat)
app = apparat.apparat app = apparat.apparat
prof = apparat.prof prof = apparat.prof
present_prof = self.getProfByName(prof.name()) present_prof = self.getProfByName(prof.name())
prof_id = present_prof.id prof_id = present_prof.id
logger.debug(present_prof) log.debug(present_prof)
app_id = self.getApparatId(app.name) app_id = self.getApparatId(app.name)
if app_id: if app_id:
return AppPresentError(app_id) return AppPresentError(app_id)
if not prof_id: if not prof_id:
logger.debug("prof id not present, creating prof with data", prof) log.debug("prof id not present, creating prof with data", prof)
prof_id = self.createProf(prof) prof_id = self.createProf(prof)
logger.debug(prof_id) log.debug(prof_id)
query = f"INSERT OR IGNORE INTO semesterapparat (appnr, name, erstellsemester, dauer, prof_id, fach,deletion_status,konto) VALUES ('{app.appnr}', '{app.name}', '{app.created_semester}', '{app.eternal}', {prof_id}, '{app.subject}', '{0}', '{SEMAP_MEDIA_ACCOUNTS[app.appnr]}')" query = f"INSERT OR IGNORE INTO semesterapparat (appnr, name, erstellsemester, dauer, prof_id, fach,deletion_status,konto) VALUES ('{app.appnr}', '{app.name}', '{app.created_semester}', '{app.eternal}', {prof_id}, '{app.subject}', '{0}', '{SEMAP_MEDIA_ACCOUNTS[app.appnr]}')"
logger.debug(query) log.debug(query)
self.query_db(query) self.query_db(query)
return None return None
@@ -914,7 +910,7 @@ class Database:
) )
ret = [] ret = []
for i in data: for i in data:
logger.debug(i) log.debug(i)
ret.append(Apparat().from_tuple(i)) ret.append(Apparat().from_tuple(i))
return ret return ret
@@ -996,7 +992,7 @@ class Database:
app_id (Union[str, int]): the id of the apparat app_id (Union[str, int]): the id of the apparat
semester (str): the semester the apparat should be deleted from semester (str): the semester the apparat should be deleted from
""" """
logger.info(f"Deleting apparat with id {app_id} in semester {semester}") log.info(f"Deleting apparat with id {app_id} in semester {semester}")
self.query_db( self.query_db(
"UPDATE semesterapparat SET deletion_status=1, deleted_date=? WHERE appnr=?", "UPDATE semesterapparat SET deletion_status=1, deleted_date=? WHERE appnr=?",
(semester, app_id), (semester, app_id),
@@ -1054,7 +1050,7 @@ class Database:
apparat_data.apparat.apparat_id_adis, apparat_data.apparat.apparat_id_adis,
apparat_data.apparat.appnr, apparat_data.apparat.appnr,
) )
logger.debug(f"Updating apparat with query {query} and params {params}") log.debug(f"Updating apparat with query {query} and params {params}")
self.query_db(query, params) self.query_db(query, params)
def checkApparatExists(self, app_name: str): def checkApparatExists(self, app_name: str):
@@ -1106,7 +1102,7 @@ class Database:
Returns: Returns:
list: the result of the query list: the result of the query
""" """
logger.debug(f"Query: {query}") log.debug(f"Query: {query}")
conn = self.connect() conn = self.connect()
cursor = conn.cursor() cursor = conn.cursor()
result = cursor.execute(query).fetchall() result = cursor.execute(query).fetchall()
@@ -1119,7 +1115,7 @@ class Database:
result_a = tuple(result_a) result_a = tuple(result_a)
result[result.index(orig_value)] = result_a result[result.index(orig_value)] = result_a
self.close_connection(conn) self.close_connection(conn)
logger.debug(f"Query result: {result}") log.debug(f"Query result: {result}")
return result return result
if "deletable" in kwargs.keys(): if "deletable" in kwargs.keys():
@@ -1134,9 +1130,9 @@ class Database:
kwargs["dauer"] = kwargs["dauer"].replace("Ja", "1").replace("Nein", "0") kwargs["dauer"] = kwargs["dauer"].replace("Ja", "1").replace("Nein", "0")
query = "SELECT * FROM semesterapparat WHERE " query = "SELECT * FROM semesterapparat WHERE "
for key, value in kwargs.items() if kwargs.items() is not None else {}: for key, value in kwargs.items() if kwargs.items() is not None else {}:
# logger.debug(key, value) # log.debug(key, value)
query += f"{key}='{value}' AND " query += f"{key}='{value}' AND "
# logger.debug(query) # log.debug(query)
# remove deletesemester part from normal query, as this will be added to the database upon deleting the apparat # remove deletesemester part from normal query, as this will be added to the database upon deleting the apparat
if "deletesemester" in kwargs.keys(): if "deletesemester" in kwargs.keys():
query = query.replace( query = query.replace(
@@ -1152,24 +1148,24 @@ class Database:
query = query.replace( query = query.replace(
f"endsemester='{kwargs['endsemester']}' AND ", "xyz" f"endsemester='{kwargs['endsemester']}' AND ", "xyz"
) )
# logger.debug("replaced") # log.debug("replaced")
query = query.replace( query = query.replace(
"xyz", "xyz",
f"(erstellsemester='{kwargs['endsemester']}' OR verlängerung_bis='{kwargs['endsemester']}') AND ", f"(erstellsemester='{kwargs['endsemester']}' OR verlängerung_bis='{kwargs['endsemester']}') AND ",
) )
# remove all x="" parts from the query where x is a key in kwargs # remove all x="" parts from the query where x is a key in kwargs
logger.info(f"Query before: {query}") log.info(f"Query before: {query}")
query = query.strip() query = query.strip()
query = query[:-4] query = query[:-4]
logger.info(f"Query after: {query}") log.info(f"Query after: {query}")
# check if query ends with lowercase letter or a '. if not, remove last symbol and try again # check if query ends with lowercase letter or a '. if not, remove last symbol and try again
while query[-1] not in ascii_lowercase and query[-1] != "'": while query[-1] not in ascii_lowercase and query[-1] != "'":
query = query[:-1] query = query[:-1]
query = query.strip() query = query.strip()
# logger.debug(query) # log.debug(query)
res = __query(query) res = __query(query)
# logger.debug(res) # log.debug(res)
return res return res
# Admin data # Admin data
@@ -1457,7 +1453,7 @@ class Database:
blob = self.query_db( blob = self.query_db(
"SELECT fileblob FROM elsa_files WHERE filename=?", (filename,), one=True "SELECT fileblob FROM elsa_files WHERE filename=?", (filename,), one=True
)[0] )[0]
# logger.debug(blob) # log.debug(blob)
tempdir = self.database.temp tempdir = self.database.temp
tempdir = tempdir.replace("~", str(Path.home())) tempdir = tempdir.replace("~", str(Path.home()))
tempdir_path = Path(tempdir) tempdir_path = Path(tempdir)
@@ -1467,7 +1463,7 @@ class Database:
delete=False, dir=tempdir_path, mode="wb", suffix=f".{filetype}" delete=False, dir=tempdir_path, mode="wb", suffix=f".{filetype}"
) )
file.write(blob) file.write(blob)
# logger.debug("file created") # log.debug("file created")
return file.name return file.name
def getElsaApparats(self) -> ELSA: def getElsaApparats(self) -> ELSA:
@@ -1517,7 +1513,7 @@ class Database:
### ###
def createProf(self, profdata: Prof): def createProf(self, profdata: Prof):
logger.debug(profdata) log.debug(profdata)
conn = self.connect() conn = self.connect()
cursor = conn.cursor() cursor = conn.cursor()
fname = profdata.firstname fname = profdata.firstname
@@ -1528,7 +1524,7 @@ class Database:
title = profdata.title title = profdata.title
query = f"INSERT INTO prof (fname, lname, fullname, mail, telnr,titel) VALUES ('{fname}','{lname}','{fullname}','{mail}','{telnr}','{title}')" query = f"INSERT INTO prof (fname, lname, fullname, mail, telnr,titel) VALUES ('{fname}','{lname}','{fullname}','{mail}','{telnr}','{title}')"
logger.debug(query) log.debug(query)
cursor.execute(query) cursor.execute(query)
conn.commit() conn.commit()
@@ -1573,7 +1569,7 @@ class Database:
else: else:
fullname = profdata.name() fullname = profdata.name()
query = f"SELECT id FROM prof WHERE fullname = '{fullname}'" query = f"SELECT id FROM prof WHERE fullname = '{fullname}'"
logger.debug(query) log.debug(query)
cursor.execute(query) cursor.execute(query)
result = cursor.fetchone() result = cursor.fetchone()
@@ -1591,7 +1587,7 @@ class Database:
conn = self.connect() conn = self.connect()
cursor = conn.cursor() cursor = conn.cursor()
query = f"SELECT * FROM prof WHERE fullname = '{fullname}'" query = f"SELECT * FROM prof WHERE fullname = '{fullname}'"
logger.debug(query) log.debug(query)
result = cursor.execute(query).fetchone() result = cursor.execute(query).fetchone()
if result: if result:
@@ -1612,7 +1608,7 @@ class Database:
query = f"SELECT prof_id from semesterapparat WHERE appnr = '{apprarat_id}' and deletion_status = 0" query = f"SELECT prof_id from semesterapparat WHERE appnr = '{apprarat_id}' and deletion_status = 0"
data = self.query_db(query) data = self.query_db(query)
if data: if data:
logger.info("Prof ID: " + str(data[0][0])) log.info("Prof ID: " + str(data[0][0]))
return data[0][0] return data[0][0]
else: else:
return None return None

20
src/backend/semester.py
View File

@@ -1,27 +1,25 @@
import datetime import datetime
from dataclasses import dataclass from dataclasses import dataclass
import loguru
import sys import sys
from loguru import logger as log
logger = log log = loguru.logger
logger.remove() log.remove()
logger.add("logs/application.log", rotation="1 week", retention="1 month", enqueue=True) log.add(sys.stdout)
log.add("logs/application.log", rotation="1 MB", retention="10 days")
# logger.add(sys.stderr, format="{time} {level} {message}", level="INFO")
logger.add(sys.stdout)
@dataclass @dataclass
class Semester: class Semester:
logger.debug("Semester class loaded") log.debug("Semester class loaded")
_year: int | None = str(datetime.datetime.now().year)[2:] _year: int | None = str(datetime.datetime.now().year)[2:]
_semester: str | None = None _semester: str | None = None
_month: int | None = datetime.datetime.now().month _month: int | None = datetime.datetime.now().month
value: str = None value: str = None
logger.debug( log.debug(
f"Initialized Semester class with values: month: {_month}, semester: {_semester}, year {_year}" f"Initialized Semester class with values: month: {_month}, semester: {_semester}, year {_year}"
) )
@@ -45,7 +43,7 @@ class Semester:
else: else:
self._semester = "SoSe" self._semester = "SoSe"
@logger.catch @log.catch
def computeValue(self): def computeValue(self):
# year is only last two digits # year is only last two digits
year = self._year year = self._year
@@ -57,7 +55,7 @@ class Semester:
valueyear = str(year) + "/" + str(year + 1) valueyear = str(year) + "/" + str(year + 1)
self.value = f"{self._semester} {valueyear}" self.value = f"{self._semester} {valueyear}"
@logger.catch @log.catch
def offset(self, value: int) -> str: def offset(self, value: int) -> str:
"""Generate a new Semester object by offsetting the current semester by a given value """Generate a new Semester object by offsetting the current semester by a given value

77
src/backend/thread_bookgrabber.py
View File

@@ -3,22 +3,17 @@ from PyQt6.QtCore import pyqtSignal as Signal
from src.backend import Database from src.backend import Database
from src.logic.webrequest import BibTextTransformer, WebRequest from src.logic.webrequest import BibTextTransformer, WebRequest
import loguru
import sys import sys
from loguru import logger as log
logger = log log = loguru.logger
logger.remove() log.remove()
logger.add( log.add(sys.stdout)
"logs/bookgrabber_thread.log", rotation="1 week", retention="1 month", enqueue=True log.add("logs/application.log", rotation="1 MB", retention="10 days")
)
log.add(
"logs/application.log",
rotation="1 day",
compression="zip",
)
# logger.add(sys.stderr, format="{time} {level} {message}", level="INFO") # logger.add(sys.stderr, format="{time} {level} {message}", level="INFO")
logger.add(sys.stdout) log.add(sys.stdout)
class BookGrabber(QThread): class BookGrabber(QThread):
@@ -28,7 +23,7 @@ class BookGrabber(QThread):
def __init__(self): def __init__(self):
super(BookGrabber, self).__init__(parent=None) super(BookGrabber, self).__init__(parent=None)
self.is_Running = True self.is_Running = True
logger.info("Starting worker thread") log.info("Starting worker thread")
self.data = [] self.data = []
self.app_id = None self.app_id = None
self.prof_id = None self.prof_id = None
@@ -49,21 +44,21 @@ class BookGrabber(QThread):
self.data: list[str] = data self.data: list[str] = data
self.use_any = any_book self.use_any = any_book
self.use_exact = exact self.use_exact = exact
logger.info(f"Working on {len(self.data)} entries") log.info(f"Working on {len(self.data)} entries")
self.tstate = (self.app_id, self.prof_id, self.mode, self.data) self.tstate = (self.app_id, self.prof_id, self.mode, self.data)
logger.debug("State: " + str(self.tstate)) log.debug("State: " + str(self.tstate))
self.request.set_apparat(self.app_id) self.request.set_apparat(self.app_id)
# logger.debug(self.tstate) # log.debug(self.tstate)
def run(self): def run(self):
self.db = Database() self.db = Database()
item = 0 item = 0
iterdata = self.data iterdata = self.data
# logger.debug(iterdata) # log.debug(iterdata)
for entry in iterdata: for entry in iterdata:
# logger.debug(entry) # log.debug(entry)
logger.info("Processing entry: {}", entry) log.info("Processing entry: {}", entry)
webdata = self.request.get_ppn(entry) webdata = self.request.get_ppn(entry)
if self.use_any: if self.use_any:
@@ -74,12 +69,12 @@ class BookGrabber(QThread):
continue continue
bd = BibTextTransformer(self.mode) bd = BibTextTransformer(self.mode)
logger.debug(webdata) log.debug(webdata)
if self.mode == "ARRAY": if self.mode == "ARRAY":
if self.use_exact: if self.use_exact:
bd = bd.use_signature(entry) bd = bd.use_signature(entry)
bd = bd.get_data(webdata).return_data() bd = bd.get_data(webdata).return_data()
logger.debug(bd) log.debug(bd)
if bd is None: if bd is None:
# bd = BookData # bd = BookData
continue continue
@@ -92,29 +87,29 @@ class BookGrabber(QThread):
self.db.addBookToDatabase(bd, self.app_id, self.prof_id) self.db.addBookToDatabase(bd, self.app_id, self.prof_id)
# get latest book id # get latest book id
self.book_id = self.db.getLastBookId() self.book_id = self.db.getLastBookId()
logger.info("Added book to database") log.info("Added book to database")
state = 0 state = 0
for result in transformer.RDS_DATA: for result in transformer.RDS_DATA:
# logger.debug(result.RDS_LOCATION) # log.debug(result.RDS_LOCATION)
if str(self.app_id) in result.RDS_LOCATION: if str(self.app_id) in result.RDS_LOCATION:
state = 1 state = 1
break break
logger.info(f"State of {entry}: {state}") log.info(f"State of {entry}: {state}")
logger.debug( log.debug(
"updating availability of " + str(self.book_id) + " to " + str(state) "updating availability of " + str(self.book_id) + " to " + str(state)
) )
try: try:
self.db.setAvailability(self.book_id, state) self.db.setAvailability(self.book_id, state)
logger.debug("Added book to database") log.debug("Added book to database")
except Exception as e: except Exception as e:
logger.error(f"Failed to update availability: {e}") log.error(f"Failed to update availability: {e}")
logger.debug("Failed to update availability: " + str(e)) log.debug("Failed to update availability: " + str(e))
# time.sleep(5) # time.sleep(5)
item += 1 item += 1
self.updateSignal.emit(item, len(self.data)) self.updateSignal.emit(item, len(self.data))
logger.info("Worker thread finished") log.info("Worker thread finished")
# self.done.emit() # self.done.emit()
self.quit() self.quit()
@@ -129,7 +124,7 @@ class BookGrabberTest(QThread):
def __init__(self, appnr: int): def __init__(self, appnr: int):
super(BookGrabberTest, self).__init__(parent=None) super(BookGrabberTest, self).__init__(parent=None)
self.is_Running = True self.is_Running = True
logger.info("Starting worker thread") log.info("Starting worker thread")
self.data = None self.data = None
self.app_id = None self.app_id = None
self.prof_id = None self.prof_id = None
@@ -150,19 +145,19 @@ class BookGrabberTest(QThread):
self.data = data self.data = data
self.use_any = any_book self.use_any = any_book
self.use_exact = exact self.use_exact = exact
logger.info(f"Working on {len(self.data)} entries") log.info(f"Working on {len(self.data)} entries")
self.tstate = (self.app_id, self.prof_id, self.mode, self.data) self.tstate = (self.app_id, self.prof_id, self.mode, self.data)
logger.debug("State: " + str(self.tstate)) log.debug("State: " + str(self.tstate))
# logger.debug(self.tstate) # log.debug(self.tstate)
def run(self): def run(self):
item = 0 item = 0
iterdata = self.data iterdata = self.data
# logger.debug(iterdata) # log.debug(iterdata)
for entry in iterdata: for entry in iterdata:
# logger.debug(entry) # log.debug(entry)
signature = str(entry) signature = str(entry)
logger.info("Processing entry: " + signature) log.info("Processing entry: " + signature)
webdata = WebRequest().set_apparat(self.app_id).get_ppn(entry) webdata = WebRequest().set_apparat(self.app_id).get_ppn(entry)
if self.use_any: if self.use_any:
@@ -187,22 +182,22 @@ class BookGrabberTest(QThread):
# confirm lock is acquired # confirm lock is acquired
# get latest book id # get latest book id
logger.info("Added book to database") log.info("Added book to database")
state = 0 state = 0
for result in transformer.RDS_DATA: for result in transformer.RDS_DATA:
# logger.debug(result.RDS_LOCATION) # log.debug(result.RDS_LOCATION)
if str(self.app_id) in result.RDS_LOCATION: if str(self.app_id) in result.RDS_LOCATION:
state = 1 state = 1
break break
logger.info(f"State of {signature}: {state}") log.info(f"State of {signature}: {state}")
# logger.debug("updating availability of " + str(self.book_id) + " to " + str(state)) # log.debug("updating availability of " + str(self.book_id) + " to " + str(state))
self.results.append(bd) self.results.append(bd)
# time.sleep(5) # time.sleep(5)
item += 1 item += 1
self.updateSignal.emit(item, len(self.data)) self.updateSignal.emit(item, len(self.data))
logger.info("Worker thread finished") log.info("Worker thread finished")
# self.done.emit() # self.done.emit()
self.quit() self.quit()

23
src/backend/threads_autoadder.py
View File

@@ -5,21 +5,14 @@ from PyQt6.QtCore import QThread
from PyQt6.QtCore import pyqtSignal as Signal from PyQt6.QtCore import pyqtSignal as Signal
from src.backend import Database from src.backend import Database
from loguru import logger as log import loguru
import sys import sys
logger = log log = loguru.logger
logger.remove() log.remove()
logger.add("logs/application.log", rotation="1 week", retention="1 month", enqueue=True) log.add(sys.stdout)
logger.add( log.add("logs/application.log", rotation="1 MB", retention="10 days")
"logs/autoadder.log",
compression="zip",
rotation="1 week",
retention="1 month",
)
# logger.add(sys.stderr, format="{time} {level} {message}", level="INFO")
logger.add(sys.stdout)
# from src.transformers import RDS_AVAIL_DATA # from src.transformers import RDS_AVAIL_DATA
@@ -42,7 +35,7 @@ class AutoAdder(QThread):
def run(self): def run(self):
self.db = Database() self.db = Database()
# show the dialog, start the thread to gather data and dynamically update progressbar and listwidget # show the dialog, start the thread to gather data and dynamically update progressbar and listwidget
logger.info("Starting worker thread") log.info("Starting worker thread")
item = 0 item = 0
for entry in self.data: for entry in self.data:
try: try:
@@ -54,11 +47,11 @@ class AutoAdder(QThread):
except Exception as e: except Exception as e:
# print(e) # print(e)
logger.exception( log.exception(
f"The query failed with message {e} for signature {entry}" f"The query failed with message {e} for signature {entry}"
) )
continue continue
if item == len(self.data): if item == len(self.data):
logger.info("Worker thread finished") log.info("Worker thread finished")
# teminate thread # teminate thread
self.finished.emit() self.finished.emit()

26
src/backend/threads_availchecker.py
View File

@@ -9,18 +9,14 @@ from src.backend.database import Database
from src.logic.webrequest import BibTextTransformer, WebRequest from src.logic.webrequest import BibTextTransformer, WebRequest
# from src.transformers import RDS_AVAIL_DATA # from src.transformers import RDS_AVAIL_DATA
from loguru import logger as log import loguru
import sys import sys
logger = log log = loguru.logger
logger.remove() log.remove()
logger.add("logs/application.log", rotation="1 week", retention="1 month", enqueue=True) log.add(sys.stdout)
log.add( log.add("logs/application.log", rotation="1 MB", retention="10 days")
"logs/availthread.log",
)
# logger.add(sys.stderr, format="{time} {level} {message}", level="INFO")
logger.add(sys.stdout)
class AvailChecker(QThread): class AvailChecker(QThread):
@@ -33,8 +29,8 @@ class AvailChecker(QThread):
if links is None: if links is None:
links = [] links = []
super().__init__(parent) super().__init__(parent)
logger.info("Starting worker thread") log.info("Starting worker thread")
logger.info( log.info(
"Checking availability for " "Checking availability for "
+ str(links) + str(links)
+ " with appnumber " + " with appnumber "
@@ -44,7 +40,7 @@ class AvailChecker(QThread):
self.links = links self.links = links
self.appnumber = appnumber self.appnumber = appnumber
self.books = books self.books = books
logger.info( log.info(
f"Started worker with appnumber: {self.appnumber} and links: {self.links} and {len(self.books)} books..." f"Started worker with appnumber: {self.appnumber} and links: {self.links} and {len(self.books)} books..."
) )
time.sleep(2) time.sleep(2)
@@ -54,7 +50,7 @@ class AvailChecker(QThread):
state = 0 state = 0
count = 0 count = 0
for link in self.links: for link in self.links:
logger.info("Processing entry: " + str(link)) log.info("Processing entry: " + str(link))
data = WebRequest().set_apparat(self.appnumber).get_ppn(link).get_data() data = WebRequest().set_apparat(self.appnumber).get_ppn(link).get_data()
transformer = BibTextTransformer("RDS") transformer = BibTextTransformer("RDS")
rds = transformer.get_data(data).return_data("rds_availability") rds = transformer.get_data(data).return_data("rds_availability")
@@ -71,14 +67,14 @@ class AvailChecker(QThread):
if book["bookdata"].signature == link: if book["bookdata"].signature == link:
book_id = book["id"] book_id = book["id"]
break break
logger.info(f"State of {link}: " + str(state)) log.info(f"State of {link}: " + str(state))
# print("Updating availability of " + str(book_id) + " to " + str(state)) # print("Updating availability of " + str(book_id) + " to " + str(state))
self.db.setAvailability(book_id, state) self.db.setAvailability(book_id, state)
count += 1 count += 1
self.updateProgress.emit(count, len(self.links)) self.updateProgress.emit(count, len(self.links))
self.updateSignal.emit(item.callnumber, state) self.updateSignal.emit(item.callnumber, state)
logger.info("Worker thread finished") log.info("Worker thread finished")
# teminate thread # teminate thread
self.quit() self.quit()

2
src/logic/dataclass.py
View File

@@ -1,4 +1,4 @@
import re
from dataclasses import dataclass, field from dataclasses import dataclass, field
from enum import Enum from enum import Enum

47
src/logic/webrequest.py
View File

@@ -4,25 +4,20 @@ from bs4 import BeautifulSoup
# import sleep_and_retry decorator to retry requests # import sleep_and_retry decorator to retry requests
from ratelimit import limits, sleep_and_retry from ratelimit import limits, sleep_and_retry
from typing import Union, Any, Literal, Optional from typing import Union, Any, Optional
from src.logic.dataclass import BookData from src.logic.dataclass import BookData
from src.transformers import ARRAYData, BibTeXData, COinSData, RDSData, RISData from src.transformers import ARRAYData, BibTeXData, COinSData, RDSData, RISData
from src.transformers.transformers import RDS_AVAIL_DATA, RDS_GENERIC_DATA from src.transformers.transformers import RDS_AVAIL_DATA, RDS_GENERIC_DATA
import loguru
import sys import sys
from loguru import logger as log log = loguru.logger
log.remove()
logger = log log.add(sys.stdout)
logger.remove() log.add("logs/application.log", rotation="1 MB", retention="10 days")
logger.add("logs/application.log", rotation="1 week", retention="1 month", enqueue=True)
log.add(
f"logs/webrequest.log",
rotation="1 day",
compression="zip",
)
# logger.add(sys.stderr, format="{time} {level} {message}", level="INFO") # logger.add(sys.stderr, format="{time} {level} {message}", level="INFO")
logger.add(sys.stdout)
API_URL = "https://rds.ibs-bw.de/phfreiburg/opac/RDSIndexrecord/{}/" API_URL = "https://rds.ibs-bw.de/phfreiburg/opac/RDSIndexrecord/{}/"
@@ -53,20 +48,20 @@ class WebRequest:
self.ppn = None self.ppn = None
self.data = None self.data = None
self.timeout = 5 self.timeout = 5
logger.info("Initialized WebRequest") log.info("Initialized WebRequest")
@property @property
def use_any_book(self): def use_any_book(self):
"""use any book that matches the search term""" """use any book that matches the search term"""
self.use_any = True self.use_any = True
logger.info("Using any book") log.info("Using any book")
return self return self
def set_apparat(self, apparat: int): def set_apparat(self, apparat: int):
self.apparat = apparat self.apparat = apparat
if int(self.apparat) < 10: if int(self.apparat) < 10:
self.apparat = f"0{self.apparat}" self.apparat = f"0{self.apparat}"
logger.info(f"Set apparat to {self.apparat}") log.info(f"Set apparat to {self.apparat}")
return self return self
def get_ppn(self, signature: str): def get_ppn(self, signature: str):
@@ -100,12 +95,12 @@ class WebRequest:
response = requests.get(link, timeout=self.timeout) response = requests.get(link, timeout=self.timeout)
return response.text return response.text
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
logger.error(f"Request failed: {e}") log.error(f"Request failed: {e}")
return None return None
def get_data(self) -> Union[list[str], None]: def get_data(self) -> Union[list[str], None]:
links = self.get_book_links(self.ppn) links = self.get_book_links(self.ppn)
logger.debug(f"Links: {links}") log.debug(f"Links: {links}")
return_data: list[str] = [] return_data: list[str] = []
for link in links: for link in links:
result: str = self.search(link) # type:ignore result: str = self.search(link) # type:ignore
@@ -118,7 +113,7 @@ class WebRequest:
item_location = location.find( item_location = location.find(
"div", class_="col-xs-12 col-md-7 col-lg-8 rds-dl-panel" "div", class_="col-xs-12 col-md-7 col-lg-8 rds-dl-panel"
).text.strip() ).text.strip()
logger.debug(f"Item location: {item_location}") log.debug(f"Item location: {item_location}")
if self.use_any: if self.use_any:
pre_tag = soup.find_all("pre") pre_tag = soup.find_all("pre")
if pre_tag: if pre_tag:
@@ -127,7 +122,7 @@ class WebRequest:
return_data.append(data) return_data.append(data)
return return_data return return_data
else: else:
logger.error("No <pre> tag found") log.error("No <pre> tag found")
raise ValueError("No <pre> tag found") raise ValueError("No <pre> tag found")
elif f"Semesterapparat-{self.apparat}" in item_location: elif f"Semesterapparat-{self.apparat}" in item_location:
pre_tag = soup.find_all("pre") pre_tag = soup.find_all("pre")
@@ -138,10 +133,10 @@ class WebRequest:
return_data.append(data) return_data.append(data)
return return_data return return_data
else: else:
logger.error("No <pre> tag found") log.error("No <pre> tag found")
return return_data return return_data
else: else:
logger.error( log.error(
f"Signature {self.signature} not found in {item_location}" f"Signature {self.signature} not found in {item_location}"
) )
# return_data = [] # return_data = []
@@ -166,7 +161,7 @@ class WebRequest:
return_data.append(data) return_data.append(data)
return return_data return return_data
else: else:
logger.error("No <pre> tag found") log.error("No <pre> tag found")
return return_data return return_data
@@ -184,7 +179,7 @@ class BibTextTransformer:
self.field = None self.field = None
self.signature = None self.signature = None
if mode not in self.valid_modes: if mode not in self.valid_modes:
logger.error(f"Mode {mode} not valid") log.error(f"Mode {mode} not valid")
raise ValueError(f"Mode {mode} not valid") raise ValueError(f"Mode {mode} not valid")
self.data = None self.data = None
# self.bookdata = BookData(**self.data) # self.bookdata = BookData(**self.data)
@@ -274,7 +269,7 @@ class BibTextTransformer:
def cover(isbn): def cover(isbn):
test_url = f"https://www.buchhandel.de/cover/{isbn}/{isbn}-cover-m.jpg" test_url = f"https://www.buchhandel.de/cover/{isbn}/{isbn}-cover-m.jpg"
# logger.debug(test_url) # log.debug(test_url)
data = requests.get(test_url, stream=True) data = requests.get(test_url, stream=True)
return data.content return data.content
@@ -284,8 +279,8 @@ def get_content(soup, css_class):
if __name__ == "__main__": if __name__ == "__main__":
# logger.debug("main") # log.debug("main")
link = "CU 8500 K64" link = "CU 8500 K64"
data = WebRequest(71).get_ppn(link).get_data() data = WebRequest(71).get_ppn(link).get_data()
bib = BibTextTransformer("ARRAY").get_data().return_data() bib = BibTextTransformer("ARRAY").get_data().return_data()
logger.debug(bib) log.debug(bib)

26
src/logic/wordparser.py
View File

@@ -1,23 +1,17 @@
import pandas as pd import pandas as pd
from docx import Document from docx import Document
from dataclasses import dataclass from dataclasses import dataclass
import sys
from loguru import logger as log
from src.backend import Semester from src.backend import Semester
from typing import Union, Any from typing import Union, Any
logger = log import loguru
logger.remove() import sys
logger.add("logs/wordparser.log", rotation="1 week", retention="1 month", enqueue=True)
log.add( log = loguru.logger
f"logs/application.log", log.remove()
rotation="1 day", log.add(sys.stdout)
compression="zip", log.add("logs/application.log", rotation="1 MB", retention="10 days")
enqueue=True,
)
# logger.add(sys.stderr, format="{time} {level} {message}", level="INFO")
logger.add(sys.stdout)
letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
@@ -218,12 +212,12 @@ def elsa_word_to_csv(path: str):
data = [ data = [
row for row in df.itertuples(index=False, name=None) if row != tuples[doctype] row for row in df.itertuples(index=False, name=None) if row != tuples[doctype]
] ]
# logger.debug(data) # log.debug(data)
return tuple_to_dict(data, doctype), doctype return tuple_to_dict(data, doctype), doctype
def word_to_semap(word_path: str) -> SemapDocument: def word_to_semap(word_path: str) -> SemapDocument:
logger.info("Parsing Word Document {}", word_path) log.info("Parsing Word Document {}", word_path)
semap = SemapDocument() semap = SemapDocument()
df = word_docx_to_csv(word_path) df = word_docx_to_csv(word_path)
apparatdata = df[0] apparatdata = df[0]
@@ -258,7 +252,7 @@ def word_to_semap(word_path: str) -> SemapDocument:
continue continue
else: else:
booklist.append(book) booklist.append(book)
logger.info("Found {} books", len(booklist)) log.info("Found {} books", len(booklist))
semap.books = booklist semap.books = booklist
return semap return semap

22
src/transformers/transformers.py
View File

@@ -8,19 +8,13 @@ from typing import Any, List
from src.logic.dataclass import BookData from src.logic.dataclass import BookData
import loguru
import sys import sys
from loguru import logger as log
logger = log log = loguru.logger
logger.remove() log.remove()
logger.add("logs/application.log", rotation="1 week", retention="1 month", enqueue=True) log.add(sys.stdout)
log.add( log.add("logs/application.log", rotation="1 MB", retention="10 days")
"logs/transformers.log",
enqueue=True,
)
# logger.add(sys.stderr, format="{time} {level} {message}", level="INFO")
logger.add(sys.stdout)
###Pydatnic models ###Pydatnic models
@@ -143,8 +137,8 @@ class ARRAYData:
return data return data
except Exception: except Exception:
# # logger.debug(f"ARRAYData.transform failed, {source}, {search}") # # log.debug(f"ARRAYData.transform failed, {source}, {search}")
logger.exception(f"ARRAYData.transform failed, no string {search}") log.exception(f"ARRAYData.transform failed, no string {search}")
return "" return ""
def _get_list_entry(source: str, search: str, entry: str) -> str: def _get_list_entry(source: str, search: str, entry: str) -> str:
@@ -521,4 +515,4 @@ if __name__ == "__main__":
ret = RDSData().transform(data) ret = RDSData().transform(data)
data = ret.return_data("rds_availability") data = ret.return_data("rds_availability")
# logger.debug(data) # log.debug(data)

25
src/ui/dialogs/__init__.py
View File

@@ -1,32 +1,31 @@
__all__ = [ __all__ = [
"add_bookdata_ui", "BookDataUI",
"edit_bookdata_ui", "LoginDialog",
"login_ui",
"Mail_Dialog", "Mail_Dialog",
"MailTemplateDialog", "MailTemplateDialog",
"medienadder_ui", "MedienAdder",
"parsed_titles_ui", "ParsedTitles",
"popus_confirm", "popus_confirm",
"reminder_ui", "ReminderDialog",
"Settings",
"About", "About",
"ElsaGenConfirm", "ElsaGenConfirm",
"ElsaAddEntry", "ElsaAddEntry",
"ApparatExtendDialog", "ApparatExtendDialog",
"DocumentPrintDialog", "DocumentPrintDialog",
"Settings",
] ]
from .bookdata import BookDataUI as edit_bookdata_ui from .bookdata import BookDataUI
from .login import LoginDialog as login_ui from .login import LoginDialog
from .mail import Mail_Dialog from .mail import Mail_Dialog
from .mailTemplate import MailTemplateDialog from .mailTemplate import MailTemplateDialog
from .medienadder import MedienAdder as medienadder_ui from .medienadder import MedienAdder
from .parsed_titles import ParsedTitles as parsed_titles_ui from .parsed_titles import ParsedTitles
from .popup_confirm import ConfirmDialog as popus_confirm from .popup_confirm import ConfirmDialog as popus_confirm
from .reminder import ReminderDialog as reminder_ui from .reminder import ReminderDialog
from .about import About from .about import About
from .elsa_gen_confirm import ElsaGenConfirm from .elsa_gen_confirm import ElsaGenConfirm
from .elsa_add_entry import ElsaAddEntry from .elsa_add_entry import ElsaAddEntry
from .app_ext import ApparatExtendDialog from .app_ext import ApparatExtendDialog
from .docuprint import DocumentPrintDialog, launch from .docuprint import DocumentPrintDialog
from .settings import Settings from .settings import Settings

2
src/ui/dialogs/elsa_add_entry.py
View File

@@ -118,7 +118,7 @@ class ElsaAddEntry(QtWidgets.QDialog, Ui_Dialog):
if table["type"] == "zs": if table["type"] == "zs":
book = zot.createBook(table["isbn"]) book = zot.createBook(table["isbn"])
res_key = zot.createJournalArticle(book, table) res_key = zot.createJournalArticle(book, table)
logger.debug(book) log.debug(book)
a_lastname = table["section_author"].split(";")[0].strip().split(",")[0] a_lastname = table["section_author"].split(";")[0].strip().split(",")[0]
a_firstname = table["section_author"].split(";")[0].strip().split(",")[1] a_firstname = table["section_author"].split(";")[0].strip().split(",")[1]
author = f"{a_lastname}, {a_firstname[0]}" author = f"{a_lastname}, {a_firstname[0]}"

17
src/ui/dialogs/login.py
View File

@@ -6,18 +6,15 @@ from PyQt6 import QtCore, QtWidgets
from src.backend.admin_console import AdminCommands from src.backend.admin_console import AdminCommands
from src.backend.database import Database from src.backend.database import Database
from .dialog_sources.Ui_login import Ui_Dialog from .dialog_sources.login_ui import Ui_Dialog
import sys import sys
from loguru import logger as log import loguru
from src import Icon from src import Icon
logger = log log = loguru.logger
logger.remove() log.remove()
logger.add("logs/application.log", rotation="1 week", retention="1 month", enqueue=True) log.add(sys.stdout)
log.add("logs/application.log", rotation="1 MB", retention="10 days")
# logger.add(sys.stderr, format="{time} {level} {message}", level="INFO")
logger.add(sys.stdout)
class LoginDialog(Ui_Dialog): class LoginDialog(Ui_Dialog):
@@ -86,7 +83,7 @@ class LoginDialog(Ui_Dialog):
if self.db.login(username, hashed_password): if self.db.login(username, hashed_password):
self.lresult = 1 # Indicate successful login self.lresult = 1 # Indicate successful login
self.lusername = username self.lusername = username
logger.success(f"User {username} logged in.") log.success(f"User {username} logged in.")
self.dialog.accept() self.dialog.accept()
else: else:

33
src/ui/dialogs/mail.py
View File

@@ -8,21 +8,14 @@ from src import Icon, settings as config
from .dialog_sources.Ui_mail_preview import Ui_eMailPreview as MailPreviewDialog from .dialog_sources.Ui_mail_preview import Ui_eMailPreview as MailPreviewDialog
from .mailTemplate import MailTemplateDialog from .mailTemplate import MailTemplateDialog
import loguru
import sys import sys
from loguru import logger as log
logger = log log = loguru.logger
logger.remove() log.remove()
logger.add("logs/application.log", rotation="1 week", retention="1 month", enqueue=True) log.add(sys.stdout)
log.add( log.add("logs/application.log", rotation="1 MB", retention="10 days")
"logs/mail.log",
rotation="1 day",
compression="zip",
enqueue=True,
)
# logger.add(sys.stderr, format="{time} {level} {message}", level="INFO")
logger.add(sys.stdout)
empty_signature = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> empty_signature = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
@@ -60,7 +53,7 @@ class Mail_Dialog(QtWidgets.QDialog, MailPreviewDialog):
super().__init__(parent) super().__init__(parent)
self.setupUi(self) self.setupUi(self)
logger.info("Setting up mail dialog") log.info("Setting up mail dialog")
self.appid = app_id self.appid = app_id
self.appname = app_name self.appname = app_name
self.subject = app_subject self.subject = app_subject
@@ -92,7 +85,7 @@ class Mail_Dialog(QtWidgets.QDialog, MailPreviewDialog):
self.btn_okay.clicked.connect(self.createAndSendMail) self.btn_okay.clicked.connect(self.createAndSendMail)
def open_new_template(self): def open_new_template(self):
logger.info("Opening new template dialog") log.info("Opening new template dialog")
# TODO: implement new mail template dialog # TODO: implement new mail template dialog
dialog = MailTemplateDialog() dialog = MailTemplateDialog()
dialog.updateSignal.connect(self.load_mail_templates) dialog.updateSignal.connect(self.load_mail_templates)
@@ -111,9 +104,9 @@ Tel.: 0761/682-778 | 07617682-545"""
def load_mail_templates(self): def load_mail_templates(self):
# print("loading mail templates") # print("loading mail templates")
logger.info("Loading mail templates") log.info("Loading mail templates")
mail_templates = os.listdir("mail_vorlagen") mail_templates = os.listdir("mail_vorlagen")
logger.info(f"Mail templates: {mail_templates}") log.info(f"Mail templates: {mail_templates}")
self.comboBox.clear() self.comboBox.clear()
for template in mail_templates: for template in mail_templates:
self.comboBox.addItem(template) self.comboBox.addItem(template)
@@ -132,10 +125,10 @@ Tel.: 0761/682-778 | 07617682-545"""
return f"Guten Tag {name}," return f"Guten Tag {name},"
def set_mail(self): def set_mail(self):
logger.info("Setting mail") log.info("Setting mail")
email_template = self.comboBox.currentText() email_template = self.comboBox.currentText()
if email_template == "": if email_template == "":
logger.debug("No mail template selected") log.debug("No mail template selected")
return return
with open(f"mail_vorlagen/{email_template}", "r", encoding="utf-8") as f: with open(f"mail_vorlagen/{email_template}", "r", encoding="utf-8") as f:
mail_template = f.read() mail_template = f.read()
@@ -160,7 +153,7 @@ Tel.: 0761/682-778 | 07617682-545"""
self.mail_body.setHtml(mail_html) self.mail_body.setHtml(mail_html)
def createAndSendMail(self): def createAndSendMail(self):
logger.info("Sending mail") log.info("Sending mail")
import smtplib import smtplib
from email.mime.multipart import MIMEMultipart from email.mime.multipart import MIMEMultipart
from email.mime.text import MIMEText from email.mime.text import MIMEText
@@ -197,7 +190,7 @@ Tel.: 0761/682-778 | 07617682-545"""
# print("Mail sent") # print("Mail sent")
# end active process # end active process
server.quit() server.quit()
logger.info("Mail sent, closing connection to server and dialog") log.info("Mail sent, closing connection to server and dialog")
# close the dialog # close the dialog
self.accept() self.accept()

8
src/ui/dialogs/mailTemplate.py
View File

@@ -52,7 +52,7 @@ class MailTemplateDialog(QtWidgets.QDialog, NewMailTemplateDesignerDialog):
self.buttonBox.button( self.buttonBox.button(
QtWidgets.QDialogButtonBox.StandardButton.Cancel QtWidgets.QDialogButtonBox.StandardButton.Cancel
).clicked.connect(self.closeNow) ).clicked.connect(self.closeNow)
logger.info("Mail template dialog setup complete") log.info("Mail template dialog setup complete")
def save_template(self): def save_template(self):
# print("save triggered") # print("save triggered")
@@ -66,11 +66,11 @@ class MailTemplateDialog(QtWidgets.QDialog, NewMailTemplateDesignerDialog):
dialog.setWindowIcon(Icon("save").icon) dialog.setWindowIcon(Icon("save").icon)
save = dialog.exec() save = dialog.exec()
template_name = dialog.textValue() template_name = dialog.textValue()
logger.info("Saving template") log.info("Saving template")
if template_name != "" and save == 1: if template_name != "" and save == 1:
template = template_name + ".eml" template = template_name + ".eml"
if template in os.listdir("mail_vorlagen"): if template in os.listdir("mail_vorlagen"):
logger.error("Template already exists") log.error("Template already exists")
# warning dialog # warning dialog
dialog = QtWidgets.QMessageBox() dialog = QtWidgets.QMessageBox()
dialog.setIcon(QtWidgets.QMessageBox.Icon.Warning) dialog.setIcon(QtWidgets.QMessageBox.Icon.Warning)
@@ -110,7 +110,7 @@ Content-Transfer-Encoding: 8bit
f.write(mail) f.write(mail)
self.updateSignal.emit() self.updateSignal.emit()
self.close() self.close()
logger.success(f"Template {template} saved successfully") log.success(f"Template {template} saved successfully")
else: else:
# warning dialog # warning dialog
dialog = QtWidgets.QMessageBox() dialog = QtWidgets.QMessageBox()

2
src/ui/dialogs/medienadder.py
View File

@@ -1,6 +1,6 @@
from PyQt6 import QtCore, QtGui, QtWidgets from PyQt6 import QtCore, QtGui, QtWidgets
from .dialog_sources.Ui_medianadder import Ui_Dialog from .dialog_sources.medianadder_ui import Ui_Dialog
from src import Icon from src import Icon

7
src/ui/dialogs/parsed_titles.py
View File

@@ -3,15 +3,14 @@ from PyQt6 import QtWidgets
from src.backend import AutoAdder from src.backend import AutoAdder
from .dialog_sources.Ui_parsed_titles import Ui_Form from .dialog_sources.parsed_titles_ui import Ui_Form
import loguru import loguru
import sys import sys
log = loguru.logger log = loguru.logger
log.remove() log.remove()
log.add("application.log", rotation="1 week", retention="1 month") log.add(sys.stdout)
log.add(sys.stdout, level="INFO") log.add("logs/application.log", rotation="1 MB", retention="10 days")
class ParsedTitles(QtWidgets.QWidget, Ui_Form): class ParsedTitles(QtWidgets.QWidget, Ui_Form):
def __init__(self, parent=None): def __init__(self, parent=None):

2
src/ui/dialogs/reminder.py
View File

@@ -1,6 +1,6 @@
from PyQt6 import QtWidgets from PyQt6 import QtWidgets
from .dialog_sources.Ui_reminder import Ui_Erinnerung as Ui_Dialog from .dialog_sources.reminder_ui import Ui_Erinnerung as Ui_Dialog
from src import Icon from src import Icon
import datetime as date import datetime as date

22
src/ui/dialogs/settings.py
View File

@@ -1,19 +1,15 @@
from PyQt6 import QtCore, QtGui, QtWidgets from PyQt6 import QtCore, QtGui, QtWidgets
from src import Icon, settings from src import Icon, settings
from .dialog_sources.Ui_settings import Ui_Dialog as _settings from .dialog_sources.settings_ui import Ui_Dialog as _settings
from src.ui.widgets.iconLine import IconWidget from src.ui.widgets.iconLine import IconWidget
import loguru
import sys import sys
from loguru import logger as log
logger = log log = loguru.logger
logger.remove() log.remove()
logger.add("logs/application.log", rotation="1 week", retention="1 month", enqueue=True) log.add(sys.stdout)
log.add( log.add("logs/application.log", rotation="1 MB", retention="10 days")
f"logs/settings.log",
)
# logger.add(sys.stderr, format="{time} {level} {message}", level="INFO")
logger.add(sys.stdout)
base = """'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> base = """'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
@@ -80,7 +76,7 @@ class Settings(QtWidgets.QDialog, _settings):
self.toolBox.setItemIcon(2, Icon("mail").icon) self.toolBox.setItemIcon(2, Icon("mail").icon)
self.toolBox.setItemIcon(3, Icon("icons").icon) self.toolBox.setItemIcon(3, Icon("icons").icon)
logger.info("Settings dialog opened, data loaded") log.info("Settings dialog opened, data loaded")
def load_config(self): def load_config(self):
self.db_name.setText(settings.database.name) self.db_name.setText(settings.database.name)
@@ -117,7 +113,7 @@ class Settings(QtWidgets.QDialog, _settings):
self.vertical_icons.addWidget(icon_widget) self.vertical_icons.addWidget(icon_widget)
def change_color(self, lineedit): def change_color(self, lineedit):
logger.debug("Changing color for {}", lineedit.text()) log.debug("Changing color for {}", lineedit.text())
colorDialog = QtWidgets.QColorDialog() colorDialog = QtWidgets.QColorDialog()
colorDialog.setSizePolicy() colorDialog.setSizePolicy()
color = colorDialog.getColor() color = colorDialog.getColor()
@@ -191,7 +187,7 @@ class Settings(QtWidgets.QDialog, _settings):
self.save_path.setText(file_dialog.selectedFiles()[0]) self.save_path.setText(file_dialog.selectedFiles()[0])
def debug_mode(self): def debug_mode(self):
logger.debug(self.editSignature.toHtml()) log.debug(self.editSignature.toHtml())
def return_data(self): def return_data(self):
port = self.smtp_port.text() port = self.smtp_port.text()

2
src/ui/semesterapparat_ui.ui
View File

@@ -505,7 +505,7 @@
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
</property> </property>
<property name="title"> <property name="title">
<string>Apparatsdetails</string> <string>SemesterApparatsdetails</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>

4
src/ui/semesterapparat_ui_ui.py
View File

@@ -1,6 +1,6 @@
# Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\SemesterapparatsManager\src\ui\semesterapparat_ui.ui' # Form implementation generated from reading ui file 'c:\Users\aky547\GitHub\SemesterapparatsManager\src\ui\semesterapparat_ui.ui'
# #
# Created by: PyQt6 UI code generator 6.8.0 # Created by: PyQt6 UI code generator 6.9.0
# #
# WARNING: Any manual changes made to this file will be lost when pyuic6 is # WARNING: Any manual changes made to this file will be lost when pyuic6 is
# run again. Do not edit this file unless you know what you are doing. # run again. Do not edit this file unless you know what you are doing.
@@ -922,7 +922,7 @@ class Ui_MainWindow(object):
item = self.tableWidget_apparat_media.horizontalHeaderItem(6) item = self.tableWidget_apparat_media.horizontalHeaderItem(6)
item.setText(_translate("MainWindow", "Link")) item.setText(_translate("MainWindow", "Link"))
self.label.setText(_translate("MainWindow", " Medienliste")) self.label.setText(_translate("MainWindow", " Medienliste"))
self.app_group_box.setTitle(_translate("MainWindow", "Apparatsdetails")) self.app_group_box.setTitle(_translate("MainWindow", "SemesterApparatsdetails"))
item = self.document_list.horizontalHeaderItem(0) item = self.document_list.horizontalHeaderItem(0)
item.setText(_translate("MainWindow", "Dokumentname")) item.setText(_translate("MainWindow", "Dokumentname"))
item = self.document_list.horizontalHeaderItem(1) item = self.document_list.horizontalHeaderItem(1)

178
src/ui/userInterface.py
View File

@@ -32,15 +32,15 @@ from src.logic import (
) )
from src.ui.dialogs import ( from src.ui.dialogs import (
popus_confirm, popus_confirm,
medienadder_ui, MedienAdder,
About, About,
ApparatExtendDialog, ApparatExtendDialog,
Mail_Dialog, Mail_Dialog,
Settings, Settings,
edit_bookdata_ui, BookDataUI,
login_ui, LoginDialog,
parsed_titles_ui, ParsedTitles,
reminder_ui, ReminderDialog,
DocumentPrintDialog, DocumentPrintDialog,
) )
from src.ui.widgets import ( from src.ui.widgets import (
@@ -55,28 +55,27 @@ from src.ui.widgets import (
) )
from datetime import datetime from datetime import datetime
from loguru import logger as log
logger = log import loguru
logger.remove()
logger.add("logs/application.log", rotation="1 week", enqueue=True) log = loguru.logger
log.remove()
log.add(sys.stdout)
log.add("logs/application.log", rotation="1 MB", retention="10 days")
log.add( log.add(
f"logs/{datetime.now().strftime('%Y-%m-%d')}.log", f"logs/{datetime.now().strftime('%Y-%m-%d')}.log",
rotation="1 day", rotation="1 day",
compression="zip", retention="1 month",
) )
# logger.add(sys.stderr, format="{time} {level} {message}", level="INFO")
logger.add(sys.stdout)
valid_input = (0, 0, 0, 0, 0, 0) valid_input = (0, 0, 0, 0, 0, 0)
class Ui(Ui_Semesterapparat): class Ui(Ui_Semesterapparat):
# use the Ui_MainWindow class from mainwindow.py # use the Ui_MainWindow class from mainwindow.py
def __init__(self, MainWindow, username: str) -> None: # type:ignore def __init__(self, MainWindow, username: str) -> None: # type:ignore
logger.info("Starting Semesterapparatsmanagement") log.info("Starting Semesterapparatsmanagement")
super().__init__() super().__init__()
self.active_user = username self.active_user = username
self.setupUi(MainWindow) # type:ignore self.setupUi(MainWindow) # type:ignore
@@ -116,7 +115,6 @@ class Ui(Ui_Semesterapparat):
self.tableWidget_apparate.horizontalHeader().setSectionResizeMode( # type:ignore self.tableWidget_apparate.horizontalHeader().setSectionResizeMode( # type:ignore
QtWidgets.QHeaderView.ResizeMode.Stretch QtWidgets.QHeaderView.ResizeMode.Stretch
) )
self.tableWidget_apparate.setSortingEnabled(True)
self.saveandcreate.hide() self.saveandcreate.hide()
# Actions # Actions
@@ -142,7 +140,7 @@ class Ui(Ui_Semesterapparat):
self.prof_tel_nr.setValidator( self.prof_tel_nr.setValidator(
QtGui.QRegularExpressionValidator(QtCore.QRegularExpression(r"^\d{3,14}")) QtGui.QRegularExpressionValidator(QtCore.QRegularExpression(r"^\d{3,14}"))
) )
# #logger.debug(self.prof_tel_nr.maxLength()) # #log.debug(self.prof_tel_nr.maxLength())
self.app_fach.setValidator( # validator to allow typing in the app_fach field self.app_fach.setValidator( # validator to allow typing in the app_fach field
QtGui.QRegularExpressionValidator( QtGui.QRegularExpressionValidator(
QtCore.QRegularExpression(r"[a-zA-Z0-9\s\W]+") QtCore.QRegularExpression(r"[a-zA-Z0-9\s\W]+")
@@ -160,7 +158,7 @@ class Ui(Ui_Semesterapparat):
) )
self.tableWidget_apparate.doubleClicked.connect(self.load_app_data) # type:ignore self.tableWidget_apparate.doubleClicked.connect(self.load_app_data) # type:ignore
# #logger.debug(f"user:{self.active_user}") # #log.debug(f"user:{self.active_user}")
userrole = self.db.getRole(self.active_user) userrole = self.db.getRole(self.active_user)
# hide admin interface when non-admin is logged in # hide admin interface when non-admin is logged in
if userrole == "admin": if userrole == "admin":
@@ -239,7 +237,7 @@ class Ui(Ui_Semesterapparat):
self.admin_action.setTitle("") self.admin_action.setTitle("")
# Create instances to be used by the threads in the application # Create instances to be used by the threads in the application
self.bookGrabber = [] self.bookGrabber: list[QThread] = []
self.availChecker = None self.availChecker = None
self.mail_thread = None self.mail_thread = None
self.autoGrabber = None self.autoGrabber = None
@@ -260,7 +258,7 @@ class Ui(Ui_Semesterapparat):
self.valid_check_semester.clicked.connect(self.display_valid_semester) # type:ignore self.valid_check_semester.clicked.connect(self.display_valid_semester) # type:ignore
def create_doc(self): def create_doc(self):
logger.debug("Creating document") log.debug("Creating document")
# open DocumentPrintDialog # open DocumentPrintDialog
dialog = DocumentPrintDialog(self.MainWindow) dialog = DocumentPrintDialog(self.MainWindow)
dialog.show() dialog.show()
@@ -332,7 +330,7 @@ class Ui(Ui_Semesterapparat):
self.app_fach.addItems([subject[1] for subject in self.db.getSubjects()]) self.app_fach.addItems([subject[1] for subject in self.db.getSubjects()])
def open_documentation(self): def open_documentation(self):
logger.info("Opening Documentation") log.info("Opening Documentation")
if not self.docu.isRunning(): if not self.docu.isRunning():
self.docu.start() self.docu.start()
webbrowser.open("http://localhost:8000") webbrowser.open("http://localhost:8000")
@@ -357,7 +355,7 @@ class Ui(Ui_Semesterapparat):
statistics.updateCalendar.connect(self.update_calendar) statistics.updateCalendar.connect(self.update_calendar)
stats_layout.addWidget(statistics) stats_layout.addWidget(statistics)
# #logger.debug("searchpage") # #log.debug("searchpage")
if self.tabWidget.currentIndex() == 0: # Apparate if self.tabWidget.currentIndex() == 0: # Apparate
# clear all entries from the table # clear all entries from the table
self.tableWidget_apparate.setRowCount(0) self.tableWidget_apparate.setRowCount(0)
@@ -375,7 +373,7 @@ class Ui(Ui_Semesterapparat):
widget.deleteLater() widget.deleteLater()
elsa_layout.addWidget(ElsaDialog()) elsa_layout.addWidget(ElsaDialog())
# logger.debug("added") # log.debug("added")
pass pass
def generateSemester(self, today=False): def generateSemester(self, today=False):
@@ -418,9 +416,9 @@ class Ui(Ui_Semesterapparat):
self.prof_mail.setText(appdata.prof.mail) self.prof_mail.setText(appdata.prof.mail)
self.prof_tel_nr.setText(appdata.prof.telnr) self.prof_tel_nr.setText(appdata.prof.telnr)
self.app_name.setText(appdata.apparat.name) self.app_name.setText(appdata.apparat.name)
# #logger.debug("changing dropdown app_fach from '' to ", appdata.app_fach) # #log.debug("changing dropdown app_fach from '' to ", appdata.app_fach)
self.app_fach.setCurrentText(appdata.apparat.subject) self.app_fach.setCurrentText(appdata.apparat.subject)
# #logger.debug("changed dropdown app_fach to ", self.app_fach.currentText()) # #log.debug("changed dropdown app_fach to ", self.app_fach.currentText())
self.sem_year.setText(appdata.apparat.get_semester.split(" ")[1]) self.sem_year.setText(appdata.apparat.get_semester.split(" ")[1])
match appdata.apparat.get_semester.split(" ")[0]: match appdata.apparat.get_semester.split(" ")[0]:
case "SoSe": case "SoSe":
@@ -485,7 +483,7 @@ class Ui(Ui_Semesterapparat):
return popup.result() return popup.result()
def thread_check(self): def thread_check(self):
# #logger.debug("Thread started") # #log.debug("Thread started")
self.prof_mail.textChanged.connect(self.validate_prof_mail) self.prof_mail.textChanged.connect(self.validate_prof_mail)
self.drpdwn_prof_name.editTextChanged.connect(self.validate_prof_name) self.drpdwn_prof_name.editTextChanged.connect(self.validate_prof_name)
self.prof_tel_nr.textChanged.connect(self.validate_prof_tel) self.prof_tel_nr.textChanged.connect(self.validate_prof_tel)
@@ -596,7 +594,7 @@ class Ui(Ui_Semesterapparat):
return return
selected_prof = self.drpdwn_prof_name.currentText() selected_prof = self.drpdwn_prof_name.currentText()
data = self.db.getProfData(selected_prof) data = self.db.getProfData(selected_prof)
# logger.debug(data) # log.debug(data)
prof_title = data.title prof_title = data.title
if prof_title == "None": if prof_title == "None":
prof_title = "Kein Titel" prof_title = "Kein Titel"
@@ -700,20 +698,20 @@ class Ui(Ui_Semesterapparat):
def update_progress_label(self, curr: int, total: int): def update_progress_label(self, curr: int, total: int):
text = f"Medium {curr}/{total}" text = f"Medium {curr}/{total}"
logger.info(text) log.info(text)
self.progress_label.setText(text) self.progress_label.setText(text)
# update tableWidget_apparat_media # update tableWidget_apparat_media
self.update_app_media_list() self.update_app_media_list()
def hide_progress_label(self): def hide_progress_label(self):
logger.info("Finished adding media, hiding progress label") log.info("Finished adding media, hiding progress label")
self.progress_label.hide() self.progress_label.hide()
self.progress_label.setText("Bitte warten...") self.progress_label.setText("Bitte warten...")
self.line_2.hide() self.line_2.hide()
self.label_info.hide() self.label_info.hide()
def btn_add_medium(self): def btn_add_medium(self):
media = medienadder_ui() media = MedienAdder()
media.exec() media.exec()
mode = media.mode mode = media.mode
data = media.data data = media.data
@@ -733,7 +731,7 @@ class Ui(Ui_Semesterapparat):
app_id = self.active_apparat app_id = self.active_apparat
prof_id = self.db.getProfId(self.profdata) prof_id = self.db.getProfId(self.profdata)
logger.debug(prof_id) log.debug(prof_id)
# check if app_id is in database # check if app_id is in database
if self.db.checkApparatExistsById(app_id) is False: if self.db.checkApparatExistsById(app_id) is False:
# create apparat # create apparat
@@ -756,7 +754,7 @@ class Ui(Ui_Semesterapparat):
bookGrabber.start() bookGrabber.start()
while bookGrabber.isRunning(): while bookGrabber.isRunning():
# #logger.debug("waiting for thread to finish") # #log.debug("waiting for thread to finish")
QtWidgets.QApplication.processEvents() QtWidgets.QApplication.processEvents()
# self.__clear_fields() # self.__clear_fields()
@@ -802,7 +800,7 @@ class Ui(Ui_Semesterapparat):
# thread = QThread() # thread = QThread()
appnumber = self.active_apparat appnumber = self.active_apparat
# #logger.debug(links) # #log.debug(links)
self.availChecker = AvailChecker(links, appnumber, books=books) self.availChecker = AvailChecker(links, appnumber, books=books)
# availcheck.moveToThread(thread) # availcheck.moveToThread(thread)
# availcheck.finished.connect(thread.quit) # availcheck.finished.connect(thread.quit)
@@ -851,7 +849,7 @@ class Ui(Ui_Semesterapparat):
app_id, prof_id, deleted app_id, prof_id, deleted
) )
# # #logger.debug(books) # # #log.debug(books)
# take the dataclass from the tuple # take the dataclass from the tuple
# booklist:list[BookData]=[book[0] for book in books] # booklist:list[BookData]=[book[0] for book in books]
self.tableWidget_apparat_media.setRowCount(0) self.tableWidget_apparat_media.setRowCount(0)
@@ -860,7 +858,7 @@ class Ui(Ui_Semesterapparat):
book_data = book["bookdata"] book_data = book["bookdata"]
availability = book["available"] availability = book["available"]
# bd = BookData().from_string(book) # bd = BookData().from_string(book)
# # #logger.debug(bd, type(bd)) # # #log.debug(bd, type(bd))
# create a new row below the last one # create a new row below the last one
self.tableWidget_apparat_media.insertRow( self.tableWidget_apparat_media.insertRow(
self.tableWidget_apparat_media.rowCount() self.tableWidget_apparat_media.rowCount()
@@ -954,11 +952,11 @@ class Ui(Ui_Semesterapparat):
self.drpdwn_prof_name.addItem(prof) self.drpdwn_prof_name.addItem(prof)
def add_document(self): def add_document(self):
# #logger.debug("Add document") # #log.debug("Add document")
picker = FilePicker() picker = FilePicker()
files = picker.pick_files() files = picker.pick_files()
for file in files: for file in files:
# #logger.debug(file) # #log.debug(file)
filename = file.split("/")[-1] filename = file.split("/")[-1]
filetype = filename.split(".")[-1] filetype = filename.split(".")[-1]
self.document_list.insertRow(0) self.document_list.insertRow(0)
@@ -1008,7 +1006,7 @@ class Ui(Ui_Semesterapparat):
def __open_dialog(signatures: list[str]): def __open_dialog(signatures: list[str]):
dialog = QtWidgets.QDialog() dialog = QtWidgets.QDialog()
frame = parsed_titles_ui() frame = ParsedTitles()
frame.setupUi(dialog) frame.setupUi(dialog)
dialog.show() dialog.show()
frame.signatures = signatures frame.signatures = signatures
@@ -1030,7 +1028,7 @@ class Ui(Ui_Semesterapparat):
else: else:
# if file is selected, check for books in the file # if file is selected, check for books in the file
if self.document_list.currentRow() != -1: if self.document_list.currentRow() != -1:
# #logger.debug("File selected") # #log.debug("File selected")
file = self.document_list.item( file = self.document_list.item(
self.document_list.currentRow(), 3 self.document_list.currentRow(), 3
).text() ).text()
@@ -1084,7 +1082,7 @@ class Ui(Ui_Semesterapparat):
bookdata=book, app_id=app_id, prof_id=prof_id bookdata=book, app_id=app_id, prof_id=prof_id
) )
self.update_app_media_list() self.update_app_media_list()
# #logger.debug(len(signatures)) # #log.debug(len(signatures))
def extract_document_data(self) -> Union[list[str], SemapDocument]: def extract_document_data(self) -> Union[list[str], SemapDocument]:
file_type = self.document_list.item(self.document_list.currentRow(), 1).text() file_type = self.document_list.item(self.document_list.currentRow(), 1).text()
@@ -1093,7 +1091,7 @@ class Ui(Ui_Semesterapparat):
).text() ).text()
file_name = self.document_list.item(self.document_list.currentRow(), 0).text() file_name = self.document_list.item(self.document_list.currentRow(), 0).text()
file = file_location file = file_location
logger.info("File selected: {}, {}", file_name, file_location) log.info("File selected: {}, {}", file_name, file_location)
if file_location == "Database": if file_location == "Database":
# create warning, then return # create warning, then return
self.db.recreateFile(file_name, self.active_apparat, filetype=file_type) self.db.recreateFile(file_name, self.active_apparat, filetype=file_type)
@@ -1107,8 +1105,8 @@ class Ui(Ui_Semesterapparat):
return signatures return signatures
if file_type == "docx": if file_type == "docx":
data = word_to_semap(file) data = word_to_semap(file)
logger.info("Converted data from semap file") log.info("Converted data from semap file")
logger.debug("Got the data: {}", data) log.debug("Got the data: {}", data)
return data return data
@@ -1132,17 +1130,17 @@ class Ui(Ui_Semesterapparat):
for runner in self.bookGrabber: for runner in self.bookGrabber:
if not runner.isRunning(): if not runner.isRunning():
runner.deleteLater() runner.deleteLater()
# #logger.debug("Checking file") # #log.debug("Checking file")
# get active app_id and prof_id # get active app_id and prof_id
self.tableWidget_apparate.setEnabled(False) self.tableWidget_apparate.setEnabled(False)
self.tableWidget_apparate.setToolTip( self.tableWidget_apparate.setToolTip(
"Bitte warten, bis alle Medien hinzugefügt wurden" "Bitte warten, bis alle Medien hinzugefügt wurden"
) )
app_id = self.active_apparat app_id = self.active_apparat
logger.debug(self.profdata) log.debug(self.profdata)
prof_id = self.db.getProfId(self.profdata) prof_id = self.db.getProfId(self.profdata)
logger.debug("Prof id: {}", prof_id) log.debug("Prof id: {}", prof_id)
# check if apparat in database # check if apparat in database
if prof_id is None: if prof_id is None:
prof = Prof( prof = Prof(
@@ -1155,28 +1153,28 @@ class Ui(Ui_Semesterapparat):
self.db.createProf(prof) self.db.createProf(prof)
# if app_id not in database, create apparat # if app_id not in database, create apparat
if not self.db.checkApparatExistsById(app_id): if not self.db.checkApparatExistsById(app_id):
logger.info("Apparat does not exist, creating new apparat") log.info("Apparat does not exist, creating new apparat")
# create apparat # create apparat
# #logger.debug("Creating apparat") # #log.debug("Creating apparat")
if not self.btn_save_apparat(False): if not self.btn_save_apparat(False):
return return
if self.document_list.rowCount() == 0: if self.document_list.rowCount() == 0:
logger.info("No file selected") log.info("No file selected")
self.tableWidget_apparate.setEnabled(True) self.tableWidget_apparate.setEnabled(True)
self.tableWidget_apparate.setToolTip("") self.tableWidget_apparate.setToolTip("")
return return
else: else:
# if file is selected, check for books in the file # if file is selected, check for books in the file
# #logger.debug("File selected") # #log.debug("File selected")
if prof_id is None: if prof_id is None:
prof_id = self.db.getProfId(self.profdata) prof_id = self.db.getProfId(self.profdata)
# logger.debug("Prof ID is None", prof_id) # log.debug("Prof ID is None", prof_id)
document = self.extract_document_data() document = self.extract_document_data()
if document is None: if document is None:
logger.error("Document is None") log.error("Document is None")
elif isinstance(document, SemapDocument): elif isinstance(document, SemapDocument):
signatures = document.signatures signatures = document.signatures
else: else:
@@ -1287,7 +1285,7 @@ class Ui(Ui_Semesterapparat):
pid=appd.prof.fullname, pid=appd.prof.fullname,
) )
if clear_fields: if clear_fields:
# #logger.debug("clearing fields") # #log.debug("clearing fields")
self.__clear_fields() self.__clear_fields()
return True return True
@@ -1346,10 +1344,10 @@ class Ui(Ui_Semesterapparat):
for apparat in self.apparats: for apparat in self.apparats:
self.insert_apparat_into_table(apparat) self.insert_apparat_into_table(apparat)
logger.info("Inserted {} apparats into table".format(len(self.apparats))) log.info("Inserted {} apparats into table".format(len(self.apparats)))
def insert_apparat_into_table(self, apparat): def insert_apparat_into_table(self, apparat):
# logger.debug(apparat) # log.debug(apparat)
def __dauer_check(apparat): def __dauer_check(apparat):
return "Ja" if apparat[7] == 1 else "Nein" return "Ja" if apparat[7] == 1 else "Nein"
@@ -1398,7 +1396,7 @@ class Ui(Ui_Semesterapparat):
return return
app_id = self.tableWidget_apparate.item(row, 0).text() app_id = self.tableWidget_apparate.item(row, 0).text()
pid = self.db.getProfIDByApparat(app_id) pid = self.db.getProfIDByApparat(app_id)
logger.debug(app_id, pid) log.debug(app_id, pid)
delete_action.triggered.connect(lambda: self.delete_apparat(pos)) delete_action.triggered.connect(lambda: self.delete_apparat(pos))
# pass pos to contact_prof # pass pos to contact_prof
contact_action.triggered.connect( contact_action.triggered.connect(
@@ -1407,14 +1405,14 @@ class Ui(Ui_Semesterapparat):
menu.exec(self.tableWidget_apparate.mapToGlobal(position)) menu.exec(self.tableWidget_apparate.mapToGlobal(position))
def reminder(self): def reminder(self):
logger.info("Opening reminder dialog") log.info("Opening reminder dialog")
reminder = reminder_ui() reminder = ReminderDialog()
reminder.exec() reminder.exec()
tableposition = self.tableWidget_apparate.currentRow() tableposition = self.tableWidget_apparate.currentRow()
appnr = self.tableWidget_apparate.item(tableposition, 0).text() appnr = self.tableWidget_apparate.item(tableposition, 0).text()
if reminder.result() == QtWidgets.QDialog.DialogCode.Accepted: if reminder.result() == QtWidgets.QDialog.DialogCode.Accepted:
data = reminder.return_message() data = reminder.return_message()
# #logger.debug(data) # #log.debug(data)
self.db.addMessage( self.db.addMessage(
data, data,
self.active_user, self.active_user,
@@ -1423,18 +1421,18 @@ class Ui(Ui_Semesterapparat):
self.update_calendar(data) self.update_calendar(data)
# self.db.update_bookdata(data, book_id) # self.db.update_bookdata(data, book_id)
# self.db.update_bookdata(data) # self.db.update_bookdata(data)
logger.info("committed message to database") log.info("committed message to database")
# self.update_app_media_list() # self.update_app_media_list()
def get_reminders(self): def get_reminders(self):
messages = self.db.getAllMessages() messages = self.db.getAllMessages()
logger.info(f"Got {len(messages)} messages from database") log.info(f"Got {len(messages)} messages from database")
self.calendarWidget.setMessages(messages) self.calendarWidget.setMessages(messages)
self.calendarWidget.updateCells() self.calendarWidget.updateCells()
def open_reminder(self): def open_reminder(self):
selected_date = self.calendarWidget.selectedDate().toString("yyyy-MM-dd") selected_date = self.calendarWidget.selectedDate().toString("yyyy-MM-dd")
# # #logger.debug(selected_date) # # #log.debug(selected_date)
messages = self.db.getMessages(selected_date) messages = self.db.getMessages(selected_date)
if messages == []: if messages == []:
return return
@@ -1445,13 +1443,13 @@ class Ui(Ui_Semesterapparat):
dialog.repaintSignal.connect(lambda: self.calendarWidget.reload(selected_date)) dialog.repaintSignal.connect(lambda: self.calendarWidget.reload(selected_date))
def open_settings(self): def open_settings(self):
# logger.debug(settings.dict()) # log.debug(settings.dict())
settingsUI = Settings(self.active_user) settingsUI = Settings(self.active_user)
settingsUI.exec() settingsUI.exec()
if settingsUI.result() == QtWidgets.QDialog.DialogCode.Accepted: if settingsUI.result() == QtWidgets.QDialog.DialogCode.Accepted:
settingsUI.save() settingsUI.save()
# logger.debug(settings.dict()) # log.debug(settings.dict())
# self.reload() # self.reload()
@@ -1470,6 +1468,7 @@ class Ui(Ui_Semesterapparat):
delete_action = QtGui.QAction("Löschen") delete_action = QtGui.QAction("Löschen")
edit_action = QtGui.QAction("Bearbeiten") edit_action = QtGui.QAction("Bearbeiten")
update_data_action = QtGui.QAction("Daten aktualisieren")
apparat_add_action = QtGui.QAction("Zum Apparat hinzufügen") apparat_add_action = QtGui.QAction("Zum Apparat hinzufügen")
apparat_move_action = QtGui.QAction("In Apparat verschieben") apparat_move_action = QtGui.QAction("In Apparat verschieben")
apparat_copy_action = QtGui.QAction("In Apparat kopieren") apparat_copy_action = QtGui.QAction("In Apparat kopieren")
@@ -1479,7 +1478,7 @@ class Ui(Ui_Semesterapparat):
apparatmenu.addActions( apparatmenu.addActions(
[apparat_add_action, apparat_copy_action, apparat_move_action] [apparat_add_action, apparat_copy_action, apparat_move_action]
) )
generalmenu.addActions([edit_action, delete_action]) generalmenu.addActions([edit_action, delete_action, update_data_action])
# disable apparat_add_action # disable apparat_add_action
apparat_add_action.setEnabled(False) apparat_add_action.setEnabled(False)
delete_action.triggered.connect(self.delete_medium) delete_action.triggered.connect(self.delete_medium)
@@ -1487,8 +1486,13 @@ class Ui(Ui_Semesterapparat):
apparat_add_action.triggered.connect(self.add_to_apparat) apparat_add_action.triggered.connect(self.add_to_apparat)
apparat_copy_action.triggered.connect(self.copy_to_apparat) apparat_copy_action.triggered.connect(self.copy_to_apparat)
apparat_move_action.triggered.connect(self.move_to_apparat) apparat_move_action.triggered.connect(self.move_to_apparat)
update_data_action.triggered.connect(self.update_data)
menu.exec(self.tableWidget_apparat_media.mapToGlobal(position)) menu.exec(self.tableWidget_apparat_media.mapToGlobal(position))
def update_data(self):
# TODO: use link in table, parse data and if needed, update location / signature
pass
def copy_to_apparat(self): def copy_to_apparat(self):
selected_rows = self.tableWidget_apparat_media.selectionModel().selectedRows() selected_rows = self.tableWidget_apparat_media.selectionModel().selectedRows()
signatures = [] signatures = []
@@ -1577,7 +1581,7 @@ class Ui(Ui_Semesterapparat):
signature=signature, signature=signature,
prof_id=self.db.getProfId(self.profdata), prof_id=self.db.getProfId(self.profdata),
) )
# logger.debug(medium.adis_idn, medium.signature) # log.debug(medium.adis_idn, medium.signature)
def edit_medium(self): def edit_medium(self):
book = self.tableWidget_apparat_media.item( book = self.tableWidget_apparat_media.item(
@@ -1595,7 +1599,7 @@ class Ui(Ui_Semesterapparat):
book, book,
) )
widget = QtWidgets.QDialog() widget = QtWidgets.QDialog()
bookedit = edit_bookdata_ui() bookedit = BookDataUI()
bookedit.setupUi(widget) bookedit.setupUi(widget)
widget.setWindowIcon(Icon("settings").icon) widget.setWindowIcon(Icon("settings").icon)
# change title of dialog # change title of dialog
@@ -1604,10 +1608,10 @@ class Ui(Ui_Semesterapparat):
widget.exec() widget.exec()
if widget.result() == QtWidgets.QDialog.DialogCode.Accepted: if widget.result() == QtWidgets.QDialog.DialogCode.Accepted:
data = bookedit.get_data() data = bookedit.get_data()
# #logger.debug(data) # #log.debug(data)
self.db.updateBookdata(bookdata=data, book_id=book_id) self.db.updateBookdata(bookdata=data, book_id=book_id)
# self.db.update_bookdata(data) # self.db.update_bookdata(data)
# #logger.debug("accepted") # #log.debug("accepted")
self.update_app_media_list() self.update_app_media_list()
else: else:
return return
@@ -1631,7 +1635,7 @@ class Ui(Ui_Semesterapparat):
) )
message = f'Soll das Medium "{self.tableWidget_apparat_media.item(self.tableWidget_apparat_media.currentRow(), 0).text()}" wirklich gelöscht werden?' message = f'Soll das Medium "{self.tableWidget_apparat_media.item(self.tableWidget_apparat_media.currentRow(), 0).text()}" wirklich gelöscht werden?'
state = self.confirm_popup(message, title="Löschen?") state = self.confirm_popup(message, title="Löschen?")
# #logger.debug(state) # #log.debug(state)
if state == 1: if state == 1:
self.db.deleteBook(book_id) self.db.deleteBook(book_id)
self.update_app_media_list() self.update_app_media_list()
@@ -1643,7 +1647,7 @@ class Ui(Ui_Semesterapparat):
for r in ranges: for r in ranges:
for row in range(r.topRow(), r.bottomRow() + 1): for row in range(r.topRow(), r.bottomRow() + 1):
rows.append(row) rows.append(row)
# #logger.debug(rows) # #log.debug(rows)
message = f"Sollen die {len(rows)} Medien wirklich gelöscht werden?" message = f"Sollen die {len(rows)} Medien wirklich gelöscht werden?"
state = self.confirm_popup(message, title="Löschen?") state = self.confirm_popup(message, title="Löschen?")
if state == 1: if state == 1:
@@ -1663,12 +1667,12 @@ class Ui(Ui_Semesterapparat):
# return data from dialog if ok is pressed # return data from dialog if ok is pressed
if framework.result() == QtWidgets.QDialog.DialogCode.Accepted: if framework.result() == QtWidgets.QDialog.DialogCode.Accepted:
data = framework.get_data() data = framework.get_data()
# #logger.debug(data) # #log.debug(data)
# return data # return data
selected_apparat_id = self.tableWidget_apparate.item( selected_apparat_id = self.tableWidget_apparate.item(
self.tableWidget_apparate.currentRow(), 0 self.tableWidget_apparate.currentRow(), 0
).text() ).text()
# #logger.debug(selected_apparat_id) # #log.debug(selected_apparat_id)
self.db.setNewSemesterDate( self.db.setNewSemesterDate(
selected_apparat_id, data["semester"], dauerapp=data["dauerapp"] selected_apparat_id, data["semester"], dauerapp=data["dauerapp"]
@@ -1679,7 +1683,7 @@ class Ui(Ui_Semesterapparat):
return return
def __contact_dialog(self, apparat, location: tuple | str, mail=None, pid=""): def __contact_dialog(self, apparat, location: tuple | str, mail=None, pid=""):
logger.debug( log.debug(
"Got these values apparat: {}, location: {}, mail: {}, pid: {}".format( "Got these values apparat: {}, location: {}, mail: {}, pid: {}".format(
apparat, location, mail, pid apparat, location, mail, pid
) )
@@ -1722,8 +1726,8 @@ class Ui(Ui_Semesterapparat):
self.mail_thread.show() self.mail_thread.show()
def contact_prof(self, apparat="", location="", mail="", pid=""): def contact_prof(self, apparat="", location="", mail="", pid=""):
logger.debug(apparat) log.debug(apparat)
logger.debug(location) log.debug(location)
if self.active_apparat == "": if self.active_apparat == "":
if apparat is False: if apparat is False:
self.confirm_popup( self.confirm_popup(
@@ -1739,10 +1743,10 @@ class Ui(Ui_Semesterapparat):
).text() ).text()
message = f"Soll der Apparat {selected_apparat_id} wirklich gelöscht werden?" message = f"Soll der Apparat {selected_apparat_id} wirklich gelöscht werden?"
state = self.confirm_popup(message, title="Löschen?") state = self.confirm_popup(message, title="Löschen?")
# #logger.debug(state) # #log.debug(state)
logger.info("Result state: {}", state) log.info("Result state: {}", state)
if state == 1: if state == 1:
logger.debug("Deleting apparat {}", selected_apparat_id) log.debug("Deleting apparat {}", selected_apparat_id)
pid = self.db.getProfIDByApparat(selected_apparat_id) pid = self.db.getProfIDByApparat(selected_apparat_id)
self.db.deleteApparat(selected_apparat_id, Semester().value) self.db.deleteApparat(selected_apparat_id, Semester().value)
# delete the corresponding entry from self.apparats # delete the corresponding entry from self.apparats
@@ -1751,7 +1755,7 @@ class Ui(Ui_Semesterapparat):
self.apparats.remove(apparat) self.apparats.remove(apparat)
break break
self.old_apparats = self.apparats self.old_apparats = self.apparats
# #logger.debug(self.apparats) # #log.debug(self.apparats)
# remove the row from the table # remove the row from the table
self.tableWidget_apparate.removeRow(self.tableWidget_apparate.currentRow()) self.tableWidget_apparate.removeRow(self.tableWidget_apparate.currentRow())
# send mail to prof # send mail to prof
@@ -1759,24 +1763,24 @@ class Ui(Ui_Semesterapparat):
def launch_gui(): def launch_gui():
# #logger.debug("trying to login") # #log.debug("trying to login")
# #logger.debug("checking if database available") # #log.debug("checking if database available")
logger.info("Starting login dialog") log.info("Starting login dialog")
app = QtWidgets.QApplication(sys.argv) app = QtWidgets.QApplication(sys.argv)
login_dialog = QtWidgets.QDialog() login_dialog = QtWidgets.QDialog()
ui = login_ui() ui = LoginDialog()
ui.setupUi(login_dialog) ui.setupUi(login_dialog)
login_dialog.exec() # This will block until the dialog is closed login_dialog.exec() # This will block until the dialog is closed
if ui.lresult == 1: if ui.lresult == 1:
# if login is successful, open main window # if login is successful, open main window
# show login dialog # show login dialog
# #logger.debug(ui.lusername) # #log.debug(ui.lusername)
MainWindow = QtWidgets.QMainWindow() MainWindow = QtWidgets.QMainWindow()
aui = Ui(MainWindow, username=ui.lusername) aui = Ui(MainWindow, username=ui.lusername)
# #logger.debug(aui.active_user) # #log.debug(aui.active_user)
MainWindow.show() MainWindow.show()
# atexit.register() # atexit.register()
atexit.register(tempdelete) atexit.register(tempdelete)
@@ -1793,7 +1797,7 @@ def launch_gui():
if __name__ == "__main__": if __name__ == "__main__":
# #logger.debug("This is the main window") # #log.debug("This is the main window")
# app = QtWidgets.QApplication(sys.argv) # app = QtWidgets.QApplication(sys.argv)
# window = MainWindow() # window = MainWindow()
# app.exec() # app.exec()

14
src/ui/widgets/MessageCalendar.py
View File

@@ -3,17 +3,15 @@ from PyQt6.QtCore import QDate
from PyQt6.QtGui import QColor, QPen from PyQt6.QtGui import QColor, QPen
from src.backend import Database from src.backend import Database
import darkdetect import darkdetect
import loguru
import sys import sys
from loguru import logger as log
logger = log log = loguru.logger
logger.remove() log.remove()
logger.add("logs/application.log", rotation="1 week", retention="1 month", enqueue=True) log.add(sys.stdout)
log.add("logs/application.log", rotation="1 MB", retention="10 days")
# logger.add(sys.stderr, format="{time} {level} {message}", level="INFO")
logger.add(sys.stdout)
color = "#ddfb00" if darkdetect.isDark() else "#2204ff" color = "#ddfb00" if darkdetect.isDark() else "#2204ff"
pen = QPen(QColor(color)) pen = QPen(QColor(color))
pen.setWidth(5) pen.setWidth(5)
@@ -31,7 +29,7 @@ class MessageCalendar(QtWidgets.QCalendarWidget):
def getMessages(self): def getMessages(self):
# Get the messages from the database # Get the messages from the database
messages = Database().getAllMessages() messages = Database().getAllMessages()
logger.debug("Got {} messages", len(messages)) log.debug("Got {} messages", len(messages))
self.setMessages(messages) self.setMessages(messages)
def deleteMessage(self, id): def deleteMessage(self, id):

15
src/ui/widgets/admin_edit_prof.py
View File

@@ -3,15 +3,14 @@ from PyQt6 import QtWidgets
from src.logic import Prof from src.logic import Prof
from src.backend import Database from src.backend import Database
import loguru
import sys import sys
from loguru import logger as log
logger = log log = loguru.logger
logger.remove() log.remove()
logger.add("logs/application.log", rotation="1 week", retention="1 month", enqueue=True) log.add(sys.stdout)
log.add("logs/application.log", rotation="1 MB", retention="10 days")
# logger.add(sys.stderr, format="{time} {level} {message}", level="INFO")
logger.add(sys.stdout)
class EditProf(QtWidgets.QDialog, Ui_Dialog): class EditProf(QtWidgets.QDialog, Ui_Dialog):
@@ -69,7 +68,7 @@ class EditProf(QtWidgets.QDialog, Ui_Dialog):
else: else:
self.faculty_member_old_telnr.setText(data.telnr) self.faculty_member_old_telnr.setText(data.telnr)
self.faculty_member_oldmail.setText(data.mail) self.faculty_member_oldmail.setText(data.mail)
logger.debug(data) log.debug(data)
( (
self.edit_faculty_member_title.setText(data.title) self.edit_faculty_member_title.setText(data.title)
if data.title is not None if data.title is not None
@@ -93,7 +92,7 @@ class EditProf(QtWidgets.QDialog, Ui_Dialog):
olddata = self.db.getProfByName( olddata = self.db.getProfByName(
self.edit_faculty_member_select_member.currentText() self.edit_faculty_member_select_member.currentText()
) )
logger.debug(olddata) log.debug(olddata)
data = olddata data = olddata
oldlname = data.lastname oldlname = data.lastname
oldfname = data.firstname oldfname = data.firstname

33
src/ui/widgets/elsa_main.py
View File

@@ -9,15 +9,14 @@ from src.logic import elsa_word_to_csv, Prof
from src.ui.dialogs import ElsaAddEntry, popus_confirm from src.ui.dialogs import ElsaAddEntry, popus_confirm
from src.ui.widgets import FilePicker, DataGraph from src.ui.widgets import FilePicker, DataGraph
from src.backend import recreateElsaFile from src.backend import recreateElsaFile
import loguru
import sys import sys
from loguru import logger as log
log = loguru.logger
log.remove()
log.add(sys.stdout)
log.add("logs/application.log", rotation="1 MB", retention="10 days")
logger = log
logger.remove()
logger.add("logs/application.log", rotation="1 week", retention="1 month", enqueue=True)
log.add("logs/elsa_main.log", enqueue=True)
logger.add(sys.stdout)
class ElsaDialog(QtWidgets.QDialog, Ui_Dialog): class ElsaDialog(QtWidgets.QDialog, Ui_Dialog):
@@ -93,7 +92,7 @@ class ElsaDialog(QtWidgets.QDialog, Ui_Dialog):
self.newProf_title.textChanged.connect(self.checkProfData) self.newProf_title.textChanged.connect(self.checkProfData)
self.loadFrame() self.loadFrame()
logger.info("Elsa Dialog loaded") log.info("Elsa Dialog loaded")
# self.show() # self.show()
def checkProfData(self): def checkProfData(self):
@@ -237,7 +236,7 @@ class ElsaDialog(QtWidgets.QDialog, Ui_Dialog):
fullname=f"{prof.split(', ')[0]} {prof.split(', ')[1]}", fullname=f"{prof.split(', ')[0]} {prof.split(', ')[1]}",
) )
prof_id = self.db.getProfId(profdata) prof_id = self.db.getProfId(profdata)
logger.debug(f"ProfData: {profdata}, id:{prof_id}") log.debug(f"ProfData: {profdata}, id:{prof_id}")
if prof_id is None: if prof_id is None:
self.db.createProf(profdata) self.db.createProf(profdata)
@@ -263,12 +262,12 @@ class ElsaDialog(QtWidgets.QDialog, Ui_Dialog):
files, files,
elsa_id, elsa_id,
) )
logger.info("Stored {} files in the database", len(files)) log.info("Stored {} files in the database", len(files))
self.cancel_elsa_creation() self.cancel_elsa_creation()
self.refresh_elsa_table() self.refresh_elsa_table()
self.elsa_prof.setCurrentText("") self.elsa_prof.setCurrentText("")
self.quote_entry.setEnabled(False) self.quote_entry.setEnabled(False)
logger.info("Saved apparat to database, id {}", elsa_id) log.info("Saved apparat to database, id {}", elsa_id)
def refresh_elsa_table(self): def refresh_elsa_table(self):
self.elsa_table.setRowCount(0) self.elsa_table.setRowCount(0)
@@ -288,13 +287,13 @@ class ElsaDialog(QtWidgets.QDialog, Ui_Dialog):
def open_elsa(self): def open_elsa(self):
prof = self.elsa_table.item(self.elsa_table.currentRow(), 0).text() prof = self.elsa_table.item(self.elsa_table.currentRow(), 0).text()
logger.info("prof", prof) log.info("prof", prof)
date = self.elsa_table.item(self.elsa_table.currentRow(), 1).text() date = self.elsa_table.item(self.elsa_table.currentRow(), 1).text()
semester = self.elsa_table.item(self.elsa_table.currentRow(), 2).text() semester = self.elsa_table.item(self.elsa_table.currentRow(), 2).text()
self.elsa_update.setEnabled(True) self.elsa_update.setEnabled(True)
self.elsa_save.setEnabled(False) self.elsa_save.setEnabled(False)
if self.elsa_prof.currentText() == prof and date == self.elsa_date.text(): if self.elsa_prof.currentText() == prof and date == self.elsa_date.text():
logger.debug("Same prof, stopping") log.debug("Same prof, stopping")
return return
self.create_frame_elsa.setEnabled(True) self.create_frame_elsa.setEnabled(True)
self.dokument_list_elsa.setRowCount(0) self.dokument_list_elsa.setRowCount(0)
@@ -314,7 +313,7 @@ class ElsaDialog(QtWidgets.QDialog, Ui_Dialog):
self.elsa_date.setText(date) self.elsa_date.setText(date)
self.elsa_semester.setText(semester) self.elsa_semester.setText(semester)
self.elsa_prof.setCurrentText(prof) self.elsa_prof.setCurrentText(prof)
logger.info("Elsa ID is {}", elsa_id) log.info("Elsa ID is {}", elsa_id)
if elsa_id is None: if elsa_id is None:
return return
documents = self.db.getElsaFiles(elsa_id) documents = self.db.getElsaFiles(elsa_id)
@@ -411,7 +410,7 @@ class ElsaDialog(QtWidgets.QDialog, Ui_Dialog):
self.elsa_semester.text(), self.elsa_semester.text(),
self.elsa_date.text(), self.elsa_date.text(),
) )
logger.debug( log.debug(
f"elsa_id: {elsa_id}, prof: {self.elsa_prof.currentText()}, semester: {self.elsa_semester.text()}, date: {self.elsa_date.text()}" f"elsa_id: {elsa_id}, prof: {self.elsa_prof.currentText()}, semester: {self.elsa_semester.text()}, date: {self.elsa_date.text()}"
) )
for row in data: for row in data:
@@ -445,7 +444,7 @@ class ElsaDialog(QtWidgets.QDialog, Ui_Dialog):
try: try:
self.elsa_statistics.removeTab(1) self.elsa_statistics.removeTab(1)
except: except:
logger.debug("No tab to remove") log.debug("No tab to remove")
self.elsa_table.setRowCount(0) self.elsa_table.setRowCount(0)
elsa_apparats = self.db.getElsaApparats() elsa_apparats = self.db.getElsaApparats()
# elsa_apparats = natsorted(elsa_apparats, key=lambda x: x[2], reverse=True) # elsa_apparats = natsorted(elsa_apparats, key=lambda x: x[2], reverse=True)
@@ -469,7 +468,7 @@ class ElsaDialog(QtWidgets.QDialog, Ui_Dialog):
data=self.graph_data, data=self.graph_data,
label="Anzahl der Apparate", label="Anzahl der Apparate",
) )
logger.debug(self.graph_data) log.debug(self.graph_data)
self.elsa_statistics_table.setRowCount(0) self.elsa_statistics_table.setRowCount(0)
for i in range(len(self.graph_data["x"])): for i in range(len(self.graph_data["x"])):
self.elsa_statistics_table.insertRow(0) self.elsa_statistics_table.insertRow(0)
@@ -483,7 +482,7 @@ class ElsaDialog(QtWidgets.QDialog, Ui_Dialog):
def launch(): def launch():
logger.debug("Launching Elsa Dialog") log.debug("Launching Elsa Dialog")
app = QtWidgets.QApplication([]) app = QtWidgets.QApplication([])
window = ElsaDialog() window = ElsaDialog()
window.show() window.show()

17
src/ui/widgets/graph.py
View File

@@ -3,18 +3,13 @@ from typing import Union
import pyqtgraph as pg import pyqtgraph as pg
from PyQt6 import QtWidgets from PyQt6 import QtWidgets
import loguru
import sys import sys
from loguru import logger as log
logger = log log = loguru.logger
logger.remove() log.remove()
logger.add("logs/application.log", rotation="1 week", retention="1 month", enqueue=True) log.add(sys.stdout)
log.add( log.add("logs/application.log", rotation="1 MB", retention="10 days")
"logs/graph.log",
)
# logger.add(sys.stderr, format="{time} {level} {message}", level="INFO")
logger.add(sys.stdout)
def mergedicts(d1, d2): def mergedicts(d1, d2):
@@ -43,7 +38,7 @@ class DataGraph(QtWidgets.QWidget):
label=None, label=None,
): ):
super().__init__() super().__init__()
logger.debug( log.debug(
"Initialized with options: {}, {}, {}, {}".format( "Initialized with options: {}, {}, {}, {}".format(
title, data, generateMissing, label title, data, generateMissing, label
) )

11
src/ui/widgets/iconLine.py
View File

@@ -6,7 +6,7 @@ from loguru import logger as log
logger = log logger = log
logger.remove() logger.remove()
logger.add("logs/application.log", rotation="1 week", enqueue=True) logger.add("logs/application.log", rotation="1 week", retention="1 month", enqueue=True)
# logger.add(sys.stderr, format="{time} {level} {message}", level="INFO") # logger.add(sys.stderr, format="{time} {level} {message}", level="INFO")
@@ -29,9 +29,12 @@ class IconWidget(QtWidgets.QWidget, Ui_Dialog):
self.icon_filename_line.setText( self.icon_filename_line.setText(
file_dialog.selectedFiles()[0].split("/")[-1] file_dialog.selectedFiles()[0].split("/")[-1]
) )
logger.debug( try:
"Icon changed to: {}", file_dialog.selectedFiles()[0].split("/")[-1] log.debug(
) "Icon changed to: {}", file_dialog.selectedFiles()[0].split("/")[-1]
)
except IndexError:
log.debug("No file selected")
def return_data(self): def return_data(self):
return self.icon_name_settings.text(), self.icon_filename_line.text() return self.icon_name_settings.text(), self.icon_filename_line.text()

38
src/ui/widgets/searchPage.py
View File

@@ -4,20 +4,18 @@ from PyQt6.QtCore import pyqtSignal
from src.backend import Database, Semester from src.backend import Database, Semester
from src.logic import custom_sort, Prof, sort_semesters_list from src.logic import custom_sort, Prof, sort_semesters_list
from src.ui.dialogs import Mail_Dialog, ApparatExtendDialog, reminder_ui from src.ui.dialogs import Mail_Dialog, ApparatExtendDialog, ReminderDialog
from src.ui.widgets import DataGraph, StatusWidget from src.ui.widgets import DataGraph, StatusWidget
from natsort import natsorted from natsort import natsorted
import loguru
import sys import sys
from loguru import logger as log
logger = log log = loguru.logger
logger.remove() log.remove()
logger.add("logs/application.log", rotation="1 week", retention="1 month", enqueue=True) log.add(sys.stdout)
log.add("logs/searchPage.log", enqueue=True) log.add("logs/application.log", rotation="1 MB", retention="10 days")
# logger.add(sys.stderr, format="{time} {level} {message}", level="INFO")
logger.add(sys.stdout)
class MyComboBox(QtWidgets.QComboBox): class MyComboBox(QtWidgets.QComboBox):
@@ -32,7 +30,7 @@ class SearchStatisticPage(QtWidgets.QDialog, Ui_Dialog):
updateCalendar = pyqtSignal(int, list) updateCalendar = pyqtSignal(int, list)
def __init__(self): def __init__(self):
logger.info("SearchStatisticPage started") log.info("SearchStatisticPage started")
super().__init__() super().__init__()
self.setupUi(self) self.setupUi(self)
self.book_search_result.horizontalHeader().setSectionResizeMode( self.book_search_result.horizontalHeader().setSectionResizeMode(
@@ -111,7 +109,7 @@ class SearchStatisticPage(QtWidgets.QDialog, Ui_Dialog):
extend.exec() extend.exec()
if extend.result() == QtWidgets.QDialog.DialogCode.Accepted: if extend.result() == QtWidgets.QDialog.DialogCode.Accepted:
data = extend.get_data() data = extend.get_data()
logger.debug(data) log.debug(data)
app_name = self.tableWidget.item(self.tableWidget.currentRow(), 1).text() app_name = self.tableWidget.item(self.tableWidget.currentRow(), 1).text()
app_id = self.db.getApparatId(app_name) app_id = self.db.getApparatId(app_name)
self.db.setNewSemesterDate(app_id, data["semester"], data["dauerapp"]) self.db.setNewSemesterDate(app_id, data["semester"], data["dauerapp"])
@@ -120,8 +118,8 @@ class SearchStatisticPage(QtWidgets.QDialog, Ui_Dialog):
self.refreshSignal.emit() self.refreshSignal.emit()
def reminder(self): def reminder(self):
logger.info("Opening reminder dialog") log.info("Opening reminder dialog")
reminder = reminder_ui() reminder = ReminderDialog()
reminder.exec() reminder.exec()
tableposition = self.tableWidget.currentRow() tableposition = self.tableWidget.currentRow()
appnr = self.tableWidget.item(tableposition, 2).text() appnr = self.tableWidget.item(tableposition, 2).text()
@@ -134,7 +132,7 @@ class SearchStatisticPage(QtWidgets.QDialog, Ui_Dialog):
appnr, appnr,
) )
self.updateCalendar.emit(data) self.updateCalendar.emit(data)
logger.info("committed message to database") log.info("committed message to database")
def tabW2_changed(self): def tabW2_changed(self):
if self.tabWidget_2.currentIndex() == 0: if self.tabWidget_2.currentIndex() == 0:
@@ -151,12 +149,12 @@ class SearchStatisticPage(QtWidgets.QDialog, Ui_Dialog):
"title": title if title != "" else None, "title": title if title != "" else None,
} }
params = {key: value for key, value in params.items() if value is not None} params = {key: value for key, value in params.items() if value is not None}
logger.debug(params) log.debug(params)
retdata = self.db.searchBook(params) retdata = self.db.searchBook(params)
if retdata is None: if retdata is None:
return return
for book in retdata: for book in retdata:
logger.debug(book) log.debug(book)
self.book_search_result.insertRow(0) self.book_search_result.insertRow(0)
self.book_search_result.setItem( self.book_search_result.setItem(
0, 0, QtWidgets.QTableWidgetItem(book[0].title) 0, 0, QtWidgets.QTableWidgetItem(book[0].title)
@@ -188,7 +186,7 @@ class SearchStatisticPage(QtWidgets.QDialog, Ui_Dialog):
selected_apparats.append(data) selected_apparats.append(data)
# delete all selected apparats # delete all selected apparats
logger.debug(selected_apparats) log.debug(selected_apparats)
dialogs = [] dialogs = []
for i in selected_apparats: for i in selected_apparats:
app_id = i["app_id"] app_id = i["app_id"]
@@ -248,7 +246,7 @@ class SearchStatisticPage(QtWidgets.QDialog, Ui_Dialog):
self.box_dauerapp.setEnabled(True) self.box_dauerapp.setEnabled(True)
def populate_tab(self, table_or_graph=0): def populate_tab(self, table_or_graph=0):
logger.info("populate_tab started") log.info("populate_tab started")
# add default values to the dropdowns # add default values to the dropdowns
self.box_appnrs.clear() self.box_appnrs.clear()
self.box_appnrs.addItem("") self.box_appnrs.addItem("")
@@ -315,7 +313,7 @@ class SearchStatisticPage(QtWidgets.QDialog, Ui_Dialog):
# place the graph into tabWidget_3 # place the graph into tabWidget_3
self.tabWidget_3.addTab(graph, "Graph") self.tabWidget_3.addTab(graph, "Graph")
self.tabWidget_3.setCurrentIndex(table_or_graph) self.tabWidget_3.setCurrentIndex(table_or_graph)
logger.info("populate_tab finished") log.info("populate_tab finished")
def delete_selected_apparats(self): def delete_selected_apparats(self):
# get all selected apparats # get all selected apparats
@@ -327,7 +325,7 @@ class SearchStatisticPage(QtWidgets.QDialog, Ui_Dialog):
selected_apparat_rows.append(i) selected_apparat_rows.append(i)
# delete all selected apparats # delete all selected apparats
# # #print(selected_apparats) # # #print(selected_apparats)
logger.info(f"Deleting apparats: {selected_apparats}") log.info(f"Deleting apparats: {selected_apparats}")
for apparat in selected_apparats: for apparat in selected_apparats:
self.db.deleteApparat(apparat, self.semester) self.db.deleteApparat(apparat, self.semester)
for row in selected_apparat_rows: for row in selected_apparat_rows:
@@ -400,7 +398,7 @@ class SearchStatisticPage(QtWidgets.QDialog, Ui_Dialog):
sem = Semester().from_string( sem = Semester().from_string(
entry[8] if entry[8] is not None else entry[5] entry[8] if entry[8] is not None else entry[5]
) )
logger.info(f"Semester: {sem}") log.info(f"Semester: {sem}")
if sem.isPastSemester(Semester()): if sem.isPastSemester(Semester()):
data.append(entry) data.append(entry)
else: else:

58
src/ui/widgets/widget_sources/search_statistic_page.ui
View File

@@ -209,17 +209,7 @@
</attribute> </attribute>
<layout class="QHBoxLayout" name="horizontalLayout_3" stretch="30,70"> <layout class="QHBoxLayout" name="horizontalLayout_3" stretch="30,70">
<item> <item>
<layout class="QGridLayout" name="gridLayout" rowminimumheight="1,1,1,1"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_25">
<property name="text">
<string>Signatur</string>
</property>
<property name="buddy">
<cstring>seach_by_signature</cstring>
</property>
</widget>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_26"> <widget class="QLabel" name="label_26">
<property name="text"> <property name="text">
@@ -240,26 +230,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0">
<widget class="QPushButton" name="book_search">
<property name="text">
<string>Suchen</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="seach_by_signature">
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
<property name="statusTip">
<string>Trunkierung mit * am Ende unterstützt</string>
</property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="0"> <item row="2" column="0">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
@@ -273,6 +243,29 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="0">
<widget class="QLabel" name="label_25">
<property name="text">
<string>Signatur</string>
</property>
<property name="buddy">
<cstring>search_by_signature</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="search_by_signature">
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
<property name="statusTip">
<string>Trunkierung mit * am Ende unterstützt</string>
</property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>
@@ -582,9 +575,8 @@
<tabstop>box_dauerapp</tabstop> <tabstop>box_dauerapp</tabstop>
<tabstop>btn_search</tabstop> <tabstop>btn_search</tabstop>
<tabstop>book_search_result</tabstop> <tabstop>book_search_result</tabstop>
<tabstop>seach_by_signature</tabstop> <tabstop>search_by_signature</tabstop>
<tabstop>search_by_title</tabstop> <tabstop>search_by_title</tabstop>
<tabstop>book_search</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>

35
src/ui/widgets/widget_sources/search_statistic_page_ui.py
View File

@@ -102,9 +102,6 @@ class Ui_Dialog(object):
self.horizontalLayout_3.setObjectName("horizontalLayout_3") self.horizontalLayout_3.setObjectName("horizontalLayout_3")
self.gridLayout = QtWidgets.QGridLayout() self.gridLayout = QtWidgets.QGridLayout()
self.gridLayout.setObjectName("gridLayout") self.gridLayout.setObjectName("gridLayout")
self.label_25 = QtWidgets.QLabel(parent=self.tab_4)
self.label_25.setObjectName("label_25")
self.gridLayout.addWidget(self.label_25, 0, 0, 1, 1)
self.label_26 = QtWidgets.QLabel(parent=self.tab_4) self.label_26 = QtWidgets.QLabel(parent=self.tab_4)
self.label_26.setObjectName("label_26") self.label_26.setObjectName("label_26")
self.gridLayout.addWidget(self.label_26, 1, 0, 1, 1) self.gridLayout.addWidget(self.label_26, 1, 0, 1, 1)
@@ -113,20 +110,16 @@ class Ui_Dialog(object):
self.search_by_title.setClearButtonEnabled(True) self.search_by_title.setClearButtonEnabled(True)
self.search_by_title.setObjectName("search_by_title") self.search_by_title.setObjectName("search_by_title")
self.gridLayout.addWidget(self.search_by_title, 1, 1, 1, 1) self.gridLayout.addWidget(self.search_by_title, 1, 1, 1, 1)
self.book_search = QtWidgets.QPushButton(parent=self.tab_4)
self.book_search.setObjectName("book_search")
self.gridLayout.addWidget(self.book_search, 3, 0, 1, 1)
self.seach_by_signature = QtWidgets.QLineEdit(parent=self.tab_4)
self.seach_by_signature.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus)
self.seach_by_signature.setClearButtonEnabled(True)
self.seach_by_signature.setObjectName("seach_by_signature")
self.gridLayout.addWidget(self.seach_by_signature, 0, 1, 1, 1)
spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding)
self.gridLayout.addItem(spacerItem2, 2, 0, 1, 1) self.gridLayout.addItem(spacerItem2, 2, 0, 1, 1)
self.gridLayout.setRowMinimumHeight(0, 1) self.label_25 = QtWidgets.QLabel(parent=self.tab_4)
self.gridLayout.setRowMinimumHeight(1, 1) self.label_25.setObjectName("label_25")
self.gridLayout.setRowMinimumHeight(2, 1) self.gridLayout.addWidget(self.label_25, 0, 0, 1, 1)
self.gridLayout.setRowMinimumHeight(3, 1) self.search_by_signature = QtWidgets.QLineEdit(parent=self.tab_4)
self.search_by_signature.setFocusPolicy(QtCore.Qt.FocusPolicy.ClickFocus)
self.search_by_signature.setClearButtonEnabled(True)
self.search_by_signature.setObjectName("search_by_signature")
self.gridLayout.addWidget(self.search_by_signature, 0, 1, 1, 1)
self.horizontalLayout_3.addLayout(self.gridLayout) self.horizontalLayout_3.addLayout(self.gridLayout)
spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
self.horizontalLayout_3.addItem(spacerItem3) self.horizontalLayout_3.addItem(spacerItem3)
@@ -280,8 +273,8 @@ class Ui_Dialog(object):
self.label_17.setBuddy(self.box_semester) self.label_17.setBuddy(self.box_semester)
self.label_19.setBuddy(self.box_erstellsemester) self.label_19.setBuddy(self.box_erstellsemester)
self.label_16.setBuddy(self.box_fach) self.label_16.setBuddy(self.box_fach)
self.label_25.setBuddy(self.seach_by_signature)
self.label_26.setBuddy(self.search_by_title) self.label_26.setBuddy(self.search_by_title)
self.label_25.setBuddy(self.search_by_signature)
self.retranslateUi(Dialog) self.retranslateUi(Dialog)
self.tabWidget_2.setCurrentIndex(0) self.tabWidget_2.setCurrentIndex(0)
@@ -296,9 +289,8 @@ class Ui_Dialog(object):
Dialog.setTabOrder(self.box_erstellsemester, self.box_dauerapp) Dialog.setTabOrder(self.box_erstellsemester, self.box_dauerapp)
Dialog.setTabOrder(self.box_dauerapp, self.btn_search) Dialog.setTabOrder(self.box_dauerapp, self.btn_search)
Dialog.setTabOrder(self.btn_search, self.book_search_result) Dialog.setTabOrder(self.btn_search, self.book_search_result)
Dialog.setTabOrder(self.book_search_result, self.seach_by_signature) Dialog.setTabOrder(self.book_search_result, self.search_by_signature)
Dialog.setTabOrder(self.seach_by_signature, self.search_by_title) Dialog.setTabOrder(self.search_by_signature, self.search_by_title)
Dialog.setTabOrder(self.search_by_title, self.book_search)
def retranslateUi(self, Dialog): def retranslateUi(self, Dialog):
_translate = QtCore.QCoreApplication.translate _translate = QtCore.QCoreApplication.translate
@@ -312,10 +304,9 @@ class Ui_Dialog(object):
self.label_16.setText(_translate("Dialog", "Fach:")) self.label_16.setText(_translate("Dialog", "Fach:"))
self.btn_search.setText(_translate("Dialog", "Suchen")) self.btn_search.setText(_translate("Dialog", "Suchen"))
self.tabWidget_2.setTabText(self.tabWidget_2.indexOf(self.tab_3), _translate("Dialog", "Statistik")) self.tabWidget_2.setTabText(self.tabWidget_2.indexOf(self.tab_3), _translate("Dialog", "Statistik"))
self.label_25.setText(_translate("Dialog", "Signatur"))
self.label_26.setText(_translate("Dialog", "Titel")) self.label_26.setText(_translate("Dialog", "Titel"))
self.book_search.setText(_translate("Dialog", "Suchen")) self.label_25.setText(_translate("Dialog", "Signatur"))
self.seach_by_signature.setStatusTip(_translate("Dialog", "Trunkierung mit * am Ende unterstützt")) self.search_by_signature.setStatusTip(_translate("Dialog", "Trunkierung mit * am Ende unterstützt"))
self.tabWidget_2.setTabText(self.tabWidget_2.indexOf(self.tab_4), _translate("Dialog", "Suchen")) self.tabWidget_2.setTabText(self.tabWidget_2.indexOf(self.tab_4), _translate("Dialog", "Suchen"))
self.btn_del_select_apparats.setText(_translate("Dialog", "Ausgewählte Löschen")) self.btn_del_select_apparats.setText(_translate("Dialog", "Ausgewählte Löschen"))
self.btn_notify_for_deletion.setStatusTip(_translate("Dialog", "Zeigt für jeden ausgewählten Apparat eine eMail-Vorlage an")) self.btn_notify_for_deletion.setStatusTip(_translate("Dialog", "Zeigt für jeden ausgewählten Apparat eine eMail-Vorlage an"))

2
src/utils/__init__.py
View File

@@ -1,5 +1,3 @@
from .blob import create_blob
from .icon import Icon from .icon import Icon
from .pickles import dump_pickle, load_pickle
from .sortgenerator import app_sort, name_sort from .sortgenerator import app_sort, name_sort
from .richtext import SemesterDocument from .richtext import SemesterDocument

26
src/utils/richtext.py
View File

@@ -56,7 +56,7 @@ def print_document(file: str):
server.login(settings.mail.user_name, password) server.login(settings.mail.user_name, password)
server.sendmail(sender_email, receiver, mail) server.sendmail(sender_email, receiver, mail)
server.quit() server.quit()
logger.success("Mail sent") log.success("Mail sent")
class SemesterError(Exception): class SemesterError(Exception):
@@ -64,7 +64,7 @@ class SemesterError(Exception):
def __init__(self, message: str): def __init__(self, message: str):
super().__init__(message) super().__init__(message)
logger.error(message) log.error(message)
def __str__(self): def __str__(self):
return f"SemesterError: {self.args[0]}" return f"SemesterError: {self.args[0]}"
@@ -107,15 +107,15 @@ class SemesterDocument:
self.color_blue = RGBColor(0, 0, 255) self.color_blue = RGBColor(0, 0, 255)
self.filename = filename self.filename = filename
if full: if full:
logger.info("Full document generation") log.info("Full document generation")
self.cleanup self.cleanup
logger.info("Cleanup done") log.info("Cleanup done")
self.make_document() self.make_document()
logger.info("Document created") log.info("Document created")
self.create_pdf() self.create_pdf()
logger.info("PDF created") log.info("PDF created")
# print_document(self.filename + ".pdf") print_document(self.filename + ".pdf")
logger.info("Document printed") log.info("Document printed")
def set_table_border(self, table): def set_table_border(self, table):
""" """
@@ -247,7 +247,7 @@ class SemesterDocument:
doc.SaveAs(f"{curdir}/{self.filename}.pdf", FileFormat=17) doc.SaveAs(f"{curdir}/{self.filename}.pdf", FileFormat=17)
doc.Close() doc.Close()
word.Quit() word.Quit()
logger.debug("PDF saved") log.debug("PDF saved")
@property @property
def cleanup(self): def cleanup(self):
@@ -258,7 +258,7 @@ class SemesterDocument:
@property @property
def send(self): def send(self):
print_document(self.filename + ".pdf") print_document(self.filename + ".pdf")
logger.debug("Document sent to printer") log.debug("Document sent to printer")
class SemapSchilder: class SemapSchilder:
@@ -317,7 +317,7 @@ class SemapSchilder:
def save_document(self): def save_document(self):
# Save the document # Save the document
self.doc.save(f"{self.filename}.docx") self.doc.save(f"{self.filename}.docx")
logger.debug(f"Document saved as {self.filename}.docx") log.debug(f"Document saved as {self.filename}.docx")
def create_pdf(self): def create_pdf(self):
# Save the document # Save the document
@@ -331,7 +331,7 @@ class SemapSchilder:
doc.SaveAs(f"{curdir}/{self.filename}.pdf", FileFormat=17) doc.SaveAs(f"{curdir}/{self.filename}.pdf", FileFormat=17)
doc.Close() doc.Close()
word.Quit() word.Quit()
logger.debug("PDF saved") log.debug("PDF saved")
def cleanup(self): def cleanup(self):
if os.path.exists(f"{self.filename}.docx"): if os.path.exists(f"{self.filename}.docx"):
@@ -342,7 +342,7 @@ class SemapSchilder:
@property @property
def send(self): def send(self):
print_document(self.filename + ".pdf") print_document(self.filename + ".pdf")
logger.debug("Document sent to printer") log.debug("Document sent to printer")
if __name__ == "__main__": if __name__ == "__main__":