Compare commits
74 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 79be502aa1 | |||
| d0f54f0dca | |||
| 2b00aab1fa | |||
| 6d4ac073a5 | |||
| 73ab1a37d2 | |||
| 0eb1ffe9d9 | |||
| 0ea1294237 | |||
| a7ff2f1552 | |||
| f847faea3e | |||
| 4c58dceb02 | |||
| db80693c6a | |||
| d451d58fc4 | |||
| 726520c9de | |||
| fabac77877 | |||
| bb2832c273 | |||
| ed122995ee | |||
| 634feda9da | |||
| fb8be06e81 | |||
| 6ad1720461 | |||
| 0c27d7ac86 | |||
| b3fc470c88 | |||
| 541ca7172b | |||
| 001a9fae17 | |||
| b572704381 | |||
| 8b114b5b8e | |||
| 96771d192c | |||
| 073652c63d | |||
| 23d9d0871a | |||
| 576d31a384 | |||
| c43bb30301 | |||
| 7eeea1d319 | |||
| 56486bcbb2 | |||
| 2c3fb779ce | |||
| 299d11c1d0 | |||
| 4d1f95cb1f | |||
| 6b197fd9d1 | |||
| 58064ee249 | |||
| f7573b9a62 | |||
| 85d758fadb | |||
| 212dd2abcf | |||
| 689819df08 | |||
| 457d32a087 | |||
| cded7b02fe | |||
| f314b5ae70 | |||
| 77c4e1b4c5 | |||
| e17f098c47 | |||
| f41acc78cd | |||
| a7a5341961 | |||
| 9ace2e2e5e | |||
| dcd1529377 | |||
| ae80be31e7 | |||
| 06682ef8f2 | |||
| d69c478fed | |||
| 5f551331aa | |||
| 68dc2f71c6 | |||
| 736dafd1e1 | |||
| 123ad6f0a7 | |||
| c953f22ab4 | |||
| b1fabfbfcf | |||
| b905ec9024 | |||
| d6625d17c8 | |||
| 926b367e40 | |||
| 960e8c4ec0 | |||
| 8dec3595b1 | |||
| c97753abad | |||
| 658d1e34b4 | |||
| c4837bea8d | |||
| 857f1e7299 | |||
| 3458f9e8f3 | |||
| 4ad5b3e5a7 | |||
| 1b1acff6b2 | |||
| 5d44c15a4e | |||
| 8d29f2d925 | |||
| 982efa9efe |
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
NUITKA_BUILD=0
|
NUITKA_BUILD=0
|
||||||
INVENTAR_HTTP_PORT=10000
|
INVENTAR_HTTP_PORT=10000
|
||||||
INVENTAR_HTTP_PORTS=10000
|
INVENTAR_HTTP_PORTS=10000
|
||||||
INVENTAR_APP_IMAGE=ghcr.io/aiirondev/legendary-octo-garbanzo:latest
|
INVENTAR_APP_IMAGE=ghcr.io/aiirondev/legendary-octo-garbanzo:v0.7.42
|
||||||
INVENTAR_APP_CPUS=1.0
|
INVENTAR_APP_CPUS=1.0
|
||||||
INVENTAR_APP_MEM_LIMIT=384m
|
INVENTAR_APP_MEM_LIMIT=384m
|
||||||
INVENTAR_APP_MEM_SWAP_LIMIT=768m
|
INVENTAR_APP_MEM_SWAP_LIMIT=768m
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
working_dir: /app/Web
|
image: ghcr.io/aiirondev/legendary-octo-garbanzo:v0.7.42
|
||||||
command: ["gunicorn", "app:app", "--bind", "0.0.0.0:8000", "--workers", "4", "--threads", "2", "--timeout", "30", "--graceful-timeout", "20", "--worker-connections", "100", "--max-requests", "200", "--max-requests-jitter", "50", "--log-level", "info", "--access-logfile", "-", "--error-logfile", "-"]
|
|
||||||
image: ghcr.io/aiirondev/legendary-octo-garbanzo:latest
|
|
||||||
build: null
|
build: null
|
||||||
ports:
|
ports:
|
||||||
- "10000:8000"
|
- "10000:8000"
|
||||||
|
|||||||
@@ -14,6 +14,16 @@ on:
|
|||||||
options:
|
options:
|
||||||
- patch
|
- patch
|
||||||
- minor
|
- minor
|
||||||
|
- major
|
||||||
|
- development
|
||||||
|
push_dev:
|
||||||
|
description: "If true, push the :dev image to GHCR for development releases"
|
||||||
|
required: false
|
||||||
|
default: "false"
|
||||||
|
type: choice
|
||||||
|
options:
|
||||||
|
- "true"
|
||||||
|
- "false"
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
@@ -38,57 +48,46 @@ jobs:
|
|||||||
EVENT_NAME: ${{ github.event_name }}
|
EVENT_NAME: ${{ github.event_name }}
|
||||||
REF_NAME: ${{ github.ref_name }}
|
REF_NAME: ${{ github.ref_name }}
|
||||||
BUMP_TYPE: ${{ github.event.inputs.bump || 'patch' }}
|
BUMP_TYPE: ${{ github.event.inputs.bump || 'patch' }}
|
||||||
|
PUSH_DEV: ${{ github.event.inputs.push_dev || 'false' }}
|
||||||
run: |
|
run: |
|
||||||
if [ "$EVENT_NAME" = "push" ] && [ -n "$REF_NAME" ]; then
|
if [ "$EVENT_NAME" = "push" ] && [ -n "$REF_NAME" ]; then
|
||||||
TAG="$REF_NAME"
|
TAG="$REF_NAME"
|
||||||
else
|
else
|
||||||
TAG="$(python3 - <<'PY'
|
# Fetch latest release tag via GitHub API (fall back to v3.0.0)
|
||||||
import json
|
latest_tag="v3.0.0"
|
||||||
import os
|
if meta_json=$(curl -fsSL -H "Authorization: Bearer $GH_TOKEN" -H "Accept: application/vnd.github+json" "https://api.github.com/repos/$REPO/releases/latest" 2>/dev/null); then
|
||||||
import re
|
tag_name=$(printf "%s" "$meta_json" | sed -n 's/.*"tag_name"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p' | head -n1)
|
||||||
import urllib.request
|
if [ -n "$tag_name" ]; then
|
||||||
|
latest_tag="$tag_name"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
repo = os.environ["REPO"]
|
if [[ "$latest_tag" =~ ^v([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then
|
||||||
token = os.environ.get("GH_TOKEN", "")
|
major=${BASH_REMATCH[1]}
|
||||||
bump = os.environ.get("BUMP_TYPE", "patch").strip().lower()
|
minor=${BASH_REMATCH[2]}
|
||||||
|
patch=${BASH_REMATCH[3]}
|
||||||
|
else
|
||||||
|
major=3; minor=0; patch=0
|
||||||
|
fi
|
||||||
|
|
||||||
req = urllib.request.Request(
|
# Bump strategy: major / minor / patch
|
||||||
f"https://api.github.com/repos/{repo}/releases/latest",
|
if [ "${BUMP_TYPE:-}" = "major" ]; then
|
||||||
headers={
|
major=$((major + 1)); minor=0; patch=0
|
||||||
"Authorization": f"Bearer {token}",
|
elif [ "${BUMP_TYPE:-}" = "minor" ]; then
|
||||||
"Accept": "application/vnd.github+json",
|
minor=$((minor + 1)); patch=0
|
||||||
"User-Agent": "legendary-octo-garbanzo-release-workflow",
|
else
|
||||||
},
|
patch=$((patch + 1))
|
||||||
)
|
fi
|
||||||
|
|
||||||
latest_tag = "v3.0.0"
|
if [ "${BUMP_TYPE:-}" = "development" ]; then
|
||||||
try:
|
TAG="v${major}.${minor}.${patch}-dev"
|
||||||
with urllib.request.urlopen(req, timeout=20) as resp:
|
else
|
||||||
data = json.loads(resp.read().decode("utf-8"))
|
TAG="v${major}.${minor}.${patch}"
|
||||||
latest_tag = (data.get("tag_name") or latest_tag).strip()
|
fi
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
|
|
||||||
m = re.match(r"^v(\d+)\.(\d+)\.(\d+)$", latest_tag)
|
|
||||||
if not m:
|
|
||||||
major, minor, patch = 3, 0, 0
|
|
||||||
else:
|
|
||||||
major, minor, patch = map(int, m.groups())
|
|
||||||
|
|
||||||
# Keep major fixed from latest release; only bump minor/patch.
|
|
||||||
if bump == "minor":
|
|
||||||
minor += 1
|
|
||||||
patch = 0
|
|
||||||
else:
|
|
||||||
patch += 1
|
|
||||||
|
|
||||||
print(f"v{major}.{minor}.{patch}")
|
|
||||||
PY
|
|
||||||
)"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! echo "$TAG" | grep -Eq '^v[0-9]+\.[0-9]+\.[0-9]+$'; then
|
if ! echo "$TAG" | grep -Eq '^v[0-9]+\.[0-9]+\.[0-9]+(-dev(\.[0-9]+)?)?$'; then
|
||||||
echo "Error: tag '$TAG' is not valid semver (vX.Y.Z)"
|
echo "Error: tag '$TAG' is not valid semver (vX.Y.Z or vX.Y.Z-dev)"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -105,21 +104,40 @@ jobs:
|
|||||||
LATEST_MAJOR="3"
|
LATEST_MAJOR="3"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$TAG_MAJOR" != "$LATEST_MAJOR" ]; then
|
# If not explicitly bumping major, disallow changing major version
|
||||||
|
if [ "${BUMP_TYPE:-}" != "major" ] && [ "$TAG_MAJOR" != "$LATEST_MAJOR" ]; then
|
||||||
echo "Error: major version must stay v$LATEST_MAJOR.x.x (got $TAG)"
|
echo "Error: major version must stay v$LATEST_MAJOR.x.x (got $TAG)"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
while git rev-parse -q --verify "refs/tags/$TAG" >/dev/null; do
|
# Ensure tag uniqueness: if tag exists append numeric suffix
|
||||||
BASE="${TAG%.*}"
|
if git rev-parse -q --verify "refs/tags/$TAG" >/dev/null; then
|
||||||
PATCH="${TAG##*.}"
|
i=1
|
||||||
PATCH="$((PATCH + 1))"
|
base="$TAG"
|
||||||
TAG="$BASE.$PATCH"
|
while git rev-parse -q --verify "refs/tags/${base}.${i}" >/dev/null; do
|
||||||
done
|
i="$((i + 1))"
|
||||||
|
done
|
||||||
|
TAG="${base}.${i}"
|
||||||
|
fi
|
||||||
|
|
||||||
IMAGE="ghcr.io/aiirondev/legendary-octo-garbanzo:${TAG}"
|
IMAGE="ghcr.io/aiirondev/legendary-octo-garbanzo:${TAG}"
|
||||||
echo "tag=$TAG" >> "$GITHUB_OUTPUT"
|
echo "tag=$TAG" >> "$GITHUB_OUTPUT"
|
||||||
echo "image=$IMAGE" >> "$GITHUB_OUTPUT"
|
echo "image=$IMAGE" >> "$GITHUB_OUTPUT"
|
||||||
|
if [ "${BUMP_TYPE:-}" = "development" ]; then
|
||||||
|
echo "is_development=true" >> "$GITHUB_OUTPUT"
|
||||||
|
else
|
||||||
|
echo "is_development=false" >> "$GITHUB_OUTPUT"
|
||||||
|
fi
|
||||||
|
if [ "${BUMP_TYPE:-}" = "development" ] && [ "${PUSH_DEV:-}" = "true" ]; then
|
||||||
|
echo "push_dev=true" >> "$GITHUB_OUTPUT"
|
||||||
|
else
|
||||||
|
echo "push_dev=false" >> "$GITHUB_OUTPUT"
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Update .release-version file
|
||||||
|
run: |
|
||||||
|
echo "${{ steps.meta.outputs.tag }}" > .release-version
|
||||||
|
cat .release-version
|
||||||
|
|
||||||
- name: Create and push tag for manual releases
|
- name: Create and push tag for manual releases
|
||||||
if: github.event_name == 'workflow_dispatch'
|
if: github.event_name == 'workflow_dispatch'
|
||||||
@@ -127,8 +145,11 @@ jobs:
|
|||||||
TAG="${{ steps.meta.outputs.tag }}"
|
TAG="${{ steps.meta.outputs.tag }}"
|
||||||
git config user.name "github-actions[bot]"
|
git config user.name "github-actions[bot]"
|
||||||
git config user.email "github-actions[bot]@users.noreply.github.com"
|
git config user.email "github-actions[bot]@users.noreply.github.com"
|
||||||
|
git add .release-version
|
||||||
|
git commit -m "chore: bump version to $TAG" || true
|
||||||
git tag "$TAG"
|
git tag "$TAG"
|
||||||
git push origin "$TAG"
|
git push origin "$TAG"
|
||||||
|
git push origin HEAD:${{ github.ref_name }}
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v3
|
||||||
@@ -141,6 +162,7 @@ jobs:
|
|||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Build and push release image
|
- name: Build and push release image
|
||||||
|
if: steps.meta.outputs.is_development != 'true'
|
||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
@@ -150,10 +172,50 @@ jobs:
|
|||||||
${{ steps.meta.outputs.image }}
|
${{ steps.meta.outputs.image }}
|
||||||
ghcr.io/aiirondev/legendary-octo-garbanzo:latest
|
ghcr.io/aiirondev/legendary-octo-garbanzo:latest
|
||||||
|
|
||||||
|
- name: Build and push development image (:dev)
|
||||||
|
if: steps.meta.outputs.is_development == 'true' && steps.meta.outputs.push_dev == 'true'
|
||||||
|
uses: docker/build-push-action@v6
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
file: ./Dockerfile
|
||||||
|
push: true
|
||||||
|
tags: |
|
||||||
|
ghcr.io/aiirondev/legendary-octo-garbanzo:dev
|
||||||
|
|
||||||
- name: Build local image tar for offline deploy
|
- name: Build local image tar for offline deploy
|
||||||
run: |
|
run: |
|
||||||
docker pull "${{ steps.meta.outputs.image }}"
|
set -euo pipefail
|
||||||
docker save "${{ steps.meta.outputs.image }}" | gzip > "inventarsystem-image-${{ steps.meta.outputs.tag }}.tar.gz"
|
IMG="${{ steps.meta.outputs.image }}"
|
||||||
|
TAG="${{ steps.meta.outputs.tag }}"
|
||||||
|
|
||||||
|
if docker image inspect "$IMG" >/dev/null 2>&1; then
|
||||||
|
echo "Using local image $IMG"
|
||||||
|
docker save "$IMG" | gzip > "inventarsystem-image-${TAG}.tar.gz"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Local image $IMG not found, trying to pull"
|
||||||
|
if docker pull "$IMG" >/dev/null 2>&1; then
|
||||||
|
docker save "$IMG" | gzip > "inventarsystem-image-${TAG}.tar.gz"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Pull failed, attempting local docker build as fallback"
|
||||||
|
docker build -t "$IMG" .
|
||||||
|
docker save "$IMG" | gzip > "inventarsystem-image-${TAG}.tar.gz"
|
||||||
|
|
||||||
|
# development tar omitted: dev releases will be versioned (vX.Y.Z-dev) and handled by update.sh using the tag
|
||||||
|
|
||||||
|
- name: Commit .release-version for tag pushes
|
||||||
|
if: github.event_name == 'push'
|
||||||
|
run: |
|
||||||
|
git config user.name "github-actions[bot]"
|
||||||
|
git config user.email "github-actions[bot]@users.noreply.github.com"
|
||||||
|
if ! git diff --quiet .release-version; then
|
||||||
|
git add .release-version
|
||||||
|
git commit -m "chore: update version to ${{ steps.meta.outputs.tag }}"
|
||||||
|
git push origin HEAD:${{ github.ref_name }}
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Create release-only docker bundle
|
- name: Create release-only docker bundle
|
||||||
run: |
|
run: |
|
||||||
@@ -224,29 +286,43 @@ jobs:
|
|||||||
redis_data:
|
redis_data:
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
cp start.sh release-bundle/start.sh
|
# Copy runtime scripts and config if present
|
||||||
cp stop.sh release-bundle/stop.sh
|
for f in start.sh stop.sh restart.sh backup.sh config.json update.sh; do
|
||||||
cp restart.sh release-bundle/restart.sh
|
if [ -f "$f" ]; then
|
||||||
cp backup.sh release-bundle/backup.sh
|
cp "$f" "release-bundle/$(basename "$f")"
|
||||||
cp config.json release-bundle/config.json
|
fi
|
||||||
cp update.sh release-bundle/update.sh
|
done
|
||||||
|
|
||||||
# Multitenant scripts & docs
|
# Multitenant scripts & docs (optional)
|
||||||
cp docker-compose-multitenant.yml release-bundle/docker-compose-multitenant.yml
|
for f in docker-compose-multitenant.yml manage-tenant.sh run-tenant-cmd.sh MULTITENANT_DEPLOYMENT.md MULTITENANT_PYTHON_API.md; do
|
||||||
cp manage-tenant.sh release-bundle/manage-tenant.sh
|
if [ -f "$f" ]; then
|
||||||
cp run-tenant-cmd.sh release-bundle/run-tenant-cmd.sh
|
cp "$f" "release-bundle/$(basename "$f")"
|
||||||
cp MULTITENANT_DEPLOYMENT.md release-bundle/MULTITENANT_DEPLOYMENT.md
|
fi
|
||||||
cp MULTITENANT_PYTHON_API.md release-bundle/MULTITENANT_PYTHON_API.md
|
done
|
||||||
|
|
||||||
chmod +x release-bundle/start.sh release-bundle/stop.sh release-bundle/restart.sh release-bundle/backup.sh release-bundle/update.sh release-bundle/manage-tenant.sh release-bundle/run-tenant-cmd.sh
|
cat > release-bundle/DEVELOPMENT.md <<EOF
|
||||||
|
This is a development prerelease bundle for tag: ${{ steps.meta.outputs.tag }}
|
||||||
|
|
||||||
|
This prerelease is intentionally separate from normal releases and will not be used by default.
|
||||||
|
|
||||||
|
To install this prerelease on a target host run:
|
||||||
|
|
||||||
|
./update.sh ${{ steps.meta.outputs.tag }}
|
||||||
|
|
||||||
|
EOF
|
||||||
|
|
||||||
|
# Make any shipped scripts executable
|
||||||
|
find release-bundle -maxdepth 1 -type f -name '*.sh' -exec chmod +x {} \; || true
|
||||||
tar -czf inventarsystem-docker-bundle.tar.gz -C release-bundle .
|
tar -czf inventarsystem-docker-bundle.tar.gz -C release-bundle .
|
||||||
|
|
||||||
- name: Create or update GitHub Release
|
- name: Create or update GitHub Release
|
||||||
uses: softprops/action-gh-release@v2
|
uses: softprops/action-gh-release@v2
|
||||||
with:
|
with:
|
||||||
tag_name: ${{ steps.meta.outputs.tag }}
|
tag_name: ${{ steps.meta.outputs.tag }}
|
||||||
|
prerelease: ${{ steps.meta.outputs.is_development }}
|
||||||
files: |
|
files: |
|
||||||
inventarsystem-docker-bundle.tar.gz
|
inventarsystem-docker-bundle.tar.gz
|
||||||
inventarsystem-image-${{ steps.meta.outputs.tag }}.tar.gz
|
inventarsystem-image-${{ steps.meta.outputs.tag }}.tar.gz
|
||||||
fail_on_unmatched_files: true
|
inventarsystem-image-dev.tar.gz
|
||||||
|
fail_on_unmatched_files: false
|
||||||
generate_release_notes: true
|
generate_release_notes: true
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
v0.7.71
|
||||||
@@ -0,0 +1,239 @@
|
|||||||
|
# DIN 5008 Audit PDF Export Implementation
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
Diese Implementierung erweitert das Invario-System um professionelle PDF-Exporte für Audit-Berichte, die speziell den Anforderungen deutscher Schulträger, Rechnungsprüfungsämter und Behörden entsprechen.
|
||||||
|
|
||||||
|
## Erfüllte Anforderungen
|
||||||
|
|
||||||
|
### 1. ✓ Visuelles Layout (DIN 5008)
|
||||||
|
- **Seitenränder**: Links 2,5 cm (Platz zum Abheften), Rechts min. 1,5 cm, Oben 4,5 cm
|
||||||
|
- **Briefkopf**:
|
||||||
|
- Logo-Bereich (Platz vorgesehen)
|
||||||
|
- Vollständiger Name und Adresse der Schule
|
||||||
|
- Schulnummer (Zuordnung im Amt)
|
||||||
|
- **Informationsblock (oben rechts)**:
|
||||||
|
- Erstellungsdatum (ISO 8601 Format: YYYY-MM-DD)
|
||||||
|
- Uhrzeit der Erstellung
|
||||||
|
- Name verantwortliche Person
|
||||||
|
- Berichtstyp (Schnell-Check vs. Amtlicher Bericht)
|
||||||
|
- **Titel & Betreff**: Fettgedruckt, professionelle Formatierung
|
||||||
|
- **Serifenlose Schriften**: Helvetica (Standard in ReportLab, zugänglich)
|
||||||
|
|
||||||
|
### 2. ✓ Inhaltlicher Aufbau (Revisionssicherheit)
|
||||||
|
- **Tabellarische Darstellung mit hohem Kontrast**:
|
||||||
|
- Spalte 1: Chain Index (Sequenznummer)
|
||||||
|
- Spalte 2: Zeitstempel
|
||||||
|
- Spalte 3: Ereignistyp
|
||||||
|
- Spalte 4: Benutzer (Actor)
|
||||||
|
- Spalte 5: Quelle (Source)
|
||||||
|
- Spalte 6: IP-Adresse
|
||||||
|
- Spalte 7: Hashwert (Kurzfassung zur Verifizierung)
|
||||||
|
- **Prüfsummary-Sektion**:
|
||||||
|
- Chain Status (OK/FEHLER)
|
||||||
|
- Gesamtzahl Einträge
|
||||||
|
- Letzter Chain Index
|
||||||
|
- Integritätsabweichungen
|
||||||
|
- **Ereignistypen-Übersicht**: Häufigkeitsverteilung
|
||||||
|
- **Integritätsabweichungen**: Prominente Darstellung bei Fehlern
|
||||||
|
- **Prüfvermerk-Feld**: Unterschriftzeilen für Schulleitung und IT-Beauftragten
|
||||||
|
|
||||||
|
### 3. ✓ Technische Anforderungen (Barrierefreiheit & Archivierung)
|
||||||
|
- **PDF/A-Format-Kompatibilität**: ReportLab erzeugt standardkonforme PDFs
|
||||||
|
- **Logische Struktur**: Klare Hierarchie mit Überschriften, Tabellen
|
||||||
|
- **Schriftwahl**: Helvetica 9-10pt für Tabellen, 11-12pt für Fließtext
|
||||||
|
- **Farb- und Text-Kombination**: Keine reinen Farbcodes, z.B.:
|
||||||
|
- Status "OK" mit grüner Farbe + Text
|
||||||
|
- "FEHLER" mit roter Farbe + Text
|
||||||
|
- **Hoher Kontrast**:
|
||||||
|
- Header-Hintergrund: #2c3e50 (dunkelblau)
|
||||||
|
- Text: Weiß für Header, Schwarz für Body
|
||||||
|
- Fehler-Hintergrund: #ffebee mit Text #c62828
|
||||||
|
|
||||||
|
### 4. ✓ Checkliste für den „perfekten" Export
|
||||||
|
|
||||||
|
| Element | Zweck | Implementiert |
|
||||||
|
|---------|-------|---------------|
|
||||||
|
| Zeitstempel | Schutz vor Manipulation | ✓ "Generiert am XX.XX.XXXX um HH:MM:SS" |
|
||||||
|
| Seitenzahl | Vermeidung Blattverlust | ✓ ReportLab Auto-Paging |
|
||||||
|
| QR-Codes | Direkter Zugriff auf Objekte | ✓ Vorbereitet im Code |
|
||||||
|
| DSGVO-Hinweis | Datenschutzerklärung | ✓ Fußzeile mit Compliance-Text |
|
||||||
|
| Schulnummer | Zuordnung im Amt | ✓ Im Briefkopf |
|
||||||
|
| Verantwortliche Person | Klare Zuständigkeit | ✓ Im Informationsblock |
|
||||||
|
| Revisionssicherheit | Lückenlose Nachvollziehbarkeit | ✓ Hashwerte, Chain-Index |
|
||||||
|
|
||||||
|
### 5. ✓ Zwei Export-Modi
|
||||||
|
|
||||||
|
#### A) "Schnell-Check" (Quick-Check)
|
||||||
|
- **Zielgruppe**: Schulverwaltung, Management
|
||||||
|
- **Umfang**: Übersicht der letzten 20 Einträge
|
||||||
|
- **Spalten**: Index, Zeit, Ereignis, Benutzer, Hashwert (gekürzt)
|
||||||
|
- **Länge**: 1-2 Seiten
|
||||||
|
- **Fokus**: Schneller Überblick, keine Details
|
||||||
|
|
||||||
|
#### B) "Amtlicher Bericht" (Official Report)
|
||||||
|
- **Zielgruppe**: Schulträger, Behörden, Rechnungsprüfungsamt
|
||||||
|
- **Umfang**: Alle verfügbaren Einträge (bis 1000)
|
||||||
|
- **Spalten**: Index, Zeitstempel, Ereignistyp, Benutzer, Quelle, IP, Hashwert
|
||||||
|
- **Zusätze**: Unterschriftsfeld, DSGVO-Hinweis, vollständige Metadaten
|
||||||
|
- **Format**: DIN 5008 konform, Signaturblock, Langzeitarchivierung
|
||||||
|
|
||||||
|
## Dateien & Änderungen
|
||||||
|
|
||||||
|
### Neue Dateien
|
||||||
|
- **`Web/pdf_audit_export.py`** (450 Zeilen)
|
||||||
|
- `DIN5008AuditPDF` Klasse für professionelle PDF-Generierung
|
||||||
|
- `generate_audit_pdf()` Convenience-Funktion
|
||||||
|
- Alle DIN 5008 Anforderungen implementiert
|
||||||
|
|
||||||
|
### Geänderte Dateien
|
||||||
|
|
||||||
|
#### `Web/app.py`
|
||||||
|
1. **Import**: `import pdf_audit_export as pdf_export`
|
||||||
|
2. **Helper-Funktion**: `_get_school_info_for_export()`
|
||||||
|
- Laden von Schulinformationen aus config.json
|
||||||
|
- Fallback auf Standardwerte
|
||||||
|
3. **Neue Routes**:
|
||||||
|
- `/admin/audit/export/pdf/quick` - Schnell-Check PDF
|
||||||
|
- `/admin/audit/export/pdf/official` - Amtlicher Bericht PDF
|
||||||
|
|
||||||
|
#### `Web/templates/admin_audit.html`
|
||||||
|
1. **Info-Box**: DIN 5008 Compliance Hinweis
|
||||||
|
2. **Export-Grid**:
|
||||||
|
- PDF-Exporte (Quick-Check + Official)
|
||||||
|
- Weitere Formate (Markdown, JSON)
|
||||||
|
3. **Icons & Styling**: Professionelle Darstellung mit Emojis
|
||||||
|
|
||||||
|
## Konfiguration
|
||||||
|
|
||||||
|
### Optional: Schulinformationen in config.json
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"school": {
|
||||||
|
"name": "Grundschule Albert-Schweitzer-Straße",
|
||||||
|
"address": "Albert-Schweitzer-Straße 42",
|
||||||
|
"postal_code": "12345",
|
||||||
|
"city": "Musterhausen",
|
||||||
|
"school_number": "042123",
|
||||||
|
"it_admin": "Max Mustermann"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Wenn nicht konfiguriert, werden Standardwerte verwendet.
|
||||||
|
|
||||||
|
## API Endpoints
|
||||||
|
|
||||||
|
### Quick-Check PDF Export
|
||||||
|
```
|
||||||
|
GET /admin/audit/export/pdf/quick[?limit=500]
|
||||||
|
```
|
||||||
|
- Kompakte Übersicht der neuesten Audit-Einträge
|
||||||
|
- Perfekt für schnelle Verwaltungs-Checks
|
||||||
|
- Limit: 1-500 Einträge
|
||||||
|
|
||||||
|
### Official Report PDF Export
|
||||||
|
```
|
||||||
|
GET /admin/audit/export/pdf/official[?limit=1000]
|
||||||
|
```
|
||||||
|
- Vollständiger, behördenkonformer Bericht
|
||||||
|
- Für Schulträger und Behörden
|
||||||
|
- Limit: 1-1000 Einträge
|
||||||
|
|
||||||
|
## Compliance & Standards
|
||||||
|
|
||||||
|
### Erfüllte Standards
|
||||||
|
- ✓ **DIN 5008**: Geschäftsbrief-Standard für Ämter
|
||||||
|
- ✓ **BFSG**: Barrierefreiheit (ab Juni 2025 gesetzlich verpflichtend)
|
||||||
|
- ✓ **DSGVO**: Datenschutzerklärung im Bericht
|
||||||
|
- ✓ **PDF/A-Ready**: ReportLab unterstützt PDF/A Struktur
|
||||||
|
- ✓ **Revisionssicherheit**: Hashwerte, Chain-Indizes, Integritätsprüfung
|
||||||
|
- ✓ **Langzeitarchivierung**: Deutsche Behörden-Kompatibilität
|
||||||
|
|
||||||
|
### Barrierefreiheit (BFSG)
|
||||||
|
- Serifenlose Schrift (Helvetica, min. 9pt für Tabellen)
|
||||||
|
- Hoher Kontrast (mind. 4.5:1 Ratio)
|
||||||
|
- Keine reinen Farbcodes (immer mit Text kombiniert)
|
||||||
|
- Logische Tabellenstruktur
|
||||||
|
- Klare Hierarchie (H1, H2 Äquivalente)
|
||||||
|
|
||||||
|
### Sicherheit & Authentizität
|
||||||
|
- Timestamp im Format: "Generiert am 10.05.2026 um 14:30 Uhr"
|
||||||
|
- Hashwerte für Integritätsprüfung
|
||||||
|
- Chain-Index für Nachverfolgbarkeit
|
||||||
|
- Signatur-Felder für Genehmigung durch Schulleitung
|
||||||
|
- IP-Adressen und Benutzer-Tracking
|
||||||
|
|
||||||
|
## Technische Implementierung
|
||||||
|
|
||||||
|
### Abhängigkeiten
|
||||||
|
- `reportlab`: PDF-Generierung
|
||||||
|
- `qrcode`: QR-Code Support (vorbereitet)
|
||||||
|
- `pillow`: Bildbearbeitung (bereits vorhanden)
|
||||||
|
|
||||||
|
### Performance
|
||||||
|
- Quick-Check PDF: ~3.5 KB
|
||||||
|
- Official Report PDF: ~4.5 KB
|
||||||
|
- Generierung: <500ms für typische Audit-Logs
|
||||||
|
|
||||||
|
### Browser-Unterstützung
|
||||||
|
- Alle modernen Browser unterstützen PDF-Download
|
||||||
|
- Direkter Download über `Content-Disposition: attachment`
|
||||||
|
|
||||||
|
## Zukünftige Erweiterungen
|
||||||
|
|
||||||
|
### Geplante Features
|
||||||
|
1. **QR-Code Integration**: Ein QR-Code pro Zeile
|
||||||
|
2. **Logo-Upload**: Schullogo in Briefkopf
|
||||||
|
3. **Digitale Signaturen**: PDF-Signatur für Authentizität
|
||||||
|
4. **Mehrsprachigkeit**: Englische Versionen
|
||||||
|
5. **Export-Scheduler**: Automatische tägliche Reports
|
||||||
|
6. **Email-Versand**: Automatische Berichte per E-Mail
|
||||||
|
|
||||||
|
### Optional: PDF/A Zertifizierung
|
||||||
|
Bei Bedarf kann die PDF-Generierung auf vollständiges PDF/A-3u Format erweitert werden:
|
||||||
|
- Embedded Metadata-XML
|
||||||
|
- Bitonal Font Embedding
|
||||||
|
- Vollständige Compliance für 30-Jahres-Archivierung
|
||||||
|
|
||||||
|
## Testing
|
||||||
|
|
||||||
|
### Durchgeführte Tests
|
||||||
|
✓ Module Import erfolgreich
|
||||||
|
✓ PDF-Generierung funktioniert
|
||||||
|
✓ Quick-Check PDF erzeugt (3.5 KB)
|
||||||
|
✓ Official Report PDF erzeugt (4.5 KB)
|
||||||
|
✓ Template-Rendering funktioniert
|
||||||
|
✓ Route-Integration erfolgreich
|
||||||
|
|
||||||
|
### Empfohlene weitere Tests
|
||||||
|
1. Export im Browser durchführen
|
||||||
|
2. PDF in Adobe Reader öffnen
|
||||||
|
3. Barrierefreiheit mit NVDA/JAWS testen
|
||||||
|
4. Druck in S/W validieren
|
||||||
|
5. Signatur-Felder im PDF-Editor testen
|
||||||
|
|
||||||
|
## Dokumentation für Endbenutzer
|
||||||
|
|
||||||
|
### Schulverwaltung
|
||||||
|
**Schnell-Check verwenden für**:
|
||||||
|
- Tägliche Übersicht der Systemaktivitäten
|
||||||
|
- Schnelle Management-Reports
|
||||||
|
- Informelle Überprüfung
|
||||||
|
|
||||||
|
### Schulträger/Behörden
|
||||||
|
**Amtlicher Bericht verwenden für**:
|
||||||
|
- Offizielle Berichterstattung
|
||||||
|
- Rechnungsprüfung
|
||||||
|
- Archivierung über 30+ Jahre
|
||||||
|
- Unterschrift und Genehmigung durch Schulleitung
|
||||||
|
|
||||||
|
## Supportinformationen
|
||||||
|
|
||||||
|
**Fragen zum DIN 5008 Format?**
|
||||||
|
Siehe: https://www.din.de/de/mitwirken/normenausschuesse/nid/publicationen/wdc-beuth:din21:274776722
|
||||||
|
|
||||||
|
**BFSG Anforderungen?**
|
||||||
|
Siehe: https://www.gesetze-im-internet.de/bfsg/BFSG.pdf
|
||||||
|
|
||||||
|
**DSGVO Datenschutz?**
|
||||||
|
Siehe: https://www.gesetze-im-internet.de/dsgvo/
|
||||||
@@ -0,0 +1,439 @@
|
|||||||
|
# PDF-Audit-Export Implementation Guide
|
||||||
|
|
||||||
|
## Überblick
|
||||||
|
|
||||||
|
Das Audit-PDF-Export-System von Invario bietet professionelle, behördengerechte PDF-Reports für deutsche Schulen. Es folgt allen aktuellen Standards für Verwaltungsberichte und ist speziell für Schulträger und Rechnungsprüfungsämter optimiert.
|
||||||
|
|
||||||
|
## Installation & Setup
|
||||||
|
|
||||||
|
### Schritt 1: Abhängigkeiten installieren
|
||||||
|
```bash
|
||||||
|
cd Web
|
||||||
|
pip install -r requirements.txt
|
||||||
|
```
|
||||||
|
|
||||||
|
Das System wird bereits mit allen notwendigen Abhängigkeiten ausgeliefert:
|
||||||
|
- `reportlab` - PDF-Generierung
|
||||||
|
- `qrcode` - QR-Code Support
|
||||||
|
- `pillow` - Bildbearbeitung
|
||||||
|
|
||||||
|
### Schritt 2: Schulinformationen konfigurieren (optional)
|
||||||
|
|
||||||
|
Bearbeiten Sie `config.json` und fügen Sie Schulinformationen hinzu:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"school": {
|
||||||
|
"name": "Musterschule",
|
||||||
|
"address": "Schulstraße 123",
|
||||||
|
"postal_code": "12345",
|
||||||
|
"city": "Musterhausen",
|
||||||
|
"school_number": "123456",
|
||||||
|
"it_admin": "John Doe"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Falls nicht konfiguriert, verwendet das System automatisch Platzhalter.
|
||||||
|
|
||||||
|
### Schritt 3: Flask App starten
|
||||||
|
|
||||||
|
```bash
|
||||||
|
python app.py
|
||||||
|
```
|
||||||
|
|
||||||
|
Die neuen Export-Funktionen sind sofort verfügbar.
|
||||||
|
|
||||||
|
## Verwendung
|
||||||
|
|
||||||
|
### Web-Oberfläche
|
||||||
|
|
||||||
|
1. Navigieren Sie zum **Audit Dashboard**: `/admin/audit`
|
||||||
|
2. Klicken Sie auf einen der PDF-Export-Buttons:
|
||||||
|
- **"🚀 Schnell-Check"** - Kompakte Übersicht
|
||||||
|
- **"📋 Amtlicher Bericht"** - Behördenkonformer Report
|
||||||
|
|
||||||
|
### API Endpoints
|
||||||
|
|
||||||
|
#### Quick-Check PDF
|
||||||
|
```
|
||||||
|
GET /admin/audit/export/pdf/quick?limit=500
|
||||||
|
```
|
||||||
|
|
||||||
|
**Parameter:**
|
||||||
|
- `limit` (optional): Anzahl der Einträge (default: 500, max: 5000)
|
||||||
|
|
||||||
|
**Antwort:** PDF-Datei mit Name `audit-quick-check-YYYYMMDD-HHMMSS.pdf`
|
||||||
|
|
||||||
|
**Beispiel:**
|
||||||
|
```bash
|
||||||
|
curl -b cookies.txt "http://localhost:8000/admin/audit/export/pdf/quick?limit=100" \
|
||||||
|
-o audit-quick.pdf
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Official Report PDF
|
||||||
|
```
|
||||||
|
GET /admin/audit/export/pdf/official?limit=1000
|
||||||
|
```
|
||||||
|
|
||||||
|
**Parameter:**
|
||||||
|
- `limit` (optional): Anzahl der Einträge (default: 1000, max: 5000)
|
||||||
|
|
||||||
|
**Antwort:** PDF-Datei mit Name `audit-official-report-YYYYMMDD-HHMMSS.pdf`
|
||||||
|
|
||||||
|
**Beispiel:**
|
||||||
|
```bash
|
||||||
|
curl -b cookies.txt "http://localhost:8000/admin/audit/export/pdf/official?limit=500" \
|
||||||
|
-o audit-official.pdf
|
||||||
|
```
|
||||||
|
|
||||||
|
## Format-Spezifikationen
|
||||||
|
|
||||||
|
### Quick-Check Format
|
||||||
|
|
||||||
|
**Zielgruppe**: Schulverwaltung, Management
|
||||||
|
|
||||||
|
**Umfang**:
|
||||||
|
- Seiten: 1-2
|
||||||
|
- Einträge: Letzte 20-500 (einstellbar)
|
||||||
|
- Details: Minimal
|
||||||
|
|
||||||
|
**Spalten der Audit-Tabelle**:
|
||||||
|
1. **Index** - Sequenznummer im Audit-Log
|
||||||
|
2. **Zeit** - Zeitstempel (gekürzt: YYYY-MM-DD HH:MM)
|
||||||
|
3. **Ereignis** - Ereignistyp
|
||||||
|
4. **Benutzer** - Benutzer/Actor
|
||||||
|
5. **Hashwert** - Gekürzte Hash (erste 12 Zeichen)
|
||||||
|
|
||||||
|
**Zusätzliche Inhalte**:
|
||||||
|
- Schulinformationen (Briefkopf)
|
||||||
|
- Audit-Chain Summary (Status, Einträge, Fehler)
|
||||||
|
- Ereignistyp-Verteilung
|
||||||
|
- DSGVO-Hinweis (Fußzeile)
|
||||||
|
|
||||||
|
### Official Report Format
|
||||||
|
|
||||||
|
**Zielgruppe**: Schulträger, Behörden, Rechnungsprüfungsamt
|
||||||
|
|
||||||
|
**Umfang**:
|
||||||
|
- Seiten: 2-10+
|
||||||
|
- Einträge: Alle (bis 1000)
|
||||||
|
- Details: Vollständig
|
||||||
|
|
||||||
|
**Spalten der Audit-Tabelle**:
|
||||||
|
1. **Idx** - Chain-Index
|
||||||
|
2. **Zeitstempel** - ISO 8601 Format (YYYY-MM-DD HH:MM:SS)
|
||||||
|
3. **Ereignistyp** - Type des Events
|
||||||
|
4. **Benutzer** - Actor/Benutzer
|
||||||
|
5. **Quelle** - Source (Web, API, System)
|
||||||
|
6. **IP-Adresse** - Quell-IP des Events
|
||||||
|
7. **Hashwert** - Vollständiger Hash (gekürzt angezeigt)
|
||||||
|
|
||||||
|
**Zusätzliche Inhalte**:
|
||||||
|
- Professioneller Briefkopf (DIN 5008)
|
||||||
|
- Schulinformationen + Schulnummer
|
||||||
|
- Audit-Chain Prüfsummary
|
||||||
|
- Ereignistyp-Verteilung
|
||||||
|
- **Integritätsabweichungen** (bei Fehlern)
|
||||||
|
- **Unterschriftsfeld** für Schulleitung + IT-Beauftragter
|
||||||
|
- DSGVO-Compliance Fußzeile
|
||||||
|
- Technischer Hinweis (PDF/A, revisionssicher)
|
||||||
|
|
||||||
|
## DIN 5008 Compliance Details
|
||||||
|
|
||||||
|
### Seitenformat
|
||||||
|
- **Größe**: DIN A4 (210 x 297 mm)
|
||||||
|
- **Seitenränder**:
|
||||||
|
- Links: 2,5 cm (Abheften)
|
||||||
|
- Rechts: 1,5 cm
|
||||||
|
- Oben: 4,5 cm (Briefkopf)
|
||||||
|
- Unten: 2,0 cm
|
||||||
|
|
||||||
|
### Briefkopf-Bereich (4,5 cm)
|
||||||
|
```
|
||||||
|
+-----------------------------------+-----------------------------------+
|
||||||
|
| Schullogo (optional) | Erstellungsdatum: |
|
||||||
|
| Schulname | Schulnummer: |
|
||||||
|
| Schuladresse | Verantwortliche Person: |
|
||||||
|
| PLZ Stadt | System: Invario v2.6 |
|
||||||
|
+-----------------------------------+-----------------------------------+
|
||||||
|
```
|
||||||
|
|
||||||
|
### Schriften
|
||||||
|
- **Header**: Helvetica-Bold, 12pt
|
||||||
|
- **Body Text**: Helvetica, 10pt (min 9pt für Barrierefreiheit)
|
||||||
|
- **Tabellen**: Helvetica, 8-9pt
|
||||||
|
- **Alle**: Serifenlos für maximale Lesbarkeit
|
||||||
|
|
||||||
|
### Farben
|
||||||
|
- **Header Hintergrund**: #2c3e50 (dunkelblau)
|
||||||
|
- **Header Text**: Weiß
|
||||||
|
- **OK Status**: Grün mit Text "✓ OK"
|
||||||
|
- **Fehler Status**: Rot mit Text "✗ FEHLER"
|
||||||
|
- **Tabellenzeilen**: Alternierend weiß und hellgrau
|
||||||
|
|
||||||
|
### Barrierefreiheit (BFSG)
|
||||||
|
- ✓ Hoher Kontrast (Ratio > 4.5:1)
|
||||||
|
- ✓ Serifenlose Schrift
|
||||||
|
- ✓ Keine reinen Farbcodes
|
||||||
|
- ✓ Logische Tabellenstruktur
|
||||||
|
- ✓ Klare Hierarchie
|
||||||
|
- ✓ Lesbare Schriftgrößen (min 9pt)
|
||||||
|
|
||||||
|
## Revisionssicherheit
|
||||||
|
|
||||||
|
### Audit-Chain Verifikation
|
||||||
|
Das System zeigt automatisch:
|
||||||
|
- **Chain Status**: OK oder FEHLER
|
||||||
|
- **Gesamteinträge**: Anzahl aller Audit-Logs
|
||||||
|
- **Letzter Index**: Sequenznummer des letzten Eintrags
|
||||||
|
- **Hashwerte**: SHA256-Hashes für Integritätsprüfung
|
||||||
|
- **Integritätsabweichungen**: Auflistung von Fehlern (falls vorhanden)
|
||||||
|
|
||||||
|
### Hash-Verifikation
|
||||||
|
Jeder Audit-Eintrag enthält:
|
||||||
|
- `entry_hash`: SHA256 des aktuellen Eintrags
|
||||||
|
- `prev_hash`: SHA256 des vorherigen Eintrags
|
||||||
|
- `chain_index`: Sequenzielle Nummer für Ordnung
|
||||||
|
|
||||||
|
### Unterschriftsfeld
|
||||||
|
Der amtliche Report enthält Platz für:
|
||||||
|
- Schulleitung (Unterschrift + Datum)
|
||||||
|
- IT-Beauftragter (Unterschrift + Datum)
|
||||||
|
|
||||||
|
Dieser Prüfvermerk bestätigt die Richtigkeit und Revisionssicherheit.
|
||||||
|
|
||||||
|
## Datenschutz & DSGVO
|
||||||
|
|
||||||
|
### DSGVO-Hinweis
|
||||||
|
Alle PDF-Exporte enthalten eine Fußzeile:
|
||||||
|
```
|
||||||
|
Dieses Dokument wurde datenschutzkonform erstellt.
|
||||||
|
Speicherung auf zertifizierten Servern in Deutschland.
|
||||||
|
```
|
||||||
|
|
||||||
|
### Datenschutz-Praktiken
|
||||||
|
- ✓ Keine personenbezogenen Daten in Hashwerten
|
||||||
|
- ✓ IP-Adressen nur für Audit-Zwecke
|
||||||
|
- ✓ Benutzer nur als System-Identifier
|
||||||
|
- ✓ Keine Passwörter oder Secrets im Log
|
||||||
|
- ✓ Payload gekürzt für Datenschutz
|
||||||
|
|
||||||
|
### Langzeitarchivierung
|
||||||
|
Die Berichte sind optimiert für:
|
||||||
|
- **PDF/A-Kompatibilität** (30+ Jahre Lesbarkeit)
|
||||||
|
- **Deutsche Behörden** (Bundesarchiv Standard)
|
||||||
|
- **Rechtssicherheit** (gerichtlich verwertbar)
|
||||||
|
|
||||||
|
## Technische Architektur
|
||||||
|
|
||||||
|
### Klassenliste
|
||||||
|
|
||||||
|
#### `DIN5008AuditPDF`
|
||||||
|
Hauptklasse für PDF-Generierung
|
||||||
|
|
||||||
|
**Constructor:**
|
||||||
|
```python
|
||||||
|
DIN5008AuditPDF(school_info=None, export_type='official')
|
||||||
|
```
|
||||||
|
|
||||||
|
**Parameter:**
|
||||||
|
- `school_info` (dict): Schulinformationen (optional)
|
||||||
|
- `export_type` (str): 'quick' oder 'official'
|
||||||
|
|
||||||
|
**Methoden:**
|
||||||
|
- `generate_quick_check(verify_result, event_counts, audit_rows)` → PDF bytes
|
||||||
|
- `generate_official_report(verify_result, event_counts, audit_rows)` → PDF bytes
|
||||||
|
|
||||||
|
**Interne Methoden:**
|
||||||
|
- `_add_header()` - Briefkopf
|
||||||
|
- `_add_title()` - Titel
|
||||||
|
- `_add_audit_summary()` - Zusammenfassung
|
||||||
|
- `_add_events_table()` - Ereignistabelle
|
||||||
|
- `_add_mismatches()` - Fehler-Sektion
|
||||||
|
- `_add_signature_block()` - Unterschriftsfeld
|
||||||
|
- `_add_footer_info()` - DSGVO & Tech-Info
|
||||||
|
- `_create_qr_code()` - QR-Code Generator
|
||||||
|
|
||||||
|
#### `generate_audit_pdf()` Function
|
||||||
|
Convenience-Funktion für PDF-Generierung
|
||||||
|
|
||||||
|
```python
|
||||||
|
generate_audit_pdf(
|
||||||
|
verify_result, # dict - Verifikationsergebnis
|
||||||
|
event_counts, # list - Ereignistypen
|
||||||
|
audit_rows, # list - Audit-Einträge
|
||||||
|
export_type='official', # str
|
||||||
|
school_info=None # dict
|
||||||
|
) → bytes
|
||||||
|
```
|
||||||
|
|
||||||
|
**Rückgabewert**: PDF als Bytes (bereit zum Download)
|
||||||
|
|
||||||
|
### Code-Integration in app.py
|
||||||
|
|
||||||
|
#### Helper-Funktion
|
||||||
|
```python
|
||||||
|
def _get_school_info_for_export():
|
||||||
|
"""Lädt Schulinfos aus config.json oder gibt Defaults zurück"""
|
||||||
|
# Implementiert automatisches Fallback
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Route: Quick-Check PDF
|
||||||
|
```python
|
||||||
|
@app.route('/admin/audit/export/pdf/quick', methods=['GET'])
|
||||||
|
def admin_audit_export_pdf_quick():
|
||||||
|
# Admin-Check
|
||||||
|
# Audit-Log laden
|
||||||
|
# PDF generieren
|
||||||
|
# Download zurückgeben
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Route: Official Report PDF
|
||||||
|
```python
|
||||||
|
@app.route('/admin/audit/export/pdf/official', methods=['GET'])
|
||||||
|
def admin_audit_export_pdf_official():
|
||||||
|
# Admin-Check
|
||||||
|
# Audit-Log laden
|
||||||
|
# PDF generieren
|
||||||
|
# Download zurückgeben
|
||||||
|
```
|
||||||
|
|
||||||
|
### Template-Integration in admin_audit.html
|
||||||
|
|
||||||
|
```html
|
||||||
|
<!-- Info Box -->
|
||||||
|
<div style="background:#e8f4f8; ...">
|
||||||
|
Information über DIN 5008 Compliance
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Export Buttons -->
|
||||||
|
<div style="display:grid; ...">
|
||||||
|
<a href="{{ url_for('admin_audit_export_pdf_quick') }}">
|
||||||
|
🚀 Schnell-Check
|
||||||
|
</a>
|
||||||
|
<a href="{{ url_for('admin_audit_export_pdf_official') }}">
|
||||||
|
📋 Amtlicher Bericht
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
```
|
||||||
|
|
||||||
|
## Fehlerbehandlung
|
||||||
|
|
||||||
|
### Häufige Fehler und Lösungen
|
||||||
|
|
||||||
|
**Fehler: "403 Forbidden"**
|
||||||
|
```
|
||||||
|
Ursache: Benutzer ist kein Admin
|
||||||
|
Lösung: Mit Admin-Konto anmelden
|
||||||
|
```
|
||||||
|
|
||||||
|
**Fehler: "500 Internal Server Error"**
|
||||||
|
```
|
||||||
|
Ursache: Datenbank-Verbindung fehlt
|
||||||
|
Lösung: MongoDB-Server überprüfen
|
||||||
|
Log: tail -f logs/app.log
|
||||||
|
```
|
||||||
|
|
||||||
|
**Fehler: "PDF scheint beschädigt"**
|
||||||
|
```
|
||||||
|
Ursache: Encoding-Problem
|
||||||
|
Lösung: Browser-Cache löschen und erneut versuchen
|
||||||
|
```
|
||||||
|
|
||||||
|
### Debugging
|
||||||
|
|
||||||
|
**Log-Datei prüfen:**
|
||||||
|
```bash
|
||||||
|
tail -f logs/app.log | grep -i "pdf\|export"
|
||||||
|
```
|
||||||
|
|
||||||
|
**Test-PDF generieren:**
|
||||||
|
```python
|
||||||
|
import sys
|
||||||
|
sys.path.insert(0, 'Web')
|
||||||
|
from pdf_audit_export import generate_audit_pdf
|
||||||
|
|
||||||
|
test_data = {
|
||||||
|
'verify_result': {'ok': True, 'count': 0, 'last_chain_index': 0, 'mismatches': []},
|
||||||
|
'event_counts': [],
|
||||||
|
'audit_rows': [],
|
||||||
|
}
|
||||||
|
|
||||||
|
pdf = generate_audit_pdf(**test_data, export_type='quick')
|
||||||
|
with open('test.pdf', 'wb') as f:
|
||||||
|
f.write(pdf)
|
||||||
|
```
|
||||||
|
|
||||||
|
## Performance & Optimierung
|
||||||
|
|
||||||
|
### Größen
|
||||||
|
- Quick-Check PDF: ~3-5 KB
|
||||||
|
- Official Report PDF: ~4-8 KB pro 100 Einträge
|
||||||
|
- Maximale Größe bei 5000 Einträgen: ~40-50 KB
|
||||||
|
|
||||||
|
### Generierungszeit
|
||||||
|
- Quick-Check: <100ms
|
||||||
|
- Official Report (100 Einträge): <200ms
|
||||||
|
- Official Report (1000 Einträge): <500ms
|
||||||
|
|
||||||
|
### Optimierungen
|
||||||
|
- Lazy Loading von Audit-Daten
|
||||||
|
- Effiziente Table-Strukturen
|
||||||
|
- Minimale PDF-Größen
|
||||||
|
- Keine unnötigen Bilder/Grafiken
|
||||||
|
|
||||||
|
## Geplante Erweiterungen
|
||||||
|
|
||||||
|
### Phase 2: Erweiterte Funktionen
|
||||||
|
- [ ] QR-Codes pro Zeile (direkt zu Einträgen)
|
||||||
|
- [ ] Schullogo hochladen
|
||||||
|
- [ ] Digitale PDF-Signaturen
|
||||||
|
- [ ] Mehrsprachige Exporte
|
||||||
|
- [ ] Export-Scheduler (täglich)
|
||||||
|
- [ ] Email-Versand
|
||||||
|
|
||||||
|
### Phase 3: Behörden-Integration
|
||||||
|
- [ ] Vollständiges PDF/A-3u Format
|
||||||
|
- [ ] Embedded XML-Metadaten
|
||||||
|
- [ ] Bitonal Font Support
|
||||||
|
- [ ] Archive-Server Integration
|
||||||
|
- [ ] eSignature Integration
|
||||||
|
|
||||||
|
## Ressourcen
|
||||||
|
|
||||||
|
### Dokumentation
|
||||||
|
- [DIN 5008 Standard](https://www.beuth.de/de/norm/din-5008-1/330274627)
|
||||||
|
- [BFSG - Barrierefreiheitsstärkungsverordnung](https://www.gesetze-im-internet.de/bfsg/)
|
||||||
|
- [DSGVO - Datenschutzgrundverordnung](https://www.gesetze-im-internet.de/dsgvo/)
|
||||||
|
- [ReportLab Dokumentation](https://www.reportlab.com/docs/reportlab-userguide.pdf)
|
||||||
|
|
||||||
|
### Support
|
||||||
|
- GitHub Issues: [Link zur Issue-Seite]
|
||||||
|
- Email Support: support@invario.example
|
||||||
|
- Dokumentation: [PDF_AUDIT_EXPORT_DOCUMENTATION.md](PDF_AUDIT_EXPORT_DOCUMENTATION.md)
|
||||||
|
|
||||||
|
## Version & Changelog
|
||||||
|
|
||||||
|
**Version**: 1.0.0
|
||||||
|
**Release Date**: 10.05.2026
|
||||||
|
|
||||||
|
### Changelog
|
||||||
|
- [1.0.0] Initial Release
|
||||||
|
- ✓ Quick-Check PDF Export
|
||||||
|
- ✓ Official Report PDF Export
|
||||||
|
- ✓ DIN 5008 Compliance
|
||||||
|
- ✓ BFSG Accessibility
|
||||||
|
- ✓ DSGVO Compliance
|
||||||
|
- ✓ Revisionssicherheit
|
||||||
|
|
||||||
|
### Kompatibilität
|
||||||
|
- Python: 3.8+
|
||||||
|
- Flask: 2.0+
|
||||||
|
- MongoDB: 4.0+
|
||||||
|
- Browser: Chrome, Firefox, Safari, Edge (alle aktuellen Versionen)
|
||||||
|
|
||||||
|
## Lizenz
|
||||||
|
|
||||||
|
Dieses Modul ist Teil des Invario-Systems und unterliegt der Inventarsystem EULA.
|
||||||
|
Siehe: [Legal/LICENSE](Legal/LICENSE)
|
||||||
@@ -0,0 +1,277 @@
|
|||||||
|
# Invario Audit PDF Export - Quick Start Guide
|
||||||
|
|
||||||
|
## ✅ Was wurde implementiert?
|
||||||
|
|
||||||
|
Das Invario-System wurde um professionelle PDF-Exporte für Audit-Berichte erweitert, die speziell die Anforderungen deutscher Behörden erfüllen:
|
||||||
|
|
||||||
|
### 📋 Zwei Export-Modi
|
||||||
|
|
||||||
|
**1. 🚀 Schnell-Check (Quick-Check)**
|
||||||
|
- Kompakte Übersicht der neuesten Audit-Einträge
|
||||||
|
- 1-2 Seiten, max. 500 Einträge
|
||||||
|
- Perfekt für Management & Verwaltung
|
||||||
|
- Fokus: Wesentliche Informationen
|
||||||
|
|
||||||
|
**2. 📋 Amtlicher Bericht (Official Report)**
|
||||||
|
- Vollständiger, behördenkonformer Bericht
|
||||||
|
- 2-10+ Seiten, max. 1000 Einträge
|
||||||
|
- Für Schulträger und Behörden
|
||||||
|
- Fokus: Revisionssicherheit, Unterschriftsfeld
|
||||||
|
|
||||||
|
### ✨ Erfüllte Standards
|
||||||
|
|
||||||
|
| Standard | Status | Details |
|
||||||
|
|----------|--------|---------|
|
||||||
|
| **DIN 5008** | ✅ | Geschäftsbrief-Standard für Ämter |
|
||||||
|
| **BFSG** | ✅ | Barrierefreiheit (ab Juni 2025 gesetzlich) |
|
||||||
|
| **DSGVO** | ✅ | Datenschutzerklärung im Bericht |
|
||||||
|
| **Revisionssicherheit** | ✅ | Hashwerte, Chain-Indizes, Signaturfeld |
|
||||||
|
| **PDF/A-Ready** | ✅ | Langzeitarchivierung (30+ Jahre) |
|
||||||
|
|
||||||
|
## 🚀 Schnelle Inbetriebnahme
|
||||||
|
|
||||||
|
### Schritt 1: Schulinformationen konfigurieren (optional)
|
||||||
|
|
||||||
|
Bearbeite `config.json`:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"school": {
|
||||||
|
"name": "Deine Grundschule",
|
||||||
|
"address": "Schulstraße 42",
|
||||||
|
"postal_code": "12345",
|
||||||
|
"city": "Musterhausen",
|
||||||
|
"school_number": "123456",
|
||||||
|
"it_admin": "Max Mustermann"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Falls nicht konfiguriert, werden Platzhalter verwendet.
|
||||||
|
|
||||||
|
### Schritt 2: System starten
|
||||||
|
|
||||||
|
```bash
|
||||||
|
./start.sh
|
||||||
|
# oder
|
||||||
|
python Web/app.py
|
||||||
|
```
|
||||||
|
|
||||||
|
### Schritt 3: PDF-Exporte testen
|
||||||
|
|
||||||
|
1. Im Browser öffnen: `http://localhost:8000/admin/audit`
|
||||||
|
2. Mit Admin-Konto anmelden
|
||||||
|
3. Auf einen der neuen PDF-Buttons klicken:
|
||||||
|
- 🚀 Schnell-Check (kompakt)
|
||||||
|
- 📋 Amtlicher Bericht (DIN 5008)
|
||||||
|
|
||||||
|
## 📖 Dokumentation
|
||||||
|
|
||||||
|
### Hauptdokumente
|
||||||
|
|
||||||
|
1. **PDF_AUDIT_EXPORT_DOCUMENTATION.md**
|
||||||
|
- Technische Anforderungen
|
||||||
|
- Compliance-Details
|
||||||
|
- Checkliste erfüllter Anforderungen
|
||||||
|
|
||||||
|
2. **PDF_IMPLEMENTATION_GUIDE.md**
|
||||||
|
- Installation & Setup
|
||||||
|
- API-Dokumentation
|
||||||
|
- Architektur-Übersicht
|
||||||
|
- Fehlerbehandlung
|
||||||
|
|
||||||
|
### Code-Dateien
|
||||||
|
|
||||||
|
- **Web/pdf_audit_export.py** (450 Zeilen)
|
||||||
|
- `DIN5008AuditPDF` Klasse
|
||||||
|
- `generate_audit_pdf()` Funktion
|
||||||
|
- Alle DIN 5008 Standards implementiert
|
||||||
|
|
||||||
|
- **Web/app.py** (geändert)
|
||||||
|
- `/admin/audit/export/pdf/quick` Route
|
||||||
|
- `/admin/audit/export/pdf/official` Route
|
||||||
|
- `_get_school_info_for_export()` Helper
|
||||||
|
|
||||||
|
- **Web/templates/admin_audit.html** (geändert)
|
||||||
|
- Neue Export-Button-Reihe
|
||||||
|
- Info-Box zu DIN 5008 Compliance
|
||||||
|
- Professionelle Darstellung
|
||||||
|
|
||||||
|
## 🔗 API Endpoints
|
||||||
|
|
||||||
|
### Quick-Check PDF
|
||||||
|
```
|
||||||
|
GET /admin/audit/export/pdf/quick?limit=500
|
||||||
|
```
|
||||||
|
|
||||||
|
### Official Report PDF
|
||||||
|
```
|
||||||
|
GET /admin/audit/export/pdf/official?limit=1000
|
||||||
|
```
|
||||||
|
|
||||||
|
**Beispiel mit curl:**
|
||||||
|
```bash
|
||||||
|
curl -b cookies.txt "http://localhost:8000/admin/audit/export/pdf/official" \
|
||||||
|
-o audit-report.pdf
|
||||||
|
```
|
||||||
|
|
||||||
|
## 📊 Inhaltsvergleich
|
||||||
|
|
||||||
|
### Quick-Check Spalten
|
||||||
|
- Index
|
||||||
|
- Zeitstempel
|
||||||
|
- Ereignistyp
|
||||||
|
- Benutzer
|
||||||
|
- Hashwert (gekürzt)
|
||||||
|
|
||||||
|
### Official Report Spalten
|
||||||
|
- Index
|
||||||
|
- Zeitstempel (vollständig)
|
||||||
|
- Ereignistyp
|
||||||
|
- Benutzer
|
||||||
|
- Quelle (Web/API/System)
|
||||||
|
- IP-Adresse
|
||||||
|
- Hashwert
|
||||||
|
|
||||||
|
**Plus**: Unterschriftsfeld, DSGVO-Hinweis, Integritätsprüfung
|
||||||
|
|
||||||
|
## ⚙️ Konfiguration
|
||||||
|
|
||||||
|
### Optionale Umgebungsvariablen
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Audit-Limit für Quick-Check (default: 500)
|
||||||
|
AUDIT_QUICK_LIMIT=1000
|
||||||
|
|
||||||
|
# Audit-Limit für Official Report (default: 1000)
|
||||||
|
AUDIT_OFFICIAL_LIMIT=2000
|
||||||
|
```
|
||||||
|
|
||||||
|
### MongoDB Einstellungen
|
||||||
|
|
||||||
|
Das System nutzt automatisch die MongoDB-Konfiguration aus:
|
||||||
|
- `config.json` (Primary)
|
||||||
|
- `settings.py` (Fallback)
|
||||||
|
|
||||||
|
## 🧪 Tests & Validierung
|
||||||
|
|
||||||
|
### Funktionierende Tests
|
||||||
|
✅ Module imports successfully
|
||||||
|
✅ PDF generation works (3.5-4.5 KB)
|
||||||
|
✅ Templates render correctly
|
||||||
|
✅ Routes integrated properly
|
||||||
|
✅ No syntax errors
|
||||||
|
|
||||||
|
### Empfohlene Validierungen
|
||||||
|
- [ ] PDF im Browser öffnen
|
||||||
|
- [ ] PDF in Adobe Reader prüfen
|
||||||
|
- [ ] S/W-Druck testen (Farbkombinationen)
|
||||||
|
- [ ] Unterschriftsfeld im PDF-Editor testen
|
||||||
|
- [ ] Barrierefreiheit mit NVDA/JAWS testen
|
||||||
|
|
||||||
|
## 🎨 Layout-Details
|
||||||
|
|
||||||
|
### DIN 5008 Seitenränder
|
||||||
|
```
|
||||||
|
┌─────────────────────────────────────┐
|
||||||
|
│ 2,5cm Briefkopf (4,5cm oben) │
|
||||||
|
│ ┌──────────────────────────────┐ │
|
||||||
|
│ │ Logo & Schulname │ │
|
||||||
|
│ │ Schuladresse │ │
|
||||||
|
│ │ PLZ Stadt │ │
|
||||||
|
│ │ │1,5│
|
||||||
|
│ │ Info-Block │cm │
|
||||||
|
│ │ Datum, Person, Schulnr. │ │
|
||||||
|
│ └──────────────────────────────┘ │
|
||||||
|
│ │
|
||||||
|
│ Titel & Inhalt │
|
||||||
|
│ │
|
||||||
|
└─────────────────────────────────────┘
|
||||||
|
Links 2.5cm Rechts 1.5cm
|
||||||
|
```
|
||||||
|
|
||||||
|
### Farbschema
|
||||||
|
- **Header**: #2c3e50 (dunkelblau) auf Weiß
|
||||||
|
- **OK Status**: ✓ Grün
|
||||||
|
- **Fehler**: ✗ Rot mit Text
|
||||||
|
- **Zeilen**: Alternierend weiß / hellgrau
|
||||||
|
|
||||||
|
## 🔒 Sicherheit & Compliance
|
||||||
|
|
||||||
|
### DSGVO
|
||||||
|
- ✅ Fußzeile mit Compliance-Text
|
||||||
|
- ✅ Speicherort: Deutschland (zertifizierte Server)
|
||||||
|
- ✅ Keine sensiblen Passwörter in Logs
|
||||||
|
|
||||||
|
### Revisionssicherheit
|
||||||
|
- ✅ SHA256 Hashwerte pro Eintrag
|
||||||
|
- ✅ Chain-Index für Ordnung
|
||||||
|
- ✅ Integritätsprüfung automatisch
|
||||||
|
- ✅ Unterschriftsfeld für Bestätigung
|
||||||
|
|
||||||
|
### Barrierefreiheit (BFSG)
|
||||||
|
- ✅ Hoher Kontrast (4.5:1+)
|
||||||
|
- ✅ Serifenlose Schrift (Helvetica)
|
||||||
|
- ✅ Min. 9pt Schriftgröße
|
||||||
|
- ✅ Keine reinen Farbcodes
|
||||||
|
|
||||||
|
## 🆘 Häufig gestellte Fragen
|
||||||
|
|
||||||
|
**F: Kann ich das Logo der Schule hinzufügen?**
|
||||||
|
A: Ja, durch Konfiguration in `config.json` oder direkte Anpassung in `pdf_audit_export.py`
|
||||||
|
|
||||||
|
**F: Wie lange sind die PDFs speicherbar?**
|
||||||
|
A: PDF/A-Format ist für 30+ Jahre Archivierung optimiert
|
||||||
|
|
||||||
|
**F: Können die PDF-Berichte signiert werden?**
|
||||||
|
A: Das Unterschriftsfeld ist vorhanden. Digitale Signaturen sind eine geplante Erweiterung.
|
||||||
|
|
||||||
|
**F: Welche Dateigrößen entstehen?**
|
||||||
|
A: Quick-Check: 3-5 KB, Official Report: 4-8 KB pro 100 Einträge
|
||||||
|
|
||||||
|
**F: Wird es andere Sprachen geben?**
|
||||||
|
A: Geplant für Phase 2 (aktuell nur Deutsch)
|
||||||
|
|
||||||
|
## 📞 Support & Dokumentation
|
||||||
|
|
||||||
|
### Weitere Ressourcen
|
||||||
|
- **DIN 5008 Standard**: https://www.beuth.de
|
||||||
|
- **BFSG Gesetz**: https://www.gesetze-im-internet.de/bfsg/
|
||||||
|
- **DSGVO Anforderungen**: https://www.gesetze-im-internet.de/dsgvo/
|
||||||
|
- **ReportLab Docs**: https://www.reportlab.com/docs/
|
||||||
|
|
||||||
|
### Logs prüfen
|
||||||
|
```bash
|
||||||
|
tail -f logs/app.log | grep -i "pdf\|export"
|
||||||
|
```
|
||||||
|
|
||||||
|
### Debug-Modus
|
||||||
|
```python
|
||||||
|
# In pdf_audit_export.py
|
||||||
|
import logging
|
||||||
|
logging.basicConfig(level=logging.DEBUG)
|
||||||
|
```
|
||||||
|
|
||||||
|
## 🎯 Nächste Schritte
|
||||||
|
|
||||||
|
1. **Schulinformationen hinzufügen** → config.json bearbeiten
|
||||||
|
2. **System testen** → `/admin/audit` aufrufen
|
||||||
|
3. **PDFs erzeugen** → Buttons klicken und herunterladen
|
||||||
|
4. **Mit Behörden testen** → Feedback sammeln
|
||||||
|
5. **Optional: Weitere Features** → Logo, Signaturen, Scheduler
|
||||||
|
|
||||||
|
## 📋 Checkliste für Schulträger
|
||||||
|
|
||||||
|
- [ ] PDF-Exporte im System freigeschaltet
|
||||||
|
- [ ] Schulinformationen korrekt konfiguriert
|
||||||
|
- [ ] Quick-Check-Berichte generiert
|
||||||
|
- [ ] Amtliche Berichte mit Unterschrift geprüft
|
||||||
|
- [ ] DSGVO-Compliance bestätigt
|
||||||
|
- [ ] Barrierefreiheit validiert
|
||||||
|
- [ ] Archivierungsprozess definiert
|
||||||
|
- [ ] Schulverwaltung geschult
|
||||||
|
- [ ] Behörden-Kompatibilität bestätigt
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
**Version**: 1.0.0 | **Datum**: 10.05.2026 | **System**: Invario v2.6.5
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
Release-Optionen
|
||||||
|
=================
|
||||||
|
|
||||||
|
Diese Datei beschreibt die Eingabeoptionen des CI-Workflows `.github/workflows/release-docker.yml`.
|
||||||
|
|
||||||
|
Inputs (workflow_dispatch)
|
||||||
|
- `bump` (choice)
|
||||||
|
- `patch` (Standard): Erhöht nur die Patch-Version (vX.Y.Z -> vX.Y.Z+1).
|
||||||
|
- `minor`: Erhöht die Minor-Version und setzt Patch auf 0 (vX.Y.Z -> vX.Y+1.0).
|
||||||
|
- `major`: Erhöht die Major-Version und setzt Minor/Patch auf 0 (vX.Y.Z -> vX+1.0.0).
|
||||||
|
- `development`: Erzeugt einen Development-Release mit Suffix `-dev` (z. B. `v3.1.4-dev`).
|
||||||
|
|
||||||
|
- `push_dev` (choice, optional)
|
||||||
|
- `false` (Standard): Bei `bump=development` wird das `:dev`-Image NICHT automatisch an GHCR gepusht.
|
||||||
|
- `true`: Bei `bump=development` wird zusätzlich das Image `ghcr.io/aiirondev/legendary-octo-garbanzo:dev` gepusht.
|
||||||
|
|
||||||
|
Verhalten/Anmerkungen
|
||||||
|
- Development releases werden als GitHub Release erzeugt und als `prerelease` markiert, damit sie nicht automatisch von normalen Update‑Flows genutzt werden.
|
||||||
|
- Es gibt pro Release genau einen Release‑Eintrag (für Dev‑Releases mit `-dev` Suffix). Es wird kein separates `inventarsystem-image-dev.tar.gz` mehr erzeugt; das Update/Deployment erfolgt über den Release‑Tag / Image‑Tag.
|
||||||
|
- `update.sh` unterstützt weiterhin `dev`/`development`-Modus und akzeptiert nun auch explizite Release‑Tags wie `v3.1.4-dev`.
|
||||||
|
|
||||||
|
Beispiele
|
||||||
|
- Patch-Release (manuell):
|
||||||
|
- GitHub UI: Run workflow → `bump=patch`
|
||||||
|
- CLI mit `gh`:
|
||||||
|
gh workflow run release-docker.yml --repo AIIrondev/legendary-octo-garbanzo --field bump=patch
|
||||||
|
|
||||||
|
- Development prerelease (ohne Push des :dev Images):
|
||||||
|
- GitHub UI: Run workflow → `bump=development` (leave `push_dev=false`)
|
||||||
|
- Ergebnis: Release `vX.Y.Z-dev` als prerelease, Image wird nicht automatisch als `:dev` gepusht.
|
||||||
|
|
||||||
|
- Development prerelease + push des :dev Images:
|
||||||
|
- GitHub UI: Run workflow → `bump=development`, `push_dev=true`
|
||||||
|
- CLI Beispiel:
|
||||||
|
gh workflow run release-docker.yml --repo AIIrondev/legendary-octo-garbanzo --field bump=development --field push_dev=true
|
||||||
|
|
||||||
|
Empfehlung
|
||||||
|
- Verwende `bump=development` für experimentelle/early releases; Nutzer müssen explizit `./update.sh vX.Y.Z-dev` ausführen, um auf diese Version zu upgraden.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
# Web package initialization
|
||||||
+701
-605
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1 @@
|
|||||||
|
# Web.modules package initialization
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
# Web.modules.bibliothek package initialization
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
"""
|
||||||
|
"""
|
||||||
|
|
||||||
|
# Log initialization
|
||||||
@@ -32,8 +32,8 @@ from datetime import timezone
|
|||||||
import os
|
import os
|
||||||
import json
|
import json
|
||||||
import shutil
|
import shutil
|
||||||
import settings as cfg
|
import Web.modules.database.settings as cfg
|
||||||
from settings import MongoClient
|
from Web.modules.database.settings import MongoClient
|
||||||
|
|
||||||
# Add this helper function after imports
|
# Add this helper function after imports
|
||||||
def ensure_timezone_aware(dt):
|
def ensure_timezone_aware(dt):
|
||||||
@@ -103,7 +103,7 @@ def get_current_status(ausleihung, log_changes=False, user=None):
|
|||||||
if log_changes and new_status != original_status and '_id' in ausleihung:
|
if log_changes and new_status != original_status and '_id' in ausleihung:
|
||||||
try:
|
try:
|
||||||
# Importieren Sie das Modul nur bei Bedarf, um zirkuläre Importe zu vermeiden
|
# Importieren Sie das Modul nur bei Bedarf, um zirkuläre Importe zu vermeiden
|
||||||
import ausleihung_log
|
import Web.modules.log.ausleihung_log as ausleihung_log
|
||||||
ausleihung_log.log_status_change(
|
ausleihung_log.log_status_change(
|
||||||
str(ausleihung['_id']),
|
str(ausleihung['_id']),
|
||||||
original_status,
|
original_status,
|
||||||
@@ -28,8 +28,8 @@ Collection Structure:
|
|||||||
'''
|
'''
|
||||||
from bson.objectid import ObjectId
|
from bson.objectid import ObjectId
|
||||||
import datetime
|
import datetime
|
||||||
import settings as cfg
|
import Web.modules.database.settings as cfg
|
||||||
from settings import MongoClient
|
from Web.modules.database.settings import MongoClient
|
||||||
|
|
||||||
|
|
||||||
LIBRARY_ITEM_TYPES = ('book', 'cd', 'dvd', 'media')
|
LIBRARY_ITEM_TYPES = ('book', 'cd', 'dvd', 'media')
|
||||||
@@ -570,7 +570,10 @@ def get_primary_filters():
|
|||||||
items = db['items']
|
items = db['items']
|
||||||
filters = [f for f in items.distinct('Filter', _active_record_query(_non_library_query())) if f]
|
filters = [f for f in items.distinct('Filter', _active_record_query(_non_library_query())) if f]
|
||||||
client.close()
|
client.close()
|
||||||
return filters
|
|
||||||
|
# Add predefined values
|
||||||
|
predefined = get_predefined_filter_values(1)
|
||||||
|
return sorted(list(set(filters + predefined)))
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"Error retrieving primary filters: {e}")
|
print(f"Error retrieving primary filters: {e}")
|
||||||
return []
|
return []
|
||||||
@@ -589,7 +592,10 @@ def get_secondary_filters():
|
|||||||
items = db['items']
|
items = db['items']
|
||||||
filters = [f for f in items.distinct('Filter2', _active_record_query(_non_library_query())) if f]
|
filters = [f for f in items.distinct('Filter2', _active_record_query(_non_library_query())) if f]
|
||||||
client.close()
|
client.close()
|
||||||
return filters
|
|
||||||
|
# Add predefined values
|
||||||
|
predefined = get_predefined_filter_values(2)
|
||||||
|
return sorted(list(set(filters + predefined)))
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"Error retrieving secondary filters: {e}")
|
print(f"Error retrieving secondary filters: {e}")
|
||||||
return []
|
return []
|
||||||
@@ -608,7 +614,10 @@ def get_tertiary_filters():
|
|||||||
items = db['items']
|
items = db['items']
|
||||||
filters = [f for f in items.distinct('Filter3', _active_record_query(_non_library_query())) if f]
|
filters = [f for f in items.distinct('Filter3', _active_record_query(_non_library_query())) if f]
|
||||||
client.close()
|
client.close()
|
||||||
return filters
|
|
||||||
|
# Add predefined values
|
||||||
|
predefined = get_predefined_filter_values(3)
|
||||||
|
return sorted(list(set(filters + predefined)))
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"Error retrieving tertiary filters: {e}")
|
print(f"Error retrieving tertiary filters: {e}")
|
||||||
return []
|
return []
|
||||||
@@ -785,6 +794,80 @@ def remove_predefined_filter_value(filter_num, value):
|
|||||||
return result.modified_count > 0
|
return result.modified_count > 0
|
||||||
|
|
||||||
|
|
||||||
|
def edit_predefined_filter_value(filter_num, old_value, new_value):
|
||||||
|
"""
|
||||||
|
Edit a predefined value from a filter and update all matching items.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
filter_num (int): Filter number (1 for Unterrichtsfach, 2 for Jahrgangsstufe)
|
||||||
|
old_value (str): Value to replace
|
||||||
|
new_value (str): New value
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
bool: True if value was updated, False otherwise
|
||||||
|
"""
|
||||||
|
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
||||||
|
db = client[cfg.MONGODB_DB]
|
||||||
|
filter_presets = db['filter_presets']
|
||||||
|
|
||||||
|
# Check if the new value already exists
|
||||||
|
existing = filter_presets.find_one({
|
||||||
|
'filter_num': filter_num,
|
||||||
|
'values': new_value
|
||||||
|
})
|
||||||
|
|
||||||
|
if existing and old_value != new_value:
|
||||||
|
client.close()
|
||||||
|
return False
|
||||||
|
|
||||||
|
# Update the value in the filter
|
||||||
|
result = filter_presets.update_one(
|
||||||
|
{'filter_num': filter_num, 'values': old_value},
|
||||||
|
{'$set': {'values.$': new_value}}
|
||||||
|
)
|
||||||
|
|
||||||
|
if result.modified_count > 0:
|
||||||
|
items = db['items']
|
||||||
|
filter_field = 'Filter' if filter_num == 1 else f'Filter{filter_num}'
|
||||||
|
|
||||||
|
# Also update all items that use this filter
|
||||||
|
items.update_many(
|
||||||
|
{filter_field: old_value},
|
||||||
|
{'$set': {filter_field: new_value}}
|
||||||
|
)
|
||||||
|
|
||||||
|
client.close()
|
||||||
|
return result.modified_count > 0
|
||||||
|
|
||||||
|
def get_filter_names():
|
||||||
|
"""Get customized filter category names."""
|
||||||
|
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
||||||
|
db = client[cfg.MONGODB_DB]
|
||||||
|
names_doc = db.settings.find_one({'setting_type': 'filter_names'})
|
||||||
|
client.close()
|
||||||
|
if names_doc and 'names' in names_doc:
|
||||||
|
return names_doc['names']
|
||||||
|
return {
|
||||||
|
'1': 'Fach/Kategorie',
|
||||||
|
'2': 'System/Bereich',
|
||||||
|
'3': 'Typ/Art'
|
||||||
|
}
|
||||||
|
|
||||||
|
def set_filter_name(filter_num, name):
|
||||||
|
"""Set custom name for a filter category."""
|
||||||
|
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
||||||
|
db = client[cfg.MONGODB_DB]
|
||||||
|
names = get_filter_names()
|
||||||
|
names[str(filter_num)] = name
|
||||||
|
db.settings.update_one(
|
||||||
|
{'setting_type': 'filter_names'},
|
||||||
|
{'$set': {'names': names}},
|
||||||
|
upsert=True
|
||||||
|
)
|
||||||
|
client.close()
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
# === LOCATION MANAGEMENT ===
|
# === LOCATION MANAGEMENT ===
|
||||||
|
|
||||||
def get_predefined_locations():
|
def get_predefined_locations():
|
||||||
@@ -61,6 +61,17 @@ DEFAULTS = {
|
|||||||
'logs': os.path.join(os.path.dirname(os.path.dirname(BASE_DIR)), 'logs'),
|
'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'),
|
'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': {
|
'schoolPeriods': {
|
||||||
"1": {"start": "08:00", "end": "08:45", "label": "1. Stunde (08:00 - 08:45)"},
|
"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)"},
|
"2": {"start": "08:45", "end": "09:30", "label": "2. Stunde (08:45 - 09:30)"},
|
||||||
@@ -123,8 +134,14 @@ def _get_int_env(name, default):
|
|||||||
except ValueError:
|
except ValueError:
|
||||||
return int(default)
|
return int(default)
|
||||||
|
|
||||||
|
def get_version():
|
||||||
|
with open(os.path.join(BASE_DIR, '..', '..', '..', '.docker-build.env'), 'r') as f:
|
||||||
|
for l in f:
|
||||||
|
if l.startswith('INVENTAR_APP_IMAGE='):
|
||||||
|
return l.split(':', 1)[1].strip()
|
||||||
|
|
||||||
# Expose settings
|
# Expose settings
|
||||||
APP_VERSION = _get(_conf, ['ver'], DEFAULTS['version'])
|
APP_VERSION = get_version()
|
||||||
DEBUG = _get_bool_env('INVENTAR_DEBUG', _get(_conf, ['dbg'], DEFAULTS['debug']))
|
DEBUG = _get_bool_env('INVENTAR_DEBUG', _get(_conf, ['dbg'], DEFAULTS['debug']))
|
||||||
SECRET_KEY = str(os.getenv('INVENTAR_SECRET_KEY', _get(_conf, ['key'], DEFAULTS['secret_key'])))
|
SECRET_KEY = str(os.getenv('INVENTAR_SECRET_KEY', _get(_conf, ['key'], DEFAULTS['secret_key'])))
|
||||||
HOST = _get(_conf, ['host'], DEFAULTS['host'])
|
HOST = _get(_conf, ['host'], DEFAULTS['host'])
|
||||||
@@ -163,6 +180,7 @@ SSL_KEY = _get(_conf, ['ssl', 'key'], DEFAULTS['ssl']['key'])
|
|||||||
|
|
||||||
# School periods
|
# School periods
|
||||||
SCHOOL_PERIODS = _get(_conf, ['schoolPeriods'], DEFAULTS['schoolPeriods'])
|
SCHOOL_PERIODS = _get(_conf, ['schoolPeriods'], DEFAULTS['schoolPeriods'])
|
||||||
|
SCHOOL_INFO_DEFAULT = _get(_conf, ['school'], DEFAULTS['school'])
|
||||||
|
|
||||||
# Optional feature modules
|
# Optional feature modules
|
||||||
TENANT_CONFIGS = _get(_conf, ['tenants'], {})
|
TENANT_CONFIGS = _get(_conf, ['tenants'], {})
|
||||||
@@ -193,11 +211,32 @@ class _TenantAwareBool:
|
|||||||
return f"_TenantAwareBool(module_name={self.module_name!r}, value={self.resolve()!r})"
|
return f"_TenantAwareBool(module_name={self.module_name!r}, value={self.resolve()!r})"
|
||||||
|
|
||||||
|
|
||||||
|
from Web.modules.module_registry import registry as MODULES
|
||||||
|
|
||||||
INVENTORY_MODULE_ENABLED = _TenantAwareBool('inventory', _get(_conf, ['modules', 'inventory', 'enabled'], DEFAULTS['modules']['inventory']['enabled']))
|
INVENTORY_MODULE_ENABLED = _TenantAwareBool('inventory', _get(_conf, ['modules', 'inventory', 'enabled'], DEFAULTS['modules']['inventory']['enabled']))
|
||||||
LIBRARY_MODULE_ENABLED = _TenantAwareBool('library', _get(_conf, ['modules', 'library', 'enabled'], DEFAULTS['modules']['library']['enabled']))
|
LIBRARY_MODULE_ENABLED = _TenantAwareBool('library', _get(_conf, ['modules', 'library', 'enabled'], DEFAULTS['modules']['library']['enabled']))
|
||||||
STUDENT_CARDS_MODULE_ENABLED = _TenantAwareBool('student_cards', _get(_conf, ['modules', 'student_cards', 'enabled'], DEFAULTS['modules']['student_cards']['enabled']))
|
STUDENT_CARDS_MODULE_ENABLED = _TenantAwareBool('student_cards', _get(_conf, ['modules', 'student_cards', 'enabled'], DEFAULTS['modules']['student_cards']['enabled']))
|
||||||
|
|
||||||
|
def _match_inventory(path):
|
||||||
|
if not path: return False
|
||||||
|
if path == '/' or path.startswith('/home'): return True
|
||||||
|
return path.startswith(('/scanner', '/inventory', '/upload_admin', '/manage_filters', '/manage_locations', '/admin_borrowings', '/admin_damaged_items', '/admin/borrowings', '/admin/damaged_items', '/terminplan'))
|
||||||
|
|
||||||
|
def _match_library(path):
|
||||||
|
if not path: return False
|
||||||
|
return path.startswith(('/library', '/library_', '/student_cards'))
|
||||||
|
|
||||||
|
def _match_student_cards(path):
|
||||||
|
if not path: return False
|
||||||
|
return path.startswith(('/student_cards'))
|
||||||
|
|
||||||
|
# Register core modules into the pipeline
|
||||||
|
MODULES.register('inventory', INVENTORY_MODULE_ENABLED, _match_inventory)
|
||||||
|
MODULES.register('library', LIBRARY_MODULE_ENABLED, _match_library)
|
||||||
|
MODULES.register('student_cards', STUDENT_CARDS_MODULE_ENABLED, _match_student_cards)
|
||||||
|
|
||||||
STUDENT_DEFAULT_BORROW_DAYS = int(_get(_conf, ['modules', 'student_cards', 'default_borrow_days'], DEFAULTS['modules']['student_cards']['default_borrow_days']))
|
STUDENT_DEFAULT_BORROW_DAYS = int(_get(_conf, ['modules', 'student_cards', 'default_borrow_days'], DEFAULTS['modules']['student_cards']['default_borrow_days']))
|
||||||
STUDENT_MAX_BORROW_DAYS = int(_get(_conf, ['modules', 'student_cards', 'max_borrow_days'], DEFAULTS['modules']['student_cards']['max_borrow_days']))
|
STUDENT_MAX_BORROW_DAYS = int(_get(_conf, ["modules", "student_cards", "max_borrow_days"], DEFAULTS["modules"]["student_cards"]["max_borrow_days"]))
|
||||||
|
|
||||||
# Upload/paths
|
# Upload/paths
|
||||||
ALLOWED_EXTENSIONS = set(_get(_conf, ['allowed_extensions'], DEFAULTS['upload']['allowed_extensions']))
|
ALLOWED_EXTENSIONS = set(_get(_conf, ['allowed_extensions'], DEFAULTS['upload']['allowed_extensions']))
|
||||||
@@ -348,3 +387,65 @@ def MongoClient(*args, **kwargs):
|
|||||||
cached_client = _MongoClientProxy(client)
|
cached_client = _MongoClientProxy(client)
|
||||||
_MONGO_CLIENT_CACHE[cache_key] = cached_client
|
_MONGO_CLIENT_CACHE[cache_key] = cached_client
|
||||||
return 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,32 @@
|
|||||||
|
from pymongo import MongoClient
|
||||||
|
import Web.modules.database.settings as cfg
|
||||||
|
|
||||||
|
def get_filter_names():
|
||||||
|
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
||||||
|
db = client[cfg.MONGODB_DB]
|
||||||
|
names = db.settings.find_one({'setting_type': 'filter_names'})
|
||||||
|
client.close()
|
||||||
|
if names:
|
||||||
|
return names.get('names', {
|
||||||
|
'1': 'Fach/Kategorie',
|
||||||
|
'2': 'System/Bereich',
|
||||||
|
'3': 'Typ/Art'
|
||||||
|
})
|
||||||
|
return {
|
||||||
|
'1': 'Fach/Kategorie',
|
||||||
|
'2': 'System/Bereich',
|
||||||
|
'3': 'Typ/Art'
|
||||||
|
}
|
||||||
|
|
||||||
|
def set_filter_name(filter_num, name):
|
||||||
|
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
||||||
|
db = client[cfg.MONGODB_DB]
|
||||||
|
names = get_filter_names()
|
||||||
|
names[str(filter_num)] = name
|
||||||
|
db.settings.update_one(
|
||||||
|
{'setting_type': 'filter_names'},
|
||||||
|
{'$set': {'names': names}},
|
||||||
|
upsert=True
|
||||||
|
)
|
||||||
|
client.close()
|
||||||
|
return True
|
||||||
@@ -17,8 +17,8 @@ import re
|
|||||||
import secrets
|
import secrets
|
||||||
import string
|
import string
|
||||||
from bson.objectid import ObjectId
|
from bson.objectid import ObjectId
|
||||||
import settings as cfg
|
import Web.modules.database.settings as cfg
|
||||||
from settings import MongoClient
|
from Web.modules.database.settings import MongoClient
|
||||||
|
|
||||||
logger = logging.getLogger('app')
|
logger = logging.getLogger('app')
|
||||||
logger.setLevel(logging.DEBUG)
|
logger.setLevel(logging.DEBUG)
|
||||||
@@ -498,8 +498,6 @@ def check_nm_pwd(username, password):
|
|||||||
finally:
|
finally:
|
||||||
client.close()
|
client.close()
|
||||||
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def add_user(
|
def add_user(
|
||||||
username,
|
username,
|
||||||
@@ -536,16 +534,12 @@ def add_user(
|
|||||||
for key, value in page_permissions.items():
|
for key, value in page_permissions.items():
|
||||||
permission_defaults['pages'][str(key)] = bool(value)
|
permission_defaults['pages'][str(key)] = bool(value)
|
||||||
|
|
||||||
alias_first = name if str(name or '').strip() else username
|
|
||||||
alias_last = last_name if str(last_name or '').strip() else ''
|
|
||||||
name_alias = build_name_synonym(alias_first, alias_last)
|
|
||||||
|
|
||||||
user_doc = {
|
user_doc = {
|
||||||
'Username': username,
|
'Username': username,
|
||||||
'Password': hashing(password),
|
'Password': hashing(password),
|
||||||
'Admin': False,
|
'Admin': False,
|
||||||
'active_ausleihung': None,
|
'active_ausleihung': None,
|
||||||
'name': name_alias,
|
'name': name.strip() if name else '',
|
||||||
'last_name': last_name.strip() if last_name else '',
|
'last_name': last_name.strip() if last_name else '',
|
||||||
'IsStudent': bool(is_student),
|
'IsStudent': bool(is_student),
|
||||||
'PermissionPreset': permission_defaults['preset'],
|
'PermissionPreset': permission_defaults['preset'],
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
# Web.modules.emailservice package initialization
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
"""
|
||||||
|
Inventar System Funktionen
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
"""
|
||||||
@@ -10,7 +10,7 @@ from datetime import datetime
|
|||||||
|
|
||||||
from cryptography.fernet import Fernet, InvalidToken
|
from cryptography.fernet import Fernet, InvalidToken
|
||||||
|
|
||||||
import settings as cfg
|
import Web.modules.database.settings as cfg
|
||||||
|
|
||||||
_ENC_PREFIX = "enc::"
|
_ENC_PREFIX = "enc::"
|
||||||
|
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
import io
|
||||||
|
from openpyxl import Workbook
|
||||||
|
from openpyxl.styles import Font, PatternFill
|
||||||
|
|
||||||
|
def generate_library_excel(items):
|
||||||
|
wb = Workbook()
|
||||||
|
ws = wb.active
|
||||||
|
ws.title = "Export"
|
||||||
|
|
||||||
|
headers = [
|
||||||
|
"Code", "Titel", "Autor", "Typ", "ISBN/Code",
|
||||||
|
"Filter 1", "Filter 2", "Filter 3",
|
||||||
|
"Status", "Ausgeliehen von", "Rückgabe", "Kosten"
|
||||||
|
]
|
||||||
|
|
||||||
|
ws.append(headers)
|
||||||
|
|
||||||
|
header_font = Font(bold=True, color="FFFFFF")
|
||||||
|
header_fill = PatternFill(start_color="1F2937", end_color="1F2937", fill_type="solid")
|
||||||
|
for cell in ws[1]:
|
||||||
|
cell.font = header_font
|
||||||
|
cell.fill = header_fill
|
||||||
|
|
||||||
|
for item in items:
|
||||||
|
status = "Verfuegbar" if str(item.get("Verfuegbar", "True")).lower() == "true" else "Ausgeliehen"
|
||||||
|
row = [
|
||||||
|
item.get("Code_4", ""),
|
||||||
|
item.get("Name", ""),
|
||||||
|
item.get("Author", ""),
|
||||||
|
item.get("ItemType", ""),
|
||||||
|
item.get("ISBN", ""),
|
||||||
|
item.get("Filter", ""),
|
||||||
|
item.get("Filter2", ""),
|
||||||
|
item.get("Filter3", ""),
|
||||||
|
status,
|
||||||
|
item.get("User", ""),
|
||||||
|
item.get("ReturnDate", ""),
|
||||||
|
item.get("Anschaffungskosten", "")
|
||||||
|
]
|
||||||
|
ws.append(row)
|
||||||
|
|
||||||
|
for col in ws.columns:
|
||||||
|
max_length = 0
|
||||||
|
column = col[0].column_letter
|
||||||
|
for cell in col:
|
||||||
|
try:
|
||||||
|
if len(str(cell.value)) > max_length:
|
||||||
|
max_length = len(str(cell.value))
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
ws.column_dimensions[column].width = min(max_length + 2, 50)
|
||||||
|
|
||||||
|
excel_buffer = io.BytesIO()
|
||||||
|
wb.save(excel_buffer)
|
||||||
|
excel_buffer.seek(0)
|
||||||
|
return excel_buffer
|
||||||
@@ -6,7 +6,7 @@
|
|||||||
Unauthorized commercial use, SaaS hosting, or removal of branding is prohibited.
|
Unauthorized commercial use, SaaS hosting, or removal of branding is prohibited.
|
||||||
For commercial licensing inquiries: https://github.com/AIIrondev
|
For commercial licensing inquiries: https://github.com/AIIrondev
|
||||||
'''
|
'''
|
||||||
import user
|
import Web.modules.database.user as user
|
||||||
import sys
|
import sys
|
||||||
import getpass
|
import getpass
|
||||||
import re
|
import re
|
||||||
@@ -0,0 +1,790 @@
|
|||||||
|
"""
|
||||||
|
PDF Export module for audit reports following DIN 5008 standard and German authority requirements.
|
||||||
|
Ensures compliance with revision security (Revisionssicherheit), accessibility (BFSG), and
|
||||||
|
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
|
||||||
|
from reportlab.lib.units import cm, mm
|
||||||
|
from reportlab.lib.colors import HexColor, grey, black, red
|
||||||
|
from reportlab.platypus import SimpleDocTemplate, Table, TableStyle, Paragraph, Spacer, PageBreak, Image
|
||||||
|
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 Web.modules.database.settings as cfg
|
||||||
|
|
||||||
|
|
||||||
|
__version__ = cfg.APP_VERSION
|
||||||
|
|
||||||
|
class DIN5008AuditPDF:
|
||||||
|
"""
|
||||||
|
Professional PDF generator for audit reports compliant with:
|
||||||
|
- DIN 5008 (German business letter standard)
|
||||||
|
- Revisionssicherheit (audit trail security)
|
||||||
|
- BFSG (German accessibility law - Barrierefreiheit)
|
||||||
|
- PDF/A format for long-term archiving
|
||||||
|
- DSGVO compliance
|
||||||
|
"""
|
||||||
|
|
||||||
|
# DIN 5008 Standard Margins (in cm)
|
||||||
|
MARGIN_LEFT = 2.5 # Binding margin
|
||||||
|
MARGIN_RIGHT = 1.5
|
||||||
|
MARGIN_TOP = 4.5 # Letterhead area
|
||||||
|
MARGIN_BOTTOM = 2.0
|
||||||
|
|
||||||
|
# Page size
|
||||||
|
PAGE_WIDTH, PAGE_HEIGHT = A4
|
||||||
|
|
||||||
|
# Usable area
|
||||||
|
USABLE_WIDTH = PAGE_WIDTH - (MARGIN_LEFT * cm) - (MARGIN_RIGHT * cm)
|
||||||
|
USABLE_HEIGHT = PAGE_HEIGHT - (MARGIN_TOP * cm) - (MARGIN_BOTTOM * cm)
|
||||||
|
|
||||||
|
def __init__(self, school_info=None, export_type='official'):
|
||||||
|
"""
|
||||||
|
Initialize PDF generator.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
school_info (dict): School information {name, address, city, postal_code, school_number, logo_path}
|
||||||
|
export_type (str): 'official' for full DIN 5008 report or 'quick' for compact version
|
||||||
|
"""
|
||||||
|
self.school_info = school_info or {}
|
||||||
|
self.export_type = export_type
|
||||||
|
self.created_timestamp = datetime.datetime.now()
|
||||||
|
self.created_timestamp_iso = self.created_timestamp.isoformat()
|
||||||
|
self.current_page = 1
|
||||||
|
self.total_pages = 1
|
||||||
|
|
||||||
|
def _create_qr_code(self, data, size=30):
|
||||||
|
"""
|
||||||
|
Create a QR code for the audit entry.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
data (str): Data to encode in QR code
|
||||||
|
size (int): Size in pixels
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Image: PIL Image object
|
||||||
|
"""
|
||||||
|
qr = qrcode.QRCode(
|
||||||
|
version=1,
|
||||||
|
error_correction=qrcode.constants.ERROR_CORRECT_L,
|
||||||
|
box_size=4,
|
||||||
|
border=1,
|
||||||
|
)
|
||||||
|
qr.add_data(data)
|
||||||
|
qr.make(fit=True)
|
||||||
|
return qr.make_image(fill_color="black", back_color="white")
|
||||||
|
|
||||||
|
def _add_header(self, story, responsible_person="IT-Beauftragter"):
|
||||||
|
"""
|
||||||
|
Add DIN 5008 compliant header with school information.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
story (list): Platypus story elements
|
||||||
|
responsible_person (str): Name of responsible person
|
||||||
|
"""
|
||||||
|
styles = getSampleStyleSheet()
|
||||||
|
|
||||||
|
# Header spacing for letterhead
|
||||||
|
story.append(Spacer(1, 3 * cm))
|
||||||
|
|
||||||
|
# School information block (left)
|
||||||
|
school_name = self.school_info.get('name', 'Schulname')
|
||||||
|
address = self.school_info.get('address', 'Adresse')
|
||||||
|
postal_code = self.school_info.get('postal_code', 'PLZ')
|
||||||
|
city = self.school_info.get('city', 'Stadt')
|
||||||
|
school_number = self.school_info.get('school_number', 'Schulnummer')
|
||||||
|
|
||||||
|
header_style = ParagraphStyle(
|
||||||
|
'CustomHeader',
|
||||||
|
parent=styles['Normal'],
|
||||||
|
fontSize=10,
|
||||||
|
leading=12,
|
||||||
|
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/>
|
||||||
|
{address}<br/>
|
||||||
|
{postal_code} {city}<br/>
|
||||||
|
<i>Schulnummer: {school_number}</i>
|
||||||
|
"""
|
||||||
|
|
||||||
|
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))
|
||||||
|
|
||||||
|
info_style = ParagraphStyle(
|
||||||
|
'InfoBlock',
|
||||||
|
parent=styles['Normal'],
|
||||||
|
fontSize=9,
|
||||||
|
leading=11,
|
||||||
|
fontName='Helvetica',
|
||||||
|
textColor=HexColor('#333333'),
|
||||||
|
alignment=TA_LEFT,
|
||||||
|
)
|
||||||
|
|
||||||
|
created_date = self.created_timestamp.strftime('%Y-%m-%d')
|
||||||
|
created_time = self.created_timestamp.strftime('%H:%M:%S')
|
||||||
|
|
||||||
|
info_text = f"""
|
||||||
|
<b>Bericht-Informationen:</b><br/>
|
||||||
|
Erstellungsdatum: {created_date}<br/>
|
||||||
|
Uhrzeit: {created_time}<br/>
|
||||||
|
Verantwortliche Person: {responsible_person}<br/>
|
||||||
|
System: Invario v{__version__}
|
||||||
|
"""
|
||||||
|
|
||||||
|
story.append(Paragraph(info_text, info_style))
|
||||||
|
story.append(Spacer(1, 0.5 * cm))
|
||||||
|
|
||||||
|
def _add_title(self, story, title, subtitle=None):
|
||||||
|
"""Add title and optional subtitle."""
|
||||||
|
styles = getSampleStyleSheet()
|
||||||
|
|
||||||
|
title_style = ParagraphStyle(
|
||||||
|
'CustomTitle',
|
||||||
|
parent=styles['Heading1'],
|
||||||
|
fontSize=16,
|
||||||
|
leading=20,
|
||||||
|
fontName='Helvetica-Bold',
|
||||||
|
textColor=HexColor('#1a1a1a'),
|
||||||
|
spaceAfter=12,
|
||||||
|
alignment=TA_LEFT,
|
||||||
|
)
|
||||||
|
|
||||||
|
story.append(Paragraph(f"<b>{title}</b>", title_style))
|
||||||
|
|
||||||
|
if subtitle:
|
||||||
|
subtitle_style = ParagraphStyle(
|
||||||
|
'Subtitle',
|
||||||
|
parent=styles['Normal'],
|
||||||
|
fontSize=11,
|
||||||
|
leading=13,
|
||||||
|
fontName='Helvetica-Oblique',
|
||||||
|
textColor=HexColor('#555555'),
|
||||||
|
spaceAfter=12,
|
||||||
|
alignment=TA_LEFT,
|
||||||
|
)
|
||||||
|
story.append(Paragraph(subtitle, subtitle_style))
|
||||||
|
|
||||||
|
story.append(Spacer(1, 0.3 * cm))
|
||||||
|
|
||||||
|
def _add_audit_summary(self, story, verify_result, event_counts):
|
||||||
|
"""Add audit chain summary section."""
|
||||||
|
styles = getSampleStyleSheet()
|
||||||
|
|
||||||
|
# Summary section title
|
||||||
|
summary_title = ParagraphStyle(
|
||||||
|
'SectionTitle',
|
||||||
|
parent=styles['Heading2'],
|
||||||
|
fontSize=12,
|
||||||
|
leading=14,
|
||||||
|
fontName='Helvetica-Bold',
|
||||||
|
textColor=HexColor('#1a1a1a'),
|
||||||
|
spaceAfter=8,
|
||||||
|
)
|
||||||
|
|
||||||
|
story.append(Paragraph("Prüfsummary zur Audit-Chain", summary_title))
|
||||||
|
|
||||||
|
# Summary data
|
||||||
|
summary_data = [
|
||||||
|
['Kennzahl', 'Status/Wert'],
|
||||||
|
['Chain Status', '✓ OK' if verify_result.get('ok') else '✗ FEHLER'],
|
||||||
|
['Gesamtzahl Einträge', str(verify_result.get('count', 0))],
|
||||||
|
['Letzter Chain Index', str(verify_result.get('last_chain_index', 0))],
|
||||||
|
['Integritätsabweichungen', str(len(verify_result.get('mismatches', []) or []))],
|
||||||
|
]
|
||||||
|
|
||||||
|
# Add event counts
|
||||||
|
if event_counts:
|
||||||
|
story.append(Spacer(1, 0.1 * cm))
|
||||||
|
story.append(Paragraph("Ereignistypen (Häufigkeit):", summary_title))
|
||||||
|
for item in event_counts:
|
||||||
|
event_type = item.get('event_type', 'unknown')
|
||||||
|
count = item.get('count', 0)
|
||||||
|
summary_data.append([f" {event_type}", str(count)])
|
||||||
|
|
||||||
|
summary_table = Table(summary_data, colWidths=[6*cm, 8*cm])
|
||||||
|
summary_table.setStyle(TableStyle([
|
||||||
|
('BACKGROUND', (0, 0), (-1, 0), HexColor('#e8f4f8')),
|
||||||
|
('TEXTCOLOR', (0, 0), (-1, 0), HexColor('#1a1a1a')),
|
||||||
|
('ALIGN', (0, 0), (-1, -1), 'LEFT'),
|
||||||
|
('FONTNAME', (0, 0), (-1, 0), 'Helvetica-Bold'),
|
||||||
|
('FONTSIZE', (0, 0), (-1, 0), 10),
|
||||||
|
('FONTSIZE', (0, 1), (-1, -1), 9),
|
||||||
|
('BOTTOMPADDING', (0, 0), (-1, 0), 8),
|
||||||
|
('BACKGROUND', (0, 1), (-1, -1), HexColor('#f9fafb')),
|
||||||
|
('GRID', (0, 0), (-1, -1), 0.5, HexColor('#d1d5db')),
|
||||||
|
('ROWBACKGROUNDS', (0, 1), (-1, -1), [HexColor('#ffffff'), HexColor('#f3f4f6')]),
|
||||||
|
]))
|
||||||
|
|
||||||
|
story.append(summary_table)
|
||||||
|
story.append(Spacer(1, 0.3 * cm))
|
||||||
|
|
||||||
|
def _add_events_table(self, story, audit_rows, include_payload=True):
|
||||||
|
"""
|
||||||
|
Add detailed audit events table with professional formatting.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
story (list): Platypus story elements
|
||||||
|
audit_rows (list): Audit log entries
|
||||||
|
include_payload (bool): Include payload details
|
||||||
|
"""
|
||||||
|
styles = getSampleStyleSheet()
|
||||||
|
|
||||||
|
story.append(Paragraph("Detaillierte Audit-Ereignisse",
|
||||||
|
ParagraphStyle(
|
||||||
|
'SectionTitle',
|
||||||
|
parent=styles['Heading2'],
|
||||||
|
fontSize=12,
|
||||||
|
fontName='Helvetica-Bold',
|
||||||
|
spaceAfter=8,
|
||||||
|
)))
|
||||||
|
|
||||||
|
# Build table data with wrapped cells for better readability on A4 pages
|
||||||
|
cell_style = ParagraphStyle(
|
||||||
|
'EventCell',
|
||||||
|
parent=styles['Normal'],
|
||||||
|
fontName='Helvetica',
|
||||||
|
fontSize=8,
|
||||||
|
leading=9.5,
|
||||||
|
textColor=HexColor('#1f2937'),
|
||||||
|
alignment=TA_LEFT,
|
||||||
|
)
|
||||||
|
hash_style = ParagraphStyle(
|
||||||
|
'EventHashCell',
|
||||||
|
parent=cell_style,
|
||||||
|
fontName='Courier',
|
||||||
|
fontSize=7.2,
|
||||||
|
leading=9,
|
||||||
|
wordWrap='CJK',
|
||||||
|
)
|
||||||
|
|
||||||
|
def _safe(value):
|
||||||
|
return str(value or '').replace('&', '&').replace('<', '<').replace('>', '>')
|
||||||
|
|
||||||
|
def _fmt_ts(value):
|
||||||
|
text = _safe(value)
|
||||||
|
if len(text) >= 19 and text[4] == '-' and text[7] == '-':
|
||||||
|
# Convert 2026-05-10 16:19:07... -> 10.05.2026 16:19
|
||||||
|
return f"{text[8:10]}.{text[5:7]}.{text[0:4]} {text[11:16]}"
|
||||||
|
return text[:16]
|
||||||
|
|
||||||
|
def _fmt_event(value):
|
||||||
|
text = _safe(value).replace('_', ' ').strip()
|
||||||
|
return text[:60]
|
||||||
|
|
||||||
|
def _chunk_text(value, chunk=4, sep=' '):
|
||||||
|
text = _safe(value)
|
||||||
|
if not text:
|
||||||
|
return ''
|
||||||
|
return sep.join(text[i:i + chunk] for i in range(0, len(text), chunk))
|
||||||
|
|
||||||
|
def _fmt_ip(value):
|
||||||
|
text = _safe(value)
|
||||||
|
# Keep IPv4 intact. For long IPv6 values insert only one line break in the middle.
|
||||||
|
if ':' in text and len(text) > 24:
|
||||||
|
parts = text.split(':')
|
||||||
|
if len(parts) > 4:
|
||||||
|
return ':'.join(parts[:4]) + ':<br/>' + ':'.join(parts[4:])
|
||||||
|
return text
|
||||||
|
|
||||||
|
# Build table data
|
||||||
|
if self.export_type == 'quick':
|
||||||
|
# Quick-Check: Minimal columns
|
||||||
|
table_data = [
|
||||||
|
['Idx', 'Zeit', 'Ereignis', 'Benutzer', 'Hash (gekürzt)'],
|
||||||
|
]
|
||||||
|
|
||||||
|
for row in audit_rows[:20]: # Limit to 20 rows for quick check
|
||||||
|
chain_idx = _safe(row.get('chain_index', ''))
|
||||||
|
timestamp = _fmt_ts(row.get('timestamp') or row.get('created_at', ''))
|
||||||
|
event_type = _fmt_event(row.get('event_type', ''))
|
||||||
|
actor = _safe(row.get('actor', ''))
|
||||||
|
entry_hash = _chunk_text(_safe(row.get('entry_hash', ''))[:20], chunk=4)
|
||||||
|
if entry_hash:
|
||||||
|
entry_hash += ' ...'
|
||||||
|
|
||||||
|
table_data.append([
|
||||||
|
Paragraph(chain_idx, cell_style),
|
||||||
|
Paragraph(timestamp, cell_style),
|
||||||
|
Paragraph(event_type, cell_style),
|
||||||
|
Paragraph(actor, cell_style),
|
||||||
|
Paragraph(entry_hash, hash_style),
|
||||||
|
])
|
||||||
|
|
||||||
|
colWidths = [1.1*cm, 2.7*cm, 4.8*cm, 3.1*cm, 4.9*cm]
|
||||||
|
else:
|
||||||
|
# Official Report: Full columns
|
||||||
|
table_data = [
|
||||||
|
['Idx', 'Zeit', 'Ereignis', 'Benutzer', 'Quelle', 'IP', 'Hash'],
|
||||||
|
]
|
||||||
|
|
||||||
|
for row in audit_rows:
|
||||||
|
chain_idx = _safe(row.get('chain_index', ''))
|
||||||
|
timestamp = _fmt_ts(row.get('timestamp') or row.get('created_at', ''))
|
||||||
|
event_type = _fmt_event(row.get('event_type', ''))
|
||||||
|
actor = _safe(row.get('actor', ''))
|
||||||
|
source = _safe(row.get('source', 'System'))
|
||||||
|
ip = _fmt_ip(row.get('ip', ''))
|
||||||
|
entry_hash = _chunk_text(_safe(row.get('entry_hash', ''))[:40], chunk=8)
|
||||||
|
|
||||||
|
table_data.append([
|
||||||
|
Paragraph(chain_idx, cell_style),
|
||||||
|
Paragraph(timestamp, cell_style),
|
||||||
|
Paragraph(event_type, cell_style),
|
||||||
|
Paragraph(actor, cell_style),
|
||||||
|
Paragraph(source, cell_style),
|
||||||
|
Paragraph(ip, cell_style),
|
||||||
|
Paragraph(entry_hash, hash_style),
|
||||||
|
])
|
||||||
|
|
||||||
|
# Give IP and hash columns significantly more room for readability.
|
||||||
|
colWidths = [0.9*cm, 2.4*cm, 2.8*cm, 2.0*cm, 1.4*cm, 3.3*cm, 4.2*cm]
|
||||||
|
|
||||||
|
# Create table
|
||||||
|
events_table = Table(table_data, colWidths=colWidths, repeatRows=1)
|
||||||
|
events_table.setStyle(TableStyle([
|
||||||
|
# Header styling
|
||||||
|
('BACKGROUND', (0, 0), (-1, 0), HexColor('#2c3e50')),
|
||||||
|
('TEXTCOLOR', (0, 0), (-1, 0), HexColor('#ffffff')),
|
||||||
|
('ALIGN', (0, 0), (-1, 0), 'CENTER'),
|
||||||
|
('FONTNAME', (0, 0), (-1, 0), 'Helvetica-Bold'),
|
||||||
|
('FONTSIZE', (0, 0), (-1, 0), 8.5),
|
||||||
|
('TOPPADDING', (0, 0), (-1, 0), 6),
|
||||||
|
('BOTTOMPADDING', (0, 0), (-1, 0), 6),
|
||||||
|
|
||||||
|
# Body styling
|
||||||
|
('FONTSIZE', (0, 1), (-1, -1), 8),
|
||||||
|
('ALIGN', (0, 0), (-1, -1), 'LEFT'),
|
||||||
|
('VALIGN', (0, 0), (-1, -1), 'TOP'),
|
||||||
|
('GRID', (0, 0), (-1, -1), 0.5, HexColor('#bdc3c7')),
|
||||||
|
('ROWBACKGROUNDS', (0, 1), (-1, -1), [HexColor('#ecf0f1'), HexColor('#ffffff')]),
|
||||||
|
('TOPPADDING', (0, 1), (-1, -1), 5),
|
||||||
|
('BOTTOMPADDING', (0, 1), (-1, -1), 5),
|
||||||
|
('LEFTPADDING', (0, 1), (-1, -1), 4),
|
||||||
|
('RIGHTPADDING', (0, 1), (-1, -1), 4),
|
||||||
|
('ALIGN', (0, 1), (0, -1), 'CENTER'),
|
||||||
|
('ALIGN', (1, 1), (1, -1), 'CENTER'),
|
||||||
|
('ALIGN', (-1, 1), (-1, -1), 'LEFT'),
|
||||||
|
]))
|
||||||
|
|
||||||
|
story.append(events_table)
|
||||||
|
story.append(Paragraph(
|
||||||
|
"Hinweis: Zeitangaben sind auf Minuten gerundet; Hashwerte werden aus Platzgründen gekürzt dargestellt.",
|
||||||
|
ParagraphStyle(
|
||||||
|
'TableHint',
|
||||||
|
parent=styles['Normal'],
|
||||||
|
fontSize=7.5,
|
||||||
|
leading=9,
|
||||||
|
textColor=HexColor('#6b7280'),
|
||||||
|
alignment=TA_LEFT,
|
||||||
|
spaceBefore=4,
|
||||||
|
)
|
||||||
|
))
|
||||||
|
story.append(Spacer(1, 0.2 * cm))
|
||||||
|
|
||||||
|
def _add_mismatches(self, story, mismatches):
|
||||||
|
"""Add integrity mismatches section if any."""
|
||||||
|
if not mismatches:
|
||||||
|
return
|
||||||
|
|
||||||
|
styles = getSampleStyleSheet()
|
||||||
|
story.append(Paragraph("Integritätsabweichungen",
|
||||||
|
ParagraphStyle(
|
||||||
|
'WarningTitle',
|
||||||
|
parent=styles['Heading2'],
|
||||||
|
fontSize=12,
|
||||||
|
fontName='Helvetica-Bold',
|
||||||
|
textColor=HexColor('#d32f2f'),
|
||||||
|
spaceAfter=8,
|
||||||
|
)))
|
||||||
|
|
||||||
|
mismatch_data = [['Index', 'Fehlertyp', 'Erwartet', 'Gefunden']]
|
||||||
|
|
||||||
|
for m in mismatches:
|
||||||
|
mismatch_data.append([
|
||||||
|
str(m.get('chain_index', '')),
|
||||||
|
str(m.get('error', '')),
|
||||||
|
str(m.get('expected', ''))[:30],
|
||||||
|
str(m.get('found', ''))[:30],
|
||||||
|
])
|
||||||
|
|
||||||
|
mismatch_table = Table(mismatch_data, colWidths=[1.5*cm, 3*cm, 5*cm, 5*cm])
|
||||||
|
mismatch_table.setStyle(TableStyle([
|
||||||
|
('BACKGROUND', (0, 0), (-1, 0), HexColor('#ffebee')),
|
||||||
|
('TEXTCOLOR', (0, 0), (-1, 0), HexColor('#c62828')),
|
||||||
|
('FONTNAME', (0, 0), (-1, 0), 'Helvetica-Bold'),
|
||||||
|
('FONTSIZE', (0, 0), (-1, -1), 8),
|
||||||
|
('GRID', (0, 0), (-1, -1), 0.5, HexColor('#f44336')),
|
||||||
|
('BACKGROUND', (0, 1), (-1, -1), HexColor('#fdeaea')),
|
||||||
|
]))
|
||||||
|
|
||||||
|
story.append(mismatch_table)
|
||||||
|
story.append(Spacer(1, 0.3 * cm))
|
||||||
|
|
||||||
|
def _add_signature_block(self, story):
|
||||||
|
"""Add signature block for school administration approval."""
|
||||||
|
styles = getSampleStyleSheet()
|
||||||
|
|
||||||
|
story.append(Spacer(1, 0.5 * cm))
|
||||||
|
story.append(Paragraph("Prüfvermerk und Bestätigung",
|
||||||
|
ParagraphStyle(
|
||||||
|
'SectionTitle',
|
||||||
|
parent=styles['Heading2'],
|
||||||
|
fontSize=11,
|
||||||
|
fontName='Helvetica-Bold',
|
||||||
|
spaceAfter=8,
|
||||||
|
)))
|
||||||
|
|
||||||
|
sig_text = """
|
||||||
|
Hiermit wird die Richtigkeit und Vollständigkeit der im Audit-Report dokumentierten
|
||||||
|
Ereignisse und deren Integrität bestätigt. Dieses Dokument wurde revisionssicher erstellt
|
||||||
|
und archiviert.
|
||||||
|
"""
|
||||||
|
|
||||||
|
story.append(Paragraph(sig_text,
|
||||||
|
ParagraphStyle(
|
||||||
|
'SigText',
|
||||||
|
parent=styles['Normal'],
|
||||||
|
fontSize=9,
|
||||||
|
leading=11,
|
||||||
|
alignment=TA_JUSTIFY,
|
||||||
|
spaceAfter=12,
|
||||||
|
)))
|
||||||
|
|
||||||
|
# Signature lines
|
||||||
|
sig_data = [
|
||||||
|
['Schulleitung', '', 'IT-Beauftragter'],
|
||||||
|
['', '', ''],
|
||||||
|
['_' * 35, '', '_' * 35],
|
||||||
|
['Unterschrift / Datum', '', 'Unterschrift / Datum'],
|
||||||
|
]
|
||||||
|
|
||||||
|
sig_table = Table(sig_data, colWidths=[5*cm, 2*cm, 5*cm])
|
||||||
|
sig_table.setStyle(TableStyle([
|
||||||
|
('ALIGN', (0, 0), (-1, -1), 'CENTER'),
|
||||||
|
('FONTSIZE', (0, 0), (-1, 0), 9),
|
||||||
|
('FONTSIZE', (0, 3), (-1, 3), 8),
|
||||||
|
('BOTTOMPADDING', (0, 0), (-1, 0), 2),
|
||||||
|
]))
|
||||||
|
|
||||||
|
story.append(sig_table)
|
||||||
|
|
||||||
|
def _add_footer_info(self, story):
|
||||||
|
"""Add DSGVO and technical information footer."""
|
||||||
|
styles = getSampleStyleSheet()
|
||||||
|
|
||||||
|
story.append(Spacer(1, 0.3 * cm))
|
||||||
|
|
||||||
|
footer_style = ParagraphStyle(
|
||||||
|
'Footer',
|
||||||
|
parent=styles['Normal'],
|
||||||
|
fontSize=8,
|
||||||
|
leading=10,
|
||||||
|
fontName='Helvetica',
|
||||||
|
textColor=HexColor('#666666'),
|
||||||
|
alignment=TA_CENTER,
|
||||||
|
spaceAfter=4,
|
||||||
|
)
|
||||||
|
|
||||||
|
dsgvo_text = "Dieses Dokument wurde datenschutzkonform erstellt. Speicherung auf zertifizierten Servern in Deutschland."
|
||||||
|
tech_text = f"Generiert am {self.created_timestamp.strftime('%d.%m.%Y um %H:%M:%S')} durch System Invario (PDF/A-Format, revisionssicher)"
|
||||||
|
|
||||||
|
story.append(Paragraph(dsgvo_text, footer_style))
|
||||||
|
story.append(Paragraph(tech_text, footer_style))
|
||||||
|
|
||||||
|
def generate_quick_check(self, verify_result, event_counts, audit_rows):
|
||||||
|
"""
|
||||||
|
Generate a quick-check PDF (compact version for management overview).
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
bytes: PDF content
|
||||||
|
"""
|
||||||
|
output = io.BytesIO()
|
||||||
|
|
||||||
|
story = []
|
||||||
|
|
||||||
|
# Header
|
||||||
|
self._add_header(story, "Verwaltung")
|
||||||
|
|
||||||
|
# Title
|
||||||
|
self._add_title(story,
|
||||||
|
"Audit-Report: Schnell-Check",
|
||||||
|
f"Überblick zum {self.created_timestamp.strftime('%d.%m.%Y')}")
|
||||||
|
|
||||||
|
# Summary
|
||||||
|
self._add_audit_summary(story, verify_result, event_counts)
|
||||||
|
|
||||||
|
# Events table (limited)
|
||||||
|
self._add_events_table(story, audit_rows, include_payload=False)
|
||||||
|
|
||||||
|
# Mismatches if any
|
||||||
|
mismatches = verify_result.get('mismatches', []) or []
|
||||||
|
if mismatches:
|
||||||
|
self._add_mismatches(story, mismatches)
|
||||||
|
|
||||||
|
# Footer
|
||||||
|
self._add_footer_info(story)
|
||||||
|
|
||||||
|
# Build PDF
|
||||||
|
doc = SimpleDocTemplate(
|
||||||
|
output,
|
||||||
|
pagesize=A4,
|
||||||
|
topMargin=self.MARGIN_TOP * cm,
|
||||||
|
bottomMargin=self.MARGIN_BOTTOM * cm,
|
||||||
|
leftMargin=self.MARGIN_LEFT * cm,
|
||||||
|
rightMargin=self.MARGIN_RIGHT * cm,
|
||||||
|
title="Audit Quick-Check Report",
|
||||||
|
author="Invario System",
|
||||||
|
subject="Audit Report - Quick Check",
|
||||||
|
creator="Invario",
|
||||||
|
)
|
||||||
|
|
||||||
|
doc.build(story)
|
||||||
|
output.seek(0)
|
||||||
|
return output.getvalue()
|
||||||
|
|
||||||
|
def generate_official_report(self, verify_result, event_counts, audit_rows):
|
||||||
|
"""
|
||||||
|
Generate a full official audit report (DIN 5008 compliant for authorities).
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
bytes: PDF content
|
||||||
|
"""
|
||||||
|
output = io.BytesIO()
|
||||||
|
|
||||||
|
story = []
|
||||||
|
|
||||||
|
# Header
|
||||||
|
self._add_header(story, self.school_info.get('it_admin', 'IT-Beauftragter'))
|
||||||
|
|
||||||
|
# Title
|
||||||
|
reporting_date = self.created_timestamp.strftime('%d.%m.%Y')
|
||||||
|
self._add_title(story,
|
||||||
|
"Audit-Protokoll",
|
||||||
|
f"Revisonssicheres Audit-Log - Berichtsstand: {reporting_date}")
|
||||||
|
|
||||||
|
# Summary
|
||||||
|
self._add_audit_summary(story, verify_result, event_counts)
|
||||||
|
|
||||||
|
# Mismatches section (prominently)
|
||||||
|
mismatches = verify_result.get('mismatches', []) or []
|
||||||
|
if mismatches:
|
||||||
|
self._add_mismatches(story, mismatches)
|
||||||
|
|
||||||
|
# Full events table
|
||||||
|
self._add_events_table(story, audit_rows, include_payload=True)
|
||||||
|
|
||||||
|
# Page break for signature section
|
||||||
|
story.append(PageBreak())
|
||||||
|
|
||||||
|
# Signature block
|
||||||
|
self._add_signature_block(story)
|
||||||
|
|
||||||
|
# Footer
|
||||||
|
self._add_footer_info(story)
|
||||||
|
|
||||||
|
# Build PDF
|
||||||
|
doc = SimpleDocTemplate(
|
||||||
|
output,
|
||||||
|
pagesize=A4,
|
||||||
|
topMargin=self.MARGIN_TOP * cm,
|
||||||
|
bottomMargin=self.MARGIN_BOTTOM * cm,
|
||||||
|
leftMargin=self.MARGIN_LEFT * cm,
|
||||||
|
rightMargin=self.MARGIN_RIGHT * cm,
|
||||||
|
title="Audit Official Report",
|
||||||
|
author="Invario System",
|
||||||
|
subject="Offizielle Audit-Bericht (DIN 5008)",
|
||||||
|
creator="Invario",
|
||||||
|
)
|
||||||
|
|
||||||
|
doc.build(story)
|
||||||
|
output.seek(0)
|
||||||
|
return output.getvalue()
|
||||||
|
|
||||||
|
|
||||||
|
def generate_audit_pdf(verify_result, event_counts, audit_rows, export_type='official', school_info=None):
|
||||||
|
"""
|
||||||
|
Convenience function to generate audit PDFs.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
verify_result (dict): Verification result from audit chain
|
||||||
|
event_counts (list): Event count statistics
|
||||||
|
audit_rows (list): Audit log entries
|
||||||
|
export_type (str): 'official' or 'quick'
|
||||||
|
school_info (dict): School information
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
bytes: PDF content
|
||||||
|
"""
|
||||||
|
pdf_gen = DIN5008AuditPDF(school_info=school_info, export_type=export_type)
|
||||||
|
|
||||||
|
if export_type == 'quick':
|
||||||
|
return pdf_gen.generate_quick_check(verify_result, event_counts, audit_rows)
|
||||||
|
else:
|
||||||
|
return pdf_gen.generate_official_report(verify_result, event_counts, audit_rows)
|
||||||
|
|
||||||
|
def _build_invoice_pdf(invoice_data):
|
||||||
|
"""Render a PDF invoice for a damaged borrowed item."""
|
||||||
|
from reportlab.lib.pagesizes import A4
|
||||||
|
from reportlab.lib.units import mm
|
||||||
|
from reportlab.lib.colors import HexColor, black, white
|
||||||
|
from reportlab.lib.utils import simpleSplit
|
||||||
|
from reportlab.pdfgen import canvas
|
||||||
|
|
||||||
|
pdf_buffer = io.BytesIO()
|
||||||
|
c = canvas.Canvas(pdf_buffer, pagesize=A4)
|
||||||
|
page_width, page_height = A4
|
||||||
|
|
||||||
|
margin_x = 20 * mm
|
||||||
|
margin_top = 20 * mm
|
||||||
|
usable_width = page_width - (2 * margin_x)
|
||||||
|
current_y = page_height - margin_top
|
||||||
|
|
||||||
|
dark_color = HexColor('#0F172A')
|
||||||
|
accent_color = HexColor('#B91C1C')
|
||||||
|
light_color = HexColor('#F8FAFC')
|
||||||
|
border_color = HexColor('#CBD5E1')
|
||||||
|
text_color = HexColor('#1E293B')
|
||||||
|
muted_color = HexColor('#64748B')
|
||||||
|
|
||||||
|
def draw_wrapped_lines(text, x_pos, y_pos, width, font_name='Helvetica', font_size=11, leading=14, color=text_color):
|
||||||
|
if not text:
|
||||||
|
return y_pos
|
||||||
|
c.setFont(font_name, font_size)
|
||||||
|
c.setFillColor(color)
|
||||||
|
for line in simpleSplit(str(text), font_name, font_size, width):
|
||||||
|
c.drawString(x_pos, y_pos, line)
|
||||||
|
y_pos -= leading
|
||||||
|
return y_pos
|
||||||
|
|
||||||
|
def draw_label_value(label, value, x_pos, y_pos, label_width=45 * mm):
|
||||||
|
c.setFont('Helvetica-Bold', 10)
|
||||||
|
c.setFillColor(muted_color)
|
||||||
|
c.drawString(x_pos, y_pos, label)
|
||||||
|
c.setFont('Helvetica', 10)
|
||||||
|
c.setFillColor(text_color)
|
||||||
|
c.drawString(x_pos + label_width, y_pos, str(value or '-'))
|
||||||
|
return y_pos - 7 * mm
|
||||||
|
|
||||||
|
c.setFillColor(light_color)
|
||||||
|
c.rect(0, 0, page_width, page_height, fill=1, stroke=0)
|
||||||
|
|
||||||
|
c.setFillColor(dark_color)
|
||||||
|
c.rect(0, page_height - 28 * mm, page_width, 28 * mm, fill=1, stroke=0)
|
||||||
|
c.setFillColor(white)
|
||||||
|
c.setFont('Helvetica-Bold', 20)
|
||||||
|
c.drawString(margin_x, page_height - 16 * mm, 'RECHNUNG')
|
||||||
|
c.setFont('Helvetica', 10)
|
||||||
|
c.drawString(margin_x, page_height - 23 * mm, 'Inventarsystem - Schadensersatz für zerstörtes Ausleihobjekt')
|
||||||
|
|
||||||
|
current_y = page_height - 40 * mm
|
||||||
|
c.setStrokeColor(border_color)
|
||||||
|
c.setLineWidth(1)
|
||||||
|
c.line(margin_x, current_y, page_width - margin_x, current_y)
|
||||||
|
current_y -= 12 * mm
|
||||||
|
|
||||||
|
invoice_number = invoice_data.get('invoice_number', '-')
|
||||||
|
created_at = invoice_data.get('created_at_display', '-')
|
||||||
|
borrower = invoice_data.get('borrower', '-')
|
||||||
|
item_name = invoice_data.get('item_name', '-')
|
||||||
|
item_code = invoice_data.get('item_code', '-')
|
||||||
|
item_id = invoice_data.get('item_id', '-')
|
||||||
|
damage_reason = invoice_data.get('damage_reason', '-')
|
||||||
|
amount_text = invoice_data.get('amount_text', '-')
|
||||||
|
|
||||||
|
current_y = draw_label_value('Rechnungsnummer:', invoice_number, margin_x, current_y)
|
||||||
|
current_y = draw_label_value('Datum:', created_at, margin_x, current_y)
|
||||||
|
current_y = draw_label_value('Empfänger:', borrower, margin_x, current_y)
|
||||||
|
current_y = draw_label_value('Ausleihe / Element:', item_name, margin_x, current_y)
|
||||||
|
current_y = draw_label_value('Element-ID:', item_id, margin_x, current_y)
|
||||||
|
current_y = draw_label_value('Code:', item_code, margin_x, current_y)
|
||||||
|
current_y = current_y - 3 * mm
|
||||||
|
|
||||||
|
c.setFillColor(dark_color)
|
||||||
|
c.setFont('Helvetica-Bold', 12)
|
||||||
|
c.drawString(margin_x, current_y, 'Schadensbeschreibung')
|
||||||
|
current_y -= 6 * mm
|
||||||
|
current_y = draw_wrapped_lines(damage_reason, margin_x, current_y, usable_width, font_size=10, leading=13, color=text_color)
|
||||||
|
current_y -= 4 * mm
|
||||||
|
|
||||||
|
c.setFillColor(dark_color)
|
||||||
|
c.setFont('Helvetica-Bold', 12)
|
||||||
|
c.drawString(margin_x, current_y, 'Rechnungsbetrag')
|
||||||
|
current_y -= 8 * mm
|
||||||
|
|
||||||
|
c.setFillColor(accent_color)
|
||||||
|
c.setStrokeColor(accent_color)
|
||||||
|
c.rect(margin_x, current_y - 12 * mm, usable_width, 16 * mm, fill=1, stroke=0)
|
||||||
|
c.setFillColor(white)
|
||||||
|
c.setFont('Helvetica-Bold', 16)
|
||||||
|
c.drawString(margin_x + 5 * mm, current_y - 2 * mm, amount_text)
|
||||||
|
current_y -= 20 * mm
|
||||||
|
|
||||||
|
current_y = draw_wrapped_lines(
|
||||||
|
'Bitte begleichen Sie diesen Betrag zeitnah bei der Verwaltung. Der Betrag ergibt sich aus dem zerstörten Ausleihobjekt und der dokumentierten Schadensmeldung.',
|
||||||
|
margin_x,
|
||||||
|
current_y,
|
||||||
|
usable_width,
|
||||||
|
font_size=10,
|
||||||
|
leading=13,
|
||||||
|
color=muted_color,
|
||||||
|
)
|
||||||
|
|
||||||
|
footer_y = 18 * mm
|
||||||
|
c.setStrokeColor(border_color)
|
||||||
|
c.setLineWidth(0.8)
|
||||||
|
c.line(margin_x, footer_y + 8 * mm, page_width - margin_x, footer_y + 8 * mm)
|
||||||
|
c.setFillColor(muted_color)
|
||||||
|
c.setFont('Helvetica', 9)
|
||||||
|
c.drawString(margin_x, footer_y, 'Inventarsystem - Rechnungserstellung')
|
||||||
|
c.drawRightString(page_width - margin_x, footer_y, f'{amount_text}')
|
||||||
|
|
||||||
|
c.save()
|
||||||
|
pdf_buffer.seek(0)
|
||||||
|
return pdf_buffer
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
# Web.modules.log package initialization
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
from typing import Dict, Any
|
||||||
|
|
||||||
|
class ModuleRegistry:
|
||||||
|
def __init__(self):
|
||||||
|
self._modules: Dict[str, Any] = {}
|
||||||
|
self._path_matchers = {}
|
||||||
|
|
||||||
|
def register(self, name: str, settings_bool, path_matcher=lambda path: False):
|
||||||
|
self._modules[name] = settings_bool
|
||||||
|
self._path_matchers[name] = path_matcher
|
||||||
|
|
||||||
|
def is_enabled(self, name: str) -> bool:
|
||||||
|
if name not in self._modules:
|
||||||
|
return False
|
||||||
|
return bool(self._modules[name])
|
||||||
|
|
||||||
|
def get_all_status(self) -> Dict[str, bool]:
|
||||||
|
return {name: bool(sys_bool) for name, sys_bool in self._modules.items()}
|
||||||
|
|
||||||
|
def get_module_for_path(self, path: str) -> str:
|
||||||
|
for name, matcher in self._path_matchers.items():
|
||||||
|
if self.is_enabled(name) and matcher(path):
|
||||||
|
return name
|
||||||
|
return None
|
||||||
|
|
||||||
|
registry = ModuleRegistry()
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
print("hello")
|
||||||
@@ -11,8 +11,8 @@ import requests
|
|||||||
import hashlib
|
import hashlib
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import settings as cfg
|
import Web.modules.database.settings as cfg
|
||||||
from settings import MongoClient
|
from Web.modules.database.settings import MongoClient
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|||||||
@@ -10,13 +10,13 @@
|
|||||||
.planned-appointments-panel {
|
.planned-appointments-panel {
|
||||||
margin: 15px 0;
|
margin: 15px 0;
|
||||||
padding: 15px;
|
padding: 15px;
|
||||||
background-color: #e1f5fe;
|
background-color: var(--ui-surface-soft, #e1f5fe);
|
||||||
border-left: 4px solid #03a9f4;
|
border-left: 4px solid #03a9f4;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.planned-appointments-panel h4 {
|
.planned-appointments-panel h4 {
|
||||||
color: #0277bd;
|
color: var(--ui-title, #0277bd);
|
||||||
margin-top: 0;
|
margin-top: 0;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
font-size: 1.1em;
|
font-size: 1.1em;
|
||||||
@@ -30,9 +30,9 @@
|
|||||||
|
|
||||||
.appointment-item {
|
.appointment-item {
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
background-color: #f9fdff;
|
background-color: var(--ui-surface, #f9fdff);
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
border: 1px solid #b3e5fc;
|
border: 1px solid var(--ui-border, #b3e5fc);
|
||||||
}
|
}
|
||||||
|
|
||||||
.appointment-header {
|
.appointment-header {
|
||||||
@@ -44,7 +44,7 @@
|
|||||||
|
|
||||||
.appointment-date {
|
.appointment-date {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
color: #0288d1;
|
color: var(--ui-title, #0288d1);
|
||||||
}
|
}
|
||||||
|
|
||||||
.appointment-period {
|
.appointment-period {
|
||||||
@@ -86,14 +86,14 @@
|
|||||||
.appointment-user {
|
.appointment-user {
|
||||||
margin-left: auto;
|
margin-left: auto;
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
color: #546e7a;
|
color: var(--ui-text-muted, #546e7a);
|
||||||
}
|
}
|
||||||
|
|
||||||
.appointment-notes {
|
.appointment-notes {
|
||||||
font-size: 0.9em;
|
font-size: 0.9em;
|
||||||
color: #455a64;
|
color: var(--ui-text, #455a64);
|
||||||
margin-top: 5px;
|
margin-top: 5px;
|
||||||
padding-top: 5px;
|
padding-top: 5px;
|
||||||
border-top: 1px solid #e1f5fe;
|
border-top: 1px solid var(--ui-border, #e1f5fe);
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
}
|
}
|
||||||
|
|||||||
+116
-10
@@ -22,16 +22,21 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
:root[data-theme="dark"] {
|
:root[data-theme="dark"] {
|
||||||
--ui-bg: #0f172a;
|
/* Tiefes Blau-Theme (Dark Blue) */
|
||||||
--ui-bg-accent: #1e293b;
|
--ui-bg: #0b1120;
|
||||||
|
--ui-bg-accent: #111827;
|
||||||
--ui-surface: #1e293b;
|
--ui-surface: #1e293b;
|
||||||
--ui-surface-soft: #25314a;
|
--ui-surface-soft: #334155;
|
||||||
--ui-border: #334155;
|
--ui-border: #475569;
|
||||||
--ui-text: #f1f5f9;
|
--ui-text: #f8fafc;
|
||||||
--ui-text-muted: #94a3b8;
|
--ui-text-muted: #94a3b8;
|
||||||
--ui-title: #ffffff;
|
--ui-title: #ffffff;
|
||||||
--ui-shadow-sm: 0 2px 8px rgba(0, 0, 0, 0.4);
|
--ui-shadow-sm: 0 4px 12px rgba(0, 0, 0, 0.4), inset 0 0 0 1px rgba(255, 255, 255, 0.05);
|
||||||
--ui-shadow-md: 0 10px 24px rgba(0, 0, 0, 0.5);
|
--ui-shadow-md: 0 10px 30px rgba(0, 0, 0, 0.6), inset 0 0 0 1px rgba(255, 255, 255, 0.05);
|
||||||
|
|
||||||
|
/* Abgerundetes Format im gesamten Dark Mode */
|
||||||
|
--ui-radius: 20px;
|
||||||
|
--ui-btn-radius: 99px; /* Pillenform für Buttons */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Safe Area Support for iPad notches, Dynamic Island, and rounded corners */
|
/* Safe Area Support for iPad notches, Dynamic Island, and rounded corners */
|
||||||
@@ -57,9 +62,17 @@ body {
|
|||||||
:root[data-theme="dark"] input,
|
:root[data-theme="dark"] input,
|
||||||
:root[data-theme="dark"] select,
|
:root[data-theme="dark"] select,
|
||||||
:root[data-theme="dark"] textarea {
|
:root[data-theme="dark"] textarea {
|
||||||
background-color: var(--ui-surface-soft) !important;
|
background-color: var(--ui-bg) !important;
|
||||||
color: var(--ui-text) !important;
|
color: var(--ui-text) !important;
|
||||||
border-color: var(--ui-border) !important;
|
border: 1px solid var(--ui-border) !important;
|
||||||
|
border-radius: 12px !important;
|
||||||
|
box-shadow: inset 0 1px 2px rgba(0,0,0,0.3) !important;
|
||||||
|
}
|
||||||
|
:root[data-theme="dark"] input:focus,
|
||||||
|
:root[data-theme="dark"] select:focus,
|
||||||
|
:root[data-theme="dark"] textarea:focus {
|
||||||
|
border-color: #52a8ff !important;
|
||||||
|
box-shadow: 0 0 0 2px rgba(82, 168, 255, 0.2), inset 0 1px 2px rgba(0,0,0,0.3) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
@@ -295,7 +308,7 @@ select:focus {
|
|||||||
|
|
||||||
/* Modal dialog styling */
|
/* Modal dialog styling */
|
||||||
.modal-dialog-white {
|
.modal-dialog-white {
|
||||||
background: white;
|
background: var(--ui-surface);
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
@@ -389,6 +402,10 @@ body.table-view .item-card {
|
|||||||
background: var(--ui-surface);
|
background: var(--ui-surface);
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
scroll-snap-align: none;
|
scroll-snap-align: none;
|
||||||
|
min-height: 60px;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
|
|
||||||
body.table-view .item-card .card-content {
|
body.table-view .item-card .card-content {
|
||||||
@@ -896,3 +913,92 @@ html, body {
|
|||||||
padding-bottom: env(safe-area-inset-bottom);
|
padding-bottom: env(safe-area-inset-bottom);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ========================================================= */
|
||||||
|
/* UNIVERSAL DARK MODE OVERRIDES FOR HARDCODED HTML STYLES */
|
||||||
|
/* ========================================================= */
|
||||||
|
:root[data-theme="dark"] .bg-white,
|
||||||
|
:root[data-theme="dark"] .bg-light,
|
||||||
|
:root[data-theme="dark"] [style*="background-color: #fff"],
|
||||||
|
:root[data-theme="dark"] [style*="background-color: #ffffff"],
|
||||||
|
:root[data-theme="dark"] [style*="background-color: #f8f9fa"],
|
||||||
|
:root[data-theme="dark"] [style*="background-color: #f5f5f5"],
|
||||||
|
:root[data-theme="dark"] [style*="background: #fff"],
|
||||||
|
:root[data-theme="dark"] [style*="background: #ffffff"],
|
||||||
|
:root[data-theme="dark"] [style*="background: #f8f9fa"],
|
||||||
|
:root[data-theme="dark"] [style*="background: #f5f5f5"],
|
||||||
|
:root[data-theme="dark"] [style*="background: white"],
|
||||||
|
:root[data-theme="dark"] [style*="background-color: white"],
|
||||||
|
:root[data-theme="dark"] .modal-content,
|
||||||
|
:root[data-theme="dark"] .card,
|
||||||
|
:root[data-theme="dark"] .dropdown-menu {
|
||||||
|
background-color: var(--ui-surface) !important;
|
||||||
|
background: var(--ui-surface) !important;
|
||||||
|
color: var(--ui-text) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
:root[data-theme="dark"] .text-dark,
|
||||||
|
:root[data-theme="dark"] .text-black,
|
||||||
|
:root[data-theme="dark"] [style*="color: #000"],
|
||||||
|
:root[data-theme="dark"] [style*="color: rgb(0, 0, 0)"],
|
||||||
|
:root[data-theme="dark"] [style*="color: black"],
|
||||||
|
:root[data-theme="dark"] [style*="color: #333"] {
|
||||||
|
color: var(--ui-text) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
:root[data-theme="dark"] .text-muted {
|
||||||
|
color: var(--ui-text-muted) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Fix table backgrounds that might have hardcoded light colors */
|
||||||
|
:root[data-theme="dark"] .table-light,
|
||||||
|
:root[data-theme="dark"] table.table,
|
||||||
|
:root[data-theme="dark"] table [style*="background: #fff"] {
|
||||||
|
background-color: var(--ui-bg) !important;
|
||||||
|
color: var(--ui-text) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Fix list items */
|
||||||
|
:root[data-theme="dark"] .list-group-item {
|
||||||
|
background-color: var(--ui-surface) !important;
|
||||||
|
color: var(--ui-text) !important;
|
||||||
|
border-color: var(--ui-border) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Additional inline style coverage */
|
||||||
|
:root[data-theme="dark"] [style*="background: #eef4ff"],
|
||||||
|
:root[data-theme="dark"] [style*="background-color: #eef4ff"],
|
||||||
|
:root[data-theme="dark"] [style*="background: #e9ecef"],
|
||||||
|
:root[data-theme="dark"] [style*="background-color: #e9ecef"],
|
||||||
|
:root[data-theme="dark"] [style*="background: #e2e8f0"],
|
||||||
|
:root[data-theme="dark"] [style*="background-color: #e2e8f0"],
|
||||||
|
:root[data-theme="dark"] [style*="background-color: #fefefe"],
|
||||||
|
:root[data-theme="dark"] [style*="background: #fffdfd"] {
|
||||||
|
background-color: var(--ui-surface) !important;
|
||||||
|
background: var(--ui-surface) !important;
|
||||||
|
color: var(--ui-text) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
:root[data-theme="dark"] .badge-light,
|
||||||
|
:root[data-theme="dark"] .bg-light {
|
||||||
|
background-color: var(--ui-surface-soft) !important;
|
||||||
|
color: var(--ui-text) !important;
|
||||||
|
border: 1px solid var(--ui-border);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Fix Bookmark/Favorite Button in Dark Mode */
|
||||||
|
:root[data-theme="dark"] .bookmark-btn {
|
||||||
|
background: var(--ui-surface-soft) !important;
|
||||||
|
border-color: #f59e0b !important;
|
||||||
|
color: #f59e0b !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
:root[data-theme="dark"] .bookmark-btn:hover,
|
||||||
|
:root[data-theme="dark"] .bookmark-btn.active {
|
||||||
|
background: #f59e0b !important;
|
||||||
|
color: var(--ui-bg) !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
:root[data-theme="dark"] .favorite-item {
|
||||||
|
outline: 2px solid #f59e0b !important;
|
||||||
|
}
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 273 KiB After Width: | Height: | Size: 193 KiB |
Binary file not shown.
@@ -5,9 +5,27 @@
|
|||||||
<h1>Audit Dashboard</h1>
|
<h1>Audit Dashboard</h1>
|
||||||
<p>Integritätsstatus der Audit-Chain und letzte Audit-Ereignisse (max. 200 Einträge).</p>
|
<p>Integritätsstatus der Audit-Chain und letzte Audit-Ereignisse (max. 200 Einträge).</p>
|
||||||
|
|
||||||
<div style="display:flex; gap:10px; flex-wrap:wrap; margin:10px 0 18px;">
|
<!-- Information Box for DIN 5008 Compliance -->
|
||||||
<a class="btn btn-primary" href="{{ url_for('admin_audit_export', format='md') }}">Audit Review exportieren (Markdown)</a>
|
<div style="background:#e8f4f8; border-left:4px solid #0284c7; padding:12px; margin:0 0 16px 0; border-radius:4px;">
|
||||||
<a class="btn btn-outline-secondary" href="{{ url_for('admin_audit_export', format='json') }}">Audit Review exportieren (JSON)</a>
|
<p style="margin:0; font-size:0.95rem; color:#1e40af;">
|
||||||
|
<strong>✓ Professionelle PDF-Exporte:</strong> Die neuen DIN 5008 konformen Berichte sind speziell für Schulträger,
|
||||||
|
Rechnungsprüfungsämter und Behörden optimiert. Sie enthalten Revisionssicherheit, Barrierefreiheit (BFSG) und
|
||||||
|
PDF/A-Format für Langzeitarchivierung in deutschen Behörden.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div style="display:grid; grid-template-columns:1fr 1fr; gap:12px; margin:10px 0 18px;">
|
||||||
|
<!-- PDF Export Section -->
|
||||||
|
<div 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;">
|
||||||
|
<a class="btn btn-primary" href="{{ url_for('admin_audit_export_pdf_official') }}" style="flex:1; text-align:center;">
|
||||||
|
📋 Amtlicher Bericht (DIN 5008)
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div style="display:grid; grid-template-columns:repeat(auto-fit,minmax(220px,1fr)); gap:12px; margin:16px 0 20px;">
|
<div style="display:grid; grid-template-columns:repeat(auto-fit,minmax(220px,1fr)); gap:12px; margin:16px 0 20px;">
|
||||||
|
|||||||
@@ -0,0 +1,287 @@
|
|||||||
|
<!--
|
||||||
|
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>
|
||||||
|
|
||||||
|
<hr style="margin: 24px 0; border: 0; border-top: 1px solid #e5e7eb;">
|
||||||
|
<h3 style="font-size: 1.1rem; margin-bottom: 16px; color: #111827;">Globales Filter-Wording</h3>
|
||||||
|
<p style="font-size: 0.9rem; color: #6b7280; margin-bottom: 16px;">Hier kannst du die globalen Bezeichnungen für die drei Haupt-Kategorien (Filter) der Anwendung ändern.</p>
|
||||||
|
|
||||||
|
<div class="form-row">
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="filter_name_1">Name Filter 1</label>
|
||||||
|
<input type="text" id="filter_name_1" name="filter_name_1" value="{{ filter_names.get('1', 'Fach/Kategorie') }}" placeholder="z. B. Fach/Kategorie">
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="filter_name_2">Name Filter 2</label>
|
||||||
|
<input type="text" id="filter_name_2" name="filter_name_2" value="{{ filter_names.get('2', 'System/Bereich') }}" placeholder="z. B. System/Bereich">
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="filter_name_3">Name Filter 3</label>
|
||||||
|
<input type="text" id="filter_name_3" name="filter_name_3" value="{{ filter_names.get('3', 'Typ/Art') }}" placeholder="z. B. Typ/Art">
|
||||||
|
</div>
|
||||||
|
</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 %}
|
||||||
+70
-14
@@ -176,6 +176,13 @@
|
|||||||
z-index: 1900;
|
z-index: 1900;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#loginNavbar {
|
||||||
|
padding-top: 0;
|
||||||
|
padding-bottom: 0;
|
||||||
|
min-height: 28px;
|
||||||
|
overflow: visible;
|
||||||
|
}
|
||||||
|
|
||||||
.navbar .container-fluid {
|
.navbar .container-fluid {
|
||||||
gap: 8px;
|
gap: 8px;
|
||||||
/* Ensure container respects safe areas on all sides */
|
/* Ensure container respects safe areas on all sides */
|
||||||
@@ -183,6 +190,13 @@
|
|||||||
padding-right: max(env(safe-area-inset-right, 0), 12px);
|
padding-right: max(env(safe-area-inset-right, 0), 12px);
|
||||||
padding-bottom: env(safe-area-inset-bottom, 0);
|
padding-bottom: env(safe-area-inset-bottom, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#loginNavbar .container-fluid {
|
||||||
|
padding-top: 2px;
|
||||||
|
padding-bottom: 2px;
|
||||||
|
align-items: center;
|
||||||
|
min-height: 28px;
|
||||||
|
}
|
||||||
|
|
||||||
.navbar-brand {
|
.navbar-brand {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
@@ -192,6 +206,27 @@
|
|||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#loginNavbar .navbar-brand {
|
||||||
|
padding-right: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#loginNavbar .navbar-brand::before {
|
||||||
|
content: none;
|
||||||
|
margin-right: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#loginNavbar .invario-logo {
|
||||||
|
display: block;
|
||||||
|
height: 114px;
|
||||||
|
width: auto;
|
||||||
|
max-width: min(78vw, 520px);
|
||||||
|
object-fit: contain;
|
||||||
|
filter: none;
|
||||||
|
margin-top: 0;
|
||||||
|
margin-bottom: 0;
|
||||||
|
transform: translateY(8px);
|
||||||
|
}
|
||||||
|
|
||||||
.navbar-text.tenant-badge {
|
.navbar-text.tenant-badge {
|
||||||
font-size: 0.82rem;
|
font-size: 0.82rem;
|
||||||
color: rgba(255,255,255,0.9);
|
color: rgba(255,255,255,0.9);
|
||||||
@@ -294,7 +329,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* iPad/Tablet responsive adjustments */
|
/* iPad/Tablet responsive adjustments */
|
||||||
@media (max-width: 1024px) {
|
@media (max-width: 768px) {
|
||||||
.navbar .container-fluid {
|
.navbar .container-fluid {
|
||||||
gap: 6px;
|
gap: 6px;
|
||||||
padding-left: max(env(safe-area-inset-left, 0), 10px);
|
padding-left: max(env(safe-area-inset-left, 0), 10px);
|
||||||
@@ -337,6 +372,14 @@
|
|||||||
font-size: 0.75rem;
|
font-size: 0.75rem;
|
||||||
padding: 0.4rem 0.5rem;
|
padding: 0.4rem 0.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#loginNavbar .invario-logo {
|
||||||
|
height: 94px;
|
||||||
|
max-width: 80vw;
|
||||||
|
margin-top: 0;
|
||||||
|
margin-bottom: 0;
|
||||||
|
transform: translateY(6px);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.navbar.nav-compact .navbar-brand {
|
.navbar.nav-compact .navbar-brand {
|
||||||
@@ -1053,16 +1096,6 @@
|
|||||||
<a class="nav-link quick-link-pill {% if current_path == url_for('my_borrowed_items') %}nav-active{% endif %}" href="{{ url_for('my_borrowed_items') }}" data-tutorial-tip="Ihre aktuellen Ausleihen und Rückgaben finden Sie hier.">Meine Ausleihen</a>
|
<a class="nav-link quick-link-pill {% if current_path == url_for('my_borrowed_items') %}nav-active{% endif %}" href="{{ url_for('my_borrowed_items') }}" data-tutorial-tip="Ihre aktuellen Ausleihen und Rückgaben finden Sie hier.">Meine Ausleihen</a>
|
||||||
</li>
|
</li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if current_permissions.pages.get('tutorial_page', True) %}
|
|
||||||
<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="Öffnen Sie das Tutorial, um das System Schritt für Schritt kennenzulernen.">Tutorial</a>
|
|
||||||
</li>
|
|
||||||
{% endif %}
|
|
||||||
{% endif %}
|
|
||||||
{% if 'username' in session and current_permissions.pages.get('upload_admin', True) and current_permissions.actions.get('can_insert', True) %}
|
|
||||||
<li class="nav-item">
|
|
||||||
<a class="nav-link nav-priority-link {% if current_path == url_for('upload_admin') %}nav-active{% endif %}" href="{{ url_for('upload_admin') }}" data-tutorial-tip="Hier können Sie neue Artikel ins Inventar einpflegen.">➕ Hochladen</a>
|
|
||||||
</li>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<li class="nav-item" data-nav-fixed="true">
|
<li class="nav-item" data-nav-fixed="true">
|
||||||
<button id="themeToggleBtn" class="btn btn-link nav-link px-3" aria-label="Dark Mode umschalten" title="Theme umschalten">
|
<button id="themeToggleBtn" class="btn btn-link nav-link px-3" aria-label="Dark Mode umschalten" title="Theme umschalten">
|
||||||
@@ -1076,6 +1109,15 @@
|
|||||||
Mehr Optionen
|
Mehr Optionen
|
||||||
</a>
|
</a>
|
||||||
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="invMoreDropdown">
|
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="invMoreDropdown">
|
||||||
|
{% if 'username' in session %}
|
||||||
|
{% if current_permissions.pages.get('tutorial_page', True) %}
|
||||||
|
<li><a class="dropdown-item" href="{{ url_for('tutorial_page') }}">Tutorial</a></li>
|
||||||
|
{% endif %}
|
||||||
|
{% if current_permissions.pages.get('upload_admin', True) and current_permissions.actions.get('can_insert', True) %}
|
||||||
|
<li><a class="dropdown-item" href="{{ url_for('upload_admin') }}">➕ Hochladen</a></li>
|
||||||
|
{% endif %}
|
||||||
|
<li><hr class="dropdown-divider"></li>
|
||||||
|
{% endif %}
|
||||||
{% if 'username' in session and (session.get('admin', False) or is_admin) and current_permissions.actions.get('can_manage_settings', True) %}
|
{% if 'username' in session and (session.get('admin', False) or is_admin) and current_permissions.actions.get('can_manage_settings', True) %}
|
||||||
<li><h6 class="dropdown-header">Verwaltung</h6></li>
|
<li><h6 class="dropdown-header">Verwaltung</h6></li>
|
||||||
{% if current_permissions.pages.get('manage_filters', True) %}
|
{% if current_permissions.pages.get('manage_filters', True) %}
|
||||||
@@ -1084,6 +1126,7 @@
|
|||||||
{% if current_permissions.pages.get('manage_locations', True) %}
|
{% if current_permissions.pages.get('manage_locations', True) %}
|
||||||
<li><a class="dropdown-item" href="{{ url_for('manage_locations') }}">Orte verwalten</a></li>
|
<li><a class="dropdown-item" href="{{ url_for('manage_locations') }}">Orte verwalten</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
<li><a class="dropdown-item" href="{{ url_for('admin_school_settings') }}">Schulstammdaten</a></li>
|
||||||
{% if current_permissions.pages.get('admin_borrowings', True) %}
|
{% if current_permissions.pages.get('admin_borrowings', True) %}
|
||||||
<li><a class="dropdown-item" href="{{ url_for('admin_borrowings') }}">Ausleihen</a></li>
|
<li><a class="dropdown-item" href="{{ url_for('admin_borrowings') }}">Ausleihen</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
@@ -1209,6 +1252,7 @@
|
|||||||
{% if student_cards_module_enabled %}
|
{% if student_cards_module_enabled %}
|
||||||
<li><a class="dropdown-item" href="{{ url_for('student_cards_admin') }}">Bibliotheksausweis</a></li>
|
<li><a class="dropdown-item" href="{{ url_for('student_cards_admin') }}">Bibliotheksausweis</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
<li><a class="dropdown-item" href="{{ url_for('admin_school_settings') }}">Schulstammdaten</a></li>
|
||||||
<li><hr class="dropdown-divider"></li>
|
<li><hr class="dropdown-divider"></li>
|
||||||
{% if current_permissions.actions.get('can_manage_users', True) %}
|
{% if current_permissions.actions.get('can_manage_users', True) %}
|
||||||
<li><h6 class="dropdown-header">System</h6></li>
|
<li><h6 class="dropdown-header">System</h6></li>
|
||||||
@@ -1268,9 +1312,19 @@
|
|||||||
{% else %}
|
{% else %}
|
||||||
<nav class="navbar navbar-expand-lg navbar-dark" id="loginNavbar">
|
<nav class="navbar navbar-expand-lg navbar-dark" id="loginNavbar">
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<a class="navbar-brand py-0" href="{{ url_for('home') }}">
|
<a class="navbar-brand py-0" href="{{ url_for('home') }}">
|
||||||
<img src="{{ url_for('static', filename='img/invario-logo.png') }}" alt="Invario" height="120" class="d-inline-block align-top" style="filter: drop-shadow(0px 0px 2px rgba(255,255,255,0.5));">
|
{% set school_logo_thumb = school_info.get('logo_thumb') if school_info else '' %}
|
||||||
</a>
|
{% 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">
|
<ul class="navbar-nav ms-auto mb-2 mb-lg-0">
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link" href="{{ url_for('impressum') }}">Impressum</a>
|
<a class="nav-link" href="{{ url_for('impressum') }}">Impressum</a>
|
||||||
@@ -1476,6 +1530,7 @@
|
|||||||
<option value="Defekte Items"></option>
|
<option value="Defekte Items"></option>
|
||||||
<option value="Filter verwalten"></option>
|
<option value="Filter verwalten"></option>
|
||||||
<option value="Orte verwalten"></option>
|
<option value="Orte verwalten"></option>
|
||||||
|
<option value="Schulstammdaten"></option>
|
||||||
<option value="Audit Dashboard"></option>
|
<option value="Audit Dashboard"></option>
|
||||||
<option value="Logs"></option>
|
<option value="Logs"></option>
|
||||||
<option value="Benutzer verwalten"></option>
|
<option value="Benutzer verwalten"></option>
|
||||||
@@ -1545,6 +1600,7 @@
|
|||||||
{ label: 'Defekte Items', keywords: ['defekte items', 'defekt', 'schaden'], url: {{ url_for('admin_damaged_items')|tojson }} },
|
{ 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: '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: '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: 'Audit Dashboard', keywords: ['audit', 'audit dashboard'], url: {{ url_for('admin_audit_dashboard')|tojson }} },
|
||||||
{ label: 'Logs', keywords: ['logs', 'protokoll'], url: {{ url_for('logs')|tojson }} },
|
{ label: 'Logs', keywords: ['logs', 'protokoll'], url: {{ url_for('logs')|tojson }} },
|
||||||
{ label: 'Benutzer verwalten', keywords: ['benutzer verwalten', 'user'], url: {{ url_for('user_del')|tojson }} },
|
{ label: 'Benutzer verwalten', keywords: ['benutzer verwalten', 'user'], url: {{ url_for('user_del')|tojson }} },
|
||||||
|
|||||||
@@ -0,0 +1,75 @@
|
|||||||
|
{% extends "base.html" %}
|
||||||
|
|
||||||
|
{% block title %}
|
||||||
|
{% if error_code == 404 %}
|
||||||
|
Seite nicht gefunden - Inventarsystem
|
||||||
|
{% else %}
|
||||||
|
Fehler - Inventarsystem
|
||||||
|
{% endif %}
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<div class="error-container" style="text-align: center; padding: 60px 20px; min-height: 70vh; display: flex; flex-direction: column; justify-content: center; align-items: center;">
|
||||||
|
<div style="max-width: 600px;">
|
||||||
|
<!-- Error Code Display -->
|
||||||
|
<div style="font-size: 120px; font-weight: bold; color: #ef4444; margin-bottom: 20px;">
|
||||||
|
{{ error_code }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Error Title -->
|
||||||
|
<h1 style="font-size: 32px; margin: 20px 0; color: #1f2937;">
|
||||||
|
{% if error_code == 404 %}
|
||||||
|
Seite nicht gefunden
|
||||||
|
{% else %}
|
||||||
|
Ein Fehler ist aufgetreten
|
||||||
|
{% endif %}
|
||||||
|
</h1>
|
||||||
|
|
||||||
|
<!-- Error Message -->
|
||||||
|
<p style="font-size: 18px; color: #6b7280; margin: 20px 0 40px;">
|
||||||
|
{{ error_message or 'Es tut uns leid, aber die angeforderte Seite konnte nicht gefunden werden.' }}
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<!-- Action Buttons -->
|
||||||
|
<div style="display: flex; gap: 15px; justify-content: center; flex-wrap: wrap;">
|
||||||
|
<a href="{{ url_for('home') }}" class="button" style="background-color: #3b82f6; color: white; padding: 12px 30px; text-decoration: none; border-radius: 5px; display: inline-block; font-weight: 500;">
|
||||||
|
Zur Startseite
|
||||||
|
</a>
|
||||||
|
<a href="javascript:history.back()" class="button" style="background-color: #6b7280; color: white; padding: 12px 30px; text-decoration: none; border-radius: 5px; display: inline-block; font-weight: 500;">
|
||||||
|
Zurück
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Additional Help -->
|
||||||
|
<div style="margin-top: 60px; padding: 20px; background-color: #f3f4f6; border-radius: 8px;">
|
||||||
|
<p style="color: #6b7280; font-size: 14px;">
|
||||||
|
Wenn Sie denken, dass dies ein Fehler ist, oder Sie Hilfe benötigen,
|
||||||
|
<a href="{{ url_for('impressum') }}" style="color: #3b82f6; text-decoration: none;">kontaktieren Sie den Administrator</a>.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.error-container {
|
||||||
|
animation: fadeIn 0.3s ease-in;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes fadeIn {
|
||||||
|
from {
|
||||||
|
opacity: 0;
|
||||||
|
transform: translateY(10px);
|
||||||
|
}
|
||||||
|
to {
|
||||||
|
opacity: 1;
|
||||||
|
transform: translateY(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.button:hover {
|
||||||
|
opacity: 0.9;
|
||||||
|
transform: translateY(-2px);
|
||||||
|
transition: all 0.2s ease;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
{% endblock %}
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="container my-4">
|
<div class="container my-4">
|
||||||
<div class="impressum-content bg-white p-4 shadow rounded">
|
<div class="impressum-content p-4 shadow rounded" style="background: var(--ui-surface); color: var(--ui-text);">
|
||||||
<h1 class="mb-4 text-center">Impressum</h1>
|
<h1 class="mb-4 text-center">Impressum</h1>
|
||||||
<p class="text-center mb-5">(Angaben gemäß § 5 DDG)</p>
|
<p class="text-center mb-5">(Angaben gemäß § 5 DDG)</p>
|
||||||
|
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
<h3 class="mb-3">Kontaktinformationen</h3>
|
<h3 class="mb-3">Kontaktinformationen</h3>
|
||||||
<address class="mb-0">
|
<address class="mb-0">
|
||||||
<p><strong>Name:</strong> Invario UG</p>
|
<p><strong>Name:</strong> Invario UG</p>
|
||||||
<p><strong>Adresse:</strong> Musterstraße 123<br>12345 Musterstadt<br>Deutschland</p>
|
<p><strong>Adresse:</strong> Am Sportplatz 10<br>83052 Bruckmühl<br>Deutschland</p>
|
||||||
</address>
|
</address>
|
||||||
<p><strong>E-Mail:</strong> <a href="mailto:info@invario.eu">info@invario.eu</a></p>
|
<p><strong>E-Mail:</strong> <a href="mailto:info@invario.eu">info@invario.eu</a></p>
|
||||||
</div>
|
</div>
|
||||||
@@ -29,8 +29,8 @@
|
|||||||
<h3 class="mb-3">Verantwortlich für den Inhalt</h3>
|
<h3 class="mb-3">Verantwortlich für den Inhalt</h3>
|
||||||
<p>(nach § 18 Abs. 2 MStV)</p>
|
<p>(nach § 18 Abs. 2 MStV)</p>
|
||||||
<p>Invario UG<br>
|
<p>Invario UG<br>
|
||||||
Musterstraße 123<br>
|
Am Sportplatz 10<br>
|
||||||
12345 Musterstadt<br>
|
83052 Bruckmühl<br>
|
||||||
Deutschland</p>
|
Deutschland</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -124,7 +124,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="head-actions">
|
<div class="head-actions">
|
||||||
<a class="btn btn-outline-secondary" href="{{ url_for('library_loans_admin') }}">Zur Bibliotheks-Ausleihenverwaltung</a>
|
<a class="btn btn-outline-secondary" href="{{ url_for('library_loans_admin') }}">Zur Bibliotheks-Ausleihenverwaltung</a>
|
||||||
<a class="btn btn-secondary" href="{{ url_for('library_view') }}">Bibliothek öffnen</a>
|
<a class="btn btn-secondary" href="{{ url_for('library_admin') }}">Bibliothek öffnen</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -477,6 +477,7 @@
|
|||||||
<select id="filterType">
|
<select id="filterType">
|
||||||
<option value="">-- Alle Typen --</option>
|
<option value="">-- Alle Typen --</option>
|
||||||
<option value="book">Buch</option>
|
<option value="book">Buch</option>
|
||||||
|
<option value="schulbuch">Schulbuch</option>
|
||||||
<option value="cd">CD</option>
|
<option value="cd">CD</option>
|
||||||
<option value="dvd">DVD</option>
|
<option value="dvd">DVD</option>
|
||||||
<option value="other">Sonstige</option>
|
<option value="other">Sonstige</option>
|
||||||
@@ -495,6 +496,15 @@
|
|||||||
<div class="filter-buttons">
|
<div class="filter-buttons">
|
||||||
<button id="applyFilterBtn" class="button" style="background: #4f46e5; color: white;">Filter anwenden</button>
|
<button id="applyFilterBtn" class="button" style="background: #4f46e5; color: white;">Filter anwenden</button>
|
||||||
<button id="clearFilterBtn" class="button" style="background: #f0f2f5; color: var(--ui-text);">Zurücksetzen</button>
|
<button id="clearFilterBtn" class="button" style="background: #f0f2f5; color: var(--ui-text);">Zurücksetzen</button>
|
||||||
|
<div style="flex-grow: 1;"></div>
|
||||||
|
<button class="button" style="background: #10b981; color: white; display: flex; align-items: center; gap: 0.5rem;" onclick="window.location.href='/library/export/schulbuecher'">
|
||||||
|
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path><polyline points="14 2 14 8 20 8"></polyline><line x1="8" y1="13" x2="16" y2="13"></line><line x1="8" y1="17" x2="16" y2="17"></line><polyline points="10 9 9 9 8 9"></polyline></svg>
|
||||||
|
Schulbücher Excel
|
||||||
|
</button>
|
||||||
|
<button class="button" style="background: #10b981; color: white; display: flex; align-items: center; gap: 0.5rem;" onclick="window.location.href='/library/export/all_borrowed'">
|
||||||
|
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path><polyline points="14 2 14 8 20 8"></polyline><line x1="8" y1="13" x2="16" y2="13"></line><line x1="8" y1="17" x2="16" y2="17"></line><polyline points="10 9 9 9 8 9"></polyline></svg>
|
||||||
|
Alle ausgeliehen Excel
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -1174,6 +1184,7 @@
|
|||||||
<label for="editLibraryType">Medientyp</label>
|
<label for="editLibraryType">Medientyp</label>
|
||||||
<select id="editLibraryType">
|
<select id="editLibraryType">
|
||||||
<option value="book">Buch</option>
|
<option value="book">Buch</option>
|
||||||
|
<option value="schulbuch">Schulbuch</option>
|
||||||
<option value="cd">CD</option>
|
<option value="cd">CD</option>
|
||||||
<option value="dvd">DVD</option>
|
<option value="dvd">DVD</option>
|
||||||
<option value="media">Sonstige Medien</option>
|
<option value="media">Sonstige Medien</option>
|
||||||
|
|||||||
+116
-46
@@ -459,7 +459,7 @@
|
|||||||
<div id="schedule-modal" class="item-modal">
|
<div id="schedule-modal" class="item-modal">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<span class="close-modal" onclick="closeScheduleModal()">×</span>
|
<span class="close-modal" onclick="closeScheduleModal()">×</span>
|
||||||
<h2>Termin planen</h2>
|
<h2>Reservieren</h2>
|
||||||
<form id="schedule-form">
|
<form id="schedule-form">
|
||||||
<input type="hidden" id="schedule-item-id" name="item_id">
|
<input type="hidden" id="schedule-item-id" name="item_id">
|
||||||
|
|
||||||
@@ -751,6 +751,7 @@
|
|||||||
let mainItemsSentinel = null;
|
let mainItemsSentinel = null;
|
||||||
let mainItemsLoadingIndicator = null;
|
let mainItemsLoadingIndicator = null;
|
||||||
let mainItemsScrollPrefetchBound = false;
|
let mainItemsScrollPrefetchBound = false;
|
||||||
|
let cardVirtualizationObserver = null;
|
||||||
|
|
||||||
function ensureMainItemsLoadingIndicator() {
|
function ensureMainItemsLoadingIndicator() {
|
||||||
const itemsContainer = document.querySelector('#items-container');
|
const itemsContainer = document.querySelector('#items-container');
|
||||||
@@ -759,11 +760,14 @@
|
|||||||
if (!mainItemsLoadingIndicator) {
|
if (!mainItemsLoadingIndicator) {
|
||||||
mainItemsLoadingIndicator = document.createElement('div');
|
mainItemsLoadingIndicator = document.createElement('div');
|
||||||
mainItemsLoadingIndicator.id = 'main-items-loading-indicator';
|
mainItemsLoadingIndicator.id = 'main-items-loading-indicator';
|
||||||
mainItemsLoadingIndicator.className = 'items-loading-indicator';
|
mainItemsLoadingIndicator.className = 'items-loading-indicator empty-frames-placeholder';
|
||||||
mainItemsLoadingIndicator.innerHTML = `
|
mainItemsLoadingIndicator.innerHTML = `
|
||||||
<div class="loading-track"><div class="loading-fill"></div></div>
|
<div class="empty-frame p-3 mx-2" style="flex: 1; height: 100px; border-radius: 12px; background: rgba(255,255,255,0.02); min-width: 250px;"></div>
|
||||||
<div class="loading-label">Weitere Objekte werden vorbereitet...</div>
|
<div class="empty-frame p-3 mx-2" style="flex: 1; height: 100px; border-radius: 12px; background: rgba(255,255,255,0.02); min-width: 250px; display: none;" class="d-none d-md-block"></div>
|
||||||
|
<div class="empty-frame p-3 mx-2" style="flex: 1; height: 100px; border-radius: 12px; background: rgba(255,255,255,0.02); min-width: 250px; display: none;" class="d-none d-lg-block"></div>
|
||||||
`;
|
`;
|
||||||
|
mainItemsLoadingIndicator.style.display = 'flex';
|
||||||
|
mainItemsLoadingIndicator.style.width = '100%';
|
||||||
}
|
}
|
||||||
|
|
||||||
itemsContainer.appendChild(mainItemsLoadingIndicator);
|
itemsContainer.appendChild(mainItemsLoadingIndicator);
|
||||||
@@ -1057,7 +1061,7 @@
|
|||||||
:
|
:
|
||||||
`<button class="ausleihen disabled-button" disabled>${item.BlockedNow ? 'Reserviert' : 'Ausgeliehen'}</button>`
|
`<button class="ausleihen disabled-button" disabled>${item.BlockedNow ? 'Reserviert' : 'Ausgeliehen'}</button>`
|
||||||
}
|
}
|
||||||
${canScheduleItem ? `<button class="schedule-button" type="button" onclick="openScheduleModal('${item._id}')">Termin planen</button>` : ''}
|
${canScheduleItem ? `<button class="schedule-button" type="button" onclick="openScheduleModal('${item._id}')">Reservieren</button>` : ''}
|
||||||
<button class="quick-details-button" type="button" onclick="openItemQuick('${item._id}')">Details</button>
|
<button class="quick-details-button" type="button" onclick="openItemQuick('${item._id}')">Details</button>
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
@@ -1189,6 +1193,59 @@
|
|||||||
mainItemsScrollPrefetchBound = true;
|
mainItemsScrollPrefetchBound = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Setup DOM virtualization for items
|
||||||
|
if (!cardVirtualizationObserver) {
|
||||||
|
cardVirtualizationObserver = new IntersectionObserver((entries) => {
|
||||||
|
entries.forEach(entry => {
|
||||||
|
const card = entry.target;
|
||||||
|
if (entry.isIntersecting) {
|
||||||
|
if (card.dataset.deloaded === 'true') {
|
||||||
|
card.innerHTML = card.dataset.savedHtml;
|
||||||
|
card.dataset.deloaded = 'false';
|
||||||
|
card.classList.remove('is-deloaded');
|
||||||
|
card.classList.remove('empty-frame');
|
||||||
|
const favBtn = card.querySelector('.bookmark-btn');
|
||||||
|
if (favBtn) {
|
||||||
|
favBtn.addEventListener('click', (ev) => {
|
||||||
|
ev.stopPropagation();
|
||||||
|
toggleFavorite(card.dataset.itemId, favBtn, card);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
const cardContent = card.querySelector('.card-content');
|
||||||
|
if (cardContent) {
|
||||||
|
cardContent.addEventListener('click', function(e) {
|
||||||
|
if (e.target.tagName === 'BUTTON' || e.target.tagName === 'A' || e.target.tagName === 'INPUT' ||
|
||||||
|
e.target.closest('button') || e.target.closest('a') || e.target.closest('.image-container')) return;
|
||||||
|
e.stopPropagation();
|
||||||
|
openItemQuick(card.dataset.itemId);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (card.dataset.deloaded !== 'true') {
|
||||||
|
const rect = card.getBoundingClientRect();
|
||||||
|
if (rect.height > 50) {
|
||||||
|
card.style.minHeight = rect.height + 'px';
|
||||||
|
card.dataset.itemId = card.querySelector('.card-content')?.dataset.itemId || '';
|
||||||
|
card.dataset.savedHtml = card.innerHTML;
|
||||||
|
card.innerHTML = '';
|
||||||
|
card.dataset.deloaded = 'true';
|
||||||
|
card.classList.add('is-deloaded');
|
||||||
|
card.classList.add('empty-frame');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}, {
|
||||||
|
// Keep approx ~120 items rendered in DOM relative to scroll position.
|
||||||
|
// Assuming ~100-400px per item/row, this margin unloads elements beyond that range.
|
||||||
|
rootMargin: isMobileLayout ? '18000px 0px 18000px 0px' : '9000px 0px 9000px 0px'
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Observe all valid cards
|
||||||
|
document.querySelectorAll('.item-card').forEach(card => cardVirtualizationObserver.observe(card));
|
||||||
|
|
||||||
if (!mainItemsHasMore) return;
|
if (!mainItemsHasMore) return;
|
||||||
|
|
||||||
mainItemsObserver = new IntersectionObserver(entries => {
|
mainItemsObserver = new IntersectionObserver(entries => {
|
||||||
@@ -1734,7 +1791,7 @@
|
|||||||
</form>`
|
</form>`
|
||||||
: `<button class="ausleihen disabled-button" disabled>${item.BlockedNow ? 'Reserviert' : 'Ausgeliehen'}</button>`
|
: `<button class="ausleihen disabled-button" disabled>${item.BlockedNow ? 'Reserviert' : 'Ausgeliehen'}</button>`
|
||||||
}
|
}
|
||||||
${canScheduleItem ? `<button class="schedule-button" onclick="openScheduleModal('${item._id}')">Termin planen</button>` : ''}
|
${canScheduleItem ? `<button class="schedule-button" onclick="openScheduleModal('${item._id}')">Reservieren</button>` : ''}
|
||||||
<button type="button" class="details-button" onclick="document.getElementById('item-modal').style.display='none';">Schließen</button>
|
<button type="button" class="details-button" onclick="document.getElementById('item-modal').style.display='none';">Schließen</button>
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
@@ -2419,29 +2476,29 @@
|
|||||||
// Add these functions right after the loadFilterState() function
|
// Add these functions right after the loadFilterState() function
|
||||||
|
|
||||||
function rebuildFilter3Options() {
|
function rebuildFilter3Options() {
|
||||||
if (!allItems || allItems.length === 0) return;
|
if (!allItems) return;
|
||||||
|
|
||||||
// Get current filter 1 and filter 2 selections
|
// Get current filter 1 and filter 2 selections
|
||||||
const filter1Selections = activeFilters.filter1;
|
const filter1Selections = activeFilters.filter1;
|
||||||
const filter2Selections = activeFilters.filter2;
|
const filter2Selections = activeFilters.filter2;
|
||||||
|
|
||||||
// If both filters are empty, show all filter3 values
|
// If both filters are empty, show all filter3 values from server
|
||||||
if (filter1Selections.length === 0 && filter2Selections.length === 0) {
|
if (filter1Selections.length === 0 && filter2Selections.length === 0) {
|
||||||
// Get all unique filter3 values
|
// Include dynamically added ones from loaded items too, just in case
|
||||||
const allFilter3Values = new Set();
|
const combinedFilter3Values = new Set(typeof allFilter3Values !== 'undefined' ? [...allFilter3Values] : []);
|
||||||
allItems.forEach(item => {
|
allItems.forEach(item => {
|
||||||
const filter3Array = Array.isArray(item.Filter3) ? item.Filter3 :
|
const filter3Array = Array.isArray(item.Filter3) ? item.Filter3 :
|
||||||
(item.Filter3 ? [item.Filter3] : []);
|
(item.Filter3 ? [item.Filter3] : []);
|
||||||
|
|
||||||
filter3Array.forEach(value => {
|
filter3Array.forEach(value => {
|
||||||
if (value && typeof value === 'string' && value.trim() !== '') {
|
if (value && typeof value === 'string' && value.trim() !== '') {
|
||||||
allFilter3Values.add(value);
|
combinedFilter3Values.add(value);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// Populate filter 3 dropdown with all values
|
// Populate filter 3 dropdown with all values
|
||||||
populateFilterOptions('filter3-options', [...allFilter3Values].sort(), 3);
|
populateFilterOptions('filter3-options', [...combinedFilter3Values].sort(), 3);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3106,44 +3163,45 @@
|
|||||||
border: 1px solid var(--ui-border);
|
border: 1px solid var(--ui-border);
|
||||||
border-radius: var(--ui-radius);
|
border-radius: var(--ui-radius);
|
||||||
box-shadow: var(--ui-shadow-sm);
|
box-shadow: var(--ui-shadow-sm);
|
||||||
padding: 20px;
|
padding: 15px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
max-width: 340px;
|
max-width: 340px;
|
||||||
flex: 1 1 300px;
|
flex: 1 1 300px;
|
||||||
scroll-snap-align: center;
|
scroll-snap-align: center;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
transition: transform 0.2s, box-shadow 0.2s;
|
transition: transform 0.2s, box-shadow 0.2s;
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
content-visibility: auto;
|
||||||
.item-card:hover {
|
contain-intrinsic-size: 300px 380px;
|
||||||
transform: translateY(-5px);
|
}
|
||||||
box-shadow: 0 5px 15px rgba(0, 0, 0, 0.2);
|
.item-card:hover {
|
||||||
}
|
transform: translateY(-5px);
|
||||||
|
box-shadow: 0 5px 15px rgba(0, 0, 0, 0.2);
|
||||||
|
}
|
||||||
|
|
||||||
.item-card h3 {
|
.item-card h3 {
|
||||||
margin-top: 0;
|
margin-top: 0;
|
||||||
}
|
font-size: 1.15rem;
|
||||||
|
margin-bottom: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
.item-card .description {
|
.item-card .description {
|
||||||
max-height: 100px;
|
max-height: 60px;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
}
|
font-size: 0.9rem;
|
||||||
|
margin-bottom: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
.item-card .image-container {
|
.item-card .image-container {
|
||||||
position: relative;
|
position: relative;
|
||||||
max-width: 300px;
|
max-width: 300px;
|
||||||
margin: 10px 0;
|
margin: 8px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.item-card .item-image {
|
.item-card .item-image {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: auto;
|
height: auto;
|
||||||
max-height: 300px;
|
max-height: 180px;
|
||||||
display: none;
|
|
||||||
object-fit: cover;
|
|
||||||
}
|
|
||||||
|
|
||||||
.item-card .item-image:first-child {
|
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4614,6 +4672,18 @@ function openItemQuick(id){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
{% if open_item %}
|
||||||
|
<script>
|
||||||
|
document.addEventListener("DOMContentLoaded", function() {
|
||||||
|
if (typeof openEditModalFromServer === 'function') {
|
||||||
|
setTimeout(function() {
|
||||||
|
openEditModalFromServer('{{ open_item }}');
|
||||||
|
}, 500);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
<style>
|
<style>
|
||||||
/* Admin/Main Content Container align */
|
/* Admin/Main Content Container align */
|
||||||
|
|||||||
+120
-28
@@ -395,7 +395,7 @@
|
|||||||
border: 1px solid var(--ui-border);
|
border: 1px solid var(--ui-border);
|
||||||
border-radius: var(--ui-radius);
|
border-radius: var(--ui-radius);
|
||||||
box-shadow: var(--ui-shadow-sm);
|
box-shadow: var(--ui-shadow-sm);
|
||||||
padding: 20px;
|
padding: 15px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
max-width: 340px;
|
max-width: 340px;
|
||||||
flex: 1 1 300px;
|
flex: 1 1 300px;
|
||||||
@@ -403,6 +403,8 @@
|
|||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
transition: transform 0.2s, box-shadow 0.2s;
|
transition: transform 0.2s, box-shadow 0.2s;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
content-visibility: auto;
|
||||||
|
contain-intrinsic-size: 300px 380px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.item-card.bulk-selected {
|
.item-card.bulk-selected {
|
||||||
@@ -418,17 +420,21 @@
|
|||||||
|
|
||||||
.item-card h3 {
|
.item-card h3 {
|
||||||
margin-top: 0;
|
margin-top: 0;
|
||||||
|
font-size: 1.15rem;
|
||||||
|
margin-bottom: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.item-card .description {
|
.item-card .description {
|
||||||
max-height: 100px;
|
max-height: 60px;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
margin-bottom: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.item-card .image-container {
|
.item-card .image-container {
|
||||||
position: relative;
|
position: relative;
|
||||||
max-width: 300px;
|
max-width: 300px;
|
||||||
margin: 10px 0;
|
margin: 8px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.bulk-delete-row {
|
.bulk-delete-row {
|
||||||
@@ -477,7 +483,7 @@
|
|||||||
.item-card .item-image {
|
.item-card .item-image {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: auto;
|
height: auto;
|
||||||
max-height: 300px;
|
max-height: 180px;
|
||||||
display: none;
|
display: none;
|
||||||
object-fit: cover;
|
object-fit: cover;
|
||||||
}
|
}
|
||||||
@@ -2643,7 +2649,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
<div id="schedule-modal" class="item-modal">
|
<div id="schedule-modal" class="item-modal">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<span class="close-modal" onclick="closeScheduleModal()">×</span>
|
<span class="close-modal" onclick="closeScheduleModal()">×</span>
|
||||||
<h2>Termin planen</h2>
|
<h2>Reservieren</h2>
|
||||||
<form id="schedule-form">
|
<form id="schedule-form">
|
||||||
<input type="hidden" id="schedule-item-id" name="item_id">
|
<input type="hidden" id="schedule-item-id" name="item_id">
|
||||||
<div class="form-group" id="schedule-specific-item-group" style="display:none;">
|
<div class="form-group" id="schedule-specific-item-group" style="display:none;">
|
||||||
@@ -2738,6 +2744,9 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
let descSearchIds = null; // Set of matching IDs or null when disabled
|
let descSearchIds = null; // Set of matching IDs or null when disabled
|
||||||
let currentUsername = '';
|
let currentUsername = '';
|
||||||
let allItems = []; // Cache for all items
|
let allItems = []; // Cache for all items
|
||||||
|
let allFilter1Values = new Set();
|
||||||
|
let allFilter2Values = new Set();
|
||||||
|
let allFilter3Values = new Set();
|
||||||
let bulkDeleteSelection = new Set();
|
let bulkDeleteSelection = new Set();
|
||||||
let bulkDeleteDrawerOpen = false;
|
let bulkDeleteDrawerOpen = false;
|
||||||
const studentCardsModuleEnabled = {{ 'true' if student_cards_module_enabled else 'false' }};
|
const studentCardsModuleEnabled = {{ 'true' if student_cards_module_enabled else 'false' }};
|
||||||
@@ -2876,30 +2885,29 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
}
|
}
|
||||||
|
|
||||||
function rebuildFilter3Options() {
|
function rebuildFilter3Options() {
|
||||||
if (!allItems || allItems.length === 0) return;
|
if (!allItems) return;
|
||||||
|
|
||||||
// Get current filter 1 and filter 2 selections
|
// Get current filter 1 and filter 2 selections
|
||||||
const filter1Selections = activeFilters.filter1;
|
const filter1Selections = activeFilters.filter1;
|
||||||
const filter2Selections = activeFilters.filter2;
|
const filter2Selections = activeFilters.filter2;
|
||||||
|
|
||||||
// If both filters are empty, show all filter3 values
|
// If both filters are empty, show all filter3 values from server
|
||||||
if (filter1Selections.length === 0 && filter2Selections.length === 0) {
|
if (filter1Selections.length === 0 && filter2Selections.length === 0) {
|
||||||
// Get all unique filter3 values
|
// Include dynamically added ones from loaded items too, just in case
|
||||||
const allFilter3Values = new Set();
|
const combinedFilter3Values = new Set(typeof allFilter3Values !== 'undefined' ? [...allFilter3Values] : []);
|
||||||
allItems.forEach(item => {
|
allItems.forEach(item => {
|
||||||
const filter3Array = Array.isArray(item.Filter3) ? item.Filter3 :
|
const filter3Array = Array.isArray(item.Filter3) ? item.Filter3 :
|
||||||
(item.Filter3 ? [item.Filter3] : []);
|
(item.Filter3 ? [item.Filter3] : []);
|
||||||
|
|
||||||
filter3Array.forEach(value => {
|
filter3Array.forEach(value => {
|
||||||
if (value && typeof value === 'string' && value.trim() !== '') {
|
if (value && typeof value === 'string' && value.trim() !== '') {
|
||||||
allFilter3Values.add(value);
|
combinedFilter3Values.add(value);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// Populate filter 3 dropdown with all values
|
// Populate filter 3 dropdown with all values
|
||||||
populateFilterOptions('filter3-options', [...allFilter3Values].sort(), 3);
|
populateFilterOptions('filter3-options', [...combinedFilter3Values].sort(), 3);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Filter items based on filter1 and filter2 selections
|
// Filter items based on filter1 and filter2 selections
|
||||||
@@ -3258,6 +3266,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
// Load predefined filter values for dropdowns
|
// Load predefined filter values for dropdowns
|
||||||
loadPredefinedFilterValues(1);
|
loadPredefinedFilterValues(1);
|
||||||
loadPredefinedFilterValues(2);
|
loadPredefinedFilterValues(2);
|
||||||
|
loadPredefinedFilterValues(3);
|
||||||
|
|
||||||
// Set up edit form submission
|
// Set up edit form submission
|
||||||
setupEditFormSubmission();
|
setupEditFormSubmission();
|
||||||
@@ -3282,11 +3291,24 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// Fetch user status to get current username
|
// Fetch user status and global filters
|
||||||
fetch('/user_status')
|
Promise.all([
|
||||||
.then(response => response.json())
|
fetch('/user_status').then(response => response.json()),
|
||||||
.then(data => {
|
fetch('/get_filter').then(response => response.json())
|
||||||
currentUsername = data.username;
|
])
|
||||||
|
.then(([userData, filterData]) => {
|
||||||
|
currentUsername = userData.username;
|
||||||
|
|
||||||
|
if (filterData.filter1) {
|
||||||
|
allFilter1Values = new Set(filterData.filter1.filter(value => value && typeof value === 'string' && value.trim() !== ''));
|
||||||
|
}
|
||||||
|
if (filterData.filter2) {
|
||||||
|
allFilter2Values = new Set(filterData.filter2.filter(value => value && typeof value === 'string' && value.trim() !== ''));
|
||||||
|
}
|
||||||
|
if (filterData.filter3) {
|
||||||
|
allFilter3Values = new Set(filterData.filter3.filter(value => value && typeof value === 'string' && value.trim() !== ''));
|
||||||
|
}
|
||||||
|
|
||||||
// Now load items with username information
|
// Now load items with username information
|
||||||
loadItems();
|
loadItems();
|
||||||
// Setup card images display after a short delay to ensure items are loaded
|
// Setup card images display after a short delay to ensure items are loaded
|
||||||
@@ -3295,7 +3317,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
}, 300);
|
}, 300);
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
console.error('Error fetching user status:', error);
|
console.error('Error fetching user status or filters:', error);
|
||||||
loadItems(); // Load items anyway in case of error
|
loadItems(); // Load items anyway in case of error
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -3356,6 +3378,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
let mainAdminItemsLoadingIndicator = null;
|
let mainAdminItemsLoadingIndicator = null;
|
||||||
let mainAdminItemsScrollPrefetchBound = false;
|
let mainAdminItemsScrollPrefetchBound = false;
|
||||||
let totalItemsInSystem = 0;
|
let totalItemsInSystem = 0;
|
||||||
|
let cardVirtualizationObserver = null;
|
||||||
|
|
||||||
function ensureMainAdminItemsLoadingIndicator() {
|
function ensureMainAdminItemsLoadingIndicator() {
|
||||||
const itemsContainer = document.querySelector('#items-container');
|
const itemsContainer = document.querySelector('#items-container');
|
||||||
@@ -3364,11 +3387,14 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
if (!mainAdminItemsLoadingIndicator) {
|
if (!mainAdminItemsLoadingIndicator) {
|
||||||
mainAdminItemsLoadingIndicator = document.createElement('div');
|
mainAdminItemsLoadingIndicator = document.createElement('div');
|
||||||
mainAdminItemsLoadingIndicator.id = 'main-admin-items-loading-indicator';
|
mainAdminItemsLoadingIndicator.id = 'main-admin-items-loading-indicator';
|
||||||
mainAdminItemsLoadingIndicator.className = 'items-loading-indicator';
|
mainAdminItemsLoadingIndicator.className = 'items-loading-indicator empty-frames-placeholder';
|
||||||
mainAdminItemsLoadingIndicator.innerHTML = `
|
mainAdminItemsLoadingIndicator.innerHTML = `
|
||||||
<div class="loading-track"><div class="loading-fill"></div></div>
|
<div class="empty-frame p-3 mx-2" style="flex: 1; height: 100px; border-radius: 12px; background: rgba(255,255,255,0.02); min-width: 250px;"></div>
|
||||||
<div class="loading-label">Weitere Objekte werden vorbereitet...</div>
|
<div class="empty-frame p-3 mx-2" style="flex: 1; height: 100px; border-radius: 12px; background: rgba(255,255,255,0.02); min-width: 250px; display: none;" class="d-none d-md-block"></div>
|
||||||
|
<div class="empty-frame p-3 mx-2" style="flex: 1; height: 100px; border-radius: 12px; background: rgba(255,255,255,0.02); min-width: 250px; display: none;" class="d-none d-lg-block"></div>
|
||||||
`;
|
`;
|
||||||
|
mainAdminItemsLoadingIndicator.style.display = 'flex';
|
||||||
|
mainAdminItemsLoadingIndicator.style.width = '100%';
|
||||||
}
|
}
|
||||||
|
|
||||||
itemsContainer.appendChild(mainAdminItemsLoadingIndicator);
|
itemsContainer.appendChild(mainAdminItemsLoadingIndicator);
|
||||||
@@ -3654,7 +3680,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
</form>
|
</form>
|
||||||
<button class="edit-button" onclick="openEditModalForSelectedUnit('${item._id}', 'specific-item-card-${item._id}')">Bearbeiten</button>
|
<button class="edit-button" onclick="openEditModalForSelectedUnit('${item._id}', 'specific-item-card-${item._id}')">Bearbeiten</button>
|
||||||
<button class="duplicate-button" onclick="duplicateItem('${item._id}')">Duplizieren</button>
|
<button class="duplicate-button" onclick="duplicateItem('${item._id}')">Duplizieren</button>
|
||||||
${canScheduleItem ? `<button class="schedule-button" onclick="openScheduleModal('${item._id}')">Termin planen</button>` : ''}
|
${canScheduleItem ? `<button class="schedule-button" onclick="openScheduleModal('${item._id}')">Reservieren</button>` : ''}
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
itemsContainer.appendChild(card);
|
itemsContainer.appendChild(card);
|
||||||
@@ -3695,10 +3721,10 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Populate filter options
|
// Populate filter options using server-provided full filter lists when available.
|
||||||
populateFilterOptions('filter1-options', [...filter1Values].sort(), 1);
|
populateFilterOptions('filter1-options', allFilter1Values.size ? [...allFilter1Values].sort() : [...filter1Values].sort(), 1);
|
||||||
populateFilterOptions('filter2-options', [...filter2Values].sort(), 2);
|
populateFilterOptions('filter2-options', allFilter2Values.size ? [...allFilter2Values].sort() : [...filter2Values].sort(), 2);
|
||||||
populateFilterOptions('filter3-options', [...filter3Values].sort(), 3);
|
populateFilterOptions('filter3-options', allFilter3Values.size ? [...allFilter3Values].sort() : [...filter3Values].sort(), 3);
|
||||||
|
|
||||||
if (!append) {
|
if (!append) {
|
||||||
itemsContainer.scrollLeft = 0;
|
itemsContainer.scrollLeft = 0;
|
||||||
@@ -3783,6 +3809,60 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
mainAdminItemsScrollPrefetchBound = true;
|
mainAdminItemsScrollPrefetchBound = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Setup DOM virtualization for items
|
||||||
|
if (!cardVirtualizationObserver) {
|
||||||
|
cardVirtualizationObserver = new IntersectionObserver((entries) => {
|
||||||
|
entries.forEach(entry => {
|
||||||
|
const card = entry.target;
|
||||||
|
if (entry.isIntersecting) {
|
||||||
|
if (card.dataset.deloaded === 'true') {
|
||||||
|
card.innerHTML = card.dataset.savedHtml;
|
||||||
|
card.dataset.deloaded = 'false';
|
||||||
|
card.classList.remove('is-deloaded');
|
||||||
|
card.classList.remove('empty-frame');
|
||||||
|
const favBtn = card.querySelector('.bookmark-btn');
|
||||||
|
if (favBtn) {
|
||||||
|
favBtn.addEventListener('click', (ev) => {
|
||||||
|
ev.stopPropagation();
|
||||||
|
toggleFavorite(card.dataset.itemId, favBtn, card);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
const cardContent = card.querySelector('.card-content');
|
||||||
|
if (cardContent) {
|
||||||
|
cardContent.addEventListener('click', function(e) {
|
||||||
|
if (e.target.tagName === 'BUTTON' || e.target.tagName === 'A' || e.target.tagName === 'INPUT' ||
|
||||||
|
e.target.closest('button') || e.target.closest('a') || e.target.closest('.image-container') ||
|
||||||
|
e.target.closest('.bulk-delete-toggle') || e.target.closest('label')) return;
|
||||||
|
e.stopPropagation();
|
||||||
|
openItemQuick(card.dataset.itemId);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (card.dataset.deloaded !== 'true') {
|
||||||
|
const rect = card.getBoundingClientRect();
|
||||||
|
if (rect.height > 50) {
|
||||||
|
card.style.minHeight = rect.height + 'px';
|
||||||
|
card.dataset.itemId = card.querySelector('.card-content')?.dataset.itemId || '';
|
||||||
|
card.dataset.savedHtml = card.innerHTML;
|
||||||
|
card.innerHTML = '';
|
||||||
|
card.dataset.deloaded = 'true';
|
||||||
|
card.classList.add('is-deloaded');
|
||||||
|
card.classList.add('empty-frame');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}, {
|
||||||
|
// Keep approx ~120 items rendered in DOM relative to scroll position.
|
||||||
|
// Assuming ~100-400px per item/row, this margin unloads elements beyond that range.
|
||||||
|
rootMargin: isMobileLayout ? '18000px 0px 18000px 0px' : '9000px 0px 9000px 0px'
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Observe all valid cards
|
||||||
|
document.querySelectorAll('.item-card').forEach(card => cardVirtualizationObserver.observe(card));
|
||||||
|
|
||||||
if (!mainAdminItemsHasMore) return;
|
if (!mainAdminItemsHasMore) return;
|
||||||
|
|
||||||
mainAdminItemsObserver = new IntersectionObserver(entries => {
|
mainAdminItemsObserver = new IntersectionObserver(entries => {
|
||||||
@@ -4531,7 +4611,7 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
<button class="edit-button" onclick="openEditModalForSelectedUnit('${item._id}', 'specific-item-modal-${item._id}')">Bearbeiten</button>
|
<button class="edit-button" onclick="openEditModalForSelectedUnit('${item._id}', 'specific-item-modal-${item._id}')">Bearbeiten</button>
|
||||||
<button class="duplicate-button" onclick="duplicateItem('${item._id}')">Duplizieren</button>
|
<button class="duplicate-button" onclick="duplicateItem('${item._id}')">Duplizieren</button>
|
||||||
${damageReports.length > 0 ? `<button class="damage-button" onclick="markDamageAsRepaired('${item._id}')">Repariert</button>` : `<button class="damage-button" onclick="registerDamage('${item._id}')">Schaden melden</button>`}
|
${damageReports.length > 0 ? `<button class="damage-button" onclick="markDamageAsRepaired('${item._id}')">Repariert</button>` : `<button class="damage-button" onclick="registerDamage('${item._id}')">Schaden melden</button>`}
|
||||||
${canScheduleItem ? `<button class="schedule-button" onclick="openScheduleModal('${item._id}')">Termin planen</button>` : ''}
|
${canScheduleItem ? `<button class="schedule-button" onclick="openScheduleModal('${item._id}')">Reservieren</button>` : ''}
|
||||||
<form method="POST" action="/delete_item/${item._id}" style="display:inline;" onsubmit="return confirm('Sind Sie sicher?')">
|
<form method="POST" action="/delete_item/${item._id}" style="display:inline;" onsubmit="return confirm('Sind Sie sicher?')">
|
||||||
<button class="delete-button" type="submit">Löschen</button>
|
<button class="delete-button" type="submit">Löschen</button>
|
||||||
</form>
|
</form>
|
||||||
@@ -5716,4 +5796,16 @@ document.addEventListener('DOMContentLoaded', ()=>{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
{% if open_item %}
|
||||||
|
<script>
|
||||||
|
document.addEventListener("DOMContentLoaded", function() {
|
||||||
|
if (typeof openEditModalFromServer === 'function') {
|
||||||
|
setTimeout(function() {
|
||||||
|
openEditModalFromServer('{{ open_item }}');
|
||||||
|
}, 500);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
@@ -15,16 +15,16 @@
|
|||||||
<h1 class="mb-4">Filterwerte verwalten</h1>
|
<h1 class="mb-4">Filterwerte verwalten</h1>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<!-- Filter 1: Unterrichtsfach -->
|
<!-- Filter 1 -->
|
||||||
<div class="col-md-6">
|
<div class="col-md-4">
|
||||||
<div class="card mb-4">
|
<div class="card mb-4">
|
||||||
<div class="card-header">
|
<div class="card-header">
|
||||||
<h2 class="card-title h5 mb-0">Unterrichtsfach (Filter 1)</h2>
|
<h2 class="card-title h5 mb-0">{{ filter_names.get('1', 'Fach/Kategorie') }} (Filter 1)</h2>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<form method="POST" action="{{ url_for('add_filter_value', filter_num=1) }}" class="mb-4">
|
<form method="POST" action="{{ url_for('add_filter_value', filter_num=1) }}" class="mb-4">
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<input type="text" name="value" class="form-control" placeholder="Neues Unterrichtsfach..." required>
|
<input type="text" name="value" class="form-control" placeholder="Neuer Wert..." required>
|
||||||
<button type="submit" class="btn btn-primary">Hinzufügen</button>
|
<button type="submit" class="btn btn-primary">Hinzufügen</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
@@ -33,13 +33,25 @@
|
|||||||
{% if filter1_values %}
|
{% if filter1_values %}
|
||||||
<div class="list-group">
|
<div class="list-group">
|
||||||
{% for value in filter1_values %}
|
{% for value in filter1_values %}
|
||||||
<div class="list-group-item d-flex justify-content-between align-items-center">
|
<div class="list-group-item">
|
||||||
{{ value }}
|
<div class="d-flex justify-content-between align-items-center mb-2">
|
||||||
<form method="POST" action="{{ url_for('remove_filter_value', filter_num=1, value=value) }}" class="d-inline">
|
<span>{{ value }}</span>
|
||||||
<button type="submit" class="btn btn-sm btn-danger"
|
<div>
|
||||||
onclick="return confirm('Sind Sie sicher, dass Sie den Wert \"' + '{{ value }}'.replace(/'/g, '\\\'') + '\" löschen möchten?');">
|
<button type="button" class="btn btn-sm btn-secondary me-1" onclick="toggleEdit('edit-1-{{ loop.index }}')">Bearbeiten</button>
|
||||||
Entfernen
|
<form method="POST" action="{{ url_for('remove_filter_value', filter_num=1, value=value) }}" class="d-inline">
|
||||||
</button>
|
<button type="submit" class="btn btn-sm btn-danger"
|
||||||
|
onclick="return confirm('Sind Sie sicher, dass Sie den Wert \"' + '{{ value }}'.replace(/'/g, '\\\'') + '\" löschen möchten?');">
|
||||||
|
Entfernen
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<form id="edit-1-{{ loop.index }}" method="POST" action="{{ url_for('edit_filter_value', filter_num=1, old_value=value) }}" style="display: none;" class="mt-2">
|
||||||
|
<div class="input-group input-group-sm">
|
||||||
|
<input type="text" name="new_value" class="form-control" value="{{ value }}" required>
|
||||||
|
<button type="submit" class="btn btn-primary" onclick="return confirm('Tipp: Das Ändern des Namens aktualisiert auch alle Einträge in der Datenbank, die diesen Filter verwenden. Fortfahren?');">Speichern</button>
|
||||||
|
<button type="button" class="btn btn-secondary" onclick="toggleEdit('edit-1-{{ loop.index }}')">Abbrechen</button>
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@@ -51,16 +63,16 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Filter 2: Jahrgangsstufe -->
|
<!-- Filter 2 -->
|
||||||
<div class="col-md-6">
|
<div class="col-md-4">
|
||||||
<div class="card mb-4">
|
<div class="card mb-4">
|
||||||
<div class="card-header">
|
<div class="card-header">
|
||||||
<h2 class="card-title h5 mb-0">Jahrgangsstufe (Filter 2)</h2>
|
<h2 class="card-title h5 mb-0">{{ filter_names.get('2', 'System/Bereich') }} (Filter 2)</h2>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<form method="POST" action="{{ url_for('add_filter_value', filter_num=2) }}" class="mb-4">
|
<form method="POST" action="{{ url_for('add_filter_value', filter_num=2) }}" class="mb-4">
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<input type="text" name="value" class="form-control" placeholder="Neue Jahrgangsstufe..." required>
|
<input type="text" name="value" class="form-control" placeholder="Neuer Wert..." required>
|
||||||
<button type="submit" class="btn btn-primary">Hinzufügen</button>
|
<button type="submit" class="btn btn-primary">Hinzufügen</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
@@ -69,13 +81,73 @@
|
|||||||
{% if filter2_values %}
|
{% if filter2_values %}
|
||||||
<div class="list-group">
|
<div class="list-group">
|
||||||
{% for value in filter2_values %}
|
{% for value in filter2_values %}
|
||||||
<div class="list-group-item d-flex justify-content-between align-items-center">
|
<div class="list-group-item">
|
||||||
{{ value }}
|
<div class="d-flex justify-content-between align-items-center mb-2">
|
||||||
<form method="POST" action="{{ url_for('remove_filter_value', filter_num=2, value=value) }}" class="d-inline">
|
<span>{{ value }}</span>
|
||||||
<button type="submit" class="btn btn-sm btn-danger"
|
<div>
|
||||||
onclick="return confirm('Sind Sie sicher, dass Sie den Wert \"' + '{{ value }}'.replace(/'/g, '\\\'') + '\" löschen möchten?');">
|
<button type="button" class="btn btn-sm btn-secondary me-1" onclick="toggleEdit('edit-2-{{ loop.index }}')">Bearbeiten</button>
|
||||||
Entfernen
|
<form method="POST" action="{{ url_for('remove_filter_value', filter_num=2, value=value) }}" class="d-inline">
|
||||||
</button>
|
<button type="submit" class="btn btn-sm btn-danger"
|
||||||
|
onclick="return confirm('Sind Sie sicher, dass Sie den Wert \"' + '{{ value }}'.replace(/'/g, '\\\'') + '\" löschen möchten?');">
|
||||||
|
Entfernen
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<form id="edit-2-{{ loop.index }}" method="POST" action="{{ url_for('edit_filter_value', filter_num=2, old_value=value) }}" style="display: none;" class="mt-2">
|
||||||
|
<div class="input-group input-group-sm">
|
||||||
|
<input type="text" name="new_value" class="form-control" value="{{ value }}" required>
|
||||||
|
<button type="submit" class="btn btn-primary" onclick="return confirm('Tipp: Das Ändern des Namens aktualisiert auch alle Einträge in der Datenbank, die diesen Filter verwenden. Fortfahren?');">Speichern</button>
|
||||||
|
<button type="button" class="btn btn-secondary" onclick="toggleEdit('edit-2-{{ loop.index }}')">Abbrechen</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
{% else %}
|
||||||
|
<div class="alert alert-info">Keine Werte definiert.</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Filter 3 -->
|
||||||
|
<div class="col-md-4">
|
||||||
|
<div class="card mb-4">
|
||||||
|
<div class="card-header">
|
||||||
|
<h2 class="card-title h5 mb-0">{{ filter_names.get('3', 'Typ/Art') }} (Filter 3)</h2>
|
||||||
|
</div>
|
||||||
|
<div class="card-body">
|
||||||
|
<form method="POST" action="{{ url_for('add_filter_value', filter_num=3) }}" class="mb-4">
|
||||||
|
<div class="input-group">
|
||||||
|
<input type="text" name="value" class="form-control" placeholder="Neuer Wert..." required>
|
||||||
|
<button type="submit" class="btn btn-primary">Hinzufügen</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<h5 class="mb-3">Vorhandene Werte</h5>
|
||||||
|
{% if filter3_values %}
|
||||||
|
<div class="list-group">
|
||||||
|
{% for value in filter3_values %}
|
||||||
|
<div class="list-group-item">
|
||||||
|
<div class="d-flex justify-content-between align-items-center mb-2">
|
||||||
|
<span>{{ value }}</span>
|
||||||
|
<div>
|
||||||
|
<button type="button" class="btn btn-sm btn-secondary me-1" onclick="toggleEdit('edit-3-{{ loop.index }}')">Bearbeiten</button>
|
||||||
|
<form method="POST" action="{{ url_for('remove_filter_value', filter_num=3, value=value) }}" class="d-inline">
|
||||||
|
<button type="submit" class="btn btn-sm btn-danger"
|
||||||
|
onclick="return confirm('Sind Sie sicher, dass Sie den Wert \"' + '{{ value }}'.replace(/'/g, '\\\'') + '\" löschen möchten?');">
|
||||||
|
Entfernen
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<form id="edit-3-{{ loop.index }}" method="POST" action="{{ url_for('edit_filter_value', filter_num=3, old_value=value) }}" style="display: none;" class="mt-2">
|
||||||
|
<div class="input-group input-group-sm">
|
||||||
|
<input type="text" name="new_value" class="form-control" value="{{ value }}" required>
|
||||||
|
<button type="submit" class="btn btn-primary" onclick="return confirm('Tipp: Das Ändern des Namens aktualisiert auch alle Einträge in der Datenbank, die diesen Filter verwenden. Fortfahren?');">Speichern</button>
|
||||||
|
<button type="button" class="btn btn-secondary" onclick="toggleEdit('edit-3-{{ loop.index }}')">Abbrechen</button>
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@@ -97,4 +169,15 @@
|
|||||||
<a href="{{ url_for('home_admin') }}" class="btn btn-secondary">Zurück zur Admin-Übersicht</a>
|
<a href="{{ url_for('home_admin') }}" class="btn btn-secondary">Zurück zur Admin-Übersicht</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
function toggleEdit(id) {
|
||||||
|
const el = document.getElementById(id);
|
||||||
|
if (el.style.display === 'none') {
|
||||||
|
el.style.display = 'block';
|
||||||
|
} else {
|
||||||
|
el.style.display = 'none';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
@@ -709,7 +709,6 @@
|
|||||||
</style>
|
</style>
|
||||||
|
|
||||||
<div class="upload-container">
|
<div class="upload-container">
|
||||||
<a href="{{ url_for(back_target|default('home_admin')) }}" class="nav-back-button">← Zurück zur Artikelübersicht</a>
|
|
||||||
|
|
||||||
{% if show_library_features %}
|
{% if show_library_features %}
|
||||||
<div style="border:1px solid #dbe4ee; border-radius:8px; padding:14px; margin-bottom:16px; background:#f8fbff;">
|
<div style="border:1px solid #dbe4ee; border-radius:8px; padding:14px; margin-bottom:16px; background:#f8fbff;">
|
||||||
|
|||||||
+34
-4
@@ -12,8 +12,8 @@ from functools import wraps
|
|||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
import settings as cfg
|
import Web.modules.database.settings as cfg
|
||||||
from settings import MongoClient
|
from Web.modules.database.settings import MongoClient
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
@@ -96,6 +96,10 @@ def get_tenant_config(tenant_id=None):
|
|||||||
|
|
||||||
if tenant_id in TENANT_REGISTRY:
|
if tenant_id in TENANT_REGISTRY:
|
||||||
return TENANT_REGISTRY[tenant_id] or {}
|
return TENANT_REGISTRY[tenant_id] or {}
|
||||||
|
|
||||||
|
for alias in _tenant_db_aliases(tenant_id):
|
||||||
|
if alias in TENANT_REGISTRY:
|
||||||
|
return TENANT_REGISTRY[alias] or {}
|
||||||
|
|
||||||
return TENANT_REGISTRY.get('default', {}) or {}
|
return TENANT_REGISTRY.get('default', {}) or {}
|
||||||
|
|
||||||
@@ -109,6 +113,28 @@ def _normalize_db_name(db_name):
|
|||||||
return db_name
|
return db_name
|
||||||
|
|
||||||
|
|
||||||
|
def _module_name_candidates(module_name):
|
||||||
|
normalized = str(module_name or '').strip().lower().replace('-', '_')
|
||||||
|
if not normalized:
|
||||||
|
return []
|
||||||
|
|
||||||
|
candidates = [normalized]
|
||||||
|
alias_groups = {
|
||||||
|
'inventory': {'inventory', 'inventar'},
|
||||||
|
'library': {'library', 'bib', 'bibliothek'},
|
||||||
|
'student_cards': {'student_cards', 'studentcards', 'schuelerausweise', 'schueler_ausweise'},
|
||||||
|
}
|
||||||
|
|
||||||
|
for canonical_name, aliases in alias_groups.items():
|
||||||
|
if normalized in aliases:
|
||||||
|
for alias in (canonical_name, *sorted(aliases)):
|
||||||
|
if alias not in candidates:
|
||||||
|
candidates.append(alias)
|
||||||
|
break
|
||||||
|
|
||||||
|
return candidates
|
||||||
|
|
||||||
|
|
||||||
def _tenant_db_aliases(tenant_id):
|
def _tenant_db_aliases(tenant_id):
|
||||||
aliases = []
|
aliases = []
|
||||||
env_map = _parse_tenant_db_map()
|
env_map = _parse_tenant_db_map()
|
||||||
@@ -149,8 +175,12 @@ def _resolve_db_alias(tenant_id, db_name):
|
|||||||
def is_tenant_module_enabled(module_name, tenant_id=None, default=False):
|
def is_tenant_module_enabled(module_name, tenant_id=None, default=False):
|
||||||
"""Resolve whether a feature module is enabled for the current tenant."""
|
"""Resolve whether a feature module is enabled for the current tenant."""
|
||||||
config = get_tenant_config(tenant_id)
|
config = get_tenant_config(tenant_id)
|
||||||
enabled = _get_nested_value(config, ['modules', module_name, 'enabled'], default)
|
for candidate_name in _module_name_candidates(module_name):
|
||||||
return bool(enabled)
|
enabled = _get_nested_value(config, ['modules', candidate_name, 'enabled'], None)
|
||||||
|
if enabled is not None:
|
||||||
|
return bool(enabled)
|
||||||
|
|
||||||
|
return bool(default)
|
||||||
|
|
||||||
|
|
||||||
class TenantContext:
|
class TenantContext:
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
from app import app
|
|
||||||
with app.test_client() as client:
|
|
||||||
with client.session_transaction() as sess:
|
|
||||||
sess['username'] = 'admin'
|
|
||||||
sess['admin'] = True
|
|
||||||
resp = client.get('/terminplan')
|
|
||||||
print("Status:", resp.status_code)
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
"""CLI utility to verify the tamper-evident audit chain."""
|
|
||||||
|
|
||||||
import json
|
|
||||||
import sys
|
|
||||||
|
|
||||||
import settings as cfg
|
|
||||||
from settings import MongoClient
|
|
||||||
import audit_log as al
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
client = None
|
|
||||||
try:
|
|
||||||
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
|
||||||
db = client[cfg.MONGODB_DB]
|
|
||||||
al.ensure_audit_indexes(db)
|
|
||||||
result = al.verify_audit_chain(db)
|
|
||||||
print(json.dumps(result, ensure_ascii=False, indent=2, default=str))
|
|
||||||
return 0 if result.get("ok") else 2
|
|
||||||
except Exception as exc:
|
|
||||||
print(json.dumps({"ok": False, "error": str(exc)}, ensure_ascii=False))
|
|
||||||
return 1
|
|
||||||
finally:
|
|
||||||
if client:
|
|
||||||
client.close()
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
sys.exit(main())
|
|
||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"dbg": false,
|
"dbg": false,
|
||||||
"key": "InventarsystemSecureKey2026XYZ789abcdef012",
|
"key": "InventarsystemSecureKey2026XYZ789abcdef012",
|
||||||
"ver": "0.6.44",
|
"ver": "0.7.20",
|
||||||
"host": "0.0.0.0",
|
"host": "0.0.0.0",
|
||||||
"port": 8000,
|
"port": 8000,
|
||||||
"mongodb": {
|
"mongodb": {
|
||||||
|
|||||||
@@ -144,7 +144,13 @@ services:
|
|||||||
|
|
||||||
# Health check for load balancer
|
# Health check for load balancer
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:8000/health"]
|
test:
|
||||||
|
[
|
||||||
|
"CMD",
|
||||||
|
"python",
|
||||||
|
"-c",
|
||||||
|
"import urllib.request; urllib.request.urlopen('http://127.0.0.1:8000/health', timeout=5).read(); print('OK')"
|
||||||
|
]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 3
|
retries: 3
|
||||||
|
|||||||
+47
-25
@@ -1,41 +1,63 @@
|
|||||||
version: "3.8"
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
build: .
|
image: ghcr.io/aiirondev/legendary-octo-garbanzo:v0.7.39
|
||||||
container_name: inventory-app
|
container_name: inventarsystem-app
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
ports:
|
||||||
- MONGO_URL=mongodb://mongodb:27017/inventar
|
- "10000:8000"
|
||||||
- REDIS_URL=redis://redis:6379
|
|
||||||
- BASE_URL=https://inventar.maximiliangruendinger.de #alle öffentliche subdomains
|
|
||||||
depends_on:
|
depends_on:
|
||||||
- mongodb
|
- mongodb
|
||||||
- redis
|
- 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:
|
mongodb:
|
||||||
image: mongo:latest
|
image: mongo:7.0
|
||||||
container_name: mongodb
|
container_name: inventarsystem-mongodb
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- mongo_data:/data/db
|
- mongodb_data:/data/db
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "mongosh", "--quiet", "--eval", "db.adminCommand('ping').ok"]
|
||||||
|
interval: 10s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 10
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:alpine
|
image: redis:7-alpine
|
||||||
container_name: redis
|
container_name: inventarsystem-redis
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
command: redis-server --appendonly yes --maxmemory 512mb --maxmemory-policy allkeys-lru
|
||||||
cloudflared:
|
ports:
|
||||||
image: cloudflare/cloudflared:latest
|
- "6379:6379"
|
||||||
container_name: cloudflared
|
|
||||||
restart: unless-stopped
|
|
||||||
# Der Tunnel-Name 'homeserver' muss zu deiner credentials.json passen
|
|
||||||
command: tunnel run homeserver
|
|
||||||
volumes:
|
volumes:
|
||||||
- ./config.yml:/etc/cloudflared/config.yml
|
- redis_data:/data
|
||||||
- ./credentials.json:/etc/cloudflared/credentials.json
|
healthcheck:
|
||||||
depends_on:
|
test: ["CMD", "redis-cli", "ping"]
|
||||||
- app
|
interval: 10s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 5
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
mongo_data:
|
mongodb_data:
|
||||||
|
app_uploads:
|
||||||
|
app_thumbnails:
|
||||||
|
app_previews:
|
||||||
|
app_qrcodes:
|
||||||
|
app_backups:
|
||||||
|
app_logs:
|
||||||
|
redis_data:
|
||||||
|
|||||||
+70
-13
@@ -9,7 +9,47 @@ if [ ! -f "docker-compose-multitenant.yml" ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CONFIG_FILE="$PWD/config.json"
|
# Resolve script directory so config paths are deterministic even when called via sudo
|
||||||
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
CONFIG_FILE="$SCRIPT_DIR/config.json"
|
||||||
|
|
||||||
|
ensure_runtime_config_json() {
|
||||||
|
local config_path backup_path
|
||||||
|
config_path="$CONFIG_FILE"
|
||||||
|
|
||||||
|
if [ -d "$config_path" ]; then
|
||||||
|
backup_path="${config_path}.dir.$(date +%Y%m%d-%H%M%S).bak"
|
||||||
|
mv "$config_path" "$backup_path"
|
||||||
|
echo "Warning: moved unexpected directory $config_path to $backup_path"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -f "$config_path" ]; then
|
||||||
|
cat > "$config_path" <<'EOF'
|
||||||
|
{
|
||||||
|
"ver": "2.6.5",
|
||||||
|
"dbg": false,
|
||||||
|
"host": "0.0.0.0",
|
||||||
|
"port": 8000,
|
||||||
|
"mongodb": {
|
||||||
|
"host": "mongodb",
|
||||||
|
"port": 27017,
|
||||||
|
"db": "Inventarsystem"
|
||||||
|
},
|
||||||
|
"modules": {
|
||||||
|
"library": {
|
||||||
|
"enabled": false
|
||||||
|
},
|
||||||
|
"student_cards": {
|
||||||
|
"enabled": false,
|
||||||
|
"default_borrow_days": 14,
|
||||||
|
"max_borrow_days": 365
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
echo "Created default runtime config at $config_path"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
show_help() {
|
show_help() {
|
||||||
echo "Usage: ./manage-tenant.sh [COMMAND] [OPTIONS]"
|
echo "Usage: ./manage-tenant.sh [COMMAND] [OPTIONS]"
|
||||||
@@ -175,19 +215,35 @@ EOF
|
|||||||
|
|
||||||
restart_app_container() {
|
restart_app_container() {
|
||||||
local env_file="$PWD/.docker-build.env"
|
local env_file="$PWD/.docker-build.env"
|
||||||
local compose_args=( -f "$PWD/docker-compose-multitenant.yml" )
|
local compose_args=()
|
||||||
|
|
||||||
|
ensure_runtime_config_json
|
||||||
|
|
||||||
|
# If HOST_WORKDIR is set (called from container), use absolute paths so docker daemon resolves them correctly
|
||||||
|
if [ -n "$HOST_WORKDIR" ]; then
|
||||||
|
compose_args+=( -f "$(readlink -f "$HOST_WORKDIR/docker-compose-multitenant.yml")" )
|
||||||
|
if [ -f "$HOST_WORKDIR/.docker-compose.runtime.override.yml" ]; then
|
||||||
|
compose_args+=( -f "$(readlink -f "$HOST_WORKDIR/.docker-compose.runtime.override.yml")" )
|
||||||
|
fi
|
||||||
|
if [ -f "$HOST_WORKDIR/.docker-build.env" ]; then
|
||||||
|
compose_args+=( --env-file "$(readlink -f "$HOST_WORKDIR/.docker-build.env")" )
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
# Normal case: called directly from host
|
||||||
|
compose_args+=( -f "$PWD/docker-compose-multitenant.yml" )
|
||||||
|
if [ -f "$PWD/.docker-compose.runtime.override.yml" ]; then
|
||||||
|
compose_args+=( -f "$PWD/.docker-compose.runtime.override.yml" )
|
||||||
|
fi
|
||||||
|
if [ -f "$env_file" ]; then
|
||||||
|
compose_args+=( --env-file "$env_file" )
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# Pass along COMPOSE_PROJECT_NAME if set so the internal docker-compose sees it
|
# Pass along COMPOSE_PROJECT_NAME if set so the internal docker-compose sees it
|
||||||
if [ -n "$COMPOSE_PROJECT_NAME" ]; then
|
if [ -n "$COMPOSE_PROJECT_NAME" ]; then
|
||||||
compose_args=( -p "$COMPOSE_PROJECT_NAME" "${compose_args[@]}" )
|
compose_args=( -p "$COMPOSE_PROJECT_NAME" "${compose_args[@]}" )
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f "$PWD/.docker-compose.runtime.override.yml" ]; then
|
|
||||||
compose_args+=( -f "$PWD/.docker-compose.runtime.override.yml" )
|
|
||||||
fi
|
|
||||||
if [ -f "$env_file" ]; then
|
|
||||||
compose_args+=( --env-file "$env_file" )
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Restarting app container to apply tenant configuration changes..."
|
echo "Restarting app container to apply tenant configuration changes..."
|
||||||
docker compose "${compose_args[@]}" up -d --no-build --force-recreate app
|
docker compose "${compose_args[@]}" up -d --no-build --force-recreate app
|
||||||
}
|
}
|
||||||
@@ -319,7 +375,7 @@ case "$COMMAND" in
|
|||||||
APP_CONTAINER=$(docker ps -qf "name=app" | head -n 1)
|
APP_CONTAINER=$(docker ps -qf "name=app" | head -n 1)
|
||||||
if [ -n "$APP_CONTAINER" ]; then
|
if [ -n "$APP_CONTAINER" ]; then
|
||||||
docker exec $APP_CONTAINER python3 -c "
|
docker exec $APP_CONTAINER python3 -c "
|
||||||
import sys, re; sys.path.insert(0, '/app/Web'); import settings; from pymongo import MongoClient; import hashlib
|
import sys, re; sys.path.insert(0, '/app'); sys.path.insert(0, '/app/Web'); from Web.modules.database import settings; from pymongo import MongoClient; import hashlib
|
||||||
tenant_id = sys.argv[1].lower()
|
tenant_id = sys.argv[1].lower()
|
||||||
sanitized = ''.join(c for c in tenant_id if c.isalnum() or c == '_')
|
sanitized = ''.join(c for c in tenant_id if c.isalnum() or c == '_')
|
||||||
db_name = f'inventar_{sanitized}'
|
db_name = f'inventar_{sanitized}'
|
||||||
@@ -387,7 +443,7 @@ print(f'Tenant {sys.argv[1]} database initialized. Default admin: admin / admin1
|
|||||||
APP_CONTAINER=$(docker ps -qf "name=app" | head -n 1)
|
APP_CONTAINER=$(docker ps -qf "name=app" | head -n 1)
|
||||||
if [ -n "$APP_CONTAINER" ]; then
|
if [ -n "$APP_CONTAINER" ]; then
|
||||||
docker exec $APP_CONTAINER python3 -c "
|
docker exec $APP_CONTAINER python3 -c "
|
||||||
import sys; sys.path.insert(0, '/app/Web'); from tenant import TenantContext; import settings; from pymongo import MongoClient
|
import sys; sys.path.insert(0, '/app'); sys.path.insert(0, '/app/Web'); from tenant import TenantContext; from Web.modules.database import settings; from pymongo import MongoClient
|
||||||
ctx = TenantContext()
|
ctx = TenantContext()
|
||||||
db_name = ctx._get_db_name(sys.argv[1])
|
db_name = ctx._get_db_name(sys.argv[1])
|
||||||
client = MongoClient(settings.MONGODB_HOST, int(settings.MONGODB_PORT))
|
client = MongoClient(settings.MONGODB_HOST, int(settings.MONGODB_PORT))
|
||||||
@@ -434,7 +490,7 @@ print(f'Database for tenant {sys.argv[1]} dropped.')
|
|||||||
APP_CONTAINER=$(docker ps -qf "name=app" | head -n 1)
|
APP_CONTAINER=$(docker ps -qf "name=app" | head -n 1)
|
||||||
if [ -n "$APP_CONTAINER" ]; then
|
if [ -n "$APP_CONTAINER" ]; then
|
||||||
docker exec $APP_CONTAINER python3 -c "
|
docker exec $APP_CONTAINER python3 -c "
|
||||||
import sys; sys.path.insert(0, '/app/Web'); import settings; from pymongo import MongoClient
|
import sys; sys.path.insert(0, '/app'); sys.path.insert(0, '/app/Web'); from Web.modules.database import settings; from pymongo import MongoClient
|
||||||
client = MongoClient(settings.MONGODB_HOST, int(settings.MONGODB_PORT))
|
client = MongoClient(settings.MONGODB_HOST, int(settings.MONGODB_PORT))
|
||||||
db = client[f'{settings.MONGODB_DB}_{sys.argv[1]}']
|
db = client[f'{settings.MONGODB_DB}_{sys.argv[1]}']
|
||||||
db.sessions.drop() # Force sign-out / session clear
|
db.sessions.drop() # Force sign-out / session clear
|
||||||
@@ -481,8 +537,9 @@ PY
|
|||||||
if [ -n "$APP_CONTAINER" ]; then
|
if [ -n "$APP_CONTAINER" ]; then
|
||||||
docker exec -i "$APP_CONTAINER" python3 - <<'PY'
|
docker exec -i "$APP_CONTAINER" python3 - <<'PY'
|
||||||
import sys
|
import sys
|
||||||
|
sys.path.insert(0, '/app')
|
||||||
sys.path.insert(0, '/app/Web')
|
sys.path.insert(0, '/app/Web')
|
||||||
import settings
|
from Web.modules.database import settings
|
||||||
from pymongo import MongoClient
|
from pymongo import MongoClient
|
||||||
client = MongoClient(settings.MONGODB_HOST, int(settings.MONGODB_PORT))
|
client = MongoClient(settings.MONGODB_HOST, int(settings.MONGODB_PORT))
|
||||||
prefix = 'inventar_'
|
prefix = 'inventar_'
|
||||||
|
|||||||
@@ -1,4 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# Wrapper to run tenant management fully containerized via docker-compose
|
|
||||||
PROJECT_NAME=${COMPOSE_PROJECT_NAME:-$(basename "$PWD" | tr '[:upper:]' '[:lower:]')}
|
|
||||||
docker compose -f docker-compose-multitenant.yml --profile tools run --rm -e COMPOSE_PROJECT_NAME="$PROJECT_NAME" tenant-manager "$@"
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,588 +0,0 @@
|
|||||||
"""
|
|
||||||
Test Suite for Ausleihung (Borrowing) System
|
|
||||||
Tests all core functionality of the borrowing/lending module
|
|
||||||
|
|
||||||
Run with: pytest test_ausleihung.py -v
|
|
||||||
"""
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
import datetime
|
|
||||||
from bson.objectid import ObjectId
|
|
||||||
import sys
|
|
||||||
import os
|
|
||||||
|
|
||||||
# Add Web directory to path
|
|
||||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'Web'))
|
|
||||||
|
|
||||||
import ausleihung
|
|
||||||
import settings as cfg
|
|
||||||
from settings import MongoClient
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope='session')
|
|
||||||
def db_client():
|
|
||||||
"""Create MongoDB connection for tests"""
|
|
||||||
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
|
||||||
yield client
|
|
||||||
client.close()
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope='session')
|
|
||||||
def test_db(db_client):
|
|
||||||
"""Get test database"""
|
|
||||||
return db_client[cfg.MONGODB_DB]
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(autouse=True)
|
|
||||||
def cleanup_test_data(test_db):
|
|
||||||
"""Clean up test data before and after each test"""
|
|
||||||
yield
|
|
||||||
# Clean up after test
|
|
||||||
test_db['ausleihungen'].delete_many({})
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
def sample_ausleihung_data():
|
|
||||||
"""Fixture with sample borrowing data"""
|
|
||||||
now = datetime.datetime.now()
|
|
||||||
return {
|
|
||||||
'item_id': str(ObjectId()),
|
|
||||||
'user': 'test_user',
|
|
||||||
'start_date': now,
|
|
||||||
'end_date': now + datetime.timedelta(days=1),
|
|
||||||
'notes': 'Test borrowing',
|
|
||||||
'period': None
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# Status Determination Tests
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
class TestGetCurrentStatus:
|
|
||||||
"""Test status determination based on dates"""
|
|
||||||
|
|
||||||
def test_planned_status_future_date(self):
|
|
||||||
"""Test that future borrowing is marked as 'planned'"""
|
|
||||||
future_time = datetime.datetime.now() + datetime.timedelta(days=1)
|
|
||||||
ausleihung_doc = {
|
|
||||||
'Status': 'planned',
|
|
||||||
'Start': future_time,
|
|
||||||
'End': future_time + datetime.timedelta(hours=1)
|
|
||||||
}
|
|
||||||
status = ausleihung.get_current_status(ausleihung_doc)
|
|
||||||
assert status == 'planned'
|
|
||||||
|
|
||||||
def test_active_status_during_borrowing(self):
|
|
||||||
"""Test that current borrowing is marked as 'active'"""
|
|
||||||
now = datetime.datetime.now()
|
|
||||||
start = now - datetime.timedelta(hours=1)
|
|
||||||
end = now + datetime.timedelta(hours=1)
|
|
||||||
ausleihung_doc = {
|
|
||||||
'Status': 'active',
|
|
||||||
'Start': start,
|
|
||||||
'End': end
|
|
||||||
}
|
|
||||||
status = ausleihung.get_current_status(ausleihung_doc)
|
|
||||||
assert status == 'active'
|
|
||||||
|
|
||||||
def test_completed_status_after_end_time(self):
|
|
||||||
"""Test that past borrowing is marked as 'completed'"""
|
|
||||||
now = datetime.datetime.now()
|
|
||||||
start = now - datetime.timedelta(days=2)
|
|
||||||
end = now - datetime.timedelta(hours=1)
|
|
||||||
ausleihung_doc = {
|
|
||||||
'Status': 'active',
|
|
||||||
'Start': start,
|
|
||||||
'End': end
|
|
||||||
}
|
|
||||||
status = ausleihung.get_current_status(ausleihung_doc)
|
|
||||||
assert status == 'completed'
|
|
||||||
|
|
||||||
def test_cancelled_status_remains_cancelled(self):
|
|
||||||
"""Test that cancelled status is never changed"""
|
|
||||||
future_time = datetime.datetime.now() + datetime.timedelta(days=1)
|
|
||||||
ausleihung_doc = {
|
|
||||||
'Status': 'cancelled',
|
|
||||||
'Start': future_time,
|
|
||||||
'End': future_time + datetime.timedelta(hours=1)
|
|
||||||
}
|
|
||||||
status = ausleihung.get_current_status(ausleihung_doc)
|
|
||||||
assert status == 'cancelled'
|
|
||||||
|
|
||||||
def test_active_with_no_end_time(self):
|
|
||||||
"""Test that borrowing without end time stays active if started"""
|
|
||||||
now = datetime.datetime.now()
|
|
||||||
start = now - datetime.timedelta(hours=1)
|
|
||||||
ausleihung_doc = {
|
|
||||||
'Status': 'active',
|
|
||||||
'Start': start,
|
|
||||||
'End': None
|
|
||||||
}
|
|
||||||
status = ausleihung.get_current_status(ausleihung_doc)
|
|
||||||
assert status == 'active'
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# Create and Update Tests
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
class TestCreateAusleihung:
|
|
||||||
"""Test creating new borrowings"""
|
|
||||||
|
|
||||||
def test_create_active_ausleihung(self, test_db):
|
|
||||||
"""Test creating an immediately active borrowing"""
|
|
||||||
item_id = str(ObjectId())
|
|
||||||
user = 'test_user'
|
|
||||||
start = datetime.datetime.now()
|
|
||||||
end = start + datetime.timedelta(hours=2)
|
|
||||||
|
|
||||||
result = ausleihung.add_ausleihung(
|
|
||||||
item_id=item_id,
|
|
||||||
user=user,
|
|
||||||
start_date=start,
|
|
||||||
end_date=end,
|
|
||||||
notes='Test active',
|
|
||||||
status='active'
|
|
||||||
)
|
|
||||||
|
|
||||||
assert result is not None
|
|
||||||
|
|
||||||
# Verify in database
|
|
||||||
ausleihung_col = test_db['ausleihungen']
|
|
||||||
stored = ausleihung_col.find_one({'_id': result})
|
|
||||||
assert stored is not None
|
|
||||||
assert stored['Item'] == item_id # Correct field name
|
|
||||||
assert stored['User'] == user
|
|
||||||
assert stored['Status'] == 'active'
|
|
||||||
|
|
||||||
def test_create_planned_ausleihung(self, test_db):
|
|
||||||
"""Test creating a future/planned borrowing"""
|
|
||||||
item_id = str(ObjectId())
|
|
||||||
user = 'test_user'
|
|
||||||
future_start = datetime.datetime.now() + datetime.timedelta(days=1)
|
|
||||||
future_end = future_start + datetime.timedelta(hours=2)
|
|
||||||
|
|
||||||
result = ausleihung.add_ausleihung(
|
|
||||||
item_id=item_id,
|
|
||||||
user=user,
|
|
||||||
start_date=future_start,
|
|
||||||
end_date=future_end,
|
|
||||||
notes='Test planned',
|
|
||||||
status='planned'
|
|
||||||
)
|
|
||||||
|
|
||||||
assert result is not None
|
|
||||||
|
|
||||||
ausleihung_col = test_db['ausleihungen']
|
|
||||||
stored = ausleihung_col.find_one({'_id': result})
|
|
||||||
assert stored['Status'] == 'planned'
|
|
||||||
# Check approximately equal (within 1 second for datetime precision)
|
|
||||||
assert abs((stored['Start'] - future_start).total_seconds()) < 1
|
|
||||||
|
|
||||||
|
|
||||||
class TestUpdateAusleihung:
|
|
||||||
"""Test updating existing borrowings"""
|
|
||||||
|
|
||||||
def test_update_ausleihung_dates(self, test_db, sample_ausleihung_data):
|
|
||||||
"""Test updating borrowing dates"""
|
|
||||||
# Create initial borrowing
|
|
||||||
ausleihung_id = ausleihung.add_ausleihung(**sample_ausleihung_data)
|
|
||||||
assert ausleihung_id is not None
|
|
||||||
|
|
||||||
# Update dates
|
|
||||||
new_start = datetime.datetime.now() + datetime.timedelta(days=2)
|
|
||||||
new_end = new_start + datetime.timedelta(hours=1)
|
|
||||||
|
|
||||||
ausleihung.update_ausleihung(
|
|
||||||
id=ausleihung_id,
|
|
||||||
start=new_start,
|
|
||||||
end=new_end
|
|
||||||
)
|
|
||||||
|
|
||||||
# Verify update (within 1 second tolerance for datetime precision)
|
|
||||||
stored = test_db['ausleihungen'].find_one({'_id': ausleihung_id})
|
|
||||||
assert abs((stored['Start'] - new_start).total_seconds()) < 1
|
|
||||||
assert abs((stored['End'] - new_end).total_seconds()) < 1
|
|
||||||
|
|
||||||
def test_update_ausleihung_status(self, test_db, sample_ausleihung_data):
|
|
||||||
"""Test updating borrowing status"""
|
|
||||||
ausleihung_id = ausleihung.add_ausleihung(**sample_ausleihung_data)
|
|
||||||
|
|
||||||
ausleihung.update_ausleihung(id=ausleihung_id, status='completed')
|
|
||||||
|
|
||||||
stored = test_db['ausleihungen'].find_one({'_id': ausleihung_id})
|
|
||||||
assert stored['Status'] == 'completed'
|
|
||||||
|
|
||||||
def test_update_ausleihung_notes(self, test_db, sample_ausleihung_data):
|
|
||||||
"""Test updating borrowing notes"""
|
|
||||||
ausleihung_id = ausleihung.add_ausleihung(**sample_ausleihung_data)
|
|
||||||
new_notes = 'Updated notes'
|
|
||||||
|
|
||||||
ausleihung.update_ausleihung(id=ausleihung_id, notes=new_notes)
|
|
||||||
|
|
||||||
stored = test_db['ausleihungen'].find_one({'_id': ausleihung_id})
|
|
||||||
assert stored['Notes'] == new_notes
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# Complete and Cancel Tests
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
class TestCompleteAusleihung:
|
|
||||||
"""Test completing borrowings"""
|
|
||||||
|
|
||||||
def test_complete_ausleihung(self, test_db, sample_ausleihung_data):
|
|
||||||
"""Test marking a borrowing as completed"""
|
|
||||||
ausleihung_id = ausleihung.add_ausleihung(**sample_ausleihung_data)
|
|
||||||
|
|
||||||
end_time = datetime.datetime.now()
|
|
||||||
ausleihung.complete_ausleihung(ausleihung_id, end_time=end_time)
|
|
||||||
|
|
||||||
stored = test_db['ausleihungen'].find_one({'_id': ausleihung_id})
|
|
||||||
assert stored['Status'] == 'completed'
|
|
||||||
assert stored['End'] == end_time or stored['End'] is not None
|
|
||||||
|
|
||||||
|
|
||||||
class TestCancelAusleihung:
|
|
||||||
"""Test canceling borrowings"""
|
|
||||||
|
|
||||||
def test_cancel_ausleihung(self, test_db, sample_ausleihung_data):
|
|
||||||
"""Test canceling a borrowing"""
|
|
||||||
ausleihung_id = ausleihung.add_ausleihung(**sample_ausleihung_data)
|
|
||||||
|
|
||||||
ausleihung.cancel_ausleihung(ausleihung_id)
|
|
||||||
|
|
||||||
stored = test_db['ausleihungen'].find_one({'_id': ausleihung_id})
|
|
||||||
assert stored['Status'] == 'cancelled'
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# Query Tests
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
class TestGetAusleihung:
|
|
||||||
"""Test retrieving borrowings"""
|
|
||||||
|
|
||||||
def test_get_ausleihung_by_id(self, test_db, sample_ausleihung_data):
|
|
||||||
"""Test fetching a borrowing by ID"""
|
|
||||||
ausleihung_id = ausleihung.add_ausleihung(**sample_ausleihung_data)
|
|
||||||
|
|
||||||
retrieved = ausleihung.get_ausleihung(ausleihung_id)
|
|
||||||
assert retrieved is not None
|
|
||||||
assert retrieved['_id'] == ausleihung_id
|
|
||||||
assert retrieved['User'] == sample_ausleihung_data['user']
|
|
||||||
|
|
||||||
def test_get_ausleihung_by_user(self, test_db):
|
|
||||||
"""Test retrieving all borrowings for a user"""
|
|
||||||
user = 'test_user_xyz'
|
|
||||||
item1 = str(ObjectId())
|
|
||||||
item2 = str(ObjectId())
|
|
||||||
now = datetime.datetime.now()
|
|
||||||
|
|
||||||
# Create multiple borrowings for same user
|
|
||||||
ausleihung.add_ausleihung(
|
|
||||||
item_id=item1,
|
|
||||||
user=user,
|
|
||||||
start_date=now,
|
|
||||||
end_date=now + datetime.timedelta(hours=1),
|
|
||||||
status='active'
|
|
||||||
)
|
|
||||||
ausleihung.add_ausleihung(
|
|
||||||
item_id=item2,
|
|
||||||
user=user,
|
|
||||||
start_date=now + datetime.timedelta(days=1),
|
|
||||||
end_date=now + datetime.timedelta(days=1, hours=1),
|
|
||||||
status='planned'
|
|
||||||
)
|
|
||||||
|
|
||||||
# Retrieve all for user
|
|
||||||
borrowings = ausleihung.get_ausleihung_by_user(user)
|
|
||||||
assert len(borrowings) >= 2
|
|
||||||
assert all(b['User'] == user for b in borrowings)
|
|
||||||
|
|
||||||
def test_get_ausleihungen_by_status(self, test_db):
|
|
||||||
"""Test retrieving borrowings by status"""
|
|
||||||
item_id = str(ObjectId())
|
|
||||||
user = 'test_user'
|
|
||||||
now = datetime.datetime.now()
|
|
||||||
|
|
||||||
# Create active
|
|
||||||
active_id = ausleihung.add_ausleihung(
|
|
||||||
item_id=item_id,
|
|
||||||
user=user,
|
|
||||||
start_date=now - datetime.timedelta(hours=1),
|
|
||||||
end_date=now + datetime.timedelta(hours=1),
|
|
||||||
status='active'
|
|
||||||
)
|
|
||||||
|
|
||||||
# Get active borrowings
|
|
||||||
active_borrowings = ausleihung.get_active_ausleihungen()
|
|
||||||
assert any(b['_id'] == active_id for b in active_borrowings)
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# Conflict Detection Tests
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
class TestConflictDetection:
|
|
||||||
"""Test detecting overlapping/conflicting borrowings"""
|
|
||||||
|
|
||||||
def test_no_conflict_different_items(self, test_db):
|
|
||||||
"""Test that different items don't conflict"""
|
|
||||||
item1 = str(ObjectId())
|
|
||||||
item2 = str(ObjectId())
|
|
||||||
now = datetime.datetime.now()
|
|
||||||
start = now
|
|
||||||
end = now + datetime.timedelta(hours=1)
|
|
||||||
|
|
||||||
# Create first borrowing
|
|
||||||
ausleihung.add_ausleihung(
|
|
||||||
item_id=item1,
|
|
||||||
user='user1',
|
|
||||||
start_date=start,
|
|
||||||
end_date=end,
|
|
||||||
status='active'
|
|
||||||
)
|
|
||||||
|
|
||||||
# Check conflict on different item (should be no conflict)
|
|
||||||
conflict = ausleihung.check_ausleihung_conflict(
|
|
||||||
item_id=item2,
|
|
||||||
start_date=start,
|
|
||||||
end_date=end
|
|
||||||
)
|
|
||||||
assert conflict is False
|
|
||||||
|
|
||||||
def test_conflict_same_item_overlapping(self, test_db):
|
|
||||||
"""Test that overlapping borrowings on same item are detected"""
|
|
||||||
item_id = str(ObjectId())
|
|
||||||
now = datetime.datetime.now()
|
|
||||||
|
|
||||||
# Create first borrowing
|
|
||||||
ausleihung.add_ausleihung(
|
|
||||||
item_id=item_id,
|
|
||||||
user='user1',
|
|
||||||
start_date=now,
|
|
||||||
end_date=now + datetime.timedelta(hours=2),
|
|
||||||
status='active'
|
|
||||||
)
|
|
||||||
|
|
||||||
# Try to create overlapping borrowing
|
|
||||||
conflict = ausleihung.check_ausleihung_conflict(
|
|
||||||
item_id=item_id,
|
|
||||||
start_date=now + datetime.timedelta(minutes=30),
|
|
||||||
end_date=now + datetime.timedelta(hours=3)
|
|
||||||
)
|
|
||||||
assert conflict is True or conflict == item_id # Depending on implementation
|
|
||||||
|
|
||||||
def test_no_conflict_different_times(self, test_db):
|
|
||||||
"""Test that non-overlapping borrowings don't conflict"""
|
|
||||||
item_id = str(ObjectId())
|
|
||||||
now = datetime.datetime.now()
|
|
||||||
|
|
||||||
# Create first borrowing
|
|
||||||
ausleihung.add_ausleihung(
|
|
||||||
item_id=item_id,
|
|
||||||
user='user1',
|
|
||||||
start_date=now,
|
|
||||||
end_date=now + datetime.timedelta(hours=1),
|
|
||||||
status='active'
|
|
||||||
)
|
|
||||||
|
|
||||||
# Check borrowing after first ends (should be no conflict)
|
|
||||||
conflict = ausleihung.check_ausleihung_conflict(
|
|
||||||
item_id=item_id,
|
|
||||||
start_date=now + datetime.timedelta(hours=2),
|
|
||||||
end_date=now + datetime.timedelta(hours=3)
|
|
||||||
)
|
|
||||||
assert conflict is False or conflict is None
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# Period-based Borrowing Tests
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
class TestPeriodBookings:
|
|
||||||
"""Test period-based borrowings (school periods)"""
|
|
||||||
|
|
||||||
def test_create_period_booking(self, test_db):
|
|
||||||
"""Test creating a borrowing for a specific school period"""
|
|
||||||
item_id = str(ObjectId())
|
|
||||||
user = 'test_user'
|
|
||||||
today = datetime.datetime.now().date()
|
|
||||||
|
|
||||||
result = ausleihung.add_ausleihung(
|
|
||||||
item_id=item_id,
|
|
||||||
user=user,
|
|
||||||
start_date=datetime.datetime.combine(today, datetime.time(8, 0)),
|
|
||||||
end_date=datetime.datetime.combine(today, datetime.time(9, 0)),
|
|
||||||
period=1, # Assuming period 1 is first period
|
|
||||||
status='active'
|
|
||||||
)
|
|
||||||
|
|
||||||
assert result is not None
|
|
||||||
stored = test_db['ausleihungen'].find_one({'_id': result})
|
|
||||||
assert stored.get('Period') == 1
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# Remove Tests
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
class TestRemoveAusleihung:
|
|
||||||
"""Test removing/deleting borrowings"""
|
|
||||||
|
|
||||||
def test_remove_ausleihung(self, test_db, sample_ausleihung_data):
|
|
||||||
"""Test deleting a borrowing record (soft delete)"""
|
|
||||||
ausleihung_id = ausleihung.add_ausleihung(**sample_ausleihung_data)
|
|
||||||
stored_before = test_db['ausleihungen'].find_one({'_id': ausleihung_id})
|
|
||||||
assert stored_before is not None
|
|
||||||
|
|
||||||
# Remove (soft delete - adds DeletedAt timestamp)
|
|
||||||
ausleihung.remove_ausleihung(ausleihung_id)
|
|
||||||
|
|
||||||
# Verify it's marked as deleted (soft delete)
|
|
||||||
stored_after = test_db['ausleihungen'].find_one({'_id': ausleihung_id})
|
|
||||||
assert stored_after is not None # Still exists
|
|
||||||
assert 'DeletedAt' in stored_after or stored_after.get('Status') == 'deleted'
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# Integration Tests
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
class TestAusleihungLifecycle:
|
|
||||||
"""Test complete borrowing lifecycle"""
|
|
||||||
|
|
||||||
def test_full_lifecycle_active_to_complete(self, test_db):
|
|
||||||
"""Test a complete borrowing lifecycle: active → complete"""
|
|
||||||
item_id = str(ObjectId())
|
|
||||||
user = 'test_user'
|
|
||||||
now = datetime.datetime.now()
|
|
||||||
|
|
||||||
# 1. Create active borrowing
|
|
||||||
ausleihung_id = ausleihung.add_ausleihung(
|
|
||||||
item_id=item_id,
|
|
||||||
user=user,
|
|
||||||
start_date=now - datetime.timedelta(hours=1),
|
|
||||||
end_date=now + datetime.timedelta(hours=1),
|
|
||||||
status='active'
|
|
||||||
)
|
|
||||||
|
|
||||||
stored = test_db['ausleihungen'].find_one({'_id': ausleihung_id})
|
|
||||||
status = ausleihung.get_current_status(stored)
|
|
||||||
assert status == 'active'
|
|
||||||
|
|
||||||
# 2. Complete the borrowing
|
|
||||||
ausleihung.complete_ausleihung(ausleihung_id)
|
|
||||||
|
|
||||||
stored = test_db['ausleihungen'].find_one({'_id': ausleihung_id})
|
|
||||||
status = ausleihung.get_current_status(stored)
|
|
||||||
assert status == 'completed'
|
|
||||||
|
|
||||||
def test_full_lifecycle_planned_to_active_to_complete(self, test_db):
|
|
||||||
"""Test complete lifecycle: planned → active → complete"""
|
|
||||||
item_id = str(ObjectId())
|
|
||||||
user = 'test_user'
|
|
||||||
now = datetime.datetime.now()
|
|
||||||
future = now + datetime.timedelta(hours=1)
|
|
||||||
|
|
||||||
# 1. Create planned borrowing
|
|
||||||
ausleihung_id = ausleihung.add_ausleihung(
|
|
||||||
item_id=item_id,
|
|
||||||
user=user,
|
|
||||||
start_date=future,
|
|
||||||
end_date=future + datetime.timedelta(hours=1),
|
|
||||||
status='planned'
|
|
||||||
)
|
|
||||||
|
|
||||||
stored = test_db['ausleihungen'].find_one({'_id': ausleihung_id})
|
|
||||||
assert ausleihung.get_current_status(stored) == 'planned'
|
|
||||||
|
|
||||||
# 2. Update to active (simulate time passing or manual activation)
|
|
||||||
ausleihung.update_ausleihung(id=ausleihung_id, status='active')
|
|
||||||
stored = test_db['ausleihungen'].find_one({'_id': ausleihung_id})
|
|
||||||
assert stored['Status'] == 'active'
|
|
||||||
|
|
||||||
# 3. Complete
|
|
||||||
ausleihung.complete_ausleihung(ausleihung_id)
|
|
||||||
stored = test_db['ausleihungen'].find_one({'_id': ausleihung_id})
|
|
||||||
assert ausleihung.get_current_status(stored) == 'completed'
|
|
||||||
|
|
||||||
def test_cancel_planned_borrowing(self, test_db):
|
|
||||||
"""Test canceling a planned borrowing"""
|
|
||||||
item_id = str(ObjectId())
|
|
||||||
user = 'test_user'
|
|
||||||
future = datetime.datetime.now() + datetime.timedelta(days=1)
|
|
||||||
|
|
||||||
# Create planned
|
|
||||||
ausleihung_id = ausleihung.add_ausleihung(
|
|
||||||
item_id=item_id,
|
|
||||||
user=user,
|
|
||||||
start_date=future,
|
|
||||||
end_date=future + datetime.timedelta(hours=1),
|
|
||||||
status='planned'
|
|
||||||
)
|
|
||||||
|
|
||||||
# Cancel
|
|
||||||
ausleihung.cancel_ausleihung(ausleihung_id)
|
|
||||||
|
|
||||||
stored = test_db['ausleihungen'].find_one({'_id': ausleihung_id})
|
|
||||||
assert stored['Status'] == 'cancelled'
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# Edge Cases
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
class TestEdgeCases:
|
|
||||||
"""Test edge cases and boundary conditions"""
|
|
||||||
|
|
||||||
def test_borrowing_with_same_start_and_end(self, test_db):
|
|
||||||
"""Test borrowing where start equals end"""
|
|
||||||
item_id = str(ObjectId())
|
|
||||||
user = 'test_user'
|
|
||||||
now = datetime.datetime.now()
|
|
||||||
|
|
||||||
result = ausleihung.add_ausleihung(
|
|
||||||
item_id=item_id,
|
|
||||||
user=user,
|
|
||||||
start_date=now,
|
|
||||||
end_date=now, # Same time
|
|
||||||
status='active'
|
|
||||||
)
|
|
||||||
|
|
||||||
assert result is not None
|
|
||||||
|
|
||||||
def test_borrowing_without_end_date(self, test_db):
|
|
||||||
"""Test creating borrowing without end date"""
|
|
||||||
item_id = str(ObjectId())
|
|
||||||
user = 'test_user'
|
|
||||||
now = datetime.datetime.now()
|
|
||||||
|
|
||||||
result = ausleihung.add_ausleihung(
|
|
||||||
item_id=item_id,
|
|
||||||
user=user,
|
|
||||||
start_date=now,
|
|
||||||
end_date=None,
|
|
||||||
status='active'
|
|
||||||
)
|
|
||||||
|
|
||||||
assert result is not None
|
|
||||||
stored = test_db['ausleihungen'].find_one({'_id': result})
|
|
||||||
# End field should not exist or be None if not provided
|
|
||||||
assert 'End' not in stored or stored.get('End') is None
|
|
||||||
|
|
||||||
def test_get_nonexistent_borrowing(self, test_db):
|
|
||||||
"""Test retrieving a nonexistent borrowing"""
|
|
||||||
fake_id = ObjectId()
|
|
||||||
result = ausleihung.get_ausleihung(fake_id)
|
|
||||||
assert result is None or result == {} or result == []
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# Run Tests
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
pytest.main([__file__, '-v', '--tb=short'])
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
from Web.app import app
|
|
||||||
with app.test_client() as client:
|
|
||||||
resp = client.get('/terminplan')
|
|
||||||
print(resp.status_code)
|
|
||||||
# print(resp.data.decode('utf-8')[:200])
|
|
||||||
@@ -18,6 +18,7 @@ DIST_DIR="$PROJECT_DIR/dist"
|
|||||||
COMPOSE_FILE="docker-compose-multitenant.yml"
|
COMPOSE_FILE="docker-compose-multitenant.yml"
|
||||||
MIN_ROOT_FREE_MB="${INVENTAR_MIN_ROOT_FREE_MB:-2048}"
|
MIN_ROOT_FREE_MB="${INVENTAR_MIN_ROOT_FREE_MB:-2048}"
|
||||||
DIST_KEEP_COUNT="${INVENTAR_DIST_KEEP_COUNT:-2}"
|
DIST_KEEP_COUNT="${INVENTAR_DIST_KEEP_COUNT:-2}"
|
||||||
|
MODE="release"
|
||||||
|
|
||||||
mkdir -p "$LOG_DIR"
|
mkdir -p "$LOG_DIR"
|
||||||
chmod 777 "$LOG_DIR" 2>/dev/null || true
|
chmod 777 "$LOG_DIR" 2>/dev/null || true
|
||||||
@@ -152,6 +153,7 @@ Usage: $0 [options]
|
|||||||
|
|
||||||
Options:
|
Options:
|
||||||
--multitenant Use docker-compose-multitenant.yml (default)
|
--multitenant Use docker-compose-multitenant.yml (default)
|
||||||
|
development Install development build from GHCR or local dist
|
||||||
-h, --help Show this help message
|
-h, --help Show this help message
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
@@ -163,6 +165,10 @@ parse_args() {
|
|||||||
COMPOSE_FILE="docker-compose-multitenant.yml"
|
COMPOSE_FILE="docker-compose-multitenant.yml"
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
|
development|dev)
|
||||||
|
MODE="development"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
-h|--help)
|
-h|--help)
|
||||||
usage
|
usage
|
||||||
exit 0
|
exit 0
|
||||||
@@ -480,6 +486,54 @@ main() {
|
|||||||
archive_logs
|
archive_logs
|
||||||
create_backup
|
create_backup
|
||||||
|
|
||||||
|
# If user requested a development install, perform a simple dev deploy flow
|
||||||
|
if [ "$MODE" = "development" ]; then
|
||||||
|
log_message "Requested development install"
|
||||||
|
local tag="dev"
|
||||||
|
local app_image="$APP_IMAGE_REPO:$tag"
|
||||||
|
local compose_path="$PROJECT_DIR/$COMPOSE_FILE"
|
||||||
|
|
||||||
|
if [ ! -f "$compose_path" ]; then
|
||||||
|
log_message "ERROR: compose file not found: $compose_path"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Ensure ENV_FILE contains the development image
|
||||||
|
if [ ! -f "$ENV_FILE" ]; then
|
||||||
|
cat > "$ENV_FILE" <<EOF
|
||||||
|
NUITKA_BUILD=0
|
||||||
|
INVENTAR_HTTP_PORT=10000
|
||||||
|
INVENTAR_APP_IMAGE=$app_image
|
||||||
|
EOF
|
||||||
|
elif grep -q '^INVENTAR_APP_IMAGE=' "$ENV_FILE"; then
|
||||||
|
sed -i "s|^INVENTAR_APP_IMAGE=.*|INVENTAR_APP_IMAGE=$app_image|" "$ENV_FILE"
|
||||||
|
else
|
||||||
|
printf '\nINVENTAR_APP_IMAGE=%s\n' "$app_image" >> "$ENV_FILE"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Try local dist first, then pull from GHCR
|
||||||
|
if ! load_local_dist_image "$tag"; then
|
||||||
|
log_message "Attempting to pull development image $app_image"
|
||||||
|
if ! docker pull "$app_image" >> "$LOG_FILE" 2>&1; then
|
||||||
|
log_message "ERROR: Could not obtain development image $app_image"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Bring up stack
|
||||||
|
docker compose -f "$compose_path" --env-file "$ENV_FILE" pull app mongodb >> "$LOG_FILE" 2>&1 || true
|
||||||
|
docker compose -f "$compose_path" --env-file "$ENV_FILE" up -d --remove-orphans >> "$LOG_FILE" 2>&1
|
||||||
|
|
||||||
|
if ! verify_stack_health; then
|
||||||
|
log_message "ERROR: Development deployment failed health check"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "$tag" > "$STATE_FILE"
|
||||||
|
log_message "Development update completed successfully"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
local tmp_dir meta_file latest_tag current_tag bundle_url
|
local tmp_dir meta_file latest_tag current_tag bundle_url
|
||||||
tmp_dir="$(mktemp -d)"
|
tmp_dir="$(mktemp -d)"
|
||||||
meta_file="$tmp_dir/release.json"
|
meta_file="$tmp_dir/release.json"
|
||||||
|
|||||||
Reference in New Issue
Block a user