Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8673c0f05c | |||
| 7ab2899e92 | |||
| eba20b7e2e | |||
| 92c86334e9 | |||
| 98b1e39abb | |||
| e9aea7e039 |
@@ -230,97 +230,106 @@ jobs:
|
||||
tags: |
|
||||
${{ steps.meta.outputs.image }}
|
||||
|
||||
- name: Create release-only docker bundle
|
||||
run: |
|
||||
mkdir -p release-bundle
|
||||
cat > release-bundle/docker-compose.yml <<EOF
|
||||
services:
|
||||
app:
|
||||
image: \${INVENTAR_APP_IMAGE:-${{ steps.meta.outputs.image }}}
|
||||
container_name: inventarsystem-app
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "\${INVENTAR_HTTP_PORT:-10000}:8000"
|
||||
depends_on:
|
||||
- mongodb
|
||||
- redis
|
||||
environment:
|
||||
INVENTAR_MONGODB_HOST: mongodb
|
||||
INVENTAR_MONGODB_PORT: "27017"
|
||||
INVENTAR_MONGODB_DB: Inventarsystem
|
||||
INVENTAR_BACKUP_FOLDER: /data/backups
|
||||
INVENTAR_LOGS_FOLDER: /data/logs
|
||||
INVENTAR_SECRET_KEY: ${{secrets.INVENTAR_SECRET_KEY}}
|
||||
INVENTAR_DATA_ENCRYPTION_KEY: ${{secrets.INVENTAR_DATA_ENCRYPTION_KEY}}
|
||||
INVENTAR_MONGODB_PASSWORD: ${{secrets.INVENTAR_MONGODB_PASSWORD}}
|
||||
EMAIL_ENABLED: ${{secrets.EMAIL_ENABLED}}
|
||||
EMAIL_SMTP_HOST: ${{secrets.EMAIL_SMTP_HOST}}
|
||||
EMAIL_SMTP_PORT: ${{secrets.EMAIL_SMTP_PORT}}
|
||||
EMAIL_USERNAME: ${{secrets.EMAIL_USERNAME}}
|
||||
EMAIL_PASSWORD: ${{secrets.EMAIL_PASSWORD}}
|
||||
expose:
|
||||
- "8000"
|
||||
volumes:
|
||||
- ./config.json:/app/config.json:ro
|
||||
- app_uploads:/app/Web/uploads
|
||||
- app_thumbnails:/app/Web/thumbnails
|
||||
- app_previews:/app/Web/previews
|
||||
- app_qrcodes:/app/Web/QRCodes
|
||||
- app_backups:/data/backups
|
||||
- app_logs:/data/logs
|
||||
|
||||
mongodb:
|
||||
image: mongo:7.0
|
||||
container_name: inventarsystem-mongodb
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- mongodb_data:/data/db
|
||||
healthcheck:
|
||||
test: ["CMD", "mongosh", "--quiet", "--eval", "db.adminCommand('ping').ok"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 10
|
||||
|
||||
redis:
|
||||
image: redis:7-alpine
|
||||
container_name: inventarsystem-redis
|
||||
restart: unless-stopped
|
||||
command: redis-server --appendonly yes --maxmemory 512mb --maxmemory-policy allkeys-lru
|
||||
ports:
|
||||
- "6379:6379"
|
||||
volumes:
|
||||
- redis_data:/data
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "ping"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
||||
volumes:
|
||||
mongodb_data:
|
||||
app_uploads:
|
||||
app_thumbnails:
|
||||
app_previews:
|
||||
app_qrcodes:
|
||||
app_backups:
|
||||
app_logs:
|
||||
redis_data:
|
||||
EOF
|
||||
|
||||
for f in start.sh stop.sh restart.sh backup.sh restore.sh config.json update.sh; do
|
||||
if [ -f "$f" ]; then
|
||||
cp "$f" "release-bundle/$(basename "$f")"
|
||||
fi
|
||||
done
|
||||
|
||||
for f in docker-compose-multitenant.yml manage-tenant.sh run-tenant-cmd.sh MULTITENANT_DEPLOYMENT.md MULTITENANT_PYTHON_API.md; do
|
||||
if [ -f "$f" ]; then
|
||||
cp "$f" "release-bundle/$(basename "$f")"
|
||||
fi
|
||||
done
|
||||
|
||||
find release-bundle -maxdepth 1 -type f -name '*.sh' -exec chmod +x {} \; || true
|
||||
tar -czf inventarsystem-docker-bundle.tar.gz -C release-bundle .
|
||||
- name: Create release-only docker bundle
|
||||
run: |
|
||||
mkdir -p release-bundle
|
||||
|
||||
# 1. .env Datei aus Gitea Secrets erzeugen
|
||||
cat > release-bundle/.env <<EOF
|
||||
INVENTAR_SECRET_KEY=${{ secrets.INVENTAR_SECRET_KEY }}
|
||||
INVENTAR_DATA_ENCRYPTION_KEY=${{ secrets.INVENTAR_DATA_ENCRYPTION_KEY }}
|
||||
INVENTAR_MONGODB_PASSWORD=${{ secrets.INVENTAR_MONGODB_PASSWORD }}
|
||||
EMAIL_ENABLED=${{ secrets.EMAIL_ENABLED }}
|
||||
EMAIL_SMTP_HOST=${{ secrets.EMAIL_SMTP_HOST }}
|
||||
EMAIL_SMTP_PORT=${{ secrets.EMAIL_SMTP_PORT }}
|
||||
EMAIL_USERNAME=${{ secrets.EMAIL_USERNAME }}
|
||||
EMAIL_PASSWORD=${{ secrets.EMAIL_PASSWORD }}
|
||||
EMAIL_FROM_ADDRESS=${{ secrets.EMAIL_FROM_ADDRESS }}
|
||||
EOF
|
||||
|
||||
# 2. docker-compose.yml nutzt env_file
|
||||
cat > release-bundle/docker-compose.yml <<EOF
|
||||
services:
|
||||
app:
|
||||
image: \${INVENTAR_APP_IMAGE:-${{ steps.meta.outputs.image }}}
|
||||
container_name: inventarsystem-app
|
||||
restart: unless-stopped
|
||||
env_file:
|
||||
- .env
|
||||
ports:
|
||||
- "\${INVENTAR_HTTP_PORT:-10000}:8000"
|
||||
depends_on:
|
||||
- mongodb
|
||||
- redis
|
||||
environment:
|
||||
INVENTAR_MONGODB_HOST: mongodb
|
||||
INVENTAR_MONGODB_PORT: "27017"
|
||||
INVENTAR_MONGODB_DB: Inventarsystem
|
||||
INVENTAR_BACKUP_FOLDER: /data/backups
|
||||
INVENTAR_LOGS_FOLDER: /data/logs
|
||||
expose:
|
||||
- "8000"
|
||||
volumes:
|
||||
- ./config.json:/app/config.json:ro
|
||||
- app_uploads:/app/Web/uploads
|
||||
- app_thumbnails:/app/Web/thumbnails
|
||||
- app_previews:/app/Web/previews
|
||||
- app_qrcodes:/app/Web/QRCodes
|
||||
- app_backups:/data/backups
|
||||
- app_logs:/data/logs
|
||||
|
||||
mongodb:
|
||||
image: mongo:7.0
|
||||
container_name: inventarsystem-mongodb
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- mongodb_data:/data/db
|
||||
healthcheck:
|
||||
test: ["CMD", "mongosh", "--quiet", "--eval", "db.adminCommand('ping').ok"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 10
|
||||
|
||||
redis:
|
||||
image: redis:7-alpine
|
||||
container_name: inventarsystem-redis
|
||||
restart: unless-stopped
|
||||
command: redis-server --appendonly yes --maxmemory 512mb --maxmemory-policy allkeys-lru
|
||||
ports:
|
||||
- "6379:6379"
|
||||
volumes:
|
||||
- redis_data:/data
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "ping"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
||||
volumes:
|
||||
mongodb_data:
|
||||
app_uploads:
|
||||
app_thumbnails:
|
||||
app_previews:
|
||||
app_qrcodes:
|
||||
app_backups:
|
||||
app_logs:
|
||||
redis_data:
|
||||
EOF
|
||||
|
||||
for f in start.sh stop.sh restart.sh backup.sh restore.sh config.json update.sh; do
|
||||
if [ -f "$f" ]; then
|
||||
cp "$f" "release-bundle/$(basename "$f")"
|
||||
fi
|
||||
done
|
||||
|
||||
for f in docker-compose-multitenant.yml manage-tenant.sh run-tenant-cmd.sh MULTITENANT_DEPLOYMENT.md MULTITENANT_PYTHON_API.md; do
|
||||
if [ -f "$f" ]; then
|
||||
cp "$f" "release-bundle/$(basename "$f")"
|
||||
fi
|
||||
done
|
||||
|
||||
find release-bundle -maxdepth 1 -type f -name '*.sh' -exec chmod +x {} \; || true
|
||||
tar -czf inventarsystem-docker-bundle.tar.gz -C release-bundle .
|
||||
|
||||
- name: Create or update Gitea Release
|
||||
uses: https://gitea.com/actions/gitea-release-action@v1
|
||||
|
||||
+77
-7
@@ -48,7 +48,7 @@ import Web.modules.log.audit_log as al
|
||||
import push_notifications as pn
|
||||
import Web.modules.inventarsystem.pdf_export as pdf_export
|
||||
import Web.modules.inventarsystem.excel_export as excel_export
|
||||
from Web.modules.emailservice.email import send
|
||||
from Web.modules.emailservice.email import send, send_pdf
|
||||
import datetime
|
||||
from apscheduler.schedulers.background import BackgroundScheduler
|
||||
from bson.objectid import ObjectId, InvalidId
|
||||
@@ -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_pdf(
|
||||
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_pdf(
|
||||
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_pdf(
|
||||
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}")
|
||||
|
||||
@@ -220,13 +220,25 @@ SSL_CERT = _get(_conf, ['ssl', 'cert'], DEFAULTS['ssl']['cert'])
|
||||
SSL_KEY = _get(_conf, ['ssl', 'key'], DEFAULTS['ssl']['key'])
|
||||
|
||||
# Email settings
|
||||
EMAIL_ENABLED = bool(os.getenv('EMAIL_ENABLED', False))
|
||||
EMAIL_SMTP_HOST = str(os.getenv('EMAIL_SMTP_HOST', False))
|
||||
def _get_email_env(name, default=''):
|
||||
value = os.getenv(name)
|
||||
if value is None:
|
||||
return default
|
||||
value = value.strip()
|
||||
return '' if value.lower() in {'', 'false', 'none', 'null'} else value
|
||||
|
||||
|
||||
EMAIL_ENABLED = _get_email_env('EMAIL_ENABLED').lower() in {'1', 'true', 'yes', 'on'}
|
||||
EMAIL_SMTP_HOST = _get_email_env('EMAIL_SMTP_HOST')
|
||||
EMAIL_SMTP_PORT = int(os.getenv('EMAIL_SMTP_PORT', 587))
|
||||
EMAIL_USE_TLS = True
|
||||
EMAIL_USERNAME = str(os.getenv('EMAIL_USERNAME', False))
|
||||
EMAIL_PASSWORD = str(os.getenv('EMAIL_PASSWORD', False))
|
||||
EMAIL_FROM_ADDRESS = _get(_conf, ['email', 'from_address'], EMAIL_USERNAME)
|
||||
EMAIL_USERNAME = _get_email_env('EMAIL_USERNAME')
|
||||
EMAIL_PASSWORD = _get_email_env('EMAIL_PASSWORD')
|
||||
EMAIL_FROM_ADDRESS = (
|
||||
_get_email_env('EMAIL_FROM_ADDRESS')
|
||||
or _get(_conf, ['email', 'from_address'], '')
|
||||
or EMAIL_USERNAME
|
||||
)
|
||||
EMAIL_DEFAULT_SENDER_NAME = "Invario Inventarsystem Sender"
|
||||
EMAIL_TIMEOUT_SECONDS = 20
|
||||
|
||||
|
||||
@@ -1,12 +1,20 @@
|
||||
from email.mime.multipart import MIMEMultipart
|
||||
from email.mime.text import MIMEText
|
||||
from email.mime.application import MIMEApplication
|
||||
import smtplib
|
||||
import time
|
||||
import logging
|
||||
|
||||
import Web.modules.database.settings as cfg
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def _build_smtp_client():
|
||||
if not cfg.EMAIL_SMTP_HOST:
|
||||
raise RuntimeError('EMAIL_SMTP_HOST ist nicht konfiguriert')
|
||||
|
||||
smtp = smtplib.SMTP(
|
||||
cfg.EMAIL_SMTP_HOST,
|
||||
cfg.EMAIL_SMTP_PORT,
|
||||
@@ -17,18 +25,26 @@ def _build_smtp_client():
|
||||
smtp.starttls()
|
||||
smtp.ehlo()
|
||||
if cfg.EMAIL_USERNAME:
|
||||
smtp.login("no-reply@invario-software.de", "#,EATwIn,68" or "")
|
||||
smtp.login(cfg.EMAIL_USERNAME, cfg.EMAIL_PASSWORD or "")
|
||||
return smtp
|
||||
|
||||
|
||||
def send(email: list | str, subject: str, note: str, sender: str) -> bool:
|
||||
"""Sends the email with the link to the Clients."""
|
||||
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_message(email: list | str, subject: str, note: str, sender: str, attachment=None) -> bool:
|
||||
"""Send a plain/HTML message, optionally with one PDF attachment."""
|
||||
if not cfg.MODULES.is_enabled("mail"):
|
||||
print("Debug: Module not enabled")
|
||||
logger.info("Email delivery skipped because the mail module is disabled")
|
||||
return False
|
||||
|
||||
if isinstance(email, str):
|
||||
email = [email]
|
||||
recipients = _normalize_recipients(email)
|
||||
if not recipients:
|
||||
logger.warning("Email delivery skipped because no recipients were provided")
|
||||
return False
|
||||
|
||||
body_message = note
|
||||
|
||||
@@ -63,25 +79,27 @@ def send(email: list | str, subject: str, note: str, sender: str) -> bool:
|
||||
try:
|
||||
smtp = _build_smtp_client()
|
||||
|
||||
for i, recipient in enumerate(email):
|
||||
for i, recipient in enumerate(recipients):
|
||||
start_time = time.time()
|
||||
|
||||
msg = MIMEMultipart("alternative")
|
||||
msg = MIMEMultipart("mixed" if attachment else "alternative")
|
||||
msg["Subject"] = str(subject)
|
||||
msg["From"] = f"{sender} <no-reply@invario-software.de>"
|
||||
from_address = cfg.EMAIL_FROM_ADDRESS or cfg.EMAIL_USERNAME or "no-reply@invario-software.de"
|
||||
msg["From"] = f"{sender} <{from_address}>"
|
||||
msg["To"] = str(recipient)
|
||||
|
||||
msg.attach(MIMEText(text_content, "plain"))
|
||||
msg.attach(MIMEText(html_content, "html"))
|
||||
|
||||
#smtp.sendmail(
|
||||
# from_addr=cfg.EMAIL_USERNAME,
|
||||
# to_addrs=[recipient],
|
||||
# msg=msg.as_string()
|
||||
#)
|
||||
body = MIMEMultipart("alternative") if attachment else msg
|
||||
body.attach(MIMEText(text_content, "plain"))
|
||||
body.attach(MIMEText(html_content, "html"))
|
||||
if attachment:
|
||||
msg.attach(body)
|
||||
attachment_payload, filename = attachment
|
||||
pdf_part = MIMEApplication(attachment_payload, _subtype="pdf")
|
||||
pdf_part.add_header("Content-Disposition", "attachment", filename=filename)
|
||||
msg.attach(pdf_part)
|
||||
|
||||
smtp.sendmail(
|
||||
from_addr="no-reply@invario-software.de",
|
||||
from_addr=from_address,
|
||||
to_addrs=[recipient],
|
||||
msg=msg.as_string()
|
||||
)
|
||||
@@ -89,16 +107,26 @@ def send(email: list | str, subject: str, note: str, sender: str) -> bool:
|
||||
elapsed_time = time.time() - start_time
|
||||
sleep_time = interval - elapsed_time
|
||||
|
||||
if sleep_time > 0 and i < len(email) - 1:
|
||||
if sleep_time > 0 and i < len(recipients) - 1:
|
||||
time.sleep(sleep_time)
|
||||
|
||||
return True
|
||||
except Exception as e:
|
||||
print(f"Debug: Fehler beim Senden der E-Mail: {e}")
|
||||
logger.exception("Email delivery failed: %s", e)
|
||||
return False
|
||||
finally:
|
||||
if smtp:
|
||||
try:
|
||||
smtp.quit()
|
||||
except Exception:
|
||||
pass
|
||||
pass
|
||||
|
||||
|
||||
def send(email: list | str, subject: str, note: str, sender: str) -> bool:
|
||||
"""Send an HTML/plain email without an attachment."""
|
||||
return _send_message(email, subject, note, sender)
|
||||
|
||||
|
||||
def send_pdf(email: list | str, subject: str, note: str, sender: str, pdf_bytes: bytes, filename: str) -> bool:
|
||||
"""Send an email with a PDF attachment."""
|
||||
return _send_message(email, subject, note, sender, attachment=(pdf_bytes, filename))
|
||||
@@ -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_pdf
|
||||
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_pdf(
|
||||
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>
|
||||
|
||||
@@ -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