Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 68dc2f71c6 | |||
| 736dafd1e1 | |||
| 123ad6f0a7 | |||
| c953f22ab4 | |||
| b1fabfbfcf | |||
| b905ec9024 | |||
| d6625d17c8 |
+162
-14
@@ -610,7 +610,9 @@ def _get_school_info_for_export():
|
||||
Returns default info if not configured.
|
||||
"""
|
||||
try:
|
||||
# Try to load from settings or config
|
||||
if hasattr(cfg, 'get_school_info'):
|
||||
return cfg.get_school_info()
|
||||
|
||||
school_info = {
|
||||
'name': 'Schulname',
|
||||
'address': 'Schuladresse',
|
||||
@@ -618,19 +620,8 @@ def _get_school_info_for_export():
|
||||
'city': 'Stadt',
|
||||
'school_number': '000000',
|
||||
'it_admin': 'IT-Beauftragter/in',
|
||||
'logo_path': '',
|
||||
}
|
||||
|
||||
# Try to load from config.json if available
|
||||
config_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'config.json')
|
||||
if os.path.exists(config_path):
|
||||
try:
|
||||
with open(config_path, 'r') as f:
|
||||
config = json.load(f)
|
||||
if 'school' in config:
|
||||
school_info.update(config.get('school', {}))
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
return school_info
|
||||
except Exception:
|
||||
# Return defaults if anything fails
|
||||
@@ -641,9 +632,55 @@ def _get_school_info_for_export():
|
||||
'city': 'Stadt',
|
||||
'school_number': '000000',
|
||||
'it_admin': 'IT-Beauftragter/in',
|
||||
'logo_path': '',
|
||||
}
|
||||
|
||||
|
||||
def _save_school_logo_upload(upload_file, tenant_id=None, tenant_db=None):
|
||||
"""Save an uploaded school logo to the shared upload folder with a tenant-specific filename."""
|
||||
if not upload_file or not getattr(upload_file, 'filename', ''):
|
||||
return None
|
||||
|
||||
is_allowed, error_message = allowed_file(upload_file.filename, upload_file, max_size_mb=cfg.IMAGE_MAX_UPLOAD_MB)
|
||||
if not is_allowed:
|
||||
raise ValueError(error_message)
|
||||
|
||||
safe_tenant = re.sub(r'[^a-zA-Z0-9_\-]+', '_', str(tenant_id or tenant_db or 'default').strip())
|
||||
safe_tenant = safe_tenant.strip('_') or 'default'
|
||||
_, original_ext = os.path.splitext(secure_filename(upload_file.filename))
|
||||
extension = (original_ext or '').lower()
|
||||
if not extension:
|
||||
raise ValueError('Das Logo benötigt eine Dateiendung.')
|
||||
|
||||
logo_filename = f'school-logo-{safe_tenant}{extension}'
|
||||
logo_path = os.path.join(app.config['UPLOAD_FOLDER'], logo_filename)
|
||||
|
||||
os.makedirs(app.config['UPLOAD_FOLDER'], exist_ok=True)
|
||||
upload_file.save(logo_path)
|
||||
|
||||
# Generate a thumbnail for consistent navbar sizing
|
||||
try:
|
||||
thumb_filename = f'school-logo-{safe_tenant}-thumb.png'
|
||||
thumb_path = os.path.join(app.config['UPLOAD_FOLDER'], thumb_filename)
|
||||
|
||||
with Image.open(logo_path) as img:
|
||||
# Ensure RGBA for transparency and convert if needed
|
||||
if img.mode not in ('RGBA', 'RGB'):
|
||||
img = img.convert('RGBA')
|
||||
|
||||
# Target max size: width up to 520px, height up to 114px (matches CSS constraints)
|
||||
max_thumb_size = (520, 114)
|
||||
img.thumbnail(max_thumb_size, Image.LANCZOS)
|
||||
|
||||
# Save as PNG for predictable rendering in web UI
|
||||
img.save(thumb_path, format='PNG', optimize=True)
|
||||
except Exception as e:
|
||||
app.logger.warning(f"Thumbnail generation failed for {logo_path}: {e}")
|
||||
thumb_filename = None
|
||||
|
||||
return (logo_filename, thumb_filename)
|
||||
|
||||
|
||||
def _parse_money_value(value):
|
||||
"""Parse a user-facing money value into a float when possible."""
|
||||
if value is None:
|
||||
@@ -1215,6 +1252,7 @@ def inject_version():
|
||||
'current_permissions': current_permissions,
|
||||
'current_tenant_db': current_tenant_db,
|
||||
'current_tenant_id': current_tenant_id,
|
||||
'school_info': _get_school_info_for_export(),
|
||||
'permission_action_options': PERMISSION_ACTION_OPTIONS,
|
||||
'permission_page_options': PERMISSION_PAGE_OPTIONS,
|
||||
'permission_presets': us.get_permission_preset_definitions(),
|
||||
@@ -2886,7 +2924,8 @@ def home_admin():
|
||||
library_module_enabled=cfg.LIBRARY_MODULE_ENABLED,
|
||||
student_cards_module_enabled=cfg.STUDENT_CARDS_MODULE_ENABLED,
|
||||
student_default_borrow_days=cfg.STUDENT_DEFAULT_BORROW_DAYS,
|
||||
student_max_borrow_days=cfg.STUDENT_MAX_BORROW_DAYS
|
||||
student_max_borrow_days=cfg.STUDENT_MAX_BORROW_DAYS,
|
||||
school_info=_get_school_info_for_export(),
|
||||
)
|
||||
|
||||
|
||||
@@ -9859,6 +9898,115 @@ def manage_locations():
|
||||
student_cards_module_enabled=cfg.STUDENT_CARDS_MODULE_ENABLED
|
||||
)
|
||||
|
||||
|
||||
@app.route('/admin/school-settings', methods=['GET', 'POST'])
|
||||
def admin_school_settings():
|
||||
"""Admin page for configuring school metadata used in exports."""
|
||||
if 'username' not in session:
|
||||
flash('Bitte melden Sie sich mit einem administrativen Konto an.', 'error')
|
||||
return redirect(url_for('login'))
|
||||
if not us.check_admin(session['username']):
|
||||
flash('Für diese Seite sind Administratorrechte erforderlich.', 'error')
|
||||
return redirect(url_for('login'))
|
||||
|
||||
permissions = _get_current_user_permissions()
|
||||
if not _action_access_allowed(permissions, 'can_manage_settings'):
|
||||
flash('Sie haben keine Berechtigung, die Schulstammdaten zu ändern.', 'error')
|
||||
return redirect(url_for('home_admin'))
|
||||
|
||||
current_school = _get_school_info_for_export()
|
||||
tenant_context = None
|
||||
tenant_id = None
|
||||
tenant_db = cfg.MONGODB_DB
|
||||
try:
|
||||
tenant_context = get_tenant_context()
|
||||
except Exception:
|
||||
tenant_context = None
|
||||
if tenant_context:
|
||||
tenant_id = tenant_context.tenant_id
|
||||
tenant_db = tenant_context.db_name or tenant_db
|
||||
|
||||
if request.method == 'POST':
|
||||
school_info = {
|
||||
'name': sanitize_form_value(request.form.get('name')),
|
||||
'address': sanitize_form_value(request.form.get('address')),
|
||||
'postal_code': sanitize_form_value(request.form.get('postal_code')),
|
||||
'city': sanitize_form_value(request.form.get('city')),
|
||||
'school_number': sanitize_form_value(request.form.get('school_number')),
|
||||
'it_admin': sanitize_form_value(request.form.get('it_admin')),
|
||||
'logo_path': sanitize_form_value(request.form.get('logo_path')),
|
||||
'logo_thumb': sanitize_form_value(request.form.get('logo_thumb')),
|
||||
}
|
||||
|
||||
uploaded_logo = request.files.get('logo_upload')
|
||||
if uploaded_logo and getattr(uploaded_logo, 'filename', ''):
|
||||
try:
|
||||
previous_logo_path = current_school.get('logo_path') if isinstance(current_school, dict) else ''
|
||||
previous_thumb_path = current_school.get('logo_thumb') if isinstance(current_school, dict) else ''
|
||||
saved = _save_school_logo_upload(uploaded_logo, tenant_id=tenant_id, tenant_db=tenant_db)
|
||||
if isinstance(saved, (list, tuple)):
|
||||
saved_logo_filename, saved_thumb_filename = saved
|
||||
else:
|
||||
saved_logo_filename, saved_thumb_filename = saved, None
|
||||
|
||||
if saved_logo_filename:
|
||||
school_info['logo_path'] = saved_logo_filename
|
||||
school_info['logo_thumb'] = saved_thumb_filename or ''
|
||||
|
||||
# remove previous files if different
|
||||
if previous_logo_path and previous_logo_path != saved_logo_filename:
|
||||
previous_logo_file = os.path.join(app.config['UPLOAD_FOLDER'], previous_logo_path)
|
||||
if os.path.exists(previous_logo_file):
|
||||
try:
|
||||
os.remove(previous_logo_file)
|
||||
except Exception:
|
||||
pass
|
||||
if previous_thumb_path and previous_thumb_path != saved_thumb_filename:
|
||||
previous_thumb_file = os.path.join(app.config['UPLOAD_FOLDER'], previous_thumb_path)
|
||||
if os.path.exists(previous_thumb_file):
|
||||
try:
|
||||
os.remove(previous_thumb_file)
|
||||
except Exception:
|
||||
pass
|
||||
except Exception as exc:
|
||||
flash(f'Logo konnte nicht hochgeladen werden: {exc}', 'error')
|
||||
return redirect(url_for('admin_school_settings'))
|
||||
|
||||
if not school_info.get('logo_path') and current_school.get('logo_path'):
|
||||
school_info['logo_path'] = current_school.get('logo_path', '')
|
||||
if not school_info.get('logo_thumb') and current_school.get('logo_thumb'):
|
||||
school_info['logo_thumb'] = current_school.get('logo_thumb', '')
|
||||
|
||||
missing_fields = [
|
||||
label for label, key in [
|
||||
('Schulname', 'name'),
|
||||
('Adresse', 'address'),
|
||||
('PLZ', 'postal_code'),
|
||||
('Ort', 'city'),
|
||||
('Schulnummer', 'school_number'),
|
||||
] if not school_info.get(key)
|
||||
]
|
||||
|
||||
if missing_fields:
|
||||
flash(f'Bitte füllen Sie die Pflichtfelder aus: {", ".join(missing_fields)}.', 'error')
|
||||
else:
|
||||
try:
|
||||
updated_school = cfg.update_school_info(school_info)
|
||||
current_school = updated_school
|
||||
flash('Schulstammdaten wurden erfolgreich gespeichert.', 'success')
|
||||
except Exception as exc:
|
||||
app.logger.error(f'Could not update school settings: {exc}\n{traceback.format_exc()}')
|
||||
flash('Die Schulstammdaten konnten nicht gespeichert werden.', 'error')
|
||||
|
||||
return render_template(
|
||||
'admin_school_settings.html',
|
||||
school_info=current_school,
|
||||
tenant_id=tenant_id,
|
||||
tenant_db=tenant_db,
|
||||
library_module_enabled=cfg.LIBRARY_MODULE_ENABLED,
|
||||
student_cards_module_enabled=cfg.STUDENT_CARDS_MODULE_ENABLED,
|
||||
)
|
||||
|
||||
@app.route('/check_code_unique/<code>')
|
||||
def check_code_unique(code):
|
||||
"""
|
||||
|
||||
+41
-3
@@ -7,6 +7,7 @@ PDF/A archiving standards for German schools and educational authorities.
|
||||
import io
|
||||
import json
|
||||
import datetime
|
||||
import os
|
||||
import qrcode
|
||||
from reportlab.lib.pagesizes import A4
|
||||
from reportlab.lib.styles import getSampleStyleSheet, ParagraphStyle
|
||||
@@ -17,8 +18,11 @@ from reportlab.pdfgen import canvas
|
||||
from reportlab.lib.enums import TA_LEFT, TA_RIGHT, TA_CENTER, TA_JUSTIFY
|
||||
from reportlab.pdfbase import pdfmetrics
|
||||
from reportlab.pdfbase.ttfonts import TTFont
|
||||
import settings as cfg
|
||||
|
||||
|
||||
__version__ = cfg.APP_VERSION
|
||||
|
||||
class DIN5008AuditPDF:
|
||||
"""
|
||||
Professional PDF generator for audit reports compliant with:
|
||||
@@ -106,6 +110,20 @@ class DIN5008AuditPDF:
|
||||
fontName='Helvetica',
|
||||
textColor=HexColor('#000000'),
|
||||
)
|
||||
|
||||
logo_path = self.school_info.get('logo_path', '')
|
||||
resolved_logo_path = None
|
||||
if logo_path:
|
||||
candidate_paths = [
|
||||
logo_path,
|
||||
os.path.join(cfg.UPLOAD_FOLDER, logo_path),
|
||||
os.path.join('/opt/Inventarsystem/Web/uploads', logo_path),
|
||||
os.path.join('/var/Inventarsystem/Web/uploads', logo_path),
|
||||
]
|
||||
for candidate_path in candidate_paths:
|
||||
if candidate_path and os.path.exists(candidate_path):
|
||||
resolved_logo_path = candidate_path
|
||||
break
|
||||
|
||||
school_info_text = f"""
|
||||
<b>{school_name}</b><br/>
|
||||
@@ -113,8 +131,28 @@ class DIN5008AuditPDF:
|
||||
{postal_code} {city}<br/>
|
||||
<i>Schulnummer: {school_number}</i>
|
||||
"""
|
||||
|
||||
story.append(Paragraph(school_info_text, header_style))
|
||||
|
||||
if resolved_logo_path:
|
||||
logo_image = Image(resolved_logo_path)
|
||||
try:
|
||||
logo_image._restrictSize(3.4 * cm, 3.4 * cm)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
school_table = Table(
|
||||
[[logo_image, Paragraph(school_info_text, header_style)]],
|
||||
colWidths=[3.8 * cm, self.USABLE_WIDTH - 3.8 * cm],
|
||||
)
|
||||
school_table.setStyle(TableStyle([
|
||||
('VALIGN', (0, 0), (-1, -1), 'MIDDLE'),
|
||||
('LEFTPADDING', (0, 0), (-1, -1), 0),
|
||||
('RIGHTPADDING', (0, 0), (-1, -1), 0),
|
||||
('TOPPADDING', (0, 0), (-1, -1), 0),
|
||||
('BOTTOMPADDING', (0, 0), (-1, -1), 0),
|
||||
]))
|
||||
story.append(school_table)
|
||||
else:
|
||||
story.append(Paragraph(school_info_text, header_style))
|
||||
|
||||
# Information block (right side simulation)
|
||||
story.append(Spacer(1, 0.3 * cm))
|
||||
@@ -137,7 +175,7 @@ class DIN5008AuditPDF:
|
||||
Erstellungsdatum: {created_date}<br/>
|
||||
Uhrzeit: {created_time}<br/>
|
||||
Verantwortliche Person: {responsible_person}<br/>
|
||||
System: Invario v2.6.5
|
||||
System: Invario v{__version__}
|
||||
"""
|
||||
|
||||
story.append(Paragraph(info_text, info_style))
|
||||
|
||||
@@ -61,6 +61,17 @@ DEFAULTS = {
|
||||
'logs': os.path.join(os.path.dirname(os.path.dirname(BASE_DIR)), 'logs'),
|
||||
'deleted_archives': os.path.join(os.path.dirname(os.path.dirname(BASE_DIR)), 'deleted_archives'),
|
||||
},
|
||||
'school': {
|
||||
'name': 'Schulname',
|
||||
'address': 'Schulstraße 1',
|
||||
'postal_code': '00000',
|
||||
'city': 'Ort',
|
||||
'school_number': '000000',
|
||||
'it_admin': 'IT-Beauftragte oder IT-Beauftragter',
|
||||
'logo_path': '',
|
||||
'logo_thumb': '',
|
||||
'logo_thumb': '',
|
||||
},
|
||||
'schoolPeriods': {
|
||||
"1": {"start": "08:00", "end": "08:45", "label": "1. Stunde (08:00 - 08:45)"},
|
||||
"2": {"start": "08:45", "end": "09:30", "label": "2. Stunde (08:45 - 09:30)"},
|
||||
@@ -163,6 +174,7 @@ SSL_KEY = _get(_conf, ['ssl', 'key'], DEFAULTS['ssl']['key'])
|
||||
|
||||
# School periods
|
||||
SCHOOL_PERIODS = _get(_conf, ['schoolPeriods'], DEFAULTS['schoolPeriods'])
|
||||
SCHOOL_INFO_DEFAULT = _get(_conf, ['school'], DEFAULTS['school'])
|
||||
|
||||
# Optional feature modules
|
||||
TENANT_CONFIGS = _get(_conf, ['tenants'], {})
|
||||
@@ -348,3 +360,65 @@ def MongoClient(*args, **kwargs):
|
||||
cached_client = _MongoClientProxy(client)
|
||||
_MONGO_CLIENT_CACHE[cache_key] = cached_client
|
||||
return cached_client
|
||||
|
||||
|
||||
def get_school_info():
|
||||
"""Return the tenant-scoped school metadata used for PDFs and admin views."""
|
||||
school_info = dict(SCHOOL_INFO_DEFAULT)
|
||||
client = None
|
||||
try:
|
||||
client = MongoClient(MONGODB_HOST, MONGODB_PORT)
|
||||
db = client[MONGODB_DB]
|
||||
if 'settings' not in db.list_collection_names():
|
||||
return school_info
|
||||
|
||||
settings_collection = db['settings']
|
||||
settings_document = settings_collection.find_one({'setting_type': 'school_info'})
|
||||
if not settings_document:
|
||||
return school_info
|
||||
|
||||
configured_school = settings_document.get('school', {})
|
||||
if isinstance(configured_school, dict):
|
||||
for key, value in configured_school.items():
|
||||
if value is not None:
|
||||
school_info[key] = value
|
||||
return school_info
|
||||
except Exception:
|
||||
return school_info
|
||||
finally:
|
||||
if client:
|
||||
client.close()
|
||||
|
||||
|
||||
def update_school_info(school_info):
|
||||
"""Persist tenant-scoped school metadata into MongoDB and refresh the in-memory cache."""
|
||||
if not isinstance(school_info, dict):
|
||||
raise TypeError('school_info must be a dict')
|
||||
|
||||
updated_school = dict(SCHOOL_INFO_DEFAULT)
|
||||
for key in updated_school.keys():
|
||||
value = school_info.get(key, updated_school[key])
|
||||
if value is None:
|
||||
value = ''
|
||||
updated_school[key] = str(value).strip()
|
||||
|
||||
client = None
|
||||
try:
|
||||
client = MongoClient(MONGODB_HOST, MONGODB_PORT)
|
||||
db = client[MONGODB_DB]
|
||||
settings_collection = db['settings']
|
||||
settings_collection.update_one(
|
||||
{'setting_type': 'school_info'},
|
||||
{
|
||||
'$set': {
|
||||
'setting_type': 'school_info',
|
||||
'school': updated_school,
|
||||
}
|
||||
},
|
||||
upsert=True,
|
||||
)
|
||||
finally:
|
||||
if client:
|
||||
client.close()
|
||||
|
||||
return dict(updated_school)
|
||||
|
||||
@@ -0,0 +1,268 @@
|
||||
<!--
|
||||
Copyright 2025-2026 AIIrondev
|
||||
|
||||
Licensed under the Inventarsystem EULA (Endbenutzer-Lizenzvertrag).
|
||||
See Legal/LICENSE for the full license text.
|
||||
Unauthorized commercial use, SaaS hosting, or removal of branding is prohibited.
|
||||
For commercial licensing inquiries: https://github.com/AIIrondev
|
||||
-->
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}Schulstammdaten verwalten{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="page-header">
|
||||
<h1>Schulstammdaten verwalten</h1>
|
||||
<p>Diese Angaben werden für amtliche Exporte, PDF-Berichte und die Zuordnung in Behörden verwendet.</p>
|
||||
</div>
|
||||
|
||||
<div class="notice-card">
|
||||
<strong>Hinweis:</strong> Die hier gespeicherten Daten werden tenantweise in der MongoDB gespeichert und sofort für die PDF-Exporte verwendet.
|
||||
</div>
|
||||
|
||||
<div class="notice-card" style="background:#f8fafc; border-color:#dbe3ee; color:#334155;">
|
||||
<strong>Aktueller Kontext:</strong>
|
||||
Tenant {{ tenant_id or 'default' }} · Datenbank {{ tenant_db or 'Inventarsystem' }}
|
||||
</div>
|
||||
|
||||
<div class="settings-grid">
|
||||
<div class="card settings-card">
|
||||
<div class="card-header">
|
||||
<h2>Schuldaten</h2>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<form method="POST" action="{{ url_for('admin_school_settings') }}" enctype="multipart/form-data">
|
||||
<div class="form-row">
|
||||
<div class="form-group">
|
||||
<label for="name">Schulname *</label>
|
||||
<input type="text" id="name" name="name" value="{{ school_info.name or '' }}" required placeholder="Grundschule Beispielstadt">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="school_number">Schulnummer *</label>
|
||||
<input type="text" id="school_number" name="school_number" value="{{ school_info.school_number or '' }}" required placeholder="042123">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="address">Adresse *</label>
|
||||
<input type="text" id="address" name="address" value="{{ school_info.address or '' }}" required placeholder="Musterstraße 12">
|
||||
</div>
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group">
|
||||
<label for="postal_code">PLZ *</label>
|
||||
<input type="text" id="postal_code" name="postal_code" value="{{ school_info.postal_code or '' }}" required placeholder="12345">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="city">Ort *</label>
|
||||
<input type="text" id="city" name="city" value="{{ school_info.city or '' }}" required placeholder="Musterstadt">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="it_admin">Verantwortliche Person</label>
|
||||
<input type="text" id="it_admin" name="it_admin" value="{{ school_info.it_admin or '' }}" placeholder="IT-Beauftragte/r, Sekretariat oder Schulleitung">
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="logo_upload">Schullogo hochladen</label>
|
||||
<input type="file" id="logo_upload" name="logo_upload" accept=".png,.jpg,.jpeg,.gif,.webp,.svg,image/*">
|
||||
<small>Upload ersetzt das bisherige Logo. Wenn kein neues Logo gewählt wird, bleibt das aktuelle erhalten.</small>
|
||||
</div>
|
||||
|
||||
<div class="actions-row">
|
||||
<button type="submit" class="btn btn-primary">Schulstammdaten speichern</button>
|
||||
<a href="{{ url_for('home_admin') }}" class="btn btn-secondary">Zurück zur Admin-Übersicht</a>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card preview-card">
|
||||
<div class="card-header">
|
||||
<h2>Aktuelle Vorschau</h2>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
{% if school_info.logo_path %}
|
||||
<div style="margin-bottom:16px; padding:12px; border:1px solid #e5e7eb; border-radius:10px; background:#fff;">
|
||||
<div style="font-weight:700; margin-bottom:8px; color:#374151;">Aktuelles Logo</div>
|
||||
<img src="{{ url_for('uploaded_file', filename=school_info.logo_path) }}" alt="Aktuelles Schullogo" style="max-width:100%; max-height:180px; object-fit:contain; display:block;">
|
||||
<div style="margin-top:8px; font-size:0.85rem; color:#6b7280; word-break:break-word;">{{ school_info.logo_path }}</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
<p><strong>Schulname:</strong> {{ school_info.name or 'Nicht gesetzt' }}</p>
|
||||
<p><strong>Adresse:</strong> {{ school_info.address or 'Nicht gesetzt' }}</p>
|
||||
<p><strong>Schulnummer:</strong> {{ school_info.school_number or 'Nicht gesetzt' }}</p>
|
||||
<p><strong>Ort:</strong> {{ school_info.postal_code or '' }} {{ school_info.city or '' }}</p>
|
||||
<p><strong>Verantwortliche Person:</strong> {{ school_info.it_admin or 'Nicht gesetzt' }}</p>
|
||||
<p><strong>Logo:</strong> {{ school_info.logo_path or 'Nicht gesetzt' }}</p>
|
||||
<hr>
|
||||
<p>Diese Angaben erscheinen künftig im amtlichen Audit-PDF und in anderen Behördenberichten.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.container {
|
||||
max-width: 1100px;
|
||||
margin: 0 auto;
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
.page-header {
|
||||
text-align: center;
|
||||
margin-bottom: 18px;
|
||||
}
|
||||
|
||||
.page-header h1 {
|
||||
margin-bottom: 8px;
|
||||
color: #1f2937;
|
||||
}
|
||||
|
||||
.page-header p {
|
||||
color: #4b5563;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.notice-card {
|
||||
background: #eff6ff;
|
||||
border: 1px solid #bfdbfe;
|
||||
color: #1d4ed8;
|
||||
border-radius: 10px;
|
||||
padding: 14px 16px;
|
||||
margin-bottom: 18px;
|
||||
}
|
||||
|
||||
.settings-grid {
|
||||
display: grid;
|
||||
grid-template-columns: 1.4fr 0.9fr;
|
||||
gap: 18px;
|
||||
align-items: start;
|
||||
}
|
||||
|
||||
.card {
|
||||
background: var(--ui-surface);
|
||||
border: 1px solid #e5e7eb;
|
||||
border-radius: 12px;
|
||||
overflow: hidden;
|
||||
box-shadow: 0 6px 20px rgba(15, 23, 42, 0.06);
|
||||
}
|
||||
|
||||
.card-header {
|
||||
background: var(--ui-surface-soft);
|
||||
padding: 16px 18px;
|
||||
border-bottom: 1px solid #e5e7eb;
|
||||
}
|
||||
|
||||
.card-header h2 {
|
||||
margin: 0;
|
||||
font-size: 1.1rem;
|
||||
color: #111827;
|
||||
}
|
||||
|
||||
.card-body {
|
||||
padding: 18px;
|
||||
}
|
||||
|
||||
.form-row {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
gap: 14px;
|
||||
}
|
||||
|
||||
.form-group {
|
||||
margin-bottom: 14px;
|
||||
}
|
||||
|
||||
.form-group label {
|
||||
display: block;
|
||||
font-weight: 700;
|
||||
margin-bottom: 6px;
|
||||
color: #374151;
|
||||
}
|
||||
|
||||
.form-group input {
|
||||
width: 100%;
|
||||
padding: 11px 12px;
|
||||
border: 1px solid #cbd5e1;
|
||||
border-radius: 8px;
|
||||
background: #fff;
|
||||
color: #111827;
|
||||
font-size: 1rem;
|
||||
}
|
||||
|
||||
.form-group input:focus {
|
||||
outline: none;
|
||||
border-color: #2563eb;
|
||||
box-shadow: 0 0 0 3px rgba(37, 99, 235, 0.12);
|
||||
}
|
||||
|
||||
.form-group small {
|
||||
display: block;
|
||||
margin-top: 6px;
|
||||
color: #6b7280;
|
||||
line-height: 1.35;
|
||||
}
|
||||
|
||||
.actions-row {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 10px;
|
||||
margin-top: 18px;
|
||||
}
|
||||
|
||||
.btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 6px;
|
||||
padding: 10px 16px;
|
||||
border-radius: 8px;
|
||||
font-weight: 700;
|
||||
text-decoration: none;
|
||||
border: 1px solid transparent;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.btn-primary {
|
||||
background: #2563eb;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.btn-primary:hover {
|
||||
background: #1d4ed8;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.btn-secondary {
|
||||
background: #f3f4f6;
|
||||
color: #111827;
|
||||
border-color: #d1d5db;
|
||||
}
|
||||
|
||||
.btn-secondary:hover {
|
||||
background: #e5e7eb;
|
||||
color: #111827;
|
||||
}
|
||||
|
||||
.preview-card p {
|
||||
margin: 0 0 10px;
|
||||
line-height: 1.45;
|
||||
}
|
||||
|
||||
.preview-card hr {
|
||||
border: 0;
|
||||
border-top: 1px solid #e5e7eb;
|
||||
margin: 16px 0;
|
||||
}
|
||||
|
||||
@media (max-width: 900px) {
|
||||
.settings-grid,
|
||||
.form-row {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
{% endblock %}
|
||||
+17
-3
@@ -1127,6 +1127,7 @@
|
||||
{% if current_permissions.pages.get('manage_locations', True) %}
|
||||
<li><a class="dropdown-item" href="{{ url_for('manage_locations') }}">Orte verwalten</a></li>
|
||||
{% endif %}
|
||||
<li><a class="dropdown-item" href="{{ url_for('admin_school_settings') }}">Schulstammdaten</a></li>
|
||||
{% if current_permissions.pages.get('admin_borrowings', True) %}
|
||||
<li><a class="dropdown-item" href="{{ url_for('admin_borrowings') }}">Ausleihen</a></li>
|
||||
{% endif %}
|
||||
@@ -1252,6 +1253,7 @@
|
||||
{% if student_cards_module_enabled %}
|
||||
<li><a class="dropdown-item" href="{{ url_for('student_cards_admin') }}">Bibliotheksausweis</a></li>
|
||||
{% endif %}
|
||||
<li><a class="dropdown-item" href="{{ url_for('admin_school_settings') }}">Schulstammdaten</a></li>
|
||||
<li><hr class="dropdown-divider"></li>
|
||||
{% if current_permissions.actions.get('can_manage_users', True) %}
|
||||
<li><h6 class="dropdown-header">System</h6></li>
|
||||
@@ -1311,9 +1313,19 @@
|
||||
{% else %}
|
||||
<nav class="navbar navbar-expand-lg navbar-dark" id="loginNavbar">
|
||||
<div class="container-fluid">
|
||||
<a class="navbar-brand py-0" href="{{ url_for('home') }}">
|
||||
<img src="{{ url_for('static', filename='img/invario-logo.png') }}" alt="Invario" class="invario-logo">
|
||||
</a>
|
||||
<a class="navbar-brand py-0" href="{{ url_for('home') }}">
|
||||
{% set school_logo_thumb = school_info.get('logo_thumb') if school_info else '' %}
|
||||
{% set school_logo_path = school_info.get('logo_path') if school_info else '' %}
|
||||
{% if school_logo_thumb or school_logo_path %}
|
||||
{% if school_logo_thumb %}
|
||||
<img src="{{ url_for('uploaded_file', filename=school_logo_thumb) }}" alt="{{ school_info.name or 'Schullogo' }}" class="invario-logo">
|
||||
{% else %}
|
||||
<img src="{{ url_for('uploaded_file', filename=school_logo_path) }}" alt="{{ school_info.name or 'Schullogo' }}" class="invario-logo">
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<img src="{{ url_for('static', filename='img/invario-logo.png') }}" alt="Invario" class="invario-logo">
|
||||
{% endif %}
|
||||
</a>
|
||||
<ul class="navbar-nav ms-auto mb-2 mb-lg-0">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ url_for('impressum') }}">Impressum</a>
|
||||
@@ -1519,6 +1531,7 @@
|
||||
<option value="Defekte Items"></option>
|
||||
<option value="Filter verwalten"></option>
|
||||
<option value="Orte verwalten"></option>
|
||||
<option value="Schulstammdaten"></option>
|
||||
<option value="Audit Dashboard"></option>
|
||||
<option value="Logs"></option>
|
||||
<option value="Benutzer verwalten"></option>
|
||||
@@ -1588,6 +1601,7 @@
|
||||
{ label: 'Defekte Items', keywords: ['defekte items', 'defekt', 'schaden'], url: {{ url_for('admin_damaged_items')|tojson }} },
|
||||
{ label: 'Filter verwalten', keywords: ['filter verwalten', 'filter'], url: {{ url_for('manage_filters')|tojson }} },
|
||||
{ label: 'Orte verwalten', keywords: ['orte verwalten', 'orte', 'location'], url: {{ url_for('manage_locations')|tojson }} },
|
||||
{ label: 'Schulstammdaten', keywords: ['schule', 'settings', 'stammdaten', 'school settings'], url: {{ url_for('admin_school_settings')|tojson }} },
|
||||
{ label: 'Audit Dashboard', keywords: ['audit', 'audit dashboard'], url: {{ url_for('admin_audit_dashboard')|tojson }} },
|
||||
{ label: 'Logs', keywords: ['logs', 'protokoll'], url: {{ url_for('logs')|tojson }} },
|
||||
{ label: 'Benutzer verwalten', keywords: ['benutzer verwalten', 'user'], url: {{ url_for('user_del')|tojson }} },
|
||||
|
||||
@@ -2345,6 +2345,15 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
||||
</div>
|
||||
</div>
|
||||
</h1>
|
||||
<div class="admin-school-banner" style="display:flex; flex-wrap:wrap; justify-content:space-between; gap:12px; align-items:center; margin:0 0 14px; padding:14px 16px; border:1px solid #dbe3ee; border-radius:12px; background: var(--ui-surface); box-shadow: 0 4px 12px rgba(15, 23, 42, 0.06);">
|
||||
<div>
|
||||
<div style="font-weight:700; font-size:1rem; color:var(--ui-title);">Schulstammdaten</div>
|
||||
<div style="font-size:0.92rem; color:var(--ui-text-muted);">
|
||||
{{ school_info.name if school_info else 'Schulname nicht konfiguriert' }}
|
||||
{% if school_info and school_info.school_number %} | Schulnummer: {{ school_info.school_number }}{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="items-indicator" class="items-indicator">Objekte im System: 0</div>
|
||||
<div id="bulk-delete-drawer" class="bulk-delete-drawer" aria-hidden="true">
|
||||
<div class="bulk-delete-content">
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"dbg": false,
|
||||
"key": "InventarsystemSecureKey2026XYZ789abcdef012",
|
||||
"ver": "0.6.44",
|
||||
"ver": "0.7.20",
|
||||
"host": "0.0.0.0",
|
||||
"port": 8000,
|
||||
"mongodb": {
|
||||
|
||||
Reference in New Issue
Block a user