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

merge main into dev #13

Merged
WorldTeacher merged 41 commits from main into dev 2025-09-03 09:44:13 +01:00
Conversation 0 Commits 41 Files Changed 43 +14 -6
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c6cbb1d825 - Show all commits

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

@@ -1,23 +1,21 @@
import os
import sys
import loguru
from PySide6 import QtWidgets
from src import Icon, settings as config
from src import LOG_DIR, Icon
from src import settings as config
from .dialog_sources.Ui_mail_preview import Ui_eMailPreview as MailPreviewDialog
from .mailTemplate import MailTemplateDialog
import loguru
import sys
from src import LOG_DIR
log = loguru.logger
log.remove()
log.add(sys.stdout, level="INFO")
log.add(f"{LOG_DIR}/application.log", rotation="1 MB", retention="10 days")
empty_signature = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><style
@@ -47,6 +45,7 @@ class Mail_Dialog(QtWidgets.QDialog, MailPreviewDialog):
app_subject,
prof_name,
prof_mail,
accepted_books=None,
parent=None,
default_mail="Information zum Semesterapparat",
):
@@ -58,6 +57,7 @@ class Mail_Dialog(QtWidgets.QDialog, MailPreviewDialog):
self.appname = app_name
self.subject = app_subject
self.profname = prof_name
self.books = accepted_books if accepted_books is not None else []
self.mail_data = ""
self.signature = self.determine_signature()
self.prof_mail = prof_mail
@@ -148,6 +148,14 @@ Tel.: 0761/682-778 | 07617682-545"""
AppSubject=self.subject,
greeting=self.get_greeting(),
signature=self.signature,
newEditions="<br>".join(
[
f"{book.title} von {book.author} (ISBN: {book.isbn}, Auflage: {book.edition}, In Bibliothek: {'ja' if getattr(book, 'library_location', 1) == 1 else 'nein'})"
for book in self.books
]
)
if self.books
else "keine neuen Auflagen gefunden",
)
self.mail_body.setHtml(mail_html)