Compare commits
25 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ee1683abe1 | |||
| 320acb5256 | |||
| 7b2a6d7bc1 | |||
| 027cef257d | |||
| cbacda34ca | |||
| cbc805919a | |||
| 31e8b7ccb4 | |||
| 5d908b6142 | |||
| aa9eb4996a | |||
| 43f963d0d3 | |||
| 6589b8d275 | |||
| 612ce2e6e6 | |||
| 210483d250 | |||
| 943b48ce16 | |||
| 476dfee0ff | |||
| d002c5f9da | |||
| 1dbe5709f5 | |||
| 6b3c35f895 | |||
| d49ec9fd34 | |||
| 8673c0f05c | |||
| 7ab2899e92 | |||
| eba20b7e2e | |||
| 92c86334e9 | |||
| 98b1e39abb | |||
| e9aea7e039 |
+89
-7
@@ -4892,7 +4892,8 @@ def student_cards_admin():
|
||||
edit_mode=edit_mode,
|
||||
form_data=form_data,
|
||||
available_classes=available_classes, # Enthält nun die lesbaren Klassen
|
||||
config=cfg.get_school_info()
|
||||
config=cfg.get_school_info(),
|
||||
email_service_enabled=cfg.MODULES.is_enabled('mail')
|
||||
)
|
||||
|
||||
|
||||
@@ -5353,7 +5354,7 @@ def student_card_class_barcode_download():
|
||||
flash('Fehler beim PDF-Download', 'error')
|
||||
return redirect(url_for('student_cards_admin'))
|
||||
|
||||
@app.route('/student_card_single_barcode_download/<card_id>', methods=['GET'])
|
||||
@app.route('/student_card_single_barcode_download/<card_id>', methods=['GET', 'POST'])
|
||||
def student_card_single_barcode_download(card_id):
|
||||
"""
|
||||
Download PDF with single student card barcode.
|
||||
@@ -5533,11 +5534,34 @@ def student_card_single_barcode_download(card_id):
|
||||
c.save()
|
||||
pdf_buffer.seek(0)
|
||||
|
||||
pdf_filename = f'ausweis_{card["AusweisId"]}.pdf'
|
||||
if request.method == 'POST':
|
||||
recipient_email = (request.form.get('recipient_email') or '').strip()
|
||||
if not recipient_email:
|
||||
flash('Bitte eine Empfänger-E-Mail-Adresse eingeben oder nur PDF auswählen.', 'error')
|
||||
return redirect(url_for('student_cards_admin'))
|
||||
if not cfg.MODULES.is_enabled('mail'):
|
||||
flash('Das E-Mail-Add-on ist deaktiviert. Der Ausweis kann weiterhin als PDF heruntergeladen werden.', 'warning')
|
||||
return redirect(url_for('student_cards_admin'))
|
||||
sent = send(
|
||||
recipient_email,
|
||||
f'Bibliotheksausweis {card["AusweisId"]}',
|
||||
f'Anbei erhalten Sie den Bibliotheksausweis für {card.get("SchülerName", "")} als PDF.',
|
||||
'Bibliotheksverwaltung',
|
||||
pdf_buffer.getvalue(),
|
||||
pdf_filename,
|
||||
)
|
||||
flash(
|
||||
'Bibliotheksausweis wurde per E-Mail versendet.' if sent else 'Bibliotheksausweis konnte nicht per E-Mail versendet werden.',
|
||||
'success' if sent else 'error',
|
||||
)
|
||||
return redirect(url_for('student_cards_admin'))
|
||||
|
||||
return send_file(
|
||||
pdf_buffer,
|
||||
mimetype='application/pdf',
|
||||
as_attachment=True,
|
||||
download_name=f'ausweis_{card["AusweisId"]}.pdf'
|
||||
download_name=pdf_filename
|
||||
)
|
||||
except Exception as e:
|
||||
app.logger.error(f"Error occurred while generating PDF for card {card['AusweisId']}: {e}")
|
||||
@@ -8959,7 +8983,8 @@ def admin_borrowings():
|
||||
entries=entries,
|
||||
library_module_enabled=cfg.MODULES.is_enabled('library'),
|
||||
student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
|
||||
mail_module_enabled=cfg.MODULES.is_enabled('mail')
|
||||
mail_module_enabled=cfg.MODULES.is_enabled('mail'),
|
||||
email_service_enabled=cfg.MODULES.is_enabled('mail')
|
||||
)
|
||||
|
||||
"""-----------------------------------------------------------Audit Routes-------------------------------------------------------"""
|
||||
@@ -9051,7 +9076,7 @@ def admin_audit_dashboard():
|
||||
if client:
|
||||
client.close()
|
||||
|
||||
@app.route('/admin/audit/export/pdf/official', methods=['GET'])
|
||||
@app.route('/admin/audit/export/pdf/official', methods=['GET', 'POST'])
|
||||
def admin_audit_export_pdf_official():
|
||||
"""Export audit report as professional PDF (Official Report - full DIN 5008 compliant)."""
|
||||
if 'username' not in session:
|
||||
@@ -9118,6 +9143,29 @@ def admin_audit_export_pdf_official():
|
||||
export_type='official',
|
||||
school_info=school_info
|
||||
)
|
||||
|
||||
if request.method == 'POST':
|
||||
recipient_email = (request.form.get('recipient_email') or '').strip()
|
||||
if not recipient_email:
|
||||
flash('Bitte eine Empfänger-E-Mail-Adresse eingeben oder nur PDF auswählen.', 'error')
|
||||
return redirect(url_for('admin_audit_dashboard'))
|
||||
if not cfg.MODULES.is_enabled('mail'):
|
||||
flash('Das E-Mail-Add-on ist deaktiviert. Der Auditbericht kann weiterhin als PDF heruntergeladen werden.', 'warning')
|
||||
return redirect(url_for('admin_audit_dashboard'))
|
||||
filename = f'audit-official-report-{datetime.datetime.now(ZoneInfo("Europe/Berlin")).strftime("%Y%m%d-%H%M%S")}.pdf'
|
||||
sent = send(
|
||||
recipient_email,
|
||||
'Amtlicher Auditbericht',
|
||||
'Anbei erhalten Sie den aktuellen amtlichen Auditbericht des Inventarsystems als PDF.',
|
||||
'Inventarsystem',
|
||||
pdf_content,
|
||||
filename,
|
||||
)
|
||||
flash(
|
||||
'Auditbericht wurde per E-Mail versendet.' if sent else 'Auditbericht konnte nicht per E-Mail versendet werden.',
|
||||
'success' if sent else 'error',
|
||||
)
|
||||
return redirect(url_for('admin_audit_dashboard'))
|
||||
|
||||
response = make_response(pdf_content)
|
||||
response.headers['Content-Type'] = 'application/pdf'
|
||||
@@ -9492,11 +9540,33 @@ def admin_create_invoice(borrow_id):
|
||||
)
|
||||
|
||||
pdf_buffer = pdf_export._build_invoice_pdf(invoice_data)
|
||||
pdf_filename = f'rechnung_{invoice_number}.pdf'
|
||||
if request.form.get('delivery') == 'email':
|
||||
recipient_email = (request.form.get('recipient_email') or '').strip()
|
||||
if not recipient_email:
|
||||
flash('Bitte eine Empfänger-E-Mail-Adresse eingeben oder nur PDF auswählen.', 'error')
|
||||
return redirect(url_for('admin_borrowings'))
|
||||
if not cfg.MODULES.is_enabled('mail'):
|
||||
flash('Das E-Mail-Add-on ist deaktiviert. Die PDF-Rechnung kann weiterhin heruntergeladen werden.', 'warning')
|
||||
return redirect(url_for('admin_borrowings'))
|
||||
sent = send(
|
||||
recipient_email,
|
||||
f'Rechnung {invoice_number} - {item_name}',
|
||||
f'Anbei erhalten Sie die Rechnung {invoice_number} zum Element {item_name}.',
|
||||
'Bibliotheksverwaltung',
|
||||
pdf_buffer.getvalue(),
|
||||
pdf_filename,
|
||||
)
|
||||
flash(
|
||||
'PDF-Rechnung wurde per E-Mail versendet.' if sent else 'PDF-Rechnung konnte nicht per E-Mail versendet werden.',
|
||||
'success' if sent else 'error',
|
||||
)
|
||||
return redirect(url_for('admin_borrowings'))
|
||||
return send_file(
|
||||
pdf_buffer,
|
||||
mimetype='application/pdf',
|
||||
as_attachment=True,
|
||||
download_name=f'rechnung_{invoice_number}.pdf'
|
||||
download_name=pdf_filename
|
||||
)
|
||||
except Exception as e:
|
||||
app.logger.error(f"Error creating damage invoice for borrow {borrow_id}: {e}")
|
||||
@@ -13685,4 +13755,16 @@ def upload_csv_batch():
|
||||
"images_processed": processed_count,
|
||||
"images_deduplicated": dedup_count,
|
||||
"images_failed": error_count
|
||||
}), 200
|
||||
}), 200
|
||||
|
||||
@app.route('/test_email')
|
||||
def test_email():
|
||||
|
||||
#Test endpoint to send a sample email.
|
||||
#This is for development purposes only.
|
||||
|
||||
try:
|
||||
send(to_email="maximiliangruendinger@gmail.com", subject="Test Email from Inventarsystem", body="This is a test email sent from the Inventarsystem application.")
|
||||
return "Test email sent successfully."
|
||||
except Exception as e:
|
||||
return f"Failed to send test email: {str(e)}", 500
|
||||
@@ -1,84 +1,113 @@
|
||||
from email.mime.multipart import MIMEMultipart
|
||||
from email.mime.text import MIMEText
|
||||
from email.mime.application import MIMEApplication
|
||||
import smtplib
|
||||
import time
|
||||
|
||||
import os
|
||||
import Web.modules.database.settings as cfg
|
||||
|
||||
|
||||
def _build_smtp_client():
|
||||
smtp = smtplib.SMTP(
|
||||
cfg.EMAIL_SMTP_HOST,
|
||||
cfg.EMAIL_SMTP_PORT,
|
||||
timeout=cfg.EMAIL_TIMEOUT_SECONDS,
|
||||
"mail.invario-software.de",
|
||||
587,
|
||||
timeout=10,
|
||||
)
|
||||
smtp.ehlo()
|
||||
if cfg.EMAIL_USE_TLS:
|
||||
if True:
|
||||
smtp.starttls()
|
||||
smtp.ehlo()
|
||||
if cfg.EMAIL_USERNAME:
|
||||
smtp.login("no-reply@invario-software.de", "#,EATwIn,68" or "")
|
||||
smtp.login("no-reply@invario-software.de", "eSpage,65,{")
|
||||
return smtp
|
||||
|
||||
|
||||
def send(email: list | str, subject: str, note: str, sender: str) -> bool:
|
||||
"""Sends the email with the link to the Clients."""
|
||||
if not cfg.MODULES.is_enabled("mail"):
|
||||
print("Debug: Module not enabled")
|
||||
return False
|
||||
|
||||
def _normalize_recipients(email: list | str) -> list[str]:
|
||||
if isinstance(email, str):
|
||||
email = email.replace(';', ',').split(',')
|
||||
return [str(recipient).strip() for recipient in (email or []) if str(recipient).strip()]
|
||||
|
||||
|
||||
def send(
|
||||
email: list | str,
|
||||
subject: str,
|
||||
text_body: str,
|
||||
html_body: str = None,
|
||||
attachments: list = None
|
||||
) -> bool:
|
||||
"""Sends the email with Plain Text, HTML, and optional File Attachments support."""
|
||||
|
||||
if isinstance(email, str):
|
||||
email = [email]
|
||||
|
||||
body_message = note
|
||||
if attachments is None:
|
||||
attachments = []
|
||||
|
||||
HTML_SIGNATURE = f"""
|
||||
<table cellpadding="0" cellspacing="0" border="0" style="font-family: Arial, Helvetica, sans-serif; font-size: 13px; color: #333333; line-height: 1.5;">
|
||||
TEXT_SIGNATURE = (
|
||||
"\n\n--\n"
|
||||
"Mit freundlichen Grüßen\n"
|
||||
"Ihr Invario Team\n\n"
|
||||
"Invario UG\n"
|
||||
"Am Sportplatz 10\n"
|
||||
"83052 Bruckmühl"
|
||||
)
|
||||
|
||||
HTML_SIGNATURE = """
|
||||
<br><br>
|
||||
<table cellpadding="0" cellspacing="0" border="0" style="font-family: Arial, Helvetica, sans-serif; font-size: 13px; color: #555555; line-height: 1.5; border-top: 1px solid #eaebed; padding-top: 15px; width: 100%;">
|
||||
<tr>
|
||||
<td>
|
||||
<p style="margin:0 0 12px 0;">Mit freundlichen Grüßen</p>
|
||||
<p style="margin:0;"><strong style="font-size:16px;">Automatisierter Email Verteiler für die Schule: {cfg.get_school_info().get("name")}</strong><br></p><br>
|
||||
<p style="margin:12px 0 0 0;"><strong>Invario UG</strong><br>Am Sportplatz 10<br>83052 Bruckmühl</p>
|
||||
<p style="margin:0 0 5px 0;">Mit freundlichen Grüßen,</p>
|
||||
<p style="margin:0;"><strong style="font-size:15px; color: #333333;">Ihr Invario Team</strong></p><br>
|
||||
<p style="margin:0 0 0 0; font-size: 12px; color: #888888;">
|
||||
<strong>Invario UG</strong><br>
|
||||
Am Sportplatz 10<br>
|
||||
83052 Bruckmühl
|
||||
</p>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
"""
|
||||
|
||||
text_content = f"{body_message}\n\nMit freundlichen Grüßen\n{sender}\n"
|
||||
|
||||
html_content = f"""
|
||||
<html>
|
||||
<body>
|
||||
<p>{body_message}</p>
|
||||
<br>
|
||||
{HTML_SIGNATURE}
|
||||
</body>
|
||||
</html>
|
||||
"""
|
||||
text_content = f"{text_body}{TEXT_SIGNATURE}"
|
||||
|
||||
if html_body:
|
||||
html_content = f"<html><body style='background-color: #f9f9f9; padding: 20px;'><div style='background-color: #ffffff; padding: 30px; border-radius: 8px; max-width: 600px; margin: 0 auto; box-shadow: 0px 2px 5px rgba(0,0,0,0.05);'>{html_body}{HTML_SIGNATURE}</div></body></html>"
|
||||
else:
|
||||
# Fallback if only text is provided
|
||||
html_safe_text = text_body.replace('\n', '<br>')
|
||||
html_content = f"<html><body><p style='font-family: Arial, sans-serif; color: #333333;'>{html_safe_text}</p>{HTML_SIGNATURE}</body></html>"
|
||||
|
||||
mails_per_second = 10
|
||||
interval = 1.0 / mails_per_second
|
||||
|
||||
smtp = None
|
||||
|
||||
try:
|
||||
smtp = _build_smtp_client()
|
||||
|
||||
for i, recipient in enumerate(email):
|
||||
start_time = time.time()
|
||||
|
||||
msg = MIMEMultipart("alternative")
|
||||
msg["Subject"] = str(subject)
|
||||
msg["From"] = f"{sender} <no-reply@invario-software.de>"
|
||||
# Root message structure for email with attachments
|
||||
msg = MIMEMultipart("mixed")
|
||||
msg["Subject"] = subject
|
||||
msg["From"] = "Invario Team <no-reply@invario-software.de>"
|
||||
msg["To"] = str(recipient)
|
||||
|
||||
msg.attach(MIMEText(text_content, "plain"))
|
||||
msg.attach(MIMEText(html_content, "html"))
|
||||
# Sub-container for Plain Text and HTML bodies
|
||||
msg_body = MIMEMultipart("alternative")
|
||||
msg_body.attach(MIMEText(text_content, "plain"))
|
||||
msg_body.attach(MIMEText(html_content, "html"))
|
||||
msg.attach(msg_body)
|
||||
|
||||
#smtp.sendmail(
|
||||
# from_addr=cfg.EMAIL_USERNAME,
|
||||
# to_addrs=[recipient],
|
||||
# msg=msg.as_string()
|
||||
#)
|
||||
# Attach files if provided
|
||||
for file_path in attachments:
|
||||
if file_path and os.path.isfile(file_path):
|
||||
filename = os.path.basename(file_path)
|
||||
with open(file_path, "rb") as file:
|
||||
part = MIMEApplication(file.read(), Name=filename)
|
||||
part['Content-Disposition'] = f'attachment; filename="{filename}"'
|
||||
msg.attach(part)
|
||||
|
||||
smtp.sendmail(
|
||||
from_addr="no-reply@invario-software.de",
|
||||
|
||||
@@ -3,6 +3,7 @@ import Web.modules.terminplaner.backend_server as appointment_service
|
||||
import Web.modules.database.settings as cfg
|
||||
import Web.modules.database.termine as termin
|
||||
import Web.modules.database.user as us
|
||||
from Web.modules.emailservice.email import send
|
||||
from Web.modules.terminplaner.backend_server import _resolve_public_base_url
|
||||
import csv
|
||||
import io
|
||||
@@ -409,7 +410,7 @@ def client_slot_calendar_export(appointment_id):
|
||||
return response
|
||||
|
||||
|
||||
@appoint_bp.route('/export_pdf_brief/<plan_id>', methods=['GET'])
|
||||
@appoint_bp.route('/export_pdf_brief/<plan_id>', methods=['GET', 'POST'])
|
||||
def export_pdf_brief(plan_id):
|
||||
# 1. Daten holen (Hier als Beispiel, passe dies auf deine Datenbank an)
|
||||
# terminplan = Terminplan.query.get(plan_id)
|
||||
@@ -532,12 +533,35 @@ def export_pdf_brief(plan_id):
|
||||
# Buffer auf Anfang zurücksetzen
|
||||
pdf_buffer.seek(0)
|
||||
|
||||
pdf_filename = f"Einladung_{plan_daten['titel'].replace(' ', '_')}.pdf"
|
||||
if request.method == 'POST':
|
||||
recipient_email = (request.form.get('recipient_email') or '').strip()
|
||||
if not recipient_email:
|
||||
flash('Bitte eine Empfänger-E-Mail-Adresse eingeben oder nur PDF auswählen.', 'error')
|
||||
return redirect(url_for('terminplaner.main', tenant=tenant_id or None))
|
||||
if not cfg.MODULES.is_enabled('mail'):
|
||||
flash('Das E-Mail-Add-on ist deaktiviert. Der Einladungsbrief kann weiterhin als PDF heruntergeladen werden.', 'warning')
|
||||
return redirect(url_for('terminplaner.main', tenant=tenant_id or None))
|
||||
sent = send(
|
||||
recipient_email,
|
||||
f'Einladung zur Terminbuchung: {plan_daten["titel"]}',
|
||||
f'Anbei erhalten Sie den Einladungsbrief für {plan_daten["titel"]} als PDF.',
|
||||
'Terminplanungssystem',
|
||||
pdf_buffer.getvalue(),
|
||||
pdf_filename,
|
||||
)
|
||||
flash(
|
||||
'Einladungsbrief wurde per E-Mail versendet.' if sent else 'Einladungsbrief konnte nicht per E-Mail versendet werden.',
|
||||
'success' if sent else 'error',
|
||||
)
|
||||
return redirect(url_for('terminplaner.main', tenant=tenant_id or None))
|
||||
|
||||
# An Nutzer ausliefern
|
||||
return send_file(
|
||||
pdf_buffer,
|
||||
mimetype='application/pdf',
|
||||
as_attachment=True,
|
||||
download_name=f"Einladung_{plan_daten['titel'].replace(' ', '_')}.pdf"
|
||||
download_name=pdf_filename
|
||||
)
|
||||
|
||||
@appoint_bp.route('/')
|
||||
@@ -557,5 +581,6 @@ def main():
|
||||
current_user=current_user,
|
||||
upcoming_events=upcoming_events,
|
||||
tenant_id=tenant_id,
|
||||
appointment_module_enabled=cfg.MODULES.is_enabled('terminplan')
|
||||
appointment_module_enabled=cfg.MODULES.is_enabled('terminplan'),
|
||||
mail_service_enabled=cfg.MODULES.is_enabled('mail')
|
||||
)
|
||||
@@ -110,10 +110,16 @@
|
||||
<div class="audit-panel" style="padding:14px; border:1px solid #e2e8f0; border-radius:10px; background: var(--ui-surface);">
|
||||
<h4 style="margin:0 0 10px 0; color:#1a1a1a;">📄 PDF-Export (DIN 5008 konform)</h4>
|
||||
<p style="margin:0 0 10px 0; font-size:0.9rem; color:#666;">Professionelle Berichte für Schulträger und Behörden</p>
|
||||
<div style="display:flex; gap:8px; flex-wrap:wrap;">
|
||||
<div style="display:flex; gap:8px; flex-wrap:wrap; align-items:end;">
|
||||
<a class="btn btn-primary" href="{{ url_for('admin_audit_export_pdf_official') }}" style="flex:1; text-align:center;">
|
||||
📋 Amtlicher Bericht (DIN 5008)
|
||||
</a>
|
||||
{% if mail_module_enabled %}
|
||||
<form method="post" action="{{ url_for('admin_audit_export_pdf_official') }}" style="display:flex; gap:8px; flex:2; flex-wrap:wrap;">
|
||||
<input type="email" name="recipient_email" required placeholder="Empfänger-E-Mail" aria-label="Empfänger-E-Mail für den Auditbericht" style="flex:1; min-width:220px; padding:8px; border:1px solid #cbd5e1; border-radius:6px;">
|
||||
<button class="btn btn-outline-primary" type="submit">PDF per E-Mail senden</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -195,6 +195,13 @@
|
||||
<textarea id="damage-reason" name="damage_reason" rows="5" required style="width:100%; padding:10px; border:1px solid #ddd; border-radius:6px; resize:vertical;" placeholder="Beschreiben Sie kurz den Schaden oder die Zerstörung."></textarea>
|
||||
</div>
|
||||
|
||||
{% if email_service_enabled %}
|
||||
<div style="margin-bottom:16px;">
|
||||
<label for="invoice-recipient-email" style="display:block; font-weight:700; margin-bottom:6px;">Empfänger-E-Mail für den PDF-Versand</label>
|
||||
<input id="invoice-recipient-email" name="recipient_email" type="email" style="width:100%; padding:10px; border:1px solid #ddd; border-radius:6px;" placeholder="name@beispiel.de">
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div style="display:flex; flex-wrap:wrap; gap:16px; align-items:center; margin-bottom:18px;">
|
||||
<label style="display:flex; align-items:center; gap:8px;">
|
||||
<input type="checkbox" name="mark_destroyed" checked>
|
||||
@@ -208,7 +215,10 @@
|
||||
|
||||
<div style="display:flex; justify-content:flex-end; gap:10px;">
|
||||
<button type="button" class="btn btn-secondary" onclick="closeInvoiceModal()">Abbrechen</button>
|
||||
<button type="submit" class="btn btn-danger">PDF-Rechnung erstellen</button>
|
||||
<button type="submit" class="btn btn-outline-danger" name="delivery" value="pdf">Nur PDF herunterladen</button>
|
||||
{% if email_service_enabled %}
|
||||
<button type="submit" class="btn btn-danger" name="delivery" value="email">PDF per E-Mail senden</button>
|
||||
{% endif %}
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
+41
-36
@@ -1346,11 +1346,13 @@
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if 'username' in session %}
|
||||
<!--
|
||||
{% if current_permissions.pages.get('tutorial_page', False) %}
|
||||
<li class="nav-item">
|
||||
<a class="nav-link quick-link-pill {% if current_path == url_for('tutorial_page') %}nav-active{% endif %}" href="{{ url_for('tutorial_page') }}" data-tutorial-tip="Nutzen Sie das Tutorial, um die Bibliotheksfunktionen kennenzulernen.">Tutorial</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
-->
|
||||
{% endif %}
|
||||
{% if 'username' in session and current_permissions.actions.get('can_insert', False) and current_permissions.pages.get('library_admin', False) %}
|
||||
<li class="nav-item">
|
||||
@@ -1630,6 +1632,8 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--
|
||||
|
||||
<div id="onboarding-overlay" role="dialog" aria-modal="true" aria-label="Tutorial Vorschlag">
|
||||
<div id="onboarding-modal">
|
||||
<h3>Wollen Sie eine Vorstellung des Produkts?</h3>
|
||||
@@ -1643,6 +1647,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
-->
|
||||
|
||||
<div id="notification-toast" class="notification-toast" role="status" aria-live="polite">
|
||||
<strong id="notification-toast-title">Neue Benachrichtigung</strong>
|
||||
@@ -1662,7 +1667,7 @@
|
||||
<option value="Benachrichtigungen"></option>
|
||||
{% endif %}
|
||||
{% if current_permissions.pages.get('tutorial_page', False) %}
|
||||
<option value="Tutorial"></option>
|
||||
<!--<option value="Tutorial"></option>-->
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
@@ -1765,10 +1770,10 @@
|
||||
});
|
||||
|
||||
const username = {{ (session['username'] if 'username' in session else '')|tojson }};
|
||||
const isTutorialPage = window.location.pathname === {{ url_for('tutorial_page')|tojson }};
|
||||
//const isTutorialPage = window.location.pathname === {{ url_for('tutorial_page')|tojson }};
|
||||
const isLoginPage = window.location.pathname === {{ url_for('login')|tojson }};
|
||||
const notificationsPagePath = {{ url_for('notifications_view')|tojson }};
|
||||
const onboardingKey = username ? ('inventarsystem_tutorial_prompt_v1_' + username) : null;
|
||||
//const onboardingKey = username ? ('inventarsystem_tutorial_prompt_v1_' + username) : null;
|
||||
const onboardingOverlay = document.getElementById('onboarding-overlay');
|
||||
const notificationButtons = Array.from(document.querySelectorAll('[data-notification-button="true"]'));
|
||||
const notificationToast = document.getElementById('notification-toast');
|
||||
@@ -1789,9 +1794,9 @@
|
||||
{% if current_permissions.pages.get('notifications_view', False) %}
|
||||
{ label: 'Benachrichtigungen', keywords: ['benachrichtigungen', 'nachrichten', 'notifications'], url: {{ url_for('notifications_view')|tojson }} },
|
||||
{% endif %}
|
||||
{% if current_permissions.pages.get('tutorial_page', False) %}
|
||||
{ label: 'Tutorial', keywords: ['tutorial', 'hilfe', 'anleitung'], url: {{ url_for('tutorial_page')|tojson }} },
|
||||
{% endif %}
|
||||
//{% if current_permissions.pages.get('tutorial_page', False) %}
|
||||
//{ label: 'Tutorial', keywords: ['tutorial', 'hilfe', 'anleitung'], url: {{ url_for('tutorial_page')|tojson }} },
|
||||
//{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{ label: 'Impressum', keywords: ['impressum'], url: {{ url_for('impressum')|tojson }} },
|
||||
@@ -2042,11 +2047,11 @@
|
||||
window.setInterval(pollNotificationStatus, 30000);
|
||||
}
|
||||
|
||||
function showOnboarding(){
|
||||
if (onboardingOverlay) {
|
||||
onboardingOverlay.style.display = 'flex';
|
||||
}
|
||||
}
|
||||
//function showOnboarding(){
|
||||
// if (onboardingOverlay) {
|
||||
// onboardingOverlay.style.display = 'flex';
|
||||
// }
|
||||
//}
|
||||
|
||||
function hideOnboarding(){
|
||||
if (onboardingOverlay) {
|
||||
@@ -2054,19 +2059,19 @@
|
||||
}
|
||||
}
|
||||
|
||||
if (onboardingKey && !isTutorialPage && !isLoginPage) {
|
||||
const decision = localStorage.getItem(onboardingKey);
|
||||
if (!decision || decision === 'later') {
|
||||
showOnboarding();
|
||||
}
|
||||
}
|
||||
//if (onboardingKey && !isTutorialPage && !isLoginPage) {
|
||||
// const decision = localStorage.getItem(onboardingKey);
|
||||
// if (!decision || decision === 'later') {
|
||||
// showOnboarding();
|
||||
// }
|
||||
//}
|
||||
|
||||
document.getElementById('onboarding-start')?.addEventListener('click', function(){
|
||||
if (onboardingKey) {
|
||||
localStorage.setItem(onboardingKey, 'started');
|
||||
}
|
||||
window.location.href = {{ url_for('tutorial_page')|tojson }};
|
||||
});
|
||||
//document.getElementById('onboarding-start')?.addEventListener('click', function(){
|
||||
// if (onboardingKey) {
|
||||
// localStorage.setItem(onboardingKey, 'started');
|
||||
// }
|
||||
// window.location.href = {{ url_for('tutorial_page')|tojson }};
|
||||
//});
|
||||
|
||||
document.getElementById('onboarding-later')?.addEventListener('click', function(){
|
||||
if (onboardingKey) {
|
||||
@@ -2399,21 +2404,21 @@
|
||||
<script>
|
||||
(function () {
|
||||
const username = {{ (session['username'] if 'username' in session else '')|tojson }};
|
||||
const tooltipModeKey = username ? ('inventarsystem_tutorial_tooltips_enabled_' + username) : 'inventarsystem_tutorial_tooltips_enabled';
|
||||
//const tooltipModeKey = username ? ('inventarsystem_tutorial_tooltips_enabled_' + username) : 'inventarsystem_tutorial_tooltips_enabled';
|
||||
const enabled = localStorage.getItem(tooltipModeKey) === '1';
|
||||
|
||||
function applyTooltipMode(active) {
|
||||
document.body.classList.toggle('tutorial-tooltips-active', active);
|
||||
let indicator = document.getElementById('tutorialTooltipIndicator');
|
||||
if (!indicator) {
|
||||
indicator = document.createElement('div');
|
||||
indicator.id = 'tutorialTooltipIndicator';
|
||||
indicator.className = 'tutorial-tooltip-indicator';
|
||||
indicator.textContent = 'Tutorial-Modus aktiv: Tooltips sind eingeschaltet';
|
||||
document.body.appendChild(indicator);
|
||||
}
|
||||
indicator.style.display = active ? 'inline-flex' : 'none';
|
||||
}
|
||||
//function applyTooltipMode(active) {
|
||||
// document.body.classList.toggle('tutorial-tooltips-active', active);
|
||||
// let indicator = document.getElementById('tutorialTooltipIndicator');
|
||||
// if (!indicator) {
|
||||
// indicator = document.createElement('div');
|
||||
// indicator.id = 'tutorialTooltipIndicator';
|
||||
// indicator.className = 'tutorial-tooltip-indicator';
|
||||
// indicator.textContent = 'Tutorial-Modus aktiv: Tooltips sind eingeschaltet';
|
||||
// document.body.appendChild(indicator);
|
||||
// }
|
||||
// indicator.style.display = active ? 'inline-flex' : 'none';
|
||||
//}
|
||||
|
||||
applyTooltipMode(enabled);
|
||||
})();
|
||||
|
||||
@@ -5396,7 +5396,11 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
max-width: 880px;
|
||||
margin: 4vh auto;
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
max-height: 92vh;
|
||||
overflow-x: hidden;
|
||||
overflow-y: auto;
|
||||
overscroll-behavior: contain;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
border: 1px solid #d8e1eb;
|
||||
border-radius: 16px;
|
||||
background: var(--ui-surface);
|
||||
@@ -5645,6 +5649,8 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
#item-modal .modal-content {
|
||||
width: calc(100vw - 18px);
|
||||
margin: 9px auto;
|
||||
max-height: calc(100dvh - 18px);
|
||||
overflow-y: auto;
|
||||
border-radius: 13px;
|
||||
}
|
||||
|
||||
|
||||
@@ -529,6 +529,12 @@
|
||||
<button type="submit" class="btn-edit">Bearbeiten</button>
|
||||
</form>
|
||||
<a href="{{ url_for('student_card_single_barcode_download', card_id=card._id) }}" class="btn-export">📥 PDF</a>
|
||||
{% if email_service_enabled %}
|
||||
<form method="POST" action="{{ url_for('student_card_single_barcode_download', card_id=card._id) }}" style="display:flex; gap:4px; align-items:center;">
|
||||
<input type="email" name="recipient_email" required placeholder="E-Mail" aria-label="E-Mail für {{ card.SchülerName }}" style="width:150px; padding:5px;">
|
||||
<button type="submit" class="btn-export">PDF senden</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
<form method="POST" style="display: inline;" onsubmit="return confirm('Wirklich löschen?');">
|
||||
<input type="hidden" name="action" value="delete">
|
||||
<input type="hidden" name="card_id" value="{{ card._id }}">
|
||||
|
||||
@@ -42,6 +42,12 @@
|
||||
<a href="{{ url_for('terminplaner.export_pdf_brief', plan_id=plan_id) }}" class="btn btn-outline-success btn-sm">
|
||||
📄 Brief als PDF herunterladen
|
||||
</a>
|
||||
{% if mail_service_enabled %}
|
||||
<form method="post" action="{{ url_for('terminplaner.export_pdf_brief', plan_id=plan_id) }}" class="d-flex flex-wrap gap-2 mt-2">
|
||||
<input type="email" name="recipient_email" required placeholder="Empfänger-E-Mail" aria-label="Empfänger-E-Mail für den Einladungsbrief" class="form-control" style="max-width:280px;">
|
||||
<button type="submit" class="btn btn-outline-primary btn-sm">PDF per E-Mail senden</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
{% if calendar_link %}
|
||||
|
||||
Reference in New Issue
Block a user