add example docker.env

.github/workflows/build-docker.yml

@@ -1,147 +0,0 @@
-name: Build and test
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  REGISTRY: ghcr.io
-  APP_IMAGE_NAME: ${{ github.repository }}
-  NGINX_IMAGE_NAME: ${{ github.repository }}-nginx
-
-jobs:
-  build-test-and-deploy:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to GitHub Container Registry
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata for application image
-        id: meta-app
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.APP_IMAGE_NAME }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=sha,prefix={{branch}}-
-            type=raw,value=latest,enable={{is_default_branch}}
-
-      - name: Extract metadata for nginx image
-        id: meta-nginx
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.NGINX_IMAGE_NAME }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=sha,prefix={{branch}}-
-            type=raw,value=latest,enable={{is_default_branch}}
-
-      - name: Build application image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: docker/production/Dockerfile
-          load: true
-          tags: kompass:test
-          cache-from: |
-            type=gha,scope=app-${{ github.ref_name }}
-            type=gha,scope=app-master
-            type=gha,scope=app-main
-            type=registry,ref=ghcr.io/${{ github.repository }}:latest
-          cache-to: type=gha,mode=max,scope=app-${{ github.ref_name }}
-          build-args: |
-            BUILDKIT_INLINE_CACHE=1
-
-      - name: Build documentation
-        run: |
-          # Create output directory with proper permissions
-          mkdir -p docs-output
-          chmod 777 docs-output
-
-          # Run sphinx-build inside the container
-          docker run --rm \
-            -v ${{ github.workspace }}/docs:/app/docs:ro \
-            -v ${{ github.workspace }}/docs-output:/app/docs-output \
-            kompass:test \
-            bash -c "cd /app/docs && sphinx-build -b html source /app/docs-output"
-
-      - name: Deploy to GitHub Pages
-        uses: peaceiris/actions-gh-pages@v4
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./docs-output
-          destination_dir: ${{ github.ref == 'refs/heads/main' && '.' || github.ref_name }}
-          keep_files: true
-
-      - name: Run tests
-        run: make test-only
-
-      - name: Check coverage
-        run: |
-          COVERAGE=$(python3 -c "import json; data=json.load(open('docker/test/htmlcov/coverage.json')); print(data['totals']['percent_covered'])")
-          echo "Coverage: ${COVERAGE}%"
-          if (( $(echo "$COVERAGE < 100" | bc -l) )); then
-            echo "Error: Coverage is ${COVERAGE}%, must be 100%"
-            exit 1
-          fi
-
-      - name: Tag and push application image
-        if: github.event_name != 'pull_request'
-        run: |
-          # Tag the built image with all required tags
-          echo "${{ steps.meta-app.outputs.tags }}" | while read -r tag; do
-            docker tag kompass:test "$tag"
-            docker push "$tag"
-          done
-
-      - name: Build and push nginx image
-        if: github.event_name != 'pull_request'
-        uses: docker/build-push-action@v5
-        with:
-          context: docker/production/nginx
-          file: docker/production/nginx/Dockerfile
-          push: true
-          tags: ${{ steps.meta-nginx.outputs.tags }}
-          labels: ${{ steps.meta-nginx.outputs.labels }}
-          cache-from: |
-            type=gha,scope=nginx-${{ github.ref_name }}
-            type=gha,scope=nginx-master
-            type=gha,scope=nginx-main
-            type=registry,ref=ghcr.io/${{ github.repository }}-nginx:latest
-          cache-to: type=gha,mode=max,scope=nginx-${{ github.ref_name }}
-          build-args: |
-            BUILDKIT_INLINE_CACHE=1
-
-      - name: Output image tags
-        if: github.event_name != 'pull_request'
-        run: |
-          echo "Application image tags:"
-          echo "${{ steps.meta-app.outputs.tags }}"
-          echo ""
-          echo "Nginx image tags:"
-          echo "${{ steps.meta-nginx.outputs.tags }}"

.gitignore

@@ -133,6 +133,3 @@ jdav_web/static/docs
 
 # mac files
 .DS_Store
-
-# Claude configuration file
-CLAUDE.md

Makefile

@@ -1,7 +1,7 @@
 build-test:
 	cd docker/test; docker compose build
 
-test-only:
+test: build-test
 	mkdir -p docker/test/htmlcov
 	chmod 777 docker/test/htmlcov
 ifeq ($(keepdb), true)
@@ -10,5 +10,3 @@ else
 	cd docker/test; docker compose up --abort-on-container-exit
 endif
 	echo "Generated coverage report. To read it, point your browser to:\n\nfile://$$(pwd)/docker/test/htmlcov/index.html"
-
-test: build-test test-only

NOTICE.txt

@@ -1,2 +0,0 @@
-This repository contains third-party assets. Attributions are either placed in the file itself or
-in a file `NOTICE.txt` in the respective folder.

README.md

@@ -1,27 +1,21 @@
 # jdav Kompass
 
-![Build Status](https://github.com/chrisflav/kompass/actions/workflows/build-docker.yml/badge.svg?branch=main)
+[![Build Status](https://jenkins.merten.dev/buildStatus/icon?job=gitea%2Fkompass%2Fmain)](https://jenkins.merten.dev/job/gitea/job/kompass/job/main/)
 
 Kompass is an administration platform designed for local sections of the Young German Alpine Club. It provides
 tools to contact and (automatically) manage members, groups, material, excursions and statements.
 
 For more details on the features, see the (German) [documentation](https://jdav-hd.de/static/docs/index.html).
 
-If you are interested in using the Kompass in your own local section, please get in touch via
-email at `name of this project`@`merten.dev`. We are very happy to discuss how the Kompass can be used in
-your setting.
-
 # Contributing
 
 Any form of contribution is appreciated. If you found a bug or have a feature request, please file an
-[issue](https://github.com/chrisflav/kompass/issues). If you want to help with the documentation or
+[issue](https://git.jdav-hd.merten.dev/digitales/kompass/issues). If you want to help with the documentation or
-want to contribute code, please open a [pull request](https://github.com/chrisflav/kompass/pulls).
+want to contribute code, please open a [pull request](https://git.jdav-hd.merten.dev/digitales/kompass/pulls).
-
-If you don't have a github account or don't want to open an issue or pull request here, there is
-also a [Gitea repository](https://git.jdav-hd.merten.dev/digitales/kompass).
 
 The following is a short description of where to find the documentation with more information.
 
+
 # Documentation 
 
 Documentation is handled by [sphinx](https://www.sphinx-doc.org/) and located in `docs/`. 
@@ -34,12 +28,19 @@ The sphinx documentation contains information about:
 - End user documentation
 - and much more...
 
-For further details on the implementation, please head to the
+> Please add all further documentation also in the sphinx documentation. And not in the readme
-[developer documentation](https://jdav-hd.de/static/docs/development_manual/index.html).
 
-# License
+## online
+Online (latest release version): https://jdav-hd.de/static/docs/
 
-This code is licensed under the [GNU Affero General Public License](https://www.gnu.org/licenses/agpl-3.0.en.html).
+## local
-For the full license text, see `LICENCSE`.
+To read the documentation build it locally and view it in your browser:
+```bash
+cd docs/
+make html
 
-See the `NOTICE.txt` file for attributions.
+# MacOS (with firefox)
+open -a firefox $(pwd)/docs/build/html/index.html 
+# Linux (I guess?!?)
+firefox ${pwd}/docs/build/html/index.html 
+```

deploy/auto/config/settings.toml

@@ -0,0 +1,26 @@
+[django]
+deployed = true
+debug = true
+secret_key = 'secret'
+allowed_hosts = ['*']
+protocol = 'http'
+base_url = 'localhost:8000'
+media_root = '/var/www/jdav_web/media'
+static_root = '/var/www/jdav_web/static'
+broker_url = 'redis://redis:6379/0'
+memcached_url = 'cache:11211'
+default_static_path = '/var/www/jdav_web/static'
+
+[database]
+host = 'db'
+port = 3306
+database = 'kompass'
+user = 'kompass'
+password = 'secret'
+
+[mail]
+host = 'mailserver'
+user = 'info@jdav-town.de'
+password = 'secret'
+default_sending_address = 'info@jdav-town.de'
+default_sending_name = 'JDAV Tuetown'

deploy/auto/database/Dockerfile

@@ -0,0 +1,11 @@
+FROM mariadb
+
+COPY create_users.sql /docker-entrypoint-initdb.d/create_users.sql
+COPY replace_placeholders.sh /replace_placeholders.sh
+
+ARG KOMPASS_DB_HOST
+ARG KOMPASS_DB_PASSWORD
+ARG KOMPASS_DB_PAM_PASSWORD
+ARG KOMPASS_DB_QUERYMAIL_PASSWORD
+
+RUN chmod +x /replace_placeholders.sh && /replace_placeholders.sh

deploy/auto/database/create_users.sql

@@ -0,0 +1,28 @@
+CREATE DATABASE kompass;
+
+-- main kompass user
+CREATE USER 'kompass'@'KOMPASS_DB_HOST' IDENTIFIED BY 'KOMPASS_DB_PASSWORD';
+GRANT ALL PRIVILEGES ON kompass.* TO 'kompass'@'KOMPASS_DB_HOST';
+
+-- pam user
+CREATE USER 'pam'@'KOMPASS_DB_HOST' IDENTIFIED BY 'KOMPASS_DB_PAM_PASSWORD';
+GRANT SELECT ON kompass.* TO 'pam'@'KOMPASS_DB_HOST';
+
+-- TODO: allow for this more granular permission configuration
+-- GRANT SELECT ON kompass.auth_user TO 'pam'@'KOMPASS_DB_HOST';
+-- GRANT SELECT ON kompass.mailer_emailaddress TO 'pam'@'KOMPASS_DB_HOST';
+
+-- querymail user
+CREATE USER 'querymail'@'KOMPASS_DB_HOST' IDENTIFIED BY 'KOMPASS_DB_QUERYMAIL_PASSWORD';
+GRANT SELECT on kompass.* TO 'querymail'@'KOMPASS_DB_HOST';
+
+-- TODO: allow for this more granular permission configuration
+-- GRANT SELECT (username, id) on kompass.auth_user TO 'querymail'@'KOMPASS_DB_HOST';
+-- GRANT SELECT ON kompass.members_member_group TO 'querymail'@'KOMPASS_DB_HOST';
+-- GRANT SELECT ON kompass.mailer_emailaddress_to_groups TO 'querymail'@'KOMPASS_DB_HOST';
+-- GRANT SELECT ON kompass.members_member TO 'querymail'@'KOMPASS_DB_HOST';
+-- GRANT SELECT ON kompass.mailer_emailaddress_to_groups TO 'querymail'@'KOMPASS_DB_HOST';
+-- GRANT SELECT ON kompass.mailer_emailaddress_to_members TO 'querymail'@'KOMPASS_DB_HOST';
+-- GRANT SELECT ON kompass.mailer_emailaddress TO 'querymail'@'KOMPASS_DB_HOST';
+
+FLUSH PRIVILEGES;

deploy/auto/database/replace_placeholders.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# Check if the required variables are set
+if [ -z "${KOMPASS_DB_HOST}" ]; then
+  echo "Error: KOMPASS_DB_HOST is not set. Exiting."
+  exit 1
+fi
+
+# Replace placeholders with environment variables in the SQL file
+if [ -f /docker-entrypoint-initdb.d/create_users.sql ]; then
+    sed -i "s/KOMPASS_DB_PASSWORD/${KOMPASS_DB_PASSWORD}/g" /docker-entrypoint-initdb.d/create_users.sql
+    sed -i "s/KOMPASS_DB_PAM_PASSWORD/${KOMPASS_DB_PAM_PASSWORD}/g" /docker-entrypoint-initdb.d/create_users.sql
+    sed -i "s/KOMPASS_DB_QUERYMAIL_PASSWORD/${KOMPASS_DB_QUERYMAIL_PASSWORD}/g" /docker-entrypoint-initdb.d/create_users.sql
+    sed -i "s/KOMPASS_DB_HOST/${KOMPASS_DB_HOST}/g" /docker-entrypoint-initdb.d/create_users.sql
+fi
+
+echo "Update create_users.sql."

deploy/auto/docker-compose.yaml

@@ -0,0 +1,135 @@
+x-kompass:
+    &kompass
+    image: kompass:production
+    environment:
+      - DJANGO_SETTINGS_MODULE=jdav_web.settings
+      - KOMPASS_CONFIG_DIR_PATH=/app/config/
+    restart: always
+    depends_on:
+      - redis
+      - cache
+      - db
+
+services:
+  mailserver:
+    env_file: docker.env
+    build:
+      context: git@git.jdav-hd.merten.dev:digitales/kompass-mailserver#master
+      dockerfile: master/Dockerfile
+      args:
+        DOMAIN:
+        INTERNAL_DOMAINS:
+        DOMAINS:
+        MAIL_SERVER_ADMIN:
+        KOMPASS_DB_NAME:
+        KOMPASS_DB_HOST:
+        KOMPASS_DB_PAM_USER:
+        KOMPASS_DB_PAM_PASSWORD:
+        KOMPASS_DB_QUERYMAIL_USER:
+        KOMPASS_DB_QUERYMAIL_PASSWORD:
+    ports:
+      - "25:25"
+      - "993:993"
+      - "587:587"
+      - "465:465"
+    volumes:
+      - ./mail/:/var/vmail/
+      - ./cert.pem:/etc/ssl/cert.pem
+      - ./key.pem:/etc/ssl/key.pem
+    extra_hosts:
+      - "host:10.26.43.1"
+    restart: always
+
+  milter:
+    build:
+      context: git@git.jdav-hd.merten.dev:digitales/kompass-mailserver#master
+      dockerfile: opendkim/Dockerfile
+    volumes:
+      - ./keys/:/etc/opendkim/keys/
+    env_file: docker.env
+    restart: always
+
+  master:
+      <<: *kompass
+      build:
+        context: git@git.jdav-hd.merten.dev:digitales/kompass#main
+        dockerfile: docker/production/Dockerfile
+        args:
+          DJANGO_SUPERUSER_PASSWORD:
+          DJANGO_SUPERUSER_USERNAME:
+      env_file: docker.env
+      entrypoint: /app/docker/production/entrypoint-master.sh
+      volumes:
+        - uwsgi_data:/tmp/uwsgi/
+        - web_static:/app/static/
+        - web_static:/var/www/jdav_web/static/
+        - ./media:/var/www/jdav_web/media/
+        - ./config:/app/config:ro
+      extra_hosts:
+        - "host:10.26.42.1"
+
+  nginx:
+      build: git@git.jdav-hd.merten.dev:digitales/kompass#main:docker/production/nginx
+      restart: always
+      volumes:
+        - uwsgi_data:/tmp/uwsgi/
+        - web_static:/var/www/jdav_web/static/:ro
+        - ./media:/var/www/jdav_web/media/:ro
+      ports:
+        - "3000:80"
+      depends_on:
+        - master
+
+  cache:
+      restart: always
+      image: memcached:alpine
+
+  redis:
+      restart: always
+      image: redis:6-alpine
+
+  celery_worker:
+      <<: *kompass
+      entrypoint: /app/docker/production/entrypoint-celery-worker.sh
+      volumes:
+        - ./config:/app/config:ro
+      extra_hosts:
+        - "host:10.26.42.1"
+
+  celery_beat:
+      <<: *kompass
+      entrypoint: /app/docker/production/entrypoint-celery-beat.sh
+      volumes:
+        - ./config:/app/config:ro
+      extra_hosts:
+        - "host:10.26.42.1"
+
+  db:
+    restart: always
+    build:
+      context: ./database/
+      dockerfile: Dockerfile
+      args:
+        KOMPASS_DB_HOST:
+        KOMPASS_DB_PASSWORD:
+        KOMPASS_DB_PAM_PASSWORD:
+        KOMPASS_DB_QUERYMAIL_PASSWORD:
+    volumes:
+      - ./db:/var/lib/mysql
+    env_file: docker.env
+    #    networks:
+    #      main:
+    #        # assign static ip address
+    #        ipv4_address: 10.26.42.2
+
+volumes:
+  uwsgi_data:
+  web_static:
+
+#networks:
+#  main:
+#    driver: bridge
+#    ipam:
+#      config:
+#        - subnet: 10.26.42.0/24
+#          gateway: 10.26.42.1

deploy/auto/docker.env.example

@@ -0,0 +1,17 @@
+DOMAIN="jdav-town.de"
+DOMAINS="jdav-town.de"
+INTERNAL_DOMAINS="jdav-town.de alpenverein-town.de"
+
+KOMPASS_DB_NAME="kompass"
+KOMPASS_DB_HOST="%"
+KOMPASS_DB_PASSWORD="secret"
+KOMPASS_DB_PAM_USER="pam"
+KOMPASS_DB_PAM_PASSWORD="secret"
+KOMPASS_DB_QUERYMAIL_USER="querymail"
+KOMPASS_DB_QUERYMAIL_PASSWORD="secret"
+MARIADB_ROOT_PASSWORD="secret"
+
+MAIL_SERVER_ADMIN="digitales@jdav-town.de"
+
+DJANGO_SUPERUSER_USERNAME="superuser"
+DJANGO_SUPERUSER_PASSWORD="secret"

deploy/docker-compose.yaml

@@ -13,7 +13,7 @@ services:
     master:
         <<: *kompass
         build:
-            context: https://github.com/chrisflav/kompass.git#main
+            context: git@git.jdav-hd.merten.dev:digitales/kompass#main
             dockerfile: docker/production/Dockerfile
         entrypoint: /app/docker/production/entrypoint-master.sh
         volumes:
@@ -28,7 +28,7 @@ services:
           - "host:10.26.42.1"
 
     nginx:
-        build: https://github.com/chrisflav/kompass.git#main:docker/production/nginx
+        build: git@git.jdav-hd.merten.dev:digitales/kompass#main:docker/production/nginx
         restart: always
         volumes:
           - uwsgi_data:/tmp/uwsgi/

docker/test/Dockerfile

@@ -22,6 +22,8 @@ ENV PATH="/app/.local/bin:$PATH"
 
 # install requirements
 COPY --chown=app:app ./requirements.txt /app/requirements.txt
-RUN pip install uwsgi -r requirements.txt
+# we install uwsgi here to check if packages dependencies are resolved, but we don't actually
+# need uwsgi in test
+RUN pip install coverage uwsgi -r requirements.txt
 
 COPY --chown=app:app . /app

docker/test/config/texts.toml

@@ -1,12 +0,0 @@
-confirm_mail = """
-Hiho custom test test {name},
-
-du hast bei der JDAV %(SEKTION)s eine E-Mail Adresse hinterlegt. Da bei uns alle Kommunikation
-per Email funktioniert, brauchen wir eine Bestätigung {whattoconfirm}.
-
-Custom!
-
-{link}
-
-Test test
-Deine JDAV test test %(SEKTION)s"""

docker/test/entrypoint-master.sh

@@ -39,10 +39,8 @@ fi
 cd jdav_web
 
 if [[ "$DJANGO_TEST_KEEPDB" == 1 ]]; then
-    coverage run manage.py test startpage finance members contrib logindata mailer material ludwigsburgalpin jdav_web -v 2 --noinput --keepdb
+    coverage run manage.py test startpage finance members contrib logindata mailer material ludwigsburgalpin -v 2 --noinput --keepdb
 else
-    coverage run manage.py test startpage finance members contrib logindata mailer material ludwigsburgalpin jdav_web -v 2 --noinput
+    coverage run manage.py test startpage finance members contrib logindata mailer material ludwigsburgalpin -v 2 --noinput
 fi
-coverage html --show-contexts
+coverage html
-coverage json -o htmlcov/coverage.json
-coverage report

docs/source/_static/favicon.svg

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
-<style type="text/css">
-	.st0{display:none;}
-	.st1{display:inline;fill:#254D49;}
-	.st2{display:inline;opacity:0.27;fill:url(#SVGID_1_);}
-	.st3{fill:none;stroke:#1B2E2C;stroke-width:3;stroke-miterlimit:10;}
-	.st4{fill:#1B2E2C;}
-	.st5{fill:none;stroke:#508480;stroke-width:3.2;stroke-miterlimit:10;}
-	.st6{fill:#BADDD9;}
-	.st7{fill:#508480;}
-	.st8{opacity:0.36;}
-	.st9{opacity:0.24;fill:#FFFFFF;}
-</style>
-<g id="Hintergrund_x5F_Uni" class="st0">
-	<rect class="st1" width="48" height="48"/>
-</g>
-<g id="Verlauf" class="st0">
-	<radialGradient id="SVGID_1_" cx="23.348" cy="21.0566" r="25.4002" fx="3.9002" fy="4.7179" gradientUnits="userSpaceOnUse">
-		<stop  offset="0" style="stop-color:#000000;stop-opacity:0"/>
-		<stop  offset="1" style="stop-color:#000000"/>
-	</radialGradient>
-	<circle class="st2" cx="23.6" cy="23.6" r="22.9"/>
-</g>
-<g id="Logo_x5F_Schatten">
-	<circle class="st3" cx="24.3" cy="24.3" r="21.7"/>
-	<polygon class="st4" points="21.4,22.9 15.8,42.4 27.5,25.7 33.2,6.2 	"/>
-</g>
-<g id="LogooVordergrund">
-	<circle class="st5" cx="23.7" cy="23.7" r="21.7"/>
-	<g>
-		<polygon class="st6" points="14.9,41.8 26.6,25.1 20.5,22.2 		"/>
-		<polygon class="st7" points="32.3,5.5 20.5,22.2 26.6,25.1 		"/>
-		<polyline class="st8" points="14.9,41.8 26.6,25.1 32.3,5.5 		"/>
-		<circle class="st9" cx="23.6" cy="23.6" r="1.6"/>
-	</g>
-</g>
-</svg>

docs/source/conf.py

@@ -35,8 +35,8 @@ html_static_path = ['_static']
 # -- Sphinxawsome-theme options ------------------------------------------------
 # https://sphinxawesome.xyz/how-to/configure/
 
-html_logo = "_static/favicon.svg"
+html_logo = "_static/favicon.png"
-html_favicon  = "_static/favicon.svg"
+html_favicon  = "_static/favicon.png"
 
 html_sidebars = {
   "about": ["sidebar_main_nav_links.html"],

jdav_web/.coveragerc

@@ -1,10 +1,8 @@
 [run]
     source =
         .
-    dynamic_context = test_function
 
 [report]
     omit =
         ./jet/*
         manage.py
-        jdav_web/wsgi.py

jdav_web/contrib/admin.py

@@ -12,26 +12,6 @@ import rules.contrib.admin
 from rules.permissions import perm_exists
 
 
-def decorate_admin_view(model, perm=None):
-    """
-    Decorator for wrapping admin views.
-    """
-    def decorator(fun):
-        def aux(self, request, object_id):
-            try:
-                obj = model.objects.get(pk=object_id)
-            except model.DoesNotExist:
-                messages.error(request, _('%(modelname)s not found.') % {'modelname': self.opts.verbose_name})
-                return HttpResponseRedirect(reverse('admin:%s_%s_changelist' % (self.opts.app_label, self.opts.model_name)))
-            permitted = self.has_change_permission(request, obj) if not perm else request.user.has_perm(perm)
-            if not permitted:
-                messages.error(request, _('Insufficient permissions.'))
-                return HttpResponseRedirect(reverse('admin:%s_%s_changelist' % (self.opts.app_label, self.opts.model_name)))
-            return fun(self, request, obj)
-        return aux
-    return decorator
-
-
 class FieldPermissionsAdminMixin:
     field_change_permissions = {}
     field_view_permissions = {}

jdav_web/contrib/tests.py

@@ -1,175 +1,3 @@
-from datetime import datetime, timedelta
+from django.test import TestCase
-from decimal import Decimal
-from django.test import TestCase, RequestFactory
-from django.contrib.auth import get_user_model
-from django.contrib import admin
-from django.db import models
-from django.core.exceptions import ValidationError
-from django.core.files.uploadedfile import SimpleUploadedFile
-from django.utils.translation import gettext_lazy as _
-from unittest.mock import Mock, patch
-from rules.contrib.models import RulesModelMixin, RulesModelBase
-from contrib.models import CommonModel
-from contrib.rules import has_global_perm
-from contrib.admin import CommonAdminMixin
-from utils import file_size_validator, RestrictedFileField, cvt_to_decimal, get_member, normalize_name, normalize_filename, coming_midnight, mondays_until_nth
 
-User = get_user_model()
+# Create your tests here.
-
-class CommonModelTestCase(TestCase):
-    def test_common_model_abstract_base(self):
-        """Test that CommonModel provides the correct meta attributes"""
-        meta = CommonModel._meta
-        self.assertTrue(meta.abstract)
-        expected_permissions = (
-            'add_global', 'change_global', 'view_global', 'delete_global', 'list_global', 'view',
-        )
-        self.assertEqual(meta.default_permissions, expected_permissions)
-
-    def test_common_model_inheritance(self):
-        """Test that CommonModel has rules mixin functionality"""
-        # Test that CommonModel has the expected functionality
-        # Since it's abstract, we can't instantiate it directly
-        # but we can check its metaclass and mixins
-        self.assertTrue(issubclass(CommonModel, RulesModelMixin))
-        self.assertEqual(CommonModel.__class__, RulesModelBase)
-
-
-class GlobalPermissionRulesTestCase(TestCase):
-    def setUp(self):
-        self.user = User.objects.create_user(
-            username='testuser',
-            email='test@example.com',
-            password='testpass123'
-        )
-
-    def test_has_global_perm_predicate_creation(self):
-        """Test that has_global_perm creates a predicate function"""
-        # has_global_perm is a decorator factory, not a direct predicate
-        predicate = has_global_perm('auth.add_user')
-        self.assertTrue(callable(predicate))
-
-    def test_has_global_perm_with_superuser(self):
-        """Test that superusers have global permissions"""
-        self.user.is_superuser = True
-        self.user.save()
-
-        predicate = has_global_perm('auth.add_user')
-        result = predicate(self.user, None)
-        self.assertTrue(result)
-
-    def test_has_global_perm_with_regular_user(self):
-        """Test that regular users don't automatically have global permissions"""
-        predicate = has_global_perm('auth.add_user')
-        result = predicate(self.user, None)
-        self.assertFalse(result)
-
-
-class CommonAdminMixinTestCase(TestCase):
-    def setUp(self):
-        self.user = User.objects.create_user(username='testuser', password='testpass')
-
-    def test_formfield_for_dbfield_with_formfield_overrides(self):
-        """Test formfield_for_dbfield when db_field class is in formfield_overrides"""
-        # Create a test admin instance that inherits from Django's ModelAdmin
-        class TestAdmin(CommonAdminMixin, admin.ModelAdmin):
-            formfield_overrides = {
-                models.ForeignKey: {'widget': Mock()}
-            }
-
-        # Create a mock model to use with the admin
-        class TestModel:
-            _meta = Mock()
-            _meta.app_label = 'test'
-
-        admin_instance = TestAdmin(TestModel, admin.site)
-
-        # Create a mock ForeignKey field to trigger the missing line 147
-        db_field = models.ForeignKey(User, on_delete=models.CASCADE)
-
-        # Create a test request
-        request = RequestFactory().get('/')
-        request.user = self.user
-
-        # Call the method to test formfield_overrides usage
-        result = admin_instance.formfield_for_dbfield(db_field, request, help_text='Test help text')
-
-        # Verify that the formfield_overrides were used
-        self.assertIsNotNone(result)
-
-
-class UtilsTestCase(TestCase):
-    def setUp(self):
-        self.user = User.objects.create_user(
-            username='testuser',
-            email='test@example.com',
-            password='testpass123'
-        )
-
-    def test_file_size_validator_exceeds_limit(self):
-        """Test file_size_validator when file exceeds size limit"""
-        validator = file_size_validator(1)  # 1MB limit
-
-        # Create a mock file that exceeds the limit (2MB)
-        mock_file = Mock()
-        mock_file.size = 2 * 1024 * 1024  # 2MB
-
-        with self.assertRaises(ValidationError) as cm:
-            validator(mock_file)
-
-        # Check for the translated error message
-        expected_message = str(_('Please keep filesize under {} MiB. Current filesize: {:10.2f} MiB.').format(1, 2.00))
-        self.assertIn(expected_message, str(cm.exception))
-
-    def test_restricted_file_field_content_type_not_supported(self):
-        """Test RestrictedFileField when content type is not supported"""
-        field = RestrictedFileField(content_types=['image/jpeg'])
-
-        # Create mock data with unsupported content type
-        mock_data = Mock()
-        mock_data.file = Mock()
-        mock_data.file.content_type = "text/plain"
-
-        # Mock the super().clean() to return our mock data
-        with patch.object(models.FileField, 'clean', return_value=mock_data):
-            with self.assertRaises(ValidationError) as cm:
-                field.clean("dummy")
-
-            # Check for the translated error message
-            expected_message = str(_('Filetype not supported.'))
-            self.assertIn(expected_message, str(cm.exception))
-
-    def test_restricted_file_field_size_exceeds_limit(self):
-        """Test RestrictedFileField when file size exceeds limit"""
-        field = RestrictedFileField(max_upload_size=1)  # 1 byte limit
-
-        # Create mock data with file that exceeds size limit
-        mock_data = Mock()
-        mock_data.file = Mock()
-        mock_data.file.content_type = "text/plain"
-        mock_data.file._size = 2  # 2 bytes, exceeds limit
-
-        # Mock the super().clean() to return our mock data
-        with patch.object(models.FileField, 'clean', return_value=mock_data):
-            with self.assertRaises(ValidationError) as cm:
-                field.clean("dummy")
-
-            # Check for the translated error message
-            expected_message = str(_('Please keep filesize under {}. Current filesize: {}').format(1, 2))
-            self.assertIn(expected_message, str(cm.exception))
-
-    def test_mondays_until_nth(self):
-        """Test mondays_until_nth function"""
-        # Test with n=2 to get 3 Mondays (including the 0th)
-        result = mondays_until_nth(2)
-
-        # Should return a list of 3 dates
-        self.assertEqual(len(result), 3)
-
-        # All dates should be Mondays (weekday 0)
-        for date in result:
-            self.assertEqual(date.weekday(), 0)  # Monday is 0
-
-        # Dates should be consecutive weeks
-        self.assertEqual(result[1] - result[0], timedelta(days=7))
-        self.assertEqual(result[2] - result[1], timedelta(days=7))

jdav_web/contrib/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

jdav_web/finance/admin.py

@@ -1,4 +1,3 @@
-import logging
 from django.contrib import admin, messages
 from django.utils.safestring import mark_safe
 from django import forms
@@ -20,8 +19,6 @@ from members.pdf import render_tex_with_attachments
 from .models import Ledger, Statement, Receipt, Transaction, Bill, StatementSubmitted, StatementConfirmed,\
         StatementUnSubmitted, BillOnStatementProxy
 
-logger = logging.getLogger(__name__)
-
 
 @admin.register(Ledger)
 class LedgerAdmin(admin.ModelAdmin):
@@ -62,58 +59,24 @@ def decorate_statement_view(model, perm=None):
     return decorator
 
 
-@admin.register(Statement)
+@admin.register(StatementUnSubmitted)
-class StatementAdmin(CommonAdminMixin, admin.ModelAdmin):
+class StatementUnSubmittedAdmin(CommonAdminMixin, admin.ModelAdmin):
-    fields = ['short_description', 'explanation', 'excursion', 'status']
+    fields = ['short_description', 'explanation', 'excursion', 'submitted']
-    list_display = ['__str__', 'total_pretty', 'created_by', 'submitted_date', 'status_badge']
+    list_display = ['__str__', 'excursion', 'created_by']
-    list_filter = ['status']
-    search_fields = ('excursion__name', 'short_description')
-    ordering = ['-submitted_date']
     inlines = [BillOnStatementInline]
-    list_per_page = 25
-
-    def has_change_permission(self, request, obj=None):
-        if obj is None:
-            return super().has_change_permission(request)
-        if obj.confirmed:
-            # Confirmed statements may not be changed (they should be unconfirmed first)
-            return False
-        return super().has_change_permission(request, obj)
-
-    def has_delete_permission(self, request, obj=None):
-        if obj is None or obj.submitted:
-            # Submitted statements may not be deleted (they should be rejected first)
-            return False
-        return super().has_delete_permission(request, obj)
 
     def save_model(self, request, obj, form, change):
         if not change and hasattr(request.user, 'member'):
             obj.created_by = request.user.member
         super().save_model(request, obj, form, change)
 
-    def get_fields(self, request, obj=None):
-        if obj is not None and obj.excursion:
-            # if the object exists and an excursion is set, show the excursion (read only)
-            # instead of the short description
-            return ['excursion', 'explanation', 'status']
-        else:
-            # if the object is newly created or no excursion is set, require
-            # a short description
-            return ['short_description', 'explanation', 'status']
-
     def get_readonly_fields(self, request, obj=None):
-        readonly_fields = ['status', 'excursion']
+        readonly_fields = ['submitted', 'excursion']
         if obj is not None and obj.submitted:
             return readonly_fields + self.fields
         else:
             return readonly_fields
 
-    def get_inlines(self, request, obj=None):
-        if obj is None or not obj.submitted:
-            return [BillOnStatementInline]
-        else:
-            return [BillOnSubmittedStatementInline, TransactionOnSubmittedStatementInline]
-
     def get_urls(self):
         urls = super().get_urls()
 
@@ -130,33 +93,12 @@ class StatementAdmin(CommonAdminMixin, admin.ModelAdmin):
                 wrap(self.submit_view),
                 name="%s_%s_submit" % (self.opts.app_label, self.opts.model_name),
             ),
-            path(
-                "<path:object_id>/overview/",
-                wrap(self.overview_view),
-                name="%s_%s_overview" % (self.opts.app_label, self.opts.model_name),
-            ),
-            path(
-                "<path:object_id>/reduce_transactions/",
-                wrap(self.reduce_transactions_view),
-                name="%s_%s_reduce_transactions" % (self.opts.app_label, self.opts.model_name),
-            ),
-            path(
-                "<path:object_id>/unconfirm/",
-                wrap(self.unconfirm_view),
-                name="%s_%s_unconfirm" % (self.opts.app_label, self.opts.model_name),
-            ),
-            path(
-                "<path:object_id>/summary/",
-                wrap(self.statement_summary_view),
-                name="%s_%s_summary" % (self.opts.app_label, self.opts.model_name),
-            ),
         ]
         return custom_urls + urls
 
-    @decorate_statement_view(StatementUnSubmitted)
+    @decorate_statement_view(Statement)
     def submit_view(self, request, statement):
-        if statement.submitted: # pragma: no cover
+        if statement.submitted:
-            logger.error(f"submit_view reached with submitted statement {statement}. This should not happen.")
             messages.error(request,
                     _("%(name)s is already submitted.") % {'name': str(statement)})
             return HttpResponseRedirect(reverse('admin:%s_%s_changelist' % (self.opts.app_label, self.opts.model_name)))
@@ -174,6 +116,7 @@ class StatementAdmin(CommonAdminMixin, admin.ModelAdmin):
                        opts=self.opts,
                        memberlist=memberlist,
                        object=memberlist,
+                       participant_count=memberlist.participant_count,
                        ljp_contributions=memberlist.payable_ljp_contributions,
                        total_relative_costs=memberlist.total_relative_costs,
                        **memberlist.statement.template_context())
@@ -185,18 +128,101 @@ class StatementAdmin(CommonAdminMixin, admin.ModelAdmin):
                 statement=statement)
             return render(request, 'admin/submit_statement.html', context=context)
 
+
+class TransactionOnSubmittedStatementInline(admin.TabularInline):
+    model = Transaction
+    fields = ['amount', 'member', 'reference', 'text_length_warning', 'ledger']
+    formfield_overrides = {
+        TextField: {'widget': Textarea(attrs={'rows': 1, 'cols': 40})}
+    }
+    readonly_fields = ['text_length_warning']
+    extra = 0
+
+    def text_length_warning(self, obj):
+        """Display reference length, warn if exceeds 140 characters."""
+        len_reference = len(obj.reference)
+        len_string = f"{len_reference}/140"
+        if len_reference > 140:
+            return mark_safe(f'<span style="color: red;">{len_string}</span>')
+
+        return len_string
+    text_length_warning.short_description = _("Length")
+
+
+class BillOnSubmittedStatementInline(BillOnStatementInline):
+    model = BillOnStatementProxy
+    extra = 0
+    sortable_options = []
+    fields = ['short_description', 'explanation', 'amount', 'paid_by', 'proof', 'costs_covered']
+    formfield_overrides = {
+        TextField: {'widget': Textarea(attrs={'rows': 1, 'cols': 40})}
+    }
+
+    def get_readonly_fields(self, request, obj=None):
+        return ['short_description', 'explanation', 'amount', 'paid_by', 'proof']
+
+
+@admin.register(StatementSubmitted)
+class StatementSubmittedAdmin(admin.ModelAdmin):
+    fields = ['short_description', 'explanation', 'excursion', 'submitted']
+    list_display = ['__str__', 'is_valid', 'submitted_date', 'submitted_by']
+    ordering = ('-submitted_date',)
+    inlines = [BillOnSubmittedStatementInline, TransactionOnSubmittedStatementInline]
+
+    def has_add_permission(self, request, obj=None):
+        # Submitted statements should not be added directly, but instead be created
+        # as unsubmitted statements and then submitted.
+        return False
+
+    def has_change_permission(self, request, obj=None):
+        return request.user.has_perm('finance.process_statementsubmitted')
+
+    def has_delete_permission(self, request, obj=None):
+        # Submitted statements should not be deleted. Instead they can be rejected
+        # and then deleted as unsubmitted statements.
+        return False
+
+    def get_readonly_fields(self, request, obj=None):
+        readonly_fields = ['submitted']
+        if obj is not None and obj.submitted:
+            return readonly_fields + self.fields
+        else:
+            return readonly_fields
+
+    def get_urls(self):
+        urls = super().get_urls()
+
+        def wrap(view):
+            def wrapper(*args, **kwargs):
+                return self.admin_site.admin_view(view)(*args, **kwargs)
+
+            wrapper.model_admin = self
+            return update_wrapper(wrapper, view)
+
+        custom_urls = [
+            path(
+                "<path:object_id>/overview/",
+                wrap(self.overview_view),
+                name="%s_%s_overview" % (self.opts.app_label, self.opts.model_name),
+            ),
+            path(
+                "<path:object_id>/reduce_transactions/",
+                wrap(self.reduce_transactions_view),
+                name="%s_%s_reduce_transactions" % (self.opts.app_label, self.opts.model_name),
+            ),
+        ]
+        return custom_urls + urls
+
     @decorate_statement_view(StatementSubmitted)
     def overview_view(self, request, statement):
-        if not statement.submitted: # pragma: no cover
+        if not statement.submitted:
-            logger.error(f"overview_view reached with unsubmitted statement {statement}. This should not happen.")
             messages.error(request,
                     _("%(name)s is not yet submitted.") % {'name': str(statement)})
             return HttpResponseRedirect(reverse('admin:%s_%s_change' % (self.opts.app_label, self.opts.model_name), args=(statement.pk,)))
         if "transaction_execution_confirm" in request.POST or "transaction_execution_confirm_and_send" in request.POST:
             res = statement.confirm(confirmer=get_member(request))
-            if not res: # pragma: no cover
+            if not res:
                 # this should NOT happen!
-                logger.error(f"Error occured while confirming {statement}, this should not be possible.")
                 messages.error(request,
                         _("An error occured while trying to confirm %(name)s. Please try again.") % {'name': str(statement)})
                 return HttpResponseRedirect(reverse('admin:%s_%s_overview' % (self.opts.app_label, self.opts.model_name)))
@@ -207,8 +233,7 @@ class StatementAdmin(CommonAdminMixin, admin.ModelAdmin):
             messages.success(request,
                     _("Successfully confirmed %(name)s. I hope you executed the associated transactions, I wont remind you again.")
                     % {'name': str(statement)})
-            download_link = reverse('admin:%s_%s_summary' % (self.opts.app_label, self.opts.model_name),
+            download_link = reverse('admin:finance_statementconfirmed_summary', args=(statement.pk,))
-                                    args=(statement.pk,))
             messages.success(request,
                              mark_safe(_("You can download a <a href='%(link)s', target='_blank'>receipt</a>.") % {'link': download_link}))
             return HttpResponseRedirect(reverse('admin:%s_%s_changelist' % (self.opts.app_label, self.opts.model_name)))
@@ -234,17 +259,14 @@ class StatementAdmin(CommonAdminMixin, admin.ModelAdmin):
                 messages.error(request,
                                _("The configured recipients for the allowance don't match the regulations. Please correct this on the excursion."))
                 return HttpResponseRedirect(reverse('admin:%s_%s_overview' % (self.opts.app_label, self.opts.model_name), args=(statement.pk,)))
-            elif res == Statement.INVALID_TOTAL: # pragma: no cover
+            elif res == Statement.INVALID_TOTAL:
-                logger.error(f"INVALID_TOTAL reached on {statement}.")
                 messages.error(request,
                                _("The calculated total amount does not match the sum of all transactions. This is most likely a bug."))
                 return HttpResponseRedirect(reverse('admin:%s_%s_overview' % (self.opts.app_label, self.opts.model_name), args=(statement.pk,)))
-            else: # pragma: no cover
+            return HttpResponseRedirect(reverse('admin:%s_%s_changelist' % (self.opts.app_label, self.opts.model_name)))
-                logger.error(f"Statement.validity returned invalid value for {statement}.")
-                return HttpResponseRedirect(reverse('admin:%s_%s_changelist' % (self.opts.app_label, self.opts.model_name)))
 
         if "reject" in request.POST:
-            statement.status = Statement.UNSUBMITTED
+            statement.submitted = False
             statement.save()
             messages.success(request,
                     _("Successfully rejected %(name)s. The requestor can reapply, when needed.")
@@ -280,16 +302,61 @@ class StatementAdmin(CommonAdminMixin, admin.ModelAdmin):
         messages.success(request,
                 _("Successfully reduced transactions for %(name)s.") % {'name': str(statement)})
         return HttpResponseRedirect(request.GET['redirectTo'])
+        #return HttpResponseRedirect(reverse('admin:%s_%s_change' % (self.opts.app_label, self.opts.model_name), args=(statement.pk,)))
+
+
+@admin.register(StatementConfirmed)
+class StatementConfirmedAdmin(admin.ModelAdmin):
+    fields = ['short_description', 'explanation', 'excursion', 'confirmed']
+    #readonly_fields = fields
+    list_display = ['__str__', 'total_pretty', 'confirmed_date', 'confirmed_by']
+    ordering = ('-confirmed_date',)
+    inlines = [BillOnSubmittedStatementInline, TransactionOnSubmittedStatementInline]
+
+    def has_add_permission(self, request, obj=None):
+        # To preserve integrity, no one is allowed to add confirmed statements
+        return False
+
+    def has_change_permission(self, request, obj=None):
+        # To preserve integrity, no one is allowed to change confirmed statements
+        return False
+
+    def has_delete_permission(self, request, obj=None):
+        # To preserve integrity, no one is allowed to delete confirmed statements
+        return False
+
+    def get_urls(self):
+        urls = super().get_urls()
+
+        def wrap(view):
+            def wrapper(*args, **kwargs):
+                return self.admin_site.admin_view(view)(*args, **kwargs)
+
+            wrapper.model_admin = self
+            return update_wrapper(wrapper, view)
+
+        custom_urls = [
+            path(
+                "<path:object_id>/unconfirm/",
+                wrap(self.unconfirm_view),
+                name="%s_%s_unconfirm" % (self.opts.app_label, self.opts.model_name),
+            ),
+            path(
+                "<path:object_id>/summary/",
+                wrap(self.statement_summary_view),
+                name="%s_%s_summary" % (self.opts.app_label, self.opts.model_name),
+            ),
+        ]
+        return custom_urls + urls
 
     @decorate_statement_view(StatementConfirmed, perm='finance.may_manage_confirmed_statements')
     def unconfirm_view(self, request, statement):
-        if not statement.confirmed: # pragma: no cover
+        if not statement.confirmed:
-            logger.error(f"unconfirm_view reached with unconfirmed statement {statement}.")
             messages.error(request,
                     _("%(name)s is not yet confirmed.") % {'name': str(statement)})
             return HttpResponseRedirect(reverse('admin:%s_%s_change' % (self.opts.app_label, self.opts.model_name), args=(statement.pk,)))
         if "unconfirm" in request.POST:
-            statement.status = Statement.SUBMITTED
+            statement.confirmed = False
             statement.confirmed_date = None
             statement.confired_by = None
             statement.save()
@@ -308,8 +375,7 @@ class StatementAdmin(CommonAdminMixin, admin.ModelAdmin):
 
     @decorate_statement_view(StatementConfirmed, perm='finance.may_manage_confirmed_statements')
     def statement_summary_view(self, request, statement):
-        if not statement.confirmed: # pragma: no cover
+        if not statement.confirmed:
-            logger.error(f"statement_summary_view reached with unconfirmed statement {statement}.")
             messages.error(request,
                     _("%(name)s is not yet confirmed.") % {'name': str(statement)})
             return HttpResponseRedirect(reverse('admin:%s_%s_change' % (self.opts.app_label, self.opts.model_name), args=(statement.pk,)))
@@ -323,39 +389,6 @@ class StatementAdmin(CommonAdminMixin, admin.ModelAdmin):
     statement_summary_view.short_description = _('Download summary')
 
 
-class TransactionOnSubmittedStatementInline(admin.TabularInline):
-    model = Transaction
-    fields = ['amount', 'member', 'reference', 'text_length_warning', 'ledger']
-    formfield_overrides = {
-        TextField: {'widget': Textarea(attrs={'rows': 1, 'cols': 40})}
-    }
-    readonly_fields = ['text_length_warning']
-    extra = 0
-
-    def text_length_warning(self, obj):
-        """Display reference length, warn if exceeds 140 characters."""
-        len_reference = len(obj.reference)
-        len_string = f"{len_reference}/140"
-        if len_reference > 140:
-            return mark_safe(f'<span style="color: red;">{len_string}</span>')
-
-        return len_string
-    text_length_warning.short_description = _("Length")
-
-
-class BillOnSubmittedStatementInline(BillOnStatementInline):
-    model = BillOnStatementProxy
-    extra = 0
-    sortable_options = []
-    fields = ['short_description', 'explanation', 'amount', 'paid_by', 'proof', 'costs_covered']
-    formfield_overrides = {
-        TextField: {'widget': Textarea(attrs={'rows': 1, 'cols': 40})}
-    }
-
-    def get_readonly_fields(self, request, obj=None):
-        return ['short_description', 'explanation', 'amount', 'paid_by', 'proof']
-
-
 @admin.register(Transaction)
 class TransactionAdmin(admin.ModelAdmin):
     """The transaction admin site. This is only used to display transactions. All editing

jdav_web/finance/locale/de/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-10-16 23:09+0200\n"
+"POT-Creation-Date: 2025-05-03 19:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: finance/admin.py finance/tests/admin.py
+#: finance/admin.py
 msgid "Statement not found."
 msgstr "Abrechnung nicht gefunden."
 
-#: finance/admin.py finance/tests/admin.py
+#: finance/admin.py
 msgid "Insufficient permissions."
 msgstr "Unzureichende Berechtigungen."
 
@@ -31,7 +31,7 @@ msgstr "Unzureichende Berechtigungen."
 msgid "%(name)s is already submitted."
 msgstr "%(name)s ist bereits eingereicht."
 
-#: finance/admin.py finance/tests/admin.py
+#: finance/admin.py
 #, python-format
 msgid ""
 "Successfully submited %(name)s. The finance department will notify the "
@@ -40,14 +40,18 @@ msgstr ""
 "Rechnung %(name)s erfolgreich eingereicht. Das Finanzreferat wird auf dich "
 "sobald wie möglich zukommen."
 
-#: finance/admin.py finance/tests/admin.py
+#: finance/admin.py
 msgid "Finance overview"
 msgstr "Kostenübersicht"
 
-#: finance/admin.py finance/tests/admin.py
+#: finance/admin.py
 msgid "Submit statement"
 msgstr "Rechnung einreichen"
 
+#: finance/admin.py
+msgid "Length"
+msgstr "Länge"
+
 #: finance/admin.py
 #, python-format
 msgid "%(name)s is not yet submitted."
@@ -60,11 +64,11 @@ msgstr ""
 "Beim Abwickeln von %(name)s ist ein Fehler aufgetreten. Bitte versuche es "
 "erneut."
 
-#: finance/admin.py finance/tests/admin.py
+#: finance/admin.py
 msgid "Successfully sent receipt to the office."
 msgstr "Abrechnungsbeleg an die Geschäftsstelle gesendet."
 
-#: finance/admin.py finance/tests/admin.py
+#: finance/admin.py
 #, python-format
 msgid ""
 "Successfully confirmed %(name)s. I hope you executed the associated "
@@ -80,11 +84,11 @@ msgstr ""
 "Hier kannst du den Abrechnungsbeleg <a href='%(link)s', "
 "target='_blank'>herunterladen</a>."
 
-#: finance/admin.py finance/tests/admin.py
+#: finance/admin.py
 msgid "Statement confirmed"
 msgstr "Abrechnung abgewickelt"
 
-#: finance/admin.py finance/tests/admin.py
+#: finance/admin.py
 msgid ""
 "Transactions do not match the covered expenses. Please correct the mistakes "
 "listed below."
@@ -92,12 +96,12 @@ msgstr ""
 "Überweisungen stimmen nicht mit den übernommenen Kosten überein. Bitte "
 "korrigiere die unten aufgeführten Fehler."
 
-#: finance/admin.py finance/tests/admin.py
+#: finance/admin.py
 msgid "Some transactions have no ledger configured. Please fill in the gaps."
 msgstr ""
 "Manche Überweisungen haben kein Geldtopf eingestellt. Bitte trage das nach."
 
-#: finance/admin.py finance/tests/admin.py
+#: finance/admin.py
 msgid ""
 "The configured recipients for the allowance don't match the regulations. "
 "Please correct this on the excursion."
@@ -113,14 +117,14 @@ msgstr ""
 "Der berechnete Gesamtbetrag stimmt nicht mit der Summe aller Überweisungen "
 "überein. Das ist höchstwahrscheinlich ein Fehler in der Implementierung."
 
-#: finance/admin.py finance/tests/admin.py
+#: finance/admin.py
 #, python-format
 msgid "Successfully rejected %(name)s. The requestor can reapply, when needed."
 msgstr ""
 "Die Rechnung %(name)s wurde abgelehnt. Die Person kann die Rechnung erneut "
 "einstellen, wenn es benötigt wird."
 
-#: finance/admin.py finance/tests/admin.py
+#: finance/admin.py
 #, python-format
 msgid ""
 "%(name)s already has transactions. Please delete them first, if you want to "
@@ -129,12 +133,12 @@ msgstr ""
 "%(name)s hat bereits Überweisungen. Bitte lösche diese zunächst, bevor du "
 "neue generierst."
 
-#: finance/admin.py finance/tests/admin.py
+#: finance/admin.py
 #, python-format
 msgid "Successfully generated transactions for %(name)s"
 msgstr "Automatisch Überweisungsträger für %(name)s generiert."
 
-#: finance/admin.py finance/tests/admin.py
+#: finance/admin.py
 #, python-format
 msgid ""
 "Error while generating transactions for %(name)s. Do all bills have a payer "
@@ -146,11 +150,11 @@ msgstr ""
 "einer Ausfahrt gehört, wurde eine Person als Empfänger*in der Übernachtungs- "
 "und Fahrtkostenzuschüsse ausgewählt?"
 
-#: finance/admin.py finance/tests/admin.py
+#: finance/admin.py
 msgid "View submitted statement"
 msgstr "Eingereichte Abrechnung einsehen"
 
-#: finance/admin.py finance/tests/admin.py
+#: finance/admin.py
 #, python-format
 msgid "Successfully reduced transactions for %(name)s."
 msgstr "Überweisungsträger für %(name)s minimiert."
@@ -168,7 +172,6 @@ msgstr ""
 "was du machst."
 
 #: finance/admin.py finance/templates/admin/unconfirm_statement.html
-#: finance/tests/admin.py
 msgid "Unconfirm statement"
 msgstr "Bestätigung zurücknehmen"
 
@@ -176,10 +179,6 @@ msgstr "Bestätigung zurücknehmen"
 msgid "Download summary"
 msgstr "Beleg herunterladen"
 
-#: finance/admin.py
-msgid "Length"
-msgstr "Länge"
-
 #: finance/apps.py
 msgid "Finance"
 msgstr "Finanzen"
@@ -197,18 +196,6 @@ msgstr "Geldtopf"
 msgid "Ledgers"
 msgstr "Geldtöpfe"
 
-#: finance/models.py
-msgid "In preparation"
-msgstr "In Vorbereitung"
-
-#: finance/models.py
-msgid "Submitted"
-msgstr "Eingereicht"
-
-#: finance/models.py
-msgid "Completed"
-msgstr "Abgewickelt"
-
 #: finance/models.py
 msgid "Short description"
 msgstr "Kurzbeschreibung"
@@ -260,13 +247,17 @@ msgid "Price per night"
 msgstr "Preis pro Nacht"
 
 #: finance/models.py
-msgid "Status"
+msgid "Submitted"
-msgstr "Status"
+msgstr "Eingereicht"
 
 #: finance/models.py
 msgid "Submitted on"
 msgstr "Eingereicht am"
 
+#: finance/models.py
+msgid "Confirmed"
+msgstr "Abgewickelt"
+
 #: finance/models.py
 msgid "Paid on"
 msgstr "Bezahlt am"
@@ -293,6 +284,10 @@ msgstr "Abrechnungen"
 
 #: finance/models.py
 #, python-format
+msgid "Statement: %(excursion)s"
+msgstr "Abrechnung: %(excursion)s"
+
+#: finance/models.py
 msgid "Excursion %(excursion)s"
 msgstr "Ausfahrt %(excursion)s"
 
@@ -310,7 +305,7 @@ msgstr "Aufwandsentschädigung für %(excu)s"
 msgid "Night and travel costs for %(excu)s"
 msgstr "Übernachtungs- und Fahrtkosten für %(excu)s"
 
-#: finance/models.py finance/tests/models.py
+#: finance/models.py
 msgid "reduced by org fee"
 msgstr "reduziert um Org-Beitrag"
 

jdav_web/finance/migrations/0010_statement_status.py

@@ -1,39 +0,0 @@
-# Generated by Django 4.2.20 on 2025-10-11 15:43
-
-from django.db import migrations, models
-
-
-def set_status_from_old_fields(apps, schema_editor):
-    """
-    Set the status field based on the existing submitted and confirmed fields.
-    - If confirmed is True, status = CONFIRMED (2)
-    - If submitted is True but confirmed is False, status = SUBMITTED (1)
-    - Otherwise, status = UNSUBMITTED (0)
-    """
-    Statement = apps.get_model('finance', 'Statement')
-    UNSUBMITTED, SUBMITTED, CONFIRMED = 0, 1, 2
-
-    for statement in Statement.objects.all():
-        if statement.confirmed:
-            statement.status = CONFIRMED
-        elif statement.submitted:
-            statement.status = SUBMITTED
-        else:
-            statement.status = UNSUBMITTED
-        statement.save(update_fields=['status'])
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('finance', '0009_statement_ljp_to'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='statement',
-            name='status',
-            field=models.IntegerField(choices=[(0, 'In preparation'), (1, 'Submitted'), (2, 'Confirmed')], default=0, verbose_name='Status'),
-        ),
-        migrations.RunPython(set_status_from_old_fields, reverse_code=migrations.RunPython.noop),
-    ]

jdav_web/finance/migrations/0011_remove_statement_confirmed_and_submitted.py

@@ -1,21 +0,0 @@
-# Generated by Django 4.2.20 on 2025-10-11 16:01
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('finance', '0010_statement_status'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='statement',
-            name='confirmed',
-        ),
-        migrations.RemoveField(
-            model_name='statement',
-            name='submitted',
-        ),
-    ]

jdav_web/finance/migrations/0012_statementonexcursionproxy.py

@@ -1,28 +0,0 @@
-# Generated by Django 4.2.20 on 2025-10-12 19:16
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('finance', '0011_remove_statement_confirmed_and_submitted'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='StatementOnExcursionProxy',
-            fields=[
-            ],
-            options={
-                'verbose_name': 'Statement',
-                'verbose_name_plural': 'Statements',
-                'abstract': False,
-                'proxy': True,
-                'default_permissions': ('add_global', 'change_global', 'view_global', 'delete_global', 'list_global', 'view'),
-                'indexes': [],
-                'constraints': [],
-            },
-            bases=('finance.statement',),
-        ),
-    ]

jdav_web/finance/models.py

@@ -9,7 +9,6 @@ from django.core.exceptions import ValidationError
 from django.db import models
 from django.db.models import Sum
 from django.utils.translation import gettext_lazy as _
-from django.utils.html import format_html
 from members.models import Member, Freizeit, OEFFENTLICHE_ANREISE, MUSKELKRAFT_ANREISE
 from django.conf import settings
 import rules
@@ -47,22 +46,15 @@ class TransactionIssue:
 
 class StatementManager(models.Manager):
     def get_queryset(self):
-        return super().get_queryset().filter(status=Statement.UNSUBMITTED)
+        return super().get_queryset().filter(submitted=False, confirmed=False)
 
 
 class Statement(CommonModel):
     MISSING_LEDGER, NON_MATCHING_TRANSACTIONS, INVALID_ALLOWANCE_TO, INVALID_TOTAL, VALID = 0, 1, 2, 3, 4
-    UNSUBMITTED, SUBMITTED, CONFIRMED = 0, 1, 2
-    STATUS_CHOICES = [(UNSUBMITTED, _('In preparation')),
-                      (SUBMITTED, _('Submitted')),
-                      (CONFIRMED, _('Completed'))]
-    STATUS_CSS_CLASS = { SUBMITTED: 'submitted',
-                         CONFIRMED: 'confirmed',
-                         UNSUBMITTED: 'unsubmitted' }
 
     short_description = models.CharField(verbose_name=_('Short description'),
                                          max_length=30,
-                                         blank=False)
+                                         blank=True)
     explanation = models.TextField(verbose_name=_('Explanation'), blank=True)
 
     excursion = models.OneToOneField(Freizeit, verbose_name=_('Associated excursion'),
@@ -90,10 +82,9 @@ class Statement(CommonModel):
 
     night_cost = models.DecimalField(verbose_name=_('Price per night'), default=0, decimal_places=2, max_digits=5)
 
-    status = models.IntegerField(verbose_name=_('Status'),
+    submitted = models.BooleanField(verbose_name=_('Submitted'), default=False)
-                                 choices=STATUS_CHOICES,
-                                 default=UNSUBMITTED)
     submitted_date = models.DateTimeField(verbose_name=_('Submitted on'), default=None, null=True)
+    confirmed = models.BooleanField(verbose_name=_('Confirmed'), default=False)
     confirmed_date = models.DateTimeField(verbose_name=_('Paid on'), default=None, null=True)
 
     created_by = models.ForeignKey(Member, verbose_name=_('Created by'),
@@ -119,16 +110,20 @@ class Statement(CommonModel):
             ('may_edit_submitted_statements', 'Is allowed to edit submitted statements')
         ]
         rules_permissions = {
-            # All users may add draft statements.
+            # this is suboptimal, but Statement is only ever used as an inline on Freizeit
-            'add_obj': rules.is_staff,
+            # so we check for excursion permissions
-            # All users may view their own statements and statements of excursions they are responsible for.
+            'add_obj': is_leader,
-            'view_obj': is_creator | leads_excursion | has_global_perm('finance.view_global_statement'),
+            'view_obj': is_leader | has_global_perm('members.view_global_freizeit'),
-            # All users may change relevant (see above) draft statements.
+            'change_obj': is_leader & statement_not_submitted,
-            'change_obj': (not_submitted & (is_creator | leads_excursion)) | has_global_perm('finance.change_global_statement'),
+            'delete_obj': is_leader & statement_not_submitted,
-            # All users may delete relevant (see above) draft statements.
-            'delete_obj': not_submitted & (is_creator | leads_excursion | has_global_perm('finance.delete_global_statement')),
         }
 
+    def __str__(self):
+        if self.excursion is not None:
+            return _('Statement: %(excursion)s') % {'excursion': str(self.excursion)}
+        else:
+            return self.short_description
+
     @property
     def title(self):
         if self.excursion is not None:
@@ -136,44 +131,14 @@ class Statement(CommonModel):
         else:
             return self.short_description
 
-    def __str__(self):
-        return str(self.title)
-
-    @property
-    def submitted(self):
-        return self.status == Statement.SUBMITTED or self.status == Statement.CONFIRMED
-
-    @property
-    def confirmed(self):
-        return self.status == Statement.CONFIRMED
-
-    def status_badge(self):
-        code = Statement.STATUS_CSS_CLASS[self.status]
-        return format_html(f'<span class="statement-{code}">{Statement.STATUS_CHOICES[self.status][1]}</span>')
-    status_badge.short_description = _('Status')
-    status_badge.allow_tags = True
-    status_badge.admin_order_field = 'status'
-
     def submit(self, submitter=None):
-        self.status = self.SUBMITTED
+        self.submitted = True
         self.submitted_date = timezone.now()
         self.submitted_by = submitter
         self.save()
 
     @property
     def transaction_issues(self):
-        """
-        Returns a list of critical problems with the currently configured transactions. This is done
-        by calculating a list of required paiments. From this list, we deduce the total amount
-        every member should receive (this amount can be negative, due to org fees).
-        Finally, the amounts are compared to the total amounts paid out by currently setup transactions.
-
-        The list of required paiments is generated from:
-        - All covered bills that have a configured payer.
-          (Note: This means that `transaction_issues` might return an empty list, but the calculated
-          total still differs from the transaction total.)
-        - If the statement is associated with an excursion: allowances, subsidies, LJP paiment and org fee.
-        """
         needed_paiments = [(b.paid_by, b.amount) for b in self.bill_set.all() if b.costs_covered and b.paid_by]
 
         if self.excursion is not None:
@@ -218,7 +183,6 @@ class Statement(CommonModel):
 
     @property
     def transactions_match_expenses(self):
-        """Returns true iff there are no transaction issues."""
         return len(self.transaction_issues) == 0
 
     @property
@@ -236,11 +200,7 @@ class Statement(CommonModel):
 
     @property
     def total_valid(self):
-        """
+        """Checks if the calculated total agrees with the total amount of all transactions."""
-        Checks if the calculated total agrees with the total amount of all transactions.
-        Note: This is not the same as `transactions_match_expenses`. For details see the
-        docstring of `transaction_issues`.
-        """
         total_transactions = 0
         for transaction in self.transaction_set.all():
             total_transactions += transaction.amount
@@ -248,19 +208,6 @@ class Statement(CommonModel):
 
     @property
     def validity(self):
-        """
-        Returns the validity status of the statement. This is one of:
-        - `Statement.VALID`:
-          Everything is correct.
-        - `Statement.NON_MATCHING_TRANSACTIONS`:
-          There is a transaction issue (in the sense of `transaction_issues`).
-        - `Statement.MISSING_LEDGER`:
-          At least one transaction has no ledger configured.
-        - `Statement.INVALID_ALLOWANCE_TO`:
-          The members receiving allowance don't match the regulations.
-        - `Statement.INVALID_TOTAL`:
-          The total amount of transactions differs from the calculated total payout.
-        """
         if not self.transactions_match_expenses:
             return Statement.NON_MATCHING_TRANSACTIONS
         if not self.ledgers_configured:
@@ -284,7 +231,7 @@ class Statement(CommonModel):
         if not self.validity == Statement.VALID:
             return False
 
-        self.status = self.CONFIRMED
+        self.confirmed = True
         self.confirmed_date = timezone.now()
         self.confirmed_by = confirmer
         for trans in self.transaction_set.all():
@@ -549,7 +496,6 @@ class Statement(CommonModel):
     def total_pretty(self):
         return "{}€".format(self.total)
     total_pretty.short_description = _('Total')
-    total_pretty.admin_order_field = 'total'
 
     def template_context(self):
         context = {
@@ -621,23 +567,9 @@ class Statement(CommonModel):
                   attachments=[media_path(filename)])
 
 
-class StatementOnExcursionProxy(Statement):
-    class Meta(CommonModel.Meta):
-        proxy = True
-        verbose_name = _('Statement')
-        verbose_name_plural = _('Statements')
-        rules_permissions = {
-            # This is used as an inline on excursions, so we check for excursion permissions.
-            'add_obj': is_leader,
-            'view_obj': is_leader | has_global_perm('members.view_global_freizeit'),
-            'change_obj': is_leader & statement_not_submitted,
-            'delete_obj': is_leader & statement_not_submitted,
-        }
-
-
 class StatementUnSubmittedManager(models.Manager):
     def get_queryset(self):
-        return super().get_queryset().filter(status=Statement.UNSUBMITTED)
+        return super().get_queryset().filter(submitted=False, confirmed=False)
 
 
 class StatementUnSubmitted(Statement):
@@ -657,7 +589,7 @@ class StatementUnSubmitted(Statement):
 
 class StatementSubmittedManager(models.Manager):
     def get_queryset(self):
-        return super().get_queryset().filter(status=Statement.SUBMITTED)
+        return super().get_queryset().filter(submitted=True, confirmed=False)
 
 
 class StatementSubmitted(Statement):
@@ -674,7 +606,7 @@ class StatementSubmitted(Statement):
 
 class StatementConfirmedManager(models.Manager):
     def get_queryset(self):
-        return super().get_queryset().filter(status=Statement.CONFIRMED)
+        return super().get_queryset().filter(confirmed=True)
 
 
 class StatementConfirmed(Statement):
@@ -691,7 +623,7 @@ class StatementConfirmed(Statement):
 
 class Bill(CommonModel):
     statement = models.ForeignKey(Statement, verbose_name=_('Statement'), on_delete=models.CASCADE)
-    short_description = models.CharField(verbose_name=_('Short description'), max_length=30, blank=False)
+    short_description = models.CharField(verbose_name=_('Short description'), max_length=30)
     explanation = models.TextField(verbose_name=_('Explanation'), blank=True)
 
     amount = models.DecimalField(verbose_name=_('Amount'), max_digits=6, decimal_places=2, default=0)

jdav_web/finance/tests.py

@@ -2,15 +2,12 @@ from unittest import skip
 from django.test import TestCase
 from django.utils import timezone
 from django.conf import settings
-from django.utils.translation import gettext_lazy as _
+from .models import Statement, StatementUnSubmitted, StatementSubmitted, Bill, Ledger, Transaction,\
-from decimal import Decimal
-from finance.models import Statement, StatementUnSubmitted, StatementSubmitted, Bill, Ledger, Transaction,\
         StatementUnSubmittedManager, StatementSubmittedManager, StatementConfirmedManager,\
         StatementConfirmed, TransactionIssue, StatementManager
 from members.models import Member, Group, Freizeit, LJPProposal, Intervention, GEMEINSCHAFTS_TOUR, MUSKELKRAFT_ANREISE, NewMemberOnList,\
         FAHRGEMEINSCHAFT_ANREISE, MALE, FEMALE, DIVERSE
 from dateutil.relativedelta import relativedelta
-from utils import get_member
 
 # Create your tests here.
 class StatementTestCase(TestCase):
@@ -60,35 +57,13 @@ class StatementTestCase(TestCase):
             if i < self.allowance_to_count:
                 self.st3.allowance_to.add(m)
 
-        # Create a small excursion with < 5 theoretic LJP participants for LJP contribution test
-        small_ex = Freizeit.objects.create(name='Small trip', kilometers_traveled=100,
-                                         tour_type=GEMEINSCHAFTS_TOUR,
-                                         tour_approach=MUSKELKRAFT_ANREISE,
-                                         difficulty=1)
-        # Add only 3 participants (< 5 for theoretic_ljp_participant_count)
-        for i in range(3):
-            # Create young participants (< 6 years old) so they don't count toward LJP
-            birth_date = timezone.now().date() - relativedelta(years=4)
-            m = Member.objects.create(prename='Small {}'.format(i), lastname='Participant',
-                                    birth_date=birth_date,
-                                    email=settings.TEST_MAIL, gender=MALE)
-            NewMemberOnList.objects.create(member=m, memberlist=small_ex)
-
-        # Create LJP proposal for the small excursion
-        ljp_proposal = LJPProposal.objects.create(title='Small LJP', category=LJPProposal.LJP_STAFF_TRAINING)
-        small_ex.ljpproposal = ljp_proposal
-        small_ex.save()
-
-        self.st_small = Statement.objects.create(night_cost=10, excursion=small_ex)
-
         ex = Freizeit.objects.create(name='Wild trip 2', kilometers_traveled=self.kilometers_traveled,
                                      tour_type=GEMEINSCHAFTS_TOUR,
                                      tour_approach=MUSKELKRAFT_ANREISE,
                                      difficulty=2)
         self.st4 = Statement.objects.create(night_cost=self.night_cost, excursion=ex, subsidy_to=self.fritz)
         for i in range(2):
-            m = Member.objects.create(prename='Peter {}'.format(i), lastname='Walter',
+            m = Member.objects.create(prename='Peter {}'.format(i), lastname='Walter', birth_date=timezone.now().date(),
-                                      birth_date=timezone.now().date() - relativedelta(years=30),
                                       email=settings.TEST_MAIL, gender=DIVERSE)
             mol = NewMemberOnList.objects.create(member=m, memberlist=ex)
             ex.membersonlist.add(mol)
@@ -147,9 +122,6 @@ class StatementTestCase(TestCase):
             refunded=False
         )
         
-        self.st6 = Statement.objects.create(night_cost=self.night_cost)
-        Bill.objects.create(statement=self.st6, amount='42', costs_covered=True)
-
     def test_org_fee(self):
         # org fee should be collected if participants are older than 26
         self.assertEqual(self.st5.excursion.old_participant_count, 3, 'Calculation of number of old people in excursion is incorrect.')
@@ -399,103 +371,6 @@ class StatementTestCase(TestCase):
         bills = self.st2.grouped_bills()
         self.assertTrue('amount' in bills[0])
 
-    def test_euro_per_km_no_excursion(self):
-        """Test euro_per_km when no excursion is associated"""
-        statement = Statement.objects.create(
-            short_description="Test Statement",
-            explanation="Test explanation",
-            night_cost=25
-        )
-        self.assertEqual(statement.euro_per_km, 0)
-
-    def test_submit_workflow(self):
-        """Test statement submission workflow"""
-        statement = Statement.objects.create(
-            short_description="Test Statement",
-            explanation="Test explanation",
-            night_cost=25,
-            created_by=self.fritz
-        )
-
-        self.assertFalse(statement.submitted)
-        self.assertIsNone(statement.submitted_by)
-        self.assertIsNone(statement.submitted_date)
-
-        # Test submission - submit method doesn't return a value, just changes state
-        statement.submit(submitter=self.fritz)
-        self.assertTrue(statement.submitted)
-        self.assertEqual(statement.submitted_by, self.fritz)
-        self.assertIsNotNone(statement.submitted_date)
-
-    def test_template_context_with_excursion(self):
-        """Test statement template context when excursion is present"""
-        # Use existing excursion from setUp
-        context = self.st3.template_context()
-        self.assertIn('euro_per_km', context)
-        self.assertIsInstance(context['euro_per_km'], (int, float, Decimal))
-
-    def test_title_with_excursion(self):
-        title = self.st3.title
-        self.assertIn('Wild trip', title)
-
-    def test_transaction_issues_with_org_fee(self):
-        issues = self.st4.transaction_issues
-        self.assertIsInstance(issues, list)
-
-    def test_transaction_issues_with_ljp(self):
-        self.st3.ljp_to = self.fritz
-        self.st3.save()
-        issues = self.st3.transaction_issues
-        self.assertIsInstance(issues, list)
-
-    def test_generate_transactions_org_fee(self):
-        # Ensure conditions for org fee are met: need subsidy_to or allowances
-        # and participants >= 27 years old
-        self.st4.subsidy_to = self.fritz
-        self.st4.save()
-
-        # Verify org fee is calculated
-        self.assertGreater(self.st4.total_org_fee, 0, "Org fee should be > 0 with subsidies and old participants")
-
-        initial_count = Transaction.objects.count()
-        self.st4.generate_transactions()
-        final_count = Transaction.objects.count()
-        self.assertGreater(final_count, initial_count)
-        org_fee_transaction = Transaction.objects.filter(statement=self.st4,
-                                                         reference__icontains=_('reduced by org fee')).first()
-        self.assertIsNotNone(org_fee_transaction)
-
-    def test_generate_transactions_ljp(self):
-        self.st3.ljp_to = self.fritz
-        self.st3.save()
-        initial_count = Transaction.objects.count()
-        self.st3.generate_transactions()
-        final_count = Transaction.objects.count()
-        self.assertGreater(final_count, initial_count)
-        ljp_transaction = Transaction.objects.filter(statement=self.st3, member=self.fritz, reference__icontains='LJP').first()
-        self.assertIsNotNone(ljp_transaction)
-
-    def test_subsidies_paid_property(self):
-        subsidies_paid = self.st3.subsidies_paid
-        expected = self.st3.total_subsidies - self.st3.total_org_fee
-        self.assertEqual(subsidies_paid, expected)
-
-    def test_ljp_contributions_low_participant_count(self):
-        self.st_small.ljp_to = self.fritz
-        self.st_small.save()
-
-        # Verify that the small excursion has < 5 theoretic LJP participants
-        self.assertLess(self.st_small.excursion.theoretic_ljp_participant_count, 5,
-                        "Should have < 5 theoretic LJP participants")
-
-        ljp_contrib = self.st_small.paid_ljp_contributions
-        self.assertEqual(ljp_contrib, 0)
-
-    def test_validity_paid_by_none(self):
-        # st6 has one covered bill with no payer, so no transaction issues,
-        # but total transaction amount (= 0) differs from actual total (> 0).
-        self.assertEqual(self.st6.validity, Statement.INVALID_TOTAL)
-
 
 class LedgerTestCase(TestCase):
     def setUp(self):
@@ -513,11 +388,11 @@ class ManagerTestCase(TestCase):
         self.st_submitted = Statement.objects.create(short_description='A statement',
                                                      explanation='Important!',
                                                      night_cost=0,
-                                                     status=Statement.SUBMITTED)
+                                                     submitted=True)
         self.st_confirmed = Statement.objects.create(short_description='A statement',
                                                      explanation='Important!',
                                                      night_cost=0,
-                                                     status=Statement.CONFIRMED)
+                                                     confirmed=True)
 
     def test_get_queryset(self):
         # TODO: remove this manager, since it is not used
@@ -556,20 +431,9 @@ class TransactionTestCase(TestCase):
         self.assertTrue(str(self.trans.pk) in str(self.trans))
 
     def test_escape_reference(self):
-        """Test transaction reference escaping with various special characters"""
+        self.assertEqual(Transaction.escape_reference('harmless'), 'harmless')
-        test_cases = [
+        self.assertEqual(Transaction.escape_reference('äöüÄÖÜß'), 'aeoeueAeOeUess')
-            ('harmless', 'harmless'),
+        self.assertEqual(Transaction.escape_reference('ha@r!?mless+09'), 'har?mless+09')
-            ('äöüÄÖÜß', 'aeoeueAeOeUess'),
-            ('ha@r!?mless+09', 'har?mless+09'),
-            ("simple", "simple"),
-            ("test@email.com", "testemail.com"),
-            ("ref!with#special$chars%", "refwithspecialchars"),
-            ("normal_text-123", "normaltext-123"),  # underscores are removed
-        ]
-
-        for input_ref, expected in test_cases:
-            result = Transaction.escape_reference(input_ref)
-            self.assertEqual(result, expected)
 
     def test_code(self):
         self.trans.amount = 0
@@ -582,35 +446,6 @@ class TransactionTestCase(TestCase):
         self.fritz.iban = 'DE89370400440532013000'
         self.assertNotEqual(self.trans.code(), '')
 
-    def test_code_with_zero_amount(self):
-        """Test transaction code generation with zero amount"""
-        transaction = Transaction.objects.create(
-            reference="test-ref",
-            amount=Decimal('0.00'),
-            member=self.fritz,
-            ledger=self.personal_account,
-            statement=self.st
-        )
-
-        # Zero amount should return empty code
-        self.assertEqual(transaction.code(), '')
-
-    def test_code_with_invalid_iban(self):
-        """Test transaction code generation with invalid IBAN"""
-        self.fritz.iban = "INVALID_IBAN"
-        self.fritz.save()
-
-        transaction = Transaction.objects.create(
-            reference="test-ref",
-            amount=Decimal('100.00'),
-            member=self.fritz,
-            ledger=self.personal_account,
-            statement=self.st
-        )
-
-        # Invalid IBAN should return empty code
-        self.assertEqual(transaction.code(), '')
-
 
 class BillTestCase(TestCase):
     def setUp(self):
@@ -626,30 +461,6 @@ class BillTestCase(TestCase):
     def test_pretty_amount(self):
         self.assertTrue('€' in self.bill.pretty_amount())
 
-    def test_pretty_amount_formatting(self):
-        """Test bill pretty_amount formatting with specific values"""
-        bill = Bill.objects.create(
-            statement=self.st,
-            short_description="Test Bill",
-            amount=Decimal('42.50')
-        )
-
-        pretty = bill.pretty_amount()
-        self.assertIn("42.50", pretty)
-        self.assertIn("€", pretty)
-
-    def test_zero_amount(self):
-        """Test bill with zero amount"""
-        bill = Bill.objects.create(
-            statement=self.st,
-            short_description="Zero Bill",
-            amount=Decimal('0.00')
-        )
-
-        self.assertEqual(bill.amount, Decimal('0.00'))
-        pretty = bill.pretty_amount()
-        self.assertIn("0.00", pretty)
-
 
 class TransactionIssueTestCase(TestCase):
     def setUp(self):

jdav_web/finance/tests/__init__.py

@@ -1,4 +0,0 @@
-from .admin import *
-from .models import *
-from .rules import *
-from .migrations import *

jdav_web/finance/tests/admin.py

@@ -1,713 +0,0 @@
-import unittest
-from http import HTTPStatus
-from django.test import TestCase, override_settings
-from django.contrib.admin.sites import AdminSite
-from django.test import RequestFactory, Client
-from django.contrib.auth.models import User, Permission
-from django.contrib.auth import models as authmodels
-from django.utils import timezone
-from django.contrib.sessions.middleware import SessionMiddleware
-from django.contrib.messages.middleware import MessageMiddleware
-from django.contrib.messages.storage.fallback import FallbackStorage
-from django.contrib.messages import get_messages
-from django.utils.translation import gettext_lazy as _
-from django.urls import reverse, reverse_lazy
-from django.http import HttpResponseRedirect, HttpResponse
-from unittest.mock import Mock, patch
-from django.test.utils import override_settings
-from django.urls import path, include
-from django.contrib import admin as django_admin
-
-from members.tests.utils import create_custom_user
-from members.models import Member, MALE, Freizeit, GEMEINSCHAFTS_TOUR, MUSKELKRAFT_ANREISE
-from ..models import (
-    Ledger, Statement, StatementUnSubmitted, StatementConfirmed, Transaction, Bill,
-    StatementSubmitted
-)
-from ..admin import (
-    LedgerAdmin, StatementAdmin, TransactionAdmin, BillAdmin
-)
-
-
-class AdminTestCase(TestCase):
-    def setUp(self, model, admin):
-        self.factory = RequestFactory()
-        self.model = model
-        if model is not None and admin is not None:
-            self.admin = admin(model, AdminSite())
-        superuser = User.objects.create_superuser(
-            username='superuser', password='secret'
-        )
-        standard = create_custom_user('standard', ['Standard'], 'Paul', 'Wulter')
-        trainer = create_custom_user('trainer', ['Standard', 'Trainings'], 'Lise', 'Lotte')
-        treasurer = create_custom_user('treasurer', ['Standard', 'Finance'], 'Lara', 'Litte')
-        materialwarden = create_custom_user('materialwarden', ['Standard', 'Material'], 'Loro', 'Lutte')
-
-    def _login(self, name):
-        c = Client()
-        res = c.login(username=name, password='secret')
-        # make sure we logged in
-        assert res
-        return c
-
-
-class StatementUnSubmittedAdminTestCase(AdminTestCase):
-    """Test cases for StatementAdmin in the case of unsubmitted statements"""
-
-    def setUp(self):
-        super().setUp(model=Statement, admin=StatementAdmin)
-
-        self.superuser = User.objects.get(username='superuser')
-        self.member = Member.objects.create(
-            prename="Test", lastname="User", birth_date=timezone.now().date(),
-            email="test@example.com", gender=MALE, user=self.superuser
-        )
-
-        self.statement = StatementUnSubmitted.objects.create(
-            short_description='Test Statement',
-            explanation='Test explanation',
-            night_cost=25
-        )
-
-        # Create excursion for testing
-        self.excursion = Freizeit.objects.create(
-            name='Test Excursion',
-            kilometers_traveled=100,
-            tour_type=GEMEINSCHAFTS_TOUR,
-            tour_approach=MUSKELKRAFT_ANREISE,
-            difficulty=1
-        )
-
-        # Create confirmed statement with excursion
-        self.statement_with_excursion = StatementUnSubmitted.objects.create(
-            short_description='With Excursion',
-            explanation='Test explanation',
-            night_cost=25,
-            excursion=self.excursion,
-        )
-
-    def test_save_model_with_member(self):
-        """Test save_model sets created_by for new objects"""
-        request = self.factory.post('/')
-        request.user = self.superuser
-
-        # Test with change=False (new object)
-        new_statement = Statement(short_description='New Statement')
-        self.admin.save_model(request, new_statement, None, change=False)
-        self.assertEqual(new_statement.created_by, self.member)
-
-    def test_has_delete_permission(self):
-        """Test if unsubmitted statements may be deleted"""
-        request = self.factory.post('/')
-        request.user = self.superuser
-        self.assertTrue(self.admin.has_delete_permission(request, self.statement))
-
-    def test_get_fields(self):
-        """Test get_fields when excursion is set or not set."""
-        request = self.factory.post('/')
-        request.user = self.superuser
-        self.assertIn('excursion', self.admin.get_fields(request, self.statement_with_excursion))
-        self.assertNotIn('excursion', self.admin.get_fields(request, self.statement))
-        self.assertNotIn('excursion', self.admin.get_fields(request))
-
-    def test_get_inlines(self):
-        """Test get_inlines"""
-        request = self.factory.post('/')
-        request.user = self.superuser
-        self.assertEqual(len(self.admin.get_inlines(request, self.statement)), 1)
-
-    def test_get_readonly_fields_submitted(self):
-        """Test readonly fields when statement is submitted"""
-        # Mark statement as submitted
-        self.statement.status = Statement.SUBMITTED
-        readonly_fields = self.admin.get_readonly_fields(None, self.statement)
-        self.assertIn('status', readonly_fields)
-        self.assertIn('excursion', readonly_fields)
-        self.assertIn('short_description', readonly_fields)
-
-    def test_get_readonly_fields_not_submitted(self):
-        """Test readonly fields when statement is not submitted"""
-        readonly_fields = self.admin.get_readonly_fields(None, self.statement)
-        self.assertEqual(readonly_fields, ['status', 'excursion'])
-
-    def test_submit_view_insufficient_permission(self):
-        url = reverse('admin:finance_statement_submit',
-                      args=(self.statement.pk,))
-        c = self._login('standard')
-        response = c.get(url, follow=True)
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('Insufficient permissions.'))
-
-    def test_submit_view_get(self):
-        url = reverse('admin:finance_statement_submit',
-                      args=(self.statement.pk,))
-        c = self._login('superuser')
-        response = c.get(url, follow=True)
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('Submit statement'))
-
-    def test_submit_view_get_with_excursion(self):
-        url = reverse('admin:finance_statement_submit',
-                      args=(self.statement_with_excursion.pk,))
-        c = self._login('superuser')
-        response = c.get(url, follow=True)
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('Finance overview'))
-
-    def test_submit_view_post(self):
-        url = reverse('admin:finance_statement_submit',
-                      args=(self.statement.pk,))
-        c = self._login('superuser')
-        response = c.post(url, follow=True, data={'apply': ''})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        text = _("Successfully submited %(name)s. The finance department will notify the requestors as soon as possible.") % {'name': str(self.statement)}
-        self.assertContains(response, text)
-
-
-class StatementSubmittedAdminTestCase(AdminTestCase):
-    """Test cases for StatementAdmin in the case of submitted statements"""
-
-    def setUp(self):
-        super().setUp(model=Statement, admin=StatementAdmin)
-
-        self.user = User.objects.create_user('testuser', 'test@example.com', 'pass')
-        self.member = Member.objects.create(
-            prename="Test", lastname="User", birth_date=timezone.now().date(),
-            email="test@example.com", gender=MALE, user=self.user
-        )
-
-        self.finance_user = User.objects.create_user('finance', 'finance@example.com', 'pass')
-        self.finance_user.groups.add(authmodels.Group.objects.get(name='Finance'),
-                                     authmodels.Group.objects.get(name='Standard'))
-
-        self.statement = Statement.objects.create(
-            short_description='Submitted Statement',
-            explanation='Test explanation',
-            status=Statement.SUBMITTED,
-            submitted_by=self.member,
-            submitted_date=timezone.now(),
-            night_cost=25
-        )
-        self.statement_unsubmitted = StatementUnSubmitted.objects.create(
-            short_description='Submitted Statement',
-            explanation='Test explanation',
-            night_cost=25
-        )
-        self.transaction = Transaction.objects.create(
-            reference='verylonglong' * 14,
-            amount=3,
-            statement=self.statement,
-            member=self.member,
-        )
-
-        # Create commonly used test objects
-        self.ledger = Ledger.objects.create(name='Test Ledger')
-        self.excursion = Freizeit.objects.create(
-            name='Test Excursion',
-            kilometers_traveled=100,
-            tour_type=GEMEINSCHAFTS_TOUR,
-            tour_approach=MUSKELKRAFT_ANREISE,
-            difficulty=1
-        )
-        self.other_member = Member.objects.create(
-            prename="Other", lastname="Member", birth_date=timezone.now().date(),
-            email="other@example.com", gender=MALE
-        )
-
-        # Create statements for generate transactions tests
-        self.statement_no_trans_success = Statement.objects.create(
-            short_description='No Transactions Success',
-            explanation='Test explanation',
-            status=Statement.SUBMITTED,
-            submitted_by=self.member,
-            submitted_date=timezone.now(),
-            night_cost=25
-        )
-        self.statement_no_trans_error = Statement.objects.create(
-            short_description='No Transactions Error',
-            explanation='Test explanation',
-            status=Statement.SUBMITTED,
-            submitted_by=self.member,
-            submitted_date=timezone.now(),
-            night_cost=25
-        )
-
-        # Create bills for generate transactions tests
-        self.bill_for_success = Bill.objects.create(
-            statement=self.statement_no_trans_success,
-            short_description='Test Bill Success',
-            amount=50,
-            paid_by=self.member,
-            costs_covered=True
-        )
-        self.bill_for_error = Bill.objects.create(
-            statement=self.statement_no_trans_error,
-            short_description='Test Bill Error',
-            amount=50,
-            paid_by=None,  # No payer will cause generate_transactions to fail
-            costs_covered=True,
-        )
-
-    def _create_matching_bill(self, statement=None, amount=None):
-        """Helper method to create a bill that matches transaction amount"""
-        return Bill.objects.create(
-            statement=statement or self.statement,
-            short_description='Test Bill',
-            amount=amount or self.transaction.amount,
-            paid_by=self.member,
-            costs_covered=True
-        )
-
-    def _create_non_matching_bill(self, statement=None, amount=100):
-        """Helper method to create a bill that doesn't match transaction amount"""
-        return Bill.objects.create(
-            statement=statement or self.statement,
-            short_description='Non-matching Bill',
-            amount=amount,
-            paid_by=self.member
-        )
-
-    def test_has_change_permission_with_permission(self):
-        """Test change permission with proper permission"""
-        request = self.factory.get('/')
-        request.user = self.finance_user
-        self.assertTrue(self.admin.has_change_permission(request))
-
-    def test_has_change_permission_without_permission(self):
-        """Test change permission without proper permission"""
-        request = self.factory.get('/')
-        request.user = self.user
-        self.assertFalse(self.admin.has_change_permission(request))
-
-    def test_has_delete_permission(self):
-        """Test that delete permission is disabled"""
-        request = self.factory.get('/')
-        request.user = self.finance_user
-        self.assertFalse(self.admin.has_delete_permission(request))
-
-    def test_readonly_fields(self):
-        self.assertNotIn('explanation',
-                         self.admin.get_readonly_fields(None, self.statement_unsubmitted))
-
-    def test_change(self):
-        url = reverse('admin:finance_statement_change',
-                      args=(self.statement.pk,))
-        c = self._login('superuser')
-        response = c.get(url)
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-
-    def test_overview_view(self):
-        url = reverse('admin:finance_statement_overview',
-                      args=(self.statement.pk,))
-        c = self._login('superuser')
-        response = c.get(url)
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('View submitted statement'))
-
-    def test_overview_view_statement_not_found(self):
-        """Test overview_view with statement that can't be found in StatementSubmitted queryset"""
-        # When trying to access an unsubmitted statement via StatementSubmitted admin,
-        # the decorator will fail to find it and show "Statement not found"
-        self.statement.status = Statement.UNSUBMITTED
-        self.statement.save()
-
-        url = reverse('admin:finance_statement_overview', args=(self.statement.pk,))
-        c = self._login('superuser')
-        response = c.get(url, follow=True)
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        messages = list(get_messages(response.wsgi_request))
-        expected_text = str(_("Statement not found."))
-        self.assertTrue(any(expected_text in str(msg) for msg in messages))
-
-    def test_overview_view_transaction_execution_confirm(self):
-        """Test overview_view transaction execution confirm"""
-        # Set up statement to be valid for confirmation
-        self.transaction.ledger = self.ledger
-        self.transaction.save()
-
-        # Create a bill that matches the transaction amount to make it valid
-        self._create_matching_bill()
-
-        url = reverse('admin:finance_statement_overview', args=(self.statement.pk,))
-        c = self._login('superuser')
-        response = c.post(url, follow=True, data={'transaction_execution_confirm': ''})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        success_text = _("Successfully confirmed %(name)s. I hope you executed the associated transactions, I wont remind you again.") % {'name': str(self.statement)}
-        self.assertContains(response, success_text)
-        self.statement.refresh_from_db()
-        self.assertTrue(self.statement.confirmed)
-
-    def test_overview_view_transaction_execution_confirm_and_send(self):
-        """Test overview_view transaction execution confirm and send"""
-        # Set up statement to be valid for confirmation
-        self.transaction.ledger = self.ledger
-        self.transaction.save()
-
-        # Create a bill that matches the transaction amount to make it valid
-        self._create_matching_bill()
-
-        url = reverse('admin:finance_statement_overview', args=(self.statement.pk,))
-        c = self._login('superuser')
-        response = c.post(url, follow=True, data={'transaction_execution_confirm_and_send': ''})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        success_text = _("Successfully sent receipt to the office.")
-        self.assertContains(response, success_text)
-
-    def test_overview_view_confirm_valid(self):
-        """Test overview_view confirm with valid statement"""
-        # Create a statement with valid configuration
-        # Set up transaction with ledger to make it valid
-        self.transaction.ledger = self.ledger
-        self.transaction.save()
-
-        # Create a bill that matches the transaction amount to make total valid
-        self._create_matching_bill()
-
-        url = reverse('admin:finance_statement_overview',
-                      args=(self.statement.pk,))
-        c = self._login('superuser')
-        response = c.post(url, data={'confirm': ''})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('Statement confirmed'))
-
-    def test_overview_view_confirm_non_matching_transactions(self):
-        """Test overview_view confirm with non-matching transactions"""
-        # Create a bill that doesn't match the transaction
-        self._create_non_matching_bill()
-
-        url = reverse('admin:finance_statement_overview',
-                      args=(self.statement.pk,))
-        c = self._login('superuser')
-        response = c.post(url, follow=True, data={'confirm': ''})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        error_text = _("Transactions do not match the covered expenses. Please correct the mistakes listed below.")
-        self.assertContains(response, error_text)
-
-    def test_overview_view_confirm_missing_ledger(self):
-        """Test overview_view confirm with missing ledger"""
-        # Ensure transaction has no ledger (ledger=None)
-        self.transaction.ledger = None
-        self.transaction.save()
-
-        # Create a bill that matches the transaction amount to pass the first check
-        self._create_matching_bill()
-
-        url = reverse('admin:finance_statement_overview',
-                      args=(self.statement.pk,))
-        c = self._login('superuser')
-        response = c.post(url, follow=True, data={'confirm': ''})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        # Check the Django messages for the error
-        messages = list(get_messages(response.wsgi_request))
-        expected_text = str(_("Some transactions have no ledger configured. Please fill in the gaps."))
-        self.assertTrue(any(expected_text in str(msg) for msg in messages))
-
-    def test_overview_view_confirm_invalid_allowance_to(self):
-        """Test overview_view confirm with invalid allowance"""
-        # Create excursion and set up invalid allowance configuration
-        self.statement.excursion = self.excursion
-        self.statement.save()
-
-        # Add allowance recipient who is not a youth leader for this excursion
-        self.statement_no_trans_success.allowance_to.add(self.other_member)
-
-        # Generate required transactions
-        self.statement_no_trans_success.generate_transactions()
-        for trans in self.statement_no_trans_success.transaction_set.all():
-            trans.ledger = self.ledger
-            trans.save()
-
-        # Check validity obstruction is allowances
-        self.assertEqual(self.statement_no_trans_success.validity, Statement.INVALID_ALLOWANCE_TO)
-
-        url = reverse('admin:finance_statement_overview',
-                      args=(self.statement_no_trans_success.pk,))
-        c = self._login('superuser')
-        response = c.post(url, follow=True, data={'confirm': ''})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        # Check the Django messages for the error
-        messages = list(get_messages(response.wsgi_request))
-        expected_text = str(_("The configured recipients for the allowance don't match the regulations. Please correct this on the excursion."))
-        self.assertTrue(any(expected_text in str(msg) for msg in messages))
-
-    def test_overview_view_reject(self):
-        """Test overview_view reject statement"""
-        url = reverse('admin:finance_statement_overview', args=(self.statement.pk,))
-        c = self._login('superuser')
-        response = c.post(url, follow=True, data={'reject': ''})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        success_text = _("Successfully rejected %(name)s. The requestor can reapply, when needed.") %\
-            {'name': str(self.statement)}
-        self.assertContains(response, success_text)
-
-        # Verify statement was rejected
-        self.statement.refresh_from_db()
-        self.assertFalse(self.statement.submitted)
-
-    def test_overview_view_generate_transactions_existing(self):
-        """Test overview_view generate transactions with existing transactions"""
-        # Ensure there's already a transaction
-        self.assertTrue(self.statement.transaction_set.count() > 0)
-
-        url = reverse('admin:finance_statement_overview', args=(self.statement.pk,))
-        c = self._login('superuser')
-        response = c.post(url, follow=True, data={'generate_transactions': ''})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        error_text = _("%(name)s already has transactions. Please delete them first, if you want to generate new ones") % {'name': str(self.statement)}
-        self.assertContains(response, error_text)
-
-    def test_overview_view_generate_transactions_success(self):
-        """Test overview_view generate transactions successfully"""
-        url = reverse('admin:finance_statement_overview',
-                      args=(self.statement_no_trans_success.pk,))
-        c = self._login('superuser')
-        response = c.post(url, follow=True, data={'generate_transactions': ''})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        success_text = _("Successfully generated transactions for %(name)s") %\
-            {'name': str(self.statement_no_trans_success)}
-        self.assertContains(response, success_text)
-
-    def test_overview_view_generate_transactions_error(self):
-        """Test overview_view generate transactions with error"""
-        url = reverse('admin:finance_statement_overview',
-                      args=(self.statement_no_trans_error.pk,))
-        c = self._login('superuser')
-        response = c.post(url, follow=True, data={'generate_transactions': ''})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        messages = list(get_messages(response.wsgi_request))
-        expected_text = str(_("Error while generating transactions for %(name)s. Do all bills have a payer and, if this statement is attached to an excursion, was a person selected that receives the subsidies?") %\
-            {'name': str(self.statement_no_trans_error)})
-        self.assertTrue(any(expected_text in str(msg) for msg in messages))
-
-    def test_reduce_transactions_view(self):
-        url = reverse('admin:finance_statement_reduce_transactions',
-                      args=(self.statement.pk,))
-        c = self._login('superuser')
-        response = c.get(url, data={'redirectTo': reverse('admin:finance_statement_changelist')},
-                         follow=True)
-        self.assertContains(response,
-                            _("Successfully reduced transactions for %(name)s.") %\
-                            {'name': str(self.statement)})
-
-
-class StatementConfirmedAdminTestCase(AdminTestCase):
-    """Test cases for StatementAdmin in the case of confirmed statements"""
-
-    def setUp(self):
-        super().setUp(model=Statement, admin=StatementAdmin)
-
-        self.user = User.objects.create_user('testuser', 'test@example.com', 'pass')
-        self.member = Member.objects.create(
-            prename="Test", lastname="User", birth_date=timezone.now().date(),
-            email="test@example.com", gender=MALE, user=self.user
-        )
-
-        self.finance_user = User.objects.create_user('finance', 'finance@example.com', 'pass')
-        self.finance_user.groups.add(authmodels.Group.objects.get(name='Finance'),
-                                     authmodels.Group.objects.get(name='Standard'))
-
-        # Create a base statement first
-        base_statement = Statement.objects.create(
-            short_description='Confirmed Statement',
-            explanation='Test explanation',
-            status=Statement.CONFIRMED,
-            confirmed_by=self.member,
-            confirmed_date=timezone.now(),
-            night_cost=25
-        )
-
-        # StatementConfirmed is a proxy model, so we can get it from the base statement
-        self.statement = StatementConfirmed.objects.get(pk=base_statement.pk)
-
-        # Create an unconfirmed statement for testing
-        self.unconfirmed_statement = Statement.objects.create(
-            short_description='Unconfirmed Statement',
-            explanation='Test explanation',
-            status=Statement.SUBMITTED,
-            night_cost=25
-        )
-
-        # Create excursion for testing
-        self.excursion = Freizeit.objects.create(
-            name='Test Excursion',
-            kilometers_traveled=100,
-            tour_type=GEMEINSCHAFTS_TOUR,
-            tour_approach=MUSKELKRAFT_ANREISE,
-            difficulty=1
-        )
-
-        # Create confirmed statement with excursion
-        confirmed_with_excursion_base = Statement.objects.create(
-            short_description='Confirmed with Excursion',
-            explanation='Test explanation',
-            status=Statement.CONFIRMED,
-            confirmed_by=self.member,
-            confirmed_date=timezone.now(),
-            excursion=self.excursion,
-            night_cost=25
-        )
-        self.statement_with_excursion = StatementConfirmed.objects.get(pk=confirmed_with_excursion_base.pk)
-
-    def _add_session_to_request(self, request):
-        """Add session to request"""
-        middleware = SessionMiddleware(lambda req: None)
-        middleware.process_request(request)
-        request.session.save()
-
-        middleware = MessageMiddleware(lambda req: None)
-        middleware.process_request(request)
-        request._messages = FallbackStorage(request)
-
-    def test_has_change_permission(self):
-        """Test that change permission is disabled"""
-        request = self.factory.get('/')
-        request.user = self.finance_user
-        self.assertFalse(self.admin.has_change_permission(request, self.statement))
-
-    def test_has_delete_permission(self):
-        """Test that delete permission is disabled"""
-        request = self.factory.get('/')
-        request.user = self.finance_user
-        self.assertFalse(self.admin.has_delete_permission(request, self.statement))
-
-    def test_unconfirm_view_not_confirmed_statement(self):
-        """Test unconfirm_view with statement that is not confirmed"""
-        # Create request for unconfirmed statement
-        request = self.factory.get('/')
-        request.user = self.finance_user
-        self._add_session_to_request(request)
-
-        # Test with unconfirmed statement (should trigger error path)
-        self.assertFalse(self.unconfirmed_statement.confirmed)
-
-        # Call unconfirm_view - this should go through error path
-        response = self.admin.unconfirm_view(request, self.unconfirmed_statement.pk)
-
-        # Should redirect due to not confirmed error
-        self.assertEqual(response.status_code, 302)
-
-    def test_unconfirm_view_post_unconfirm_action(self):
-        """Test unconfirm_view POST request with 'unconfirm' action"""
-        # Create POST request with unconfirm action
-        request = self.factory.post('/', {'unconfirm': 'true'})
-        request.user = self.finance_user
-        self._add_session_to_request(request)
-
-        # Ensure statement is confirmed
-        self.assertTrue(self.statement.confirmed)
-        self.assertIsNotNone(self.statement.confirmed_by)
-        self.assertIsNotNone(self.statement.confirmed_date)
-
-        # Call unconfirm_view - this should execute the unconfirm action
-        response = self.admin.unconfirm_view(request, self.statement.pk)
-
-        # Should redirect after successful unconfirm
-        self.assertEqual(response.status_code, 302)
-
-        # Verify statement was unconfirmed (need to reload from DB)
-        self.statement.refresh_from_db()
-        self.assertFalse(self.statement.confirmed)
-        self.assertIsNone(self.statement.confirmed_date)
-
-    def test_unconfirm_view_get_render_template(self):
-        """Test unconfirm_view GET request rendering template"""
-        # Create GET request (no POST data)
-        request = self.factory.get('/')
-        request.user = self.finance_user
-        self._add_session_to_request(request)
-
-        # Ensure statement is confirmed
-        self.assertTrue(self.statement.confirmed)
-
-        # Call unconfirm_view
-        response = self.admin.unconfirm_view(request, self.statement.pk)
-
-        # Should render template (status 200)
-        self.assertEqual(response.status_code, 200)
-
-        # Check response content contains expected template elements
-        self.assertIn(str(_('Unconfirm statement')).encode('utf-8'), response.content)
-        self.assertIn(self.statement.short_description.encode(), response.content)
-
-    def test_statement_summary_view_insufficient_permission(self):
-        url = reverse('admin:finance_statement_summary',
-                      args=(self.statement_with_excursion.pk,))
-        c = self._login('standard')
-        response = c.get(url, follow=True)
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('Insufficient permissions.'))
-
-    def test_statement_summary_view_unconfirmed(self):
-        url = reverse('admin:finance_statement_summary',
-                      args=(self.unconfirmed_statement.pk,))
-        c = self._login('superuser')
-        response = c.get(url, follow=True)
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('Statement not found.'))
-
-    def test_statement_summary_view_confirmed_with_excursion(self):
-        """Test statement_summary_view when statement is confirmed with excursion"""
-        url = reverse('admin:finance_statement_summary',
-                      args=(self.statement_with_excursion.pk,))
-        c = self._login('superuser')
-        response = c.get(url, follow=True)
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertEqual(response.headers['Content-Type'], 'application/pdf')
-
-
-class TransactionAdminTestCase(TestCase):
-    """Test cases for TransactionAdmin"""
-
-    def setUp(self):
-        self.site = AdminSite()
-        self.factory = RequestFactory()
-        self.admin = TransactionAdmin(Transaction, self.site)
-
-        self.user = User.objects.create_user('testuser', 'test@example.com', 'pass')
-        self.member = Member.objects.create(
-            prename="Test", lastname="User", birth_date=timezone.now().date(),
-            email="test@example.com", gender=MALE, user=self.user
-        )
-
-        self.ledger = Ledger.objects.create(name='Test Ledger')
-        self.statement = Statement.objects.create(
-            short_description='Test Statement',
-            explanation='Test explanation'
-        )
-
-        self.transaction = Transaction.objects.create(
-            member=self.member,
-            ledger=self.ledger,
-            amount=100,
-            reference='Test transaction',
-            statement=self.statement
-        )
-
-    def test_has_add_permission(self):
-        """Test that add permission is disabled"""
-        request = self.factory.get('/')
-        request.user = self.user
-        self.assertFalse(self.admin.has_add_permission(request))
-
-    def test_has_change_permission(self):
-        """Test that change permission is disabled"""
-        request = self.factory.get('/')
-        request.user = self.user
-        self.assertFalse(self.admin.has_change_permission(request))
-
-    def test_has_delete_permission(self):
-        """Test that delete permission is disabled"""
-        request = self.factory.get('/')
-        request.user = self.user
-        self.assertFalse(self.admin.has_delete_permission(request))
-
-    def test_get_readonly_fields_confirmed(self):
-        """Test readonly fields when transaction is confirmed"""
-        self.transaction.confirmed = True
-        readonly_fields = self.admin.get_readonly_fields(None, self.transaction)
-        self.assertEqual(readonly_fields, self.admin.fields)
-
-    def test_get_readonly_fields_not_confirmed(self):
-        """Test readonly fields when transaction is not confirmed"""
-        readonly_fields = self.admin.get_readonly_fields(None, self.transaction)
-        self.assertEqual(readonly_fields, ())

jdav_web/finance/tests/migrations.py

@@ -1,70 +0,0 @@
-import django.test
-from django.apps import apps
-from django.db import connection
-from django.db.migrations.executor import MigrationExecutor
-
-
-class StatusMigrationTestCase(django.test.TransactionTestCase):
-    """Test the migration from submitted/confirmed fields to status field."""
-
-    app = 'finance'
-    migrate_from = [('finance', '0009_statement_ljp_to')]
-    migrate_to = [('finance', '0010_statement_status')]
-
-    def setUp(self):
-        # Get the state before migration
-        executor = MigrationExecutor(connection)
-        executor.migrate(self.migrate_from)
-
-        # Get the old models (before migration)
-        old_apps = executor.loader.project_state(self.migrate_from).apps
-        self.Statement = old_apps.get_model(self.app, 'Statement')
-
-        # Create statements with different combinations of submitted/confirmed
-        # created_by is nullable, so we don't need to create a Member
-        self.unsubmitted = self.Statement.objects.create(
-            short_description='Unsubmitted Statement',
-            submitted=False,
-            confirmed=False
-        )
-
-        self.submitted = self.Statement.objects.create(
-            short_description='Submitted Statement',
-            submitted=True,
-            confirmed=False
-        )
-
-        self.confirmed = self.Statement.objects.create(
-            short_description='Confirmed Statement',
-            submitted=True,
-            confirmed=True
-        )
-
-    def test_status_field_migration(self):
-        """Test that status field is correctly set from old submitted/confirmed fields."""
-        # Run the migration
-        executor = MigrationExecutor(connection)
-        executor.loader.build_graph()
-        executor.migrate(self.migrate_to)
-
-        # Get the new models (after migration)
-        new_apps = executor.loader.project_state(self.migrate_to).apps
-        Statement = new_apps.get_model(self.app, 'Statement')
-
-        # Constants from the Statement model
-        UNSUBMITTED = 0
-        SUBMITTED = 1
-        CONFIRMED = 2
-
-        # Verify the migration worked correctly
-        unsubmitted = Statement.objects.get(pk=self.unsubmitted.pk)
-        self.assertEqual(unsubmitted.status, UNSUBMITTED,
-                        'Statement with submitted=False, confirmed=False should have status=UNSUBMITTED')
-
-        submitted = Statement.objects.get(pk=self.submitted.pk)
-        self.assertEqual(submitted.status, SUBMITTED,
-                        'Statement with submitted=True, confirmed=False should have status=SUBMITTED')
-
-        confirmed = Statement.objects.get(pk=self.confirmed.pk)
-        self.assertEqual(confirmed.status, CONFIRMED,
-                        'Statement with submitted=True, confirmed=True should have status=CONFIRMED')

jdav_web/finance/tests/rules.py

@@ -1,102 +0,0 @@
-from django.test import TestCase
-from django.utils import timezone
-from django.conf import settings
-from django.contrib.auth.models import User
-from unittest.mock import Mock
-from finance.rules import is_creator, not_submitted, leads_excursion
-from finance.models import Statement, Ledger
-from members.models import Member, Group, Freizeit, GEMEINSCHAFTS_TOUR, MUSKELKRAFT_ANREISE, MALE, FEMALE
-
-
-class FinanceRulesTestCase(TestCase):
-    def setUp(self):
-        self.group = Group.objects.create(name="Test Group")
-        self.ledger = Ledger.objects.create(name="Test Ledger")
-
-        self.user1 = User.objects.create_user(username="alice", password="test123")
-        self.member1 = Member.objects.create(
-            prename="Alice", lastname="Smith", birth_date=timezone.now().date(),
-            email=settings.TEST_MAIL, gender=FEMALE, user=self.user1
-        )
-        self.member1.group.add(self.group)
-
-        self.user2 = User.objects.create_user(username="bob", password="test123")
-        self.member2 = Member.objects.create(
-            prename="Bob", lastname="Jones", birth_date=timezone.now().date(),
-            email=settings.TEST_MAIL, gender=MALE, user=self.user2
-        )
-        self.member2.group.add(self.group)
-
-        self.freizeit = Freizeit.objects.create(
-            name="Test Excursion",
-            kilometers_traveled=100,
-            tour_type=GEMEINSCHAFTS_TOUR,
-            tour_approach=MUSKELKRAFT_ANREISE,
-            difficulty=2
-        )
-        self.freizeit.jugendleiter.add(self.member1)
-
-        self.statement = Statement.objects.create(
-            short_description="Test Statement",
-            explanation="Test explanation",
-            night_cost=27,
-            created_by=self.member1,
-            excursion=self.freizeit
-        )
-        self.statement.allowance_to.add(self.member1)
-
-    def test_is_creator_true(self):
-        """Test is_creator predicate returns True when user created the statement"""
-        self.assertTrue(is_creator(self.user1, self.statement))
-        self.assertFalse(is_creator(self.user2, self.statement))
-
-    def test_not_submitted_statement(self):
-        """Test not_submitted predicate returns True when statement is not submitted"""
-        self.statement.status = Statement.UNSUBMITTED
-        self.assertTrue(not_submitted(self.user1, self.statement))
-        self.statement.status = Statement.SUBMITTED
-        self.assertFalse(not_submitted(self.user1, self.statement))
-
-    def test_not_submitted_freizeit_with_statement(self):
-        """Test not_submitted predicate with Freizeit having unsubmitted statement"""
-        self.freizeit.statement = self.statement
-        self.statement.status = Statement.UNSUBMITTED
-        self.assertTrue(not_submitted(self.user1, self.freizeit))
-
-    def test_not_submitted_freizeit_without_statement(self):
-        """Test not_submitted predicate with Freizeit having no statement attribute"""
-        # Create a mock Freizeit that truly doesn't have the statement attribute
-        mock_freizeit = Mock(spec=Freizeit)
-        # Remove the statement attribute entirely
-        if hasattr(mock_freizeit, 'statement'):
-            delattr(mock_freizeit, 'statement')
-        self.assertTrue(not_submitted(self.user1, mock_freizeit))
-
-    def test_leads_excursion_freizeit_user_is_leader(self):
-        """Test leads_excursion predicate returns True when user leads the Freizeit"""
-        self.assertTrue(leads_excursion(self.user1, self.freizeit))
-        self.assertFalse(leads_excursion(self.user2, self.freizeit))
-
-    def test_leads_excursion_statement_with_excursion(self):
-        """Test leads_excursion predicate with statement having excursion led by user"""
-        result = leads_excursion(self.user1, self.statement)
-        self.assertTrue(result)
-
-    def test_leads_excursion_statement_no_excursion_attribute(self):
-        """Test leads_excursion predicate with statement having no excursion attribute"""
-        mock_statement = Mock()
-        del mock_statement.excursion
-        result = leads_excursion(self.user1, mock_statement)
-        self.assertFalse(result)
-
-    def test_leads_excursion_statement_excursion_is_none(self):
-        """Test leads_excursion predicate with statement having None excursion"""
-        statement_no_excursion = Statement.objects.create(
-            short_description="Test Statement No Excursion",
-            explanation="Test explanation",
-            night_cost=27,
-            created_by=self.member1,
-            excursion=None
-        )
-        result = leads_excursion(self.user1, statement_no_excursion)
-        self.assertFalse(result)

jdav_web/finance/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

jdav_web/jdav_web/celery.py

@@ -11,4 +11,4 @@ app.config_from_object('django.conf:settings')
 app.autodiscover_tasks()
 
 if __name__ == '__main__':
-    app.start() # pragma: no cover
+    app.start()

jdav_web/jdav_web/settings/__init__.py

@@ -25,7 +25,7 @@ if os.path.exists(os.path.join(CONFIG_DIR_PATH, TEXTS_FILE)):
     with open(os.path.join(CONFIG_DIR_PATH, TEXTS_FILE), 'rb') as f:
         texts = tomli.load(f)
 else:
-    texts = {} # pragma: no cover
+    texts = {}
 
 
 def get_var(*keys, default='', dictionary=config):
@@ -58,7 +58,6 @@ base_settings = [
     'components/emails.py',
     'components/texts.py',
     'components/locale.py',
-    'components/logging.py',
     'components/oauth.py',
 ]
 

jdav_web/jdav_web/settings/components/jet.py

@@ -11,22 +11,21 @@ JET_SIDE_MENU_ITEMS = [
         {'name': 'group', 'permissions': ['members.view_group']},
         {'name': 'membernotelist', 'permissions': ['members.view_membernotelist']},
         {'name': 'klettertreff', 'permissions': ['members.view_klettertreff']},
+        {'name': 'activitycategory', 'permissions': ['members.view_activitycategory']},
+        {'name': 'trainingcategory', 'permissions': ['members.view_trainingcategory']},
     ]},
     {'label': 'Neue Mitglieder', 'app_label': 'members', 'permissions': ['members.view_memberunconfirmedproxy'], 'items': [
         {'name': 'memberunconfirmedproxy', 'permissions': ['members.view_memberunconfirmedproxy']},
         {'name': 'memberwaitinglist', 'permissions': ['members.view_memberwaitinglist']},
     ]},
-    {'label': 'Ausbildung', 'app_label': 'members', 'permissions': ['members.view_membertraining'], 'items': [
-        {'name': 'membertraining', 'permissions': ['members.view_membertraining']},
-        {'name': 'trainingcategory', 'permissions': ['members.view_trainingcategory']},
-        {'name': 'activitycategory', 'permissions': ['members.view_activitycategory']},
-    ]},
     {'app_label': 'mailer', 'items': [
         {'name': 'message', 'permissions': ['mailer.view_message']},
         {'name': 'emailaddress', 'permissions': ['mailer.view_emailaddress']},
     ]},
     {'app_label': 'finance', 'items': [
-        {'name': 'statement', 'permissions': ['finance.view_statement']},
+        {'name': 'statementunsubmitted', 'permissions': ['finance.view_statementunsubmitted']},
+        {'name': 'statementsubmitted', 'permissions': ['finance.view_statementsubmitted']},
+        {'name': 'statementconfirmed', 'permissions': ['finance.view_statementconfirmed']},
         {'name': 'ledger', 'permissions': ['finance.view_ledger']},
         {'name': 'bill', 'permissions': ['finance.view_bill', 'finance.view_bill_admin']},
         {'name': 'transaction', 'permissions': ['finance.view_transaction']},

jdav_web/jdav_web/settings/components/logging.py

@@ -1,59 +0,0 @@
-import os
-
-DJANGO_LOG_LEVEL = get_var('logging', 'django_level', default='INFO')
-ROOT_LOG_LEVEL = get_var('logging', 'level', default='INFO')
-LOG_ERROR_TO_EMAIL = get_var('logging', 'email_admins', default=False)
-LOG_EMAIL_BACKEND = EMAIL_BACKEND if LOG_ERROR_TO_EMAIL else "django.core.mail.backends.console.EmailBackend"
-LOG_ERROR_INCLUDE_HTML = get_var('logging', 'error_report_include_html', default=False)
-
-LOGGING = {
-    "version": 1,
-    "disable_existing_loggers": False,
-    "filters": {
-        "require_debug_false": {
-            "()": "django.utils.log.RequireDebugFalse",
-        },
-        "require_debug_true": {
-            "()": "django.utils.log.RequireDebugTrue",
-        },
-    },
-    "formatters": {
-        "simple": {
-            "format": "[{asctime}: {levelname}/{name}] {message}",
-            "style": "{",
-        },
-        "verbose": {
-            "format": "[{asctime}: {levelname}/{name}] {pathname}:{lineno} {message}",
-            "style": "{",
-        },
-    },
-    "handlers": {
-        "console": {
-            "class": "logging.StreamHandler",
-            "formatter": "simple",
-        },
-        "console_verbose": {
-            "class": "logging.StreamHandler",
-            "formatter": "verbose",
-            "level": "ERROR",
-        },
-        "mail_admins": {
-            "level": "ERROR",
-            "class": "django.utils.log.AdminEmailHandler",
-            "email_backend": LOG_EMAIL_BACKEND,
-            "include_html": LOG_ERROR_INCLUDE_HTML,
-            "filters": ["require_debug_false"],
-        },
-    },
-    "root": {
-        "handlers": ["console"],
-        "level": ROOT_LOG_LEVEL,
-    },
-    "loggers": {
-        "django": {
-            "handlers": ["console", "mail_admins"],
-            "level": DJANGO_LOG_LEVEL,
-            "propagate": False,
-        },
-    },
-}

jdav_web/jdav_web/settings/local.py

@@ -51,14 +51,6 @@ SEND_FROM_ASSOCIATION_EMAIL = get_var('misc', 'send_from_association_email', def
 # domain for association email and generated urls
 DOMAIN = get_var('misc', 'domain', default='example.org')
 
-GROUP_CHECKLIST_N_WEEKS = get_var('misc', 'group_checklist_n_weeks', default=18)
-GROUP_CHECKLIST_N_MEMBERS = get_var('misc', 'group_checklist_n_members', default=20)
-GROUP_CHECKLIST_TEXT = get_var('misc', 'group_checklist_text',
-                               default="""Anwesende Jugendleitende und Teilnehmende werden mit einem 
-Kreuz ($\\times$) markiert und die ausgefüllte Liste zum Anfang der Gruppenstunde an der Kasse 
-abgegeben. Zum Ende wird sie wieder abgeholt. Wenn die Punkte auf einer Karte fast aufgebraucht 
-sind, notiert die Kasse die verbliebenen Eintritte (3, 2, 1) unter dem Kreuz.""")
-
 # finance
 
 ALLOWANCE_PER_DAY = get_var('finance', 'allowance_per_day', default=22)

jdav_web/jdav_web/tests.py

@@ -1,30 +0,0 @@
-from django.test import TestCase, RequestFactory, override_settings
-from django.contrib.auth.models import User
-from django.contrib import admin
-from unittest.mock import Mock, patch
-from jdav_web.views import media_unprotected, custom_admin_view
-from startpage.models import Link
-
-
-class ViewsTestCase(TestCase):
-    def setUp(self):
-        self.factory = RequestFactory()
-        self.user = User.objects.create_user('testuser', 'test@example.com', 'password')
-        Link.objects.create(title='Test Link', url='https://example.com')
-
-    @override_settings(DEBUG=True)
-    def test_media_unprotected_debug_true(self):
-        request = self.factory.get('/media/test.jpg')
-        with patch('jdav_web.views.serve') as mock_serve:
-            mock_serve.return_value = Mock()
-            result = media_unprotected(request, 'test.jpg')
-            mock_serve.assert_called_once()
-
-    def test_custom_admin_view(self):
-        request = self.factory.get('/admin/')
-        request.user = self.user
-        with patch.object(admin.site, 'get_app_list') as mock_get_app_list:
-            mock_get_app_list.return_value = []
-            response = custom_admin_view(request)
-            self.assertEqual(response.status_code, 200)
-            mock_get_app_list.assert_called_once_with(request)

jdav_web/locale/de/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-04-15 23:05+0200\n"
+"POT-Creation-Date: 2025-04-06 19:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -276,10 +276,6 @@ msgstr "Kostenübersicht"
 msgid "Generate group overview"
 msgstr "Gruppenübersicht erstellen"
 
-#: templates/admin/members/group/change_list.html
-msgid "Generate group checklist"
-msgstr "Gruppencheckliste erstellen"
-
 #: templates/admin/members/member/change_form_object_tools.html
 msgid "Invite as user"
 msgstr "Als Kompassbenutzer*in einladen"

jdav_web/logindata/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

jdav_web/logindata/tests/__init__.py

@@ -1,2 +0,0 @@
-from .views import *
-from .oauth import *

jdav_web/logindata/tests/oauth.py

@@ -1,47 +0,0 @@
-from django.test import TestCase
-from django.contrib.auth.models import User
-from django.conf import settings
-from unittest.mock import Mock
-from logindata.oauth import CustomOAuth2Validator
-from members.models import Member, MALE
-
-
-class CustomOAuth2ValidatorTestCase(TestCase):
-    def setUp(self):
-        self.validator = CustomOAuth2Validator()
-
-        # Create user with member
-        self.user_with_member = User.objects.create_user(username="alice", password="test123")
-        self.member = Member.objects.create(
-            prename="Alice", lastname="Smith", birth_date="1990-01-01",
-            email=settings.TEST_MAIL, gender=MALE, user=self.user_with_member
-        )
-
-        # Create user without member
-        self.user_without_member = User.objects.create_user(username="bob", password="test123")
-
-    def test_get_additional_claims_with_member(self):
-        """Test get_additional_claims when user has a member"""
-        request = Mock()
-        request.user = self.user_with_member
-
-        result = self.validator.get_additional_claims(request)
-
-        self.assertEqual(result['email'], settings.TEST_MAIL)
-        self.assertEqual(result['preferred_username'], 'alice')
-
-    def test_get_additional_claims_without_member(self):
-        """Test get_additional_claims when user has no member"""
-        # ensure branch coverage, not possible under standard scenarios
-        request = Mock()
-        request.user = Mock()
-        request.user.member = None
-        self.assertEqual(len(self.validator.get_additional_claims(request)), 1)
-
-        request = Mock()
-        request.user = self.user_without_member
-
-        # The method will raise RelatedObjectDoesNotExist, which means the code
-        # should use hasattr or try/except. For now, test that it raises.
-        with self.assertRaises(User.member.RelatedObjectDoesNotExist):
-            self.validator.get_additional_claims(request)

jdav_web/logindata/tests/views.py

@@ -1,154 +0,0 @@
-from http import HTTPStatus
-from django.test import TestCase, Client
-from django.urls import reverse
-from django.utils import timezone
-from django.utils.translation import gettext as _
-from django.contrib.auth.models import User, Group
-
-from members.models import Member, DIVERSE
-from ..models import RegistrationPassword, initial_user_setup
-
-
-class RegistrationPasswordTestCase(TestCase):
-    def test_str_method(self):
-        """Test RegistrationPassword __str__ method returns password"""
-        reg_password = RegistrationPassword.objects.create(password="test123")
-        self.assertEqual(str(reg_password), "test123")
-
-
-class RegisterViewTestCase(TestCase):
-    def setUp(self):
-        self.client = Client()
-
-        # Create a test member with invite key
-        self.member = Member.objects.create(
-            prename='Test',
-            lastname='User',
-            birth_date=timezone.now().date(),
-            email='test@example.com',
-            gender=DIVERSE,
-            invite_as_user_key='test_key_123'
-        )
-
-        # Create a registration password
-        self.registration_password = RegistrationPassword.objects.create(
-            password='test_password'
-        )
-
-        # Get or create Standard group for user setup
-        self.standard_group, created = Group.objects.get_or_create(name='Standard')
-
-    def test_register_get_without_key_redirects(self):
-        """Test GET request without key redirects to startpage."""
-        url = reverse('logindata:register')
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, HTTPStatus.FOUND)
-
-    def test_register_post_without_key_redirects(self):
-        """Test POST request without key redirects to startpage."""
-        url = reverse('logindata:register')
-        response = self.client.post(url)
-        self.assertEqual(response.status_code, HTTPStatus.FOUND)
-
-    def test_register_get_with_empty_key_shows_failed(self):
-        """Test GET request with empty key shows registration failed page."""
-        url = reverse('logindata:register')
-        response = self.client.get(url, {'key': ''})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('Something went wrong. The registration key is invalid or has expired.'))
-
-    def test_register_get_with_invalid_key_shows_failed(self):
-        """Test GET request with invalid key shows registration failed page."""
-        url = reverse('logindata:register')
-        response = self.client.get(url, {'key': 'invalid_key'})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('Something went wrong. The registration key is invalid or has expired.'))
-
-    def test_register_get_with_valid_key_shows_password_form(self):
-        """Test GET request with valid key shows password entry form."""
-        url = reverse('logindata:register')
-        response = self.client.get(url, {'key': self.member.invite_as_user_key})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('Set login data'))
-        self.assertContains(response, _('Welcome, '))
-        self.assertContains(response, self.member.prename)
-
-    def test_register_post_without_password_shows_failed(self):
-        """Test POST request without password shows registration failed page."""
-        url = reverse('logindata:register')
-        response = self.client.post(url, {'key': self.member.invite_as_user_key})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('Something went wrong. The registration key is invalid or has expired.'))
-
-    def test_register_post_with_wrong_password_shows_error(self):
-        """Test POST request with wrong password shows error message."""
-        url = reverse('logindata:register')
-        response = self.client.post(url, {
-            'key': self.member.invite_as_user_key,
-            'password': 'wrong_password'
-        })
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('You entered a wrong password.'))
-
-    def test_register_post_with_correct_password_shows_form(self):
-        """Test POST request with correct password shows user creation form."""
-        url = reverse('logindata:register')
-        response = self.client.post(url, {
-            'key': self.member.invite_as_user_key,
-            'password': self.registration_password.password
-        })
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('Set login data'))
-        self.assertContains(response, self.member.suggested_username())
-
-    def test_register_post_with_save_and_invalid_form_shows_errors(self):
-        """Test POST request with save but invalid form shows form errors."""
-        url = reverse('logindata:register')
-        response = self.client.post(url, {
-            'key': self.member.invite_as_user_key,
-            'password': self.registration_password.password,
-            'save': 'true',
-            'username': '',  # Invalid - empty username
-            'password1': 'testpass123',
-            'password2': 'different_pass'  # Invalid - passwords don't match
-        })
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('Set login data'))
-
-    def test_register_post_with_save_and_valid_form_shows_success(self):
-        """Test POST request with save and valid form shows success page."""
-        url = reverse('logindata:register')
-        response = self.client.post(url, {
-            'key': self.member.invite_as_user_key,
-            'password': self.registration_password.password,
-            'save': 'true',
-            'username': 'testuser',
-            'password1': 'testpass123',
-            'password2': 'testpass123'
-        })
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('You successfully set your login data. You can now proceed to'))
-
-        # Verify user was created and associated with member
-        user = User.objects.get(username='testuser')
-        self.assertEqual(user.is_staff, True)
-        self.member.refresh_from_db()
-        self.assertEqual(self.member.user, user)
-        self.assertEqual(self.member.invite_as_user_key, '')
-
-    def test_register_post_with_save_and_no_standard_group_shows_failed(self):
-        """Test POST request with save but no Standard group shows failed page."""
-        # Delete the Standard group
-        self.standard_group.delete()
-
-        url = reverse('logindata:register')
-        response = self.client.post(url, {
-            'key': self.member.invite_as_user_key,
-            'password': self.registration_password.password,
-            'save': 'true',
-            'username': 'testuser',
-            'password1': 'testpass123',
-            'password2': 'testpass123'
-        })
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('Something went wrong. The registration key is invalid or has expired.'))

jdav_web/mailer/mailutils.py

@@ -1,13 +1,9 @@
 from django.core import mail
 from django.core.mail import EmailMessage
 from django.conf import settings
-import logging
 import os
 
 
-logger = logging.getLogger(__name__)
-
-
 NOT_SENT, SENT, PARTLY_SENT = 0, 1, 2
 
 def send(subject, content, sender, recipients, message_id=None, reply_to=None,
@@ -45,7 +41,7 @@ def send(subject, content, sender, recipients, message_id=None, reply_to=None,
         # send all mails with one connection
         connection.send_messages(mails)
     except Exception as e:
-        logger.error(f"Caught exception while sending email: {e}")
+        print("Error when sending mail:", e)
         failed = True
     else:
         succeeded = True

jdav_web/mailer/models.py

@@ -1,4 +1,3 @@
-import logging
 from django.db import models
 from django.core.exceptions import ValidationError
 from django import forms
@@ -18,9 +17,6 @@ from .rules import is_creator
 import os
 
 
-logger = logging.getLogger(__name__)
-
-
 alphanumeric = RegexValidator(r'^[0-9a-zA-Z._-]*$',
                               _('Only alphanumeric characters, ., - and _ are allowed'))
 
@@ -149,7 +145,7 @@ class Message(CommonModel):
             members.update([mol.member for mol in
                             self.to_notelist.membersonlist.all()])
         filtered = [m for m in members if m.gets_newsletter]
-        logger.info(f"sending mail to {filtered}")
+        print("sending mail to", filtered)
 
         attach = [a.f.path for a in Attachment.objects.filter(msg__id=self.pk)
                   if a.f.name]
@@ -193,7 +189,7 @@ class Message(CommonModel):
                 a.delete()
             success = SENT
         except Exception as e:
-            logger.error(f"Caught exception while sending email: {e}")
+            print("Exception caught", e)
             success = NOT_SENT
         finally:
             self.save()
@@ -236,7 +232,7 @@ class Attachment(CommonModel):
                             max_upload_size=10)
 
     def __str__(self):
-        return os.path.basename(self.f.name) if self.f.name else str(_("Empty"))
+        return os.path.basename(self.f.name) if self.f.name else _("Empty")
 
     class Meta:
         verbose_name = _('attachment')

jdav_web/mailer/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

jdav_web/mailer/tests/__init__.py

@@ -1,5 +0,0 @@
-from .models import *
-from .admin import *
-from .views import *
-from .rules import *
-from .mailutils import *

jdav_web/mailer/tests/admin.py

@@ -1,330 +0,0 @@
-import json
-import unittest
-from http import HTTPStatus
-from django.test import TestCase, override_settings
-from django.contrib.admin.sites import AdminSite
-from django.test import RequestFactory, Client
-from django.contrib.auth.models import User, Permission
-from django.utils import timezone
-from django.contrib.sessions.middleware import SessionMiddleware
-from django.contrib.messages.middleware import MessageMiddleware
-from django.contrib.messages.storage.fallback import FallbackStorage
-from django.contrib.messages import get_messages
-from django.utils.translation import gettext_lazy as _
-from django.urls import reverse, reverse_lazy
-from django.http import HttpResponseRedirect, HttpResponse
-from unittest.mock import Mock, patch
-from django.test.utils import override_settings
-from django.urls import path, include
-from django.contrib import admin as django_admin
-from django.conf import settings
-
-from members.tests.utils import create_custom_user
-from members.models import Member, MALE, DIVERSE, Group
-from ..models import Message, Attachment, EmailAddress
-from ..admin import MessageAdmin, submit_message
-from ..mailutils import SENT, NOT_SENT, PARTLY_SENT
-
-
-class AdminTestCase(TestCase):
-    def setUp(self, model, admin):
-        self.factory = RequestFactory()
-        self.model = model
-        if model is not None and admin is not None:
-            self.admin = admin(model, AdminSite())
-        superuser = User.objects.create_superuser(
-            username='superuser', password='secret'
-        )
-        standard = create_custom_user('standard', ['Standard'], 'Paul', 'Wulter')
-        trainer = create_custom_user('trainer', ['Standard', 'Trainings'], 'Lise', 'Lotte')
-
-    def _add_middleware(self, request):
-        """Add required middleware to request."""
-        # Session middleware
-        middleware = SessionMiddleware(lambda x: None)
-        middleware.process_request(request)
-        request.session.save()
-
-        # Messages middleware
-        messages_middleware = MessageMiddleware(lambda x: None)
-        messages_middleware.process_request(request)
-        request._messages = FallbackStorage(request)
-
-
-class MessageAdminTestCase(AdminTestCase):
-    def setUp(self):
-        super().setUp(Message, MessageAdmin)
-
-        # Create test data
-        self.group = Group.objects.create(name='Test Group')
-        self.email_address = EmailAddress.objects.create(name='testmail')
-
-        # Create test member with internal email
-        self.internal_member = Member.objects.create(
-            prename='Internal',
-            lastname='User',
-            birth_date=timezone.now().date(),
-            email=f'internal@{settings.ALLOWED_EMAIL_DOMAINS_FOR_INVITE_AS_USER[0]}',
-            gender=DIVERSE
-        )
-
-        # Create test member with external email
-        self.external_member = Member.objects.create(
-            prename='External',
-            lastname='User',
-            birth_date=timezone.now().date(),
-            email='external@example.com',
-            gender=DIVERSE
-        )
-
-        # Create users for testing
-        self.user_with_internal_member = User.objects.create_user(username='testuser', password='secret')
-        self.user_with_internal_member.member = self.internal_member
-        self.user_with_internal_member.save()
-
-        self.user_with_external_member = User.objects.create_user(username='external_user', password='secret')
-        self.user_with_external_member.member = self.external_member
-        self.user_with_external_member.save()
-
-        self.user_without_member = User.objects.create_user(username='no_member_user', password='secret')
-
-        # Create test message
-        self.message = Message.objects.create(
-            subject='Test Message',
-            content='Test content'
-        )
-        self.message.to_groups.add(self.group)
-        self.message.to_members.add(self.internal_member)
-
-    def test_save_model_sets_created_by(self):
-        """Test that save_model sets created_by when creating new message."""
-        request = self.factory.post('/admin/mailer/message/add/')
-        request.user = self.user_with_internal_member
-
-        # Create new message
-        new_message = Message(subject='New Message', content='New content')
-
-        # Test save_model for new object (change=False)
-        self.admin.save_model(request, new_message, None, change=False)
-
-        self.assertEqual(new_message.created_by, self.internal_member)
-
-    def test_save_model_does_not_change_created_by_on_update(self):
-        """Test that save_model doesn't change created_by when updating."""
-        request = self.factory.post('/admin/mailer/message/1/change/')
-        request.user = self.user_with_internal_member
-
-        # Message already has created_by set
-        self.message.created_by = self.external_member
-
-        # Test save_model for existing object (change=True)
-        self.admin.save_model(request, self.message, None, change=True)
-
-        self.assertEqual(self.message.created_by, self.external_member)
-
-    @patch('mailer.models.Message.submit')
-    def test_submit_message_success(self, mock_submit):
-        """Test submit_message with successful send."""
-        mock_submit.return_value = SENT
-
-        request = self.factory.post('/admin/mailer/message/')
-        request.user = self.user_with_internal_member
-        self._add_middleware(request)
-
-        # Test submit_message
-        submit_message(self.message, request)
-
-        # Verify submit was called with correct sender
-        mock_submit.assert_called_once_with(self.internal_member)
-
-        # Check success message
-        messages_list = list(get_messages(request))
-        self.assertEqual(len(messages_list), 1)
-        self.assertIn(str(_('Successfully sent message')), str(messages_list[0]))
-
-    @patch('mailer.models.Message.submit')
-    def test_submit_message_not_sent(self, mock_submit):
-        """Test submit_message when sending fails."""
-        mock_submit.return_value = NOT_SENT
-
-        request = self.factory.post('/admin/mailer/message/')
-        request.user = self.user_with_internal_member
-        self._add_middleware(request)
-
-        # Test submit_message
-        submit_message(self.message, request)
-
-        # Check error message
-        messages_list = list(get_messages(request))
-        self.assertEqual(len(messages_list), 1)
-        self.assertIn(str(_('Failed to send message')), str(messages_list[0]))
-
-    @patch('mailer.models.Message.submit')
-    def test_submit_message_partly_sent(self, mock_submit):
-        """Test submit_message when partially sent."""
-        mock_submit.return_value = PARTLY_SENT
-
-        request = self.factory.post('/admin/mailer/message/')
-        request.user = self.user_with_internal_member
-        self._add_middleware(request)
-
-        # Test submit_message
-        submit_message(self.message, request)
-
-        # Check warning message
-        messages_list = list(get_messages(request))
-        self.assertEqual(len(messages_list), 1)
-        self.assertIn(str(_('Failed to send some messages')), str(messages_list[0]))
-
-    def test_submit_message_user_has_no_member(self):
-        """Test submit_message when user has no associated member."""
-        request = self.factory.post('/admin/mailer/message/')
-        request.user = self.user_without_member
-        self._add_middleware(request)
-
-        # Test submit_message
-        submit_message(self.message, request)
-
-        # Check error message
-        messages_list = list(get_messages(request))
-        self.assertEqual(len(messages_list), 1)
-        self.assertIn(str(_('Your account is not connected to a member. Please contact your system administrator.')), str(messages_list[0]))
-
-    def test_submit_message_user_has_external_email(self):
-        """Test submit_message when user has external email."""
-        request = self.factory.post('/admin/mailer/message/')
-        request.user = self.user_with_external_member
-        self._add_middleware(request)
-
-        # Test submit_message
-        submit_message(self.message, request)
-
-        # Check error message
-        messages_list = list(get_messages(request))
-        self.assertEqual(len(messages_list), 1)
-        self.assertIn(str(_('Your email address is not an internal email address. Please use an email address with one of the following domains: %(domains)s.') % {'domains': ", ".join(settings.ALLOWED_EMAIL_DOMAINS_FOR_INVITE_AS_USER)}), str(messages_list[0]))
-
-    @patch('mailer.admin.submit_message')
-    def test_send_message_action_confirmed(self, mock_submit_message):
-        """Test send_message action when confirmed."""
-        request = self.factory.post('/admin/mailer/message/', {'confirmed': 'true'})
-        request.user = self.user_with_internal_member
-        self._add_middleware(request)
-
-        queryset = Message.objects.filter(pk=self.message.pk)
-
-        # Test send_message action
-        result = self.admin.send_message(request, queryset)
-
-        # Verify submit_message was called for each message
-        mock_submit_message.assert_called_once_with(self.message, request)
-
-        # Should return None when confirmed (no template response)
-        self.assertIsNone(result)
-
-    def test_send_message_action_not_confirmed(self):
-        """Test send_message action when not confirmed (shows confirmation page)."""
-        request = self.factory.post('/admin/mailer/message/')
-        request.user = self.user_with_internal_member
-        self._add_middleware(request)
-
-        queryset = Message.objects.filter(pk=self.message.pk)
-
-        # Test send_message action
-        result = self.admin.send_message(request, queryset)
-
-        # Should return HttpResponse with confirmation template
-        self.assertIsNotNone(result)
-        self.assertEqual(result.status_code, HTTPStatus.OK)
-
-    @patch('mailer.admin.submit_message')
-    def test_response_change_with_send(self, mock_submit_message):
-        """Test response_change when _send is in POST."""
-        request = self.factory.post('/admin/mailer/message/1/change/', {'_send': 'Send'})
-        request.user = self.user_with_internal_member
-        self._add_middleware(request)
-
-        # Test response_change
-        with patch.object(self.admin.__class__.__bases__[2], 'response_change') as mock_super:
-            mock_super.return_value = HttpResponseRedirect('/admin/')
-            result = self.admin.response_change(request, self.message)
-
-            # Verify submit_message was called
-            mock_submit_message.assert_called_once_with(self.message, request)
-
-            # Verify super method was called
-            mock_super.assert_called_once()
-
-    @patch('mailer.admin.submit_message')
-    def test_response_change_without_send(self, mock_submit_message):
-        """Test response_change when _send is not in POST."""
-        request = self.factory.post('/admin/mailer/message/1/change/', {'_save': 'Save'})
-        request.user = self.user_with_internal_member
-        self._add_middleware(request)
-
-        # Test response_change
-        with patch.object(self.admin.__class__.__bases__[2], 'response_change') as mock_super:
-            mock_super.return_value = HttpResponseRedirect('/admin/')
-            result = self.admin.response_change(request, self.message)
-
-            # Verify submit_message was NOT called
-            mock_submit_message.assert_not_called()
-
-            # Verify super method was called
-            mock_super.assert_called_once()
-
-    @patch('mailer.admin.submit_message')
-    def test_response_add_with_send(self, mock_submit_message):
-        """Test response_add when _send is in POST."""
-        request = self.factory.post('/admin/mailer/message/add/', {'_send': 'Send'})
-        request.user = self.user_with_internal_member
-        self._add_middleware(request)
-
-        # Test response_add
-        with patch.object(self.admin.__class__.__bases__[2], 'response_add') as mock_super:
-            mock_super.return_value = HttpResponseRedirect('/admin/')
-            result = self.admin.response_add(request, self.message)
-
-            # Verify submit_message was called
-            mock_submit_message.assert_called_once_with(self.message, request)
-
-            # Verify super method was called
-            mock_super.assert_called_once()
-
-    def test_get_form_with_members_param(self):
-        """Test get_form when members parameter is provided."""
-        # Create request with members parameter
-        members_ids = [self.internal_member.pk, self.external_member.pk]
-        request = self.factory.get(f'/admin/mailer/message/add/?members={json.dumps(members_ids)}')
-        request.user = self.user_with_internal_member
-
-        # Test get_form
-        form_class = self.admin.get_form(request)
-        form = form_class()
-
-        # Verify initial members are set
-        self.assertEqual(list(form.fields['to_members'].initial), [self.internal_member, self.external_member])
-
-    def test_get_form_with_invalid_members_param(self):
-        """Test get_form when members parameter is not a list."""
-        # Create request with invalid members parameter
-        request = self.factory.get('/admin/mailer/message/add/?members="not_a_list"')
-        request.user = self.user_with_internal_member
-
-        # Test get_form
-        form_class = self.admin.get_form(request)
-
-        # Should return form without modification
-        self.assertIsNotNone(form_class)
-
-    def test_get_form_without_members_param(self):
-        """Test get_form when no members parameter is provided."""
-        # Create request without members parameter
-        request = self.factory.get('/admin/mailer/message/add/')
-        request.user = self.user_with_internal_member
-
-        # Test get_form
-        form_class = self.admin.get_form(request)
-
-        # Should return form without modification
-        self.assertIsNotNone(form_class)

jdav_web/mailer/tests/mailutils.py

@@ -1,34 +0,0 @@
-from django.test import TestCase, override_settings
-from unittest.mock import patch, Mock
-from mailer.mailutils import send, SENT, NOT_SENT
-
-
-class MailUtilsTest(TestCase):
-    def setUp(self):
-        self.subject = "Test Subject"
-        self.content = "Test Content"
-        self.sender = "sender@example.com"
-        self.recipient = "recipient@example.com"
-
-    def test_send_with_reply_to(self):
-        with patch('mailer.mailutils.mail.get_connection') as mock_connection:
-            mock_conn = Mock()
-            mock_connection.return_value = mock_conn
-            result = send(self.subject, self.content, self.sender, self.recipient, reply_to=["reply@example.com"])
-            self.assertEqual(result, SENT)
-
-    def test_send_with_message_id(self):
-        with patch('mailer.mailutils.mail.get_connection') as mock_connection:
-            mock_conn = Mock()
-            mock_connection.return_value = mock_conn
-            result = send(self.subject, self.content, self.sender, self.recipient, message_id="<test@example.com>")
-            self.assertEqual(result, SENT)
-
-    def test_send_exception_handling(self):
-        with patch('mailer.mailutils.mail.get_connection') as mock_connection:
-            mock_conn = Mock()
-            mock_conn.send_messages.side_effect = Exception("Test exception")
-            mock_connection.return_value = mock_conn
-            with patch('builtins.print'):
-                result = send(self.subject, self.content, self.sender, self.recipient)
-            self.assertEqual(result, NOT_SENT)

jdav_web/mailer/tests/models.py

@@ -1,271 +0,0 @@
-from unittest import skip, mock
-from django.test import TestCase
-from django.conf import settings
-from django.utils import timezone
-from django.core.exceptions import ValidationError
-from django.utils.translation import gettext as _
-from django.core.files.uploadedfile import SimpleUploadedFile
-from members.models import Member, Group, DIVERSE, Freizeit, MemberNoteList, GEMEINSCHAFTS_TOUR, MUSKELKRAFT_ANREISE
-from mailer.models import EmailAddress, EmailAddressForm, Message, MessageForm, Attachment
-from mailer.mailutils import SENT, NOT_SENT, PARTLY_SENT
-from .utils import BasicMailerTestCase
-
-
-class EmailAddressTestCase(BasicMailerTestCase):
-    def test_email(self):
-        self.assertEqual(self.em.email, f"foobar@{settings.DOMAIN}")
-
-    def test_str(self):
-        self.assertEqual(self.em.email, str(self.em))
-
-    def test_forwards(self):
-        self.assertEqual(self.em.forwards, {'fritz@foo.com', 'paul@foo.com'})
-
-
-class EmailAddressFormTestCase(BasicMailerTestCase):
-    def test_clean(self):
-        # instantiate form with only name field set
-        form = EmailAddressForm(data={'name': 'bar'})
-        # validate the form - this should fail due to missing required recipients
-        self.assertFalse(form.is_valid())
-
-
-class MessageFormTestCase(BasicMailerTestCase):
-    def test_clean(self):
-        # instantiate form with only subject and content fields set
-        form = MessageForm(data={'subject': 'Test Subject', 'content': 'Test content'})
-        # validate the form - this should fail due to missing required recipients
-        self.assertFalse(form.is_valid())
-
-
-class MessageTestCase(BasicMailerTestCase):
-    def setUp(self):
-        super().setUp()
-        self.message = Message.objects.create(
-            subject='Test Message',
-            content='This is a test message'
-        )
-        self.freizeit = Freizeit.objects.create(
-            name='Test Freizeit',
-            kilometers_traveled=120,
-            tour_type=GEMEINSCHAFTS_TOUR,
-            tour_approach=MUSKELKRAFT_ANREISE,
-            difficulty=1
-        )
-        self.notelist = MemberNoteList.objects.create(
-            title='Test Note List'
-        )
-
-        # Set up message with multiple recipient types
-        self.message.to_groups.add(self.mygroup)
-        self.message.to_freizeit = self.freizeit
-        self.message.to_notelist = self.notelist
-        self.message.to_members.add(self.fritz)
-        self.message.save()
-
-        # Create a sender member for submit tests
-        self.sender = Member.objects.create(
-            prename='Sender',
-            lastname='Test',
-            birth_date=timezone.now().date(),
-            email='sender@test.com',
-            gender=DIVERSE
-        )
-
-    def test_str(self):
-        self.assertEqual(str(self.message), 'Test Message')
-
-    def test_get_recipients(self):
-        recipients = self.message.get_recipients()
-        self.assertIn('My Group', recipients)
-        self.assertIn('Test Freizeit', recipients)
-        self.assertIn('Test Note List', recipients)
-        self.assertIn('Fritz Wulter', recipients)
-
-    def test_get_recipients_with_many_members(self):
-        # Add additional members to test the "Some other members" case
-        for i in range(3):
-            member = Member.objects.create(
-                prename=f'Member{i}',
-                lastname='Test',
-                birth_date=timezone.now().date(),
-                email=f'member{i}@test.com',
-                gender=DIVERSE
-            )
-            self.message.to_members.add(member)
-
-        recipients = self.message.get_recipients()
-        self.assertIn(_('Some other members'), recipients)
-
-    @mock.patch('mailer.models.send')
-    def test_submit_successful(self, mock_send):
-        # Mock successful email sending
-        mock_send.return_value = SENT
-
-        # Test submit method
-        result = self.message.submit(sender=self.sender)
-
-        # Verify the message was marked as sent
-        self.message.refresh_from_db()
-        self.assertTrue(self.message.sent)
-        self.assertEqual(result, SENT)
-
-        # Verify send was called
-        self.assertTrue(mock_send.called)
-
-    @mock.patch('mailer.models.send')
-    def test_submit_failed(self, mock_send):
-        # Mock failed email sending
-        mock_send.return_value = NOT_SENT
-
-        # Test submit method
-        result = self.message.submit(sender=self.sender)
-
-        # Verify the message was not marked as sent
-        self.message.refresh_from_db()
-        self.assertFalse(self.message.sent)
-        # Note: The submit method always returns SENT when an exception occurs
-        self.assertEqual(result, SENT)
-
-    @mock.patch('mailer.models.send')
-    def test_submit_without_sender(self, mock_send):
-        # Mock successful email sending
-        mock_send.return_value = SENT
-
-        # Test submit method without sender
-        result = self.message.submit()
-
-        # Verify the message was marked as sent
-        self.message.refresh_from_db()
-        self.assertTrue(self.message.sent)
-        self.assertEqual(result, SENT)
-
-    @mock.patch('mailer.models.send')
-    def test_submit_subject_cleaning(self, mock_send):
-        # Mock successful email sending
-        mock_send.return_value = SENT
-
-        # Create message with underscores in subject
-        message_with_underscores = Message.objects.create(
-            subject='Test_Message_With_Underscores',
-            content='Test content'
-        )
-        message_with_underscores.to_members.add(self.fritz)
-
-        # Test submit method
-        result = message_with_underscores.submit()
-
-        # Verify underscores were removed from subject
-        message_with_underscores.refresh_from_db()
-        self.assertEqual(message_with_underscores.subject, 'Test Message With Underscores')
-
-    @mock.patch('mailer.models.send')
-    def test_submit_exception_handling(self, mock_send):
-        # Mock an exception during email sending
-        mock_send.side_effect = Exception("Email sending failed")
-
-        # Test submit method
-        result = self.message.submit(sender=self.sender)
-
-        # Verify the message was not marked as sent
-        self.message.refresh_from_db()
-        self.assertFalse(self.message.sent)
-        # When exception occurs, it should return NOT_SENT
-        self.assertEqual(result, NOT_SENT)
-
-    @mock.patch('mailer.models.send')
-    @mock.patch('django.conf.settings.SEND_FROM_ASSOCIATION_EMAIL', False)
-    def test_submit_with_sender_no_association_email(self, mock_send):
-        # Mock successful email sending
-        mock_send.return_value = PARTLY_SENT
-
-        # Test submit method with sender but SEND_FROM_ASSOCIATION_EMAIL disabled
-        result = self.message.submit(sender=self.sender)
-
-        # Verify the message was marked as sent
-        self.message.refresh_from_db()
-        self.assertTrue(self.message.sent)
-        self.assertEqual(result, SENT)
-
-    @mock.patch('mailer.models.send')
-    @mock.patch('django.conf.settings.SEND_FROM_ASSOCIATION_EMAIL', False)
-    def test_submit_with_reply_to_logic(self, mock_send):
-        # Mock successful email sending
-        mock_send.return_value = SENT
-
-        # Create a sender with internal email capability
-        sender_with_internal = Member.objects.create(
-            prename='Internal',
-            lastname='Sender',
-            birth_date=timezone.now().date(),
-            email='internal@test.com',
-            gender=DIVERSE
-        )
-
-        # Mock has_internal_email to return True
-        with mock.patch.object(sender_with_internal, 'has_internal_email', return_value=True):
-            # Test submit method
-            result = self.message.submit(sender=sender_with_internal)
-
-        # Verify the message was marked as sent
-        self.message.refresh_from_db()
-        self.assertTrue(self.message.sent)
-        self.assertEqual(result, SENT)
-
-    @mock.patch('mailer.models.send')
-    @mock.patch('os.remove')
-    def test_submit_with_attachments(self, mock_os_remove, mock_send):
-        # Mock successful email sending
-        mock_send.return_value = SENT
-
-        # Create an attachment with a file
-        test_file = SimpleUploadedFile("test_file.pdf", b"file_content", content_type="application/pdf")
-        attachment = Attachment.objects.create(msg=self.message, f=test_file)
-
-        # Test submit method
-        result = self.message.submit()
-
-        # Verify the message was marked as sent
-        self.message.refresh_from_db()
-        self.assertTrue(self.message.sent)
-        self.assertEqual(result, SENT)
-
-        # Verify file removal was attempted (the path will be the actual file path)
-        mock_os_remove.assert_called()
-        # Attachment should be deleted
-        with self.assertRaises(Attachment.DoesNotExist):
-            attachment.refresh_from_db()
-
-    @mock.patch('mailer.models.send')
-    def test_submit_with_association_email_enabled(self, mock_send):
-        """Test submit method when SEND_FROM_ASSOCIATION_EMAIL is True and sender has association_email"""
-        mock_send.return_value = SENT
-
-        # Mock settings to enable association email sending
-        with mock.patch.object(settings, 'SEND_FROM_ASSOCIATION_EMAIL', True):
-            result = self.message.submit(sender=self.sender)
-
-        # Check that send was called with sender's association email
-        self.assertTrue(mock_send.called)
-        call_args = mock_send.call_args
-        from_addr = call_args[0][2]  # from_addr is the 3rd positional argument
-        expected_from = f"{self.sender.name} <{self.sender.association_email}>"
-        self.assertEqual(from_addr, expected_from)
-
-
-class AttachmentTestCase(BasicMailerTestCase):
-    def setUp(self):
-        super().setUp()
-        self.message = Message.objects.create(
-            subject='Test Message',
-            content='Test content'
-        )
-        self.attachment = Attachment.objects.create(msg=self.message)
-
-    def test_str_with_file(self):
-        # Simulate a file name
-        self.attachment.f.name = 'attachments/test_document.pdf'
-        self.assertEqual(str(self.attachment), 'test_document.pdf')
-
-    def test_str_without_file(self):
-        self.assertEqual(str(self.attachment), _('Empty'))

jdav_web/mailer/tests/rules.py

@@ -1,31 +0,0 @@
-from django.test import TestCase
-from django.conf import settings
-from django.contrib.auth.models import User
-from mailer.rules import is_creator
-from mailer.models import Message
-from members.models import Member, MALE
-
-
-class MailerRulesTestCase(TestCase):
-    def setUp(self):
-        self.user1 = User.objects.create_user(username="alice", password="test123")
-        self.member1 = Member.objects.create(
-            prename="Alice", lastname="Smith", birth_date="1990-01-01",
-            email=settings.TEST_MAIL, gender=MALE, user=self.user1
-        )
-
-        self.message = Message.objects.create(
-            subject="Test Message",
-            content="Test content",
-            created_by=self.member1
-        )
-
-    def test_is_creator_returns_true_when_user_created_message(self):
-        """Test is_creator predicate returns True when user created the message"""
-        result = is_creator(self.user1, self.message)
-        self.assertTrue(result)
-
-    def test_is_creator_returns_false_when_message_is_none(self):
-        """Test is_creator predicate returns False when message is None"""
-        result = is_creator(self.user1, None)
-        self.assertFalse(result)

jdav_web/mailer/tests/utils.py

@@ -1,27 +0,0 @@
-from unittest import skip, mock
-from django.test import TestCase
-from django.conf import settings
-from django.utils import timezone
-from django.core.exceptions import ValidationError
-from django.utils.translation import gettext as _
-from django.core.files.uploadedfile import SimpleUploadedFile
-from members.models import Member, Group, DIVERSE, Freizeit, MemberNoteList, GEMEINSCHAFTS_TOUR, MUSKELKRAFT_ANREISE
-from mailer.models import EmailAddress, EmailAddressForm, Message, MessageForm, Attachment
-from mailer.mailutils import SENT, NOT_SENT, PARTLY_SENT
-
-
-class BasicMailerTestCase(TestCase):
-    def setUp(self):
-        self.mygroup = Group.objects.create(name="My Group")
-        self.fritz = Member.objects.create(prename="Fritz", lastname="Wulter", birth_date=timezone.now().date(),
-                              email='fritz@foo.com', gender=DIVERSE)
-        self.fritz.group.add(self.mygroup)
-        self.fritz.save()
-        self.fritz.generate_key()
-
-        self.paul = Member.objects.create(prename="Paul", lastname="Wulter", birth_date=timezone.now().date(),
-                              email='paul@foo.com', gender=DIVERSE)
-
-        self.em = EmailAddress.objects.create(name='foobar')
-        self.em.to_groups.add(self.mygroup)
-        self.em.to_members.add(self.paul)

jdav_web/mailer/tests/views.py

@@ -1,65 +0,0 @@
-from unittest import skip, mock
-from http import HTTPStatus
-from django.urls import reverse
-from django.test import TestCase
-from django.conf import settings
-from django.utils import timezone
-from django.core.exceptions import ValidationError
-from django.utils.translation import gettext as _
-from django.core.files.uploadedfile import SimpleUploadedFile
-from members.models import Member, Group, DIVERSE, Freizeit, MemberNoteList, GEMEINSCHAFTS_TOUR, MUSKELKRAFT_ANREISE
-from mailer.models import EmailAddress, EmailAddressForm, Message, MessageForm, Attachment
-from mailer.mailutils import SENT, NOT_SENT, PARTLY_SENT
-from .utils import BasicMailerTestCase
-
-
-class IndexTestCase(BasicMailerTestCase):
-    def test_index(self):
-        url = reverse('mailer:index')
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, HTTPStatus.FOUND)
-
-
-class UnsubscribeTestCase(BasicMailerTestCase):
-    def test_unsubscribe(self):
-        url = reverse('mailer:unsubscribe')
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _("Here you can unsubscribe from the newsletter"))
-
-    def test_unsubscribe_key_invalid(self):
-        url = reverse('mailer:unsubscribe')
-
-        # invalid key
-        response = self.client.get(url, data={'key': 'invalid'})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _("Can't verify this link. Try again!"))
-
-        # expired key
-        self.fritz.unsubscribe_expire = timezone.now()
-        self.fritz.save()
-        response = self.client.get(url, data={'key': self.fritz.unsubscribe_key})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _("Can't verify this link. Try again!"))
-
-    def test_unsubscribe_key(self):
-        url = reverse('mailer:unsubscribe')
-        response = self.client.get(url, data={'key': self.fritz.unsubscribe_key})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _("Successfully unsubscribed from the newsletter for "))
-
-    def test_unsubscribe_post_incomplete(self):
-        url = reverse('mailer:unsubscribe')
-        response = self.client.post(url, data={'post': True})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _("Please fill in every field"))
-
-        response = self.client.post(url, data={'post': True, 'email': 'foobar@notexisting.com'})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _("Please fill in every field"))
-
-    def test_unsubscribe_post(self):
-        url = reverse('mailer:unsubscribe')
-        response = self.client.post(url, data={'post': True, 'email': self.fritz.email})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _("Sent confirmation mail to"))

jdav_web/mailer/urls.py

@@ -5,5 +5,6 @@ from . import views
 app_name = "mailer"
 urlpatterns = [
     re_path(r'^$', views.index, name='index'),
+    # url(r'^subscribe', views.subscribe, name='subscribe'),
     re_path(r'^unsubscribe', views.unsubscribe, name='unsubscribe'),
 ]

jdav_web/mailer/views.py

@@ -53,5 +53,52 @@ def unsubscribe(request):
         return render_confirmation_sent(request, email)
 
 
+def render_subscribe(request, error_message=""):
+    date_input = forms.DateInput(attrs={'required': True,
+                                        'class': 'datepicker',
+                                        'name': 'birthdate'})
+    date_field = date_input.render(_("Birthdate"), "")
+    context = {'date_field': date_field}
+    if error_message:
+        context['error_message'] = error_message
+    return render(request, 'mailer/subscribe.html', context)
+
+
 def render_confirmation_sent(request, email):
     return render(request, 'mailer/confirmation_sent.html', {'email': email})
+
+
+def subscribe(request):
+    try:
+        request.POST['post']
+        try:
+            print("trying to subscribe")
+            prename = request.POST['prename']
+            lastname = request.POST['lastname']
+            email = request.POST['email']
+            print("email", email)
+            birth_date = request.POST['birthdate']
+            print("birthdate", birth_date)
+        except KeyError:
+            return subscribe(request, _("Please fill in every field!"))
+        else:
+            # TODO: check whether member exists
+            exists = Member.objects.filter(prename=prename,
+                                           lastname=lastname)
+            if len(exists) > 0:
+                return render_subscribe(request,
+                                        error_message=_("Member "
+                                                        "already exists"))
+            member = Member(prename=prename,
+                            lastname=lastname,
+                            email=email,
+                            birth_date=birth_date,
+                            gets_newsletter=True)
+            member.save()
+            return subscribed(request)
+    except KeyError:
+        return render_subscribe(request)
+
+
+def subscribed(request):
+    return render(request, 'mailer/subscribed.html')

jdav_web/material/tests.py

@@ -1,238 +1,3 @@
-from django.test import TestCase, RequestFactory
+from django.test import TestCase
-from django.utils import timezone
-from datetime import date, datetime
-from decimal import Decimal
-from unittest.mock import Mock
-from material.models import MaterialCategory, MaterialPart, Ownership, yearsago
-from material.admin import NotTooOldFilter, MaterialAdmin
-from members.models import Member, MALE, FEMALE, DIVERSE
 
-
+# Create your tests here.
-class MaterialCategoryTestCase(TestCase):
-    def setUp(self):
-        self.category = MaterialCategory.objects.create(name="Climbing Gear")
-
-    def test_str(self):
-        """Test string representation of MaterialCategory"""
-        self.assertEqual(str(self.category), "Climbing Gear")
-
-    def test_verbose_names(self):
-        """Test verbose names are set correctly"""
-        meta = MaterialCategory._meta
-        self.assertTrue(hasattr(meta, 'verbose_name'))
-        self.assertTrue(hasattr(meta, 'verbose_name_plural'))
-
-
-class MaterialPartTestCase(TestCase):
-    def setUp(self):
-        self.category = MaterialCategory.objects.create(name="Ropes")
-        self.material_part = MaterialPart.objects.create(
-            name="Dynamic Rope 10mm",
-            description="60m dynamic climbing rope",
-            quantity=5,
-            buy_date=date(2020, 1, 15),
-            lifetime=Decimal('8')
-        )
-        self.material_part.material_cat.add(self.category)
-
-        self.member = Member.objects.create(
-            prename="John",
-            lastname="Doe",
-            birth_date=date(1990, 1, 1),
-            email="john@example.com",
-            gender=MALE
-        )
-
-    def test_str(self):
-        """Test string representation of MaterialPart"""
-        self.assertEqual(str(self.material_part), "Dynamic Rope 10mm")
-
-    def test_quantity_real_no_ownership(self):
-        """Test quantity_real when no ownership exists"""
-        result = self.material_part.quantity_real()
-        self.assertEqual(result, "0/5")
-
-    def test_quantity_real_with_ownership(self):
-        """Test quantity_real with ownership records"""
-        Ownership.objects.create(
-            material=self.material_part,
-            owner=self.member,
-            count=3
-        )
-        Ownership.objects.create(
-            material=self.material_part,
-            owner=self.member,
-            count=1
-        )
-        result = self.material_part.quantity_real()
-        self.assertEqual(result, "4/5")
-
-    def test_verbose_names(self):
-        """Test field verbose names"""
-        # Just test that verbose names exist, since they might be translated
-        field_names = ['name', 'description', 'quantity', 'buy_date', 'lifetime', 'photo', 'material_cat']
-
-        for field_name in field_names:
-            field = self.material_part._meta.get_field(field_name)
-            self.assertTrue(hasattr(field, 'verbose_name'))
-            self.assertIsNotNone(field.verbose_name)
-
-    def test_admin_thumbnail_with_photo(self):
-        """Test admin_thumbnail when photo exists"""
-        mock_photo = Mock()
-        mock_photo.url = "/media/test.jpg"
-        self.material_part.photo = mock_photo
-        result = self.material_part.admin_thumbnail()
-        self.assertIn("/media/test.jpg", result)
-        self.assertIn("<img", result)
-
-    def test_admin_thumbnail_without_photo(self):
-        """Test admin_thumbnail when no photo exists"""
-        self.material_part.photo = None
-        result = self.material_part.admin_thumbnail()
-        self.assertIn("kein Bild", result)
-
-    def test_ownership_overview(self):
-        """Test ownership_overview method"""
-        Ownership.objects.create(material=self.material_part, owner=self.member, count=2)
-        result = self.material_part.ownership_overview()
-        self.assertIn(str(self.member), result)
-        self.assertIn("2", result)
-
-    def test_not_too_old(self):
-        """Test not_too_old method"""
-        # Set a buy_date that makes the material old
-        old_date = date(2000, 1, 1)
-        self.material_part.buy_date = old_date
-        self.material_part.lifetime = Decimal('5')
-        result = self.material_part.not_too_old()
-        self.assertFalse(result)
-
-
-class OwnershipTestCase(TestCase):
-    def setUp(self):
-        self.category = MaterialCategory.objects.create(name="Hardware")
-        self.material_part = MaterialPart.objects.create(
-            name="Carabiner Set",
-            description="Lightweight aluminum carabiners",
-            quantity=10,
-            buy_date=date(2021, 6, 1),
-            lifetime=Decimal('10')
-        )
-
-        self.member = Member.objects.create(
-            prename="Alice",
-            lastname="Smith",
-            birth_date=date(1985, 3, 15),
-            email="alice@example.com",
-            gender=FEMALE
-        )
-
-        self.ownership = Ownership.objects.create(
-            material=self.material_part,
-            owner=self.member,
-            count=6
-        )
-
-    def test_ownership_creation(self):
-        """Test ownership record creation"""
-        self.assertEqual(self.ownership.material, self.material_part)
-        self.assertEqual(self.ownership.owner, self.member)
-        self.assertEqual(self.ownership.count, 6)
-
-    def test_material_part_relationship(self):
-        """Test relationship between MaterialPart and Ownership"""
-        ownerships = Ownership.objects.filter(material=self.material_part)
-        self.assertEqual(ownerships.count(), 1)
-        self.assertEqual(ownerships.first(), self.ownership)
-
-    def test_str(self):
-        """Test string representation of Ownership"""
-        result = str(self.ownership)
-        self.assertEqual(result, str(self.member))
-
-
-class UtilityFunctionTestCase(TestCase):
-    def test_yearsago_with_from_date(self):
-        """Test yearsago function with explicit from_date"""
-        test_date = timezone.make_aware(datetime(2020, 5, 15, 12, 0, 0))
-        result = yearsago(5, from_date=test_date)
-        expected = timezone.make_aware(datetime(2015, 5, 15, 12, 0, 0))
-        self.assertEqual(result, expected)
-
-    def test_yearsago_default_from_date(self):
-        """Test yearsago function with default from_date (None)"""
-        # This will use timezone.now() internally
-        result = yearsago(1)
-        self.assertIsNotNone(result)
-        self.assertLess(result, timezone.now())
-
-    def test_yearsago_leap_year_edge_case(self):
-        """Test yearsago function with leap year edge case (Feb 29)"""
-        # Feb 29, 2020 (leap year) minus 1 year should become Feb 28, 2019
-        leap_date = timezone.make_aware(datetime(2020, 2, 29, 12, 0, 0))
-        result = yearsago(1, from_date=leap_date)
-        expected = timezone.make_aware(datetime(2019, 2, 28, 12, 0, 0))
-        self.assertEqual(result, expected)
-
-
-class NotTooOldFilterTestCase(TestCase):
-    def setUp(self):
-        self.factory = RequestFactory()
-        self.filter = NotTooOldFilter(None, {}, MaterialPart, MaterialAdmin)
-
-        # Create test data
-        self.member = Member.objects.create(
-            prename="Test", lastname="User", birth_date=date(1990, 1, 1),
-            email="test@example.com", gender=MALE
-        )
-
-        # Create old material (should be too old)
-        self.old_material = MaterialPart.objects.create(
-            name="Old Material",
-            description="Old material",
-            quantity=1,
-            buy_date=date(2000, 1, 1),  # Very old
-            lifetime=Decimal('5')
-        )
-
-        # Create new material (should not be too old)
-        self.new_material = MaterialPart.objects.create(
-            name="New Material",
-            description="New material",
-            quantity=1,
-            buy_date=date.today(),  # Today
-            lifetime=Decimal('10')
-        )
-
-    def test_not_too_old_filter_lookups(self):
-        """Test NotTooOldFilter lookups method"""
-        request = self.factory.get('/')
-        lookups = self.filter.lookups(request, None)
-        self.assertEqual(len(lookups), 2)
-        self.assertEqual(lookups[0][0], 'too_old')
-        self.assertEqual(lookups[1][0], 'not_too_old')
-
-    def test_not_too_old_filter_queryset_too_old(self):
-        """Test NotTooOldFilter queryset method with 'too_old' value"""
-        request = self.factory.get('/?age=too_old')
-        self.filter.used_parameters = {'age': 'too_old'}
-
-        queryset = MaterialPart.objects.all()
-        filtered = self.filter.queryset(request, queryset)
-
-        # Should return materials that are not too old (i.e., new materials)
-        self.assertIn(self.new_material, filtered)
-        self.assertNotIn(self.old_material, filtered)
-
-    def test_not_too_old_filter_queryset_not_too_old(self):
-        """Test NotTooOldFilter queryset method with 'not_too_old' value"""
-        request = self.factory.get('/?age=not_too_old')
-        self.filter.used_parameters = {'age': 'not_too_old'}
-
-        queryset = MaterialPart.objects.all()
-        filtered = self.filter.queryset(request, queryset)
-
-        # Should return materials that are too old
-        self.assertIn(self.old_material, filtered)
-        self.assertNotIn(self.new_material, filtered)

jdav_web/material/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

jdav_web/members/admin.py

@@ -30,9 +30,8 @@ from django.shortcuts import render
 from django.core.exceptions import PermissionDenied, ValidationError
 from .pdf import render_tex, fill_pdf_form, merge_pdfs, serve_pdf, render_docx
 from .excel import generate_group_overview, generate_ljp_vbk
-from .models import WEEKDAYS
 
-from contrib.admin import CommonAdminInlineMixin, CommonAdminMixin, decorate_admin_view
+from contrib.admin import CommonAdminInlineMixin, CommonAdminMixin
 
 import nested_admin
 
@@ -42,10 +41,10 @@ from .models import (Member, Group, Freizeit, MemberNoteList, NewMemberOnList, K
                      KlettertreffAttendee, ActivityCategory, EmergencyContact,
                      annotate_activity_score, RegistrationPassword, MemberUnconfirmedProxy,
                      InvitationToGroup)
-from finance.models import BillOnExcursionProxy, StatementOnExcursionProxy
+from finance.models import Statement, BillOnExcursionProxy
 from mailer.mailutils import send as send_mail, get_echo_link
 from django.conf import settings
-from utils import get_member, RestrictedFileField, mondays_until_nth
+from utils import get_member, RestrictedFileField
 from schwifty import IBAN
 from .pdf import media_path, media_dir
 
@@ -108,22 +107,15 @@ class PermissionOnMemberInline(admin.StackedInline):
 
 class TrainingOnMemberInline(CommonAdminInlineMixin, admin.TabularInline):
     model = MemberTraining
-    description = _("Please enter all training courses and further education courses that you have already attended or will be attending soon. Please also upload your confirmation of participation so that the responsible person can fill in the 'Attended' and 'Passed' fields. If the activity selection does not match your training, please describe it in the comment field.")
     formfield_overrides = {
         TextField: {'widget': Textarea(attrs={'rows': 1, 'cols': 25})}
     }
     ordering = ("date",)
     extra = 1
 
-    field_change_permissions = {
-        'participated': 'members.manage_success_trainings',
-        'passed': 'members.manage_success_trainings',
-    }
-
 
 class EmergencyContactInline(CommonAdminInlineMixin, admin.TabularInline):
     model = EmergencyContact
-    description = _('Please enter at least one emergency contact with contact details here. These are necessary for crisis intervention during trips.')
     formfield_overrides = {
         TextField: {'widget': Textarea(attrs={'rows': 1, 'cols': 40})}
     }
@@ -136,6 +128,44 @@ class TrainingCategoryAdmin(admin.ModelAdmin):
     ordering = ('name', )
 
 
+class RegistrationFilter(admin.SimpleListFilter):
+    title = _('Registration complete')
+    parameter_name = 'registration_complete'
+    default_value = ('All', None)
+
+    def lookups(self, request, model_admin):
+        return (
+            ('True', _('True')),
+            ('False', _('False')),
+            ('All', _('All'))
+        )
+
+    def queryset(self, request, queryset):
+        if self.value() == 'True':
+            return queryset.filter(registration_complete=True)
+        elif self.value() == 'False':
+            return queryset.filter(registration_complete=False)
+        elif self.value() is None:
+            if self.default_value[1] is None:
+                return queryset
+            else:
+                return queryset.filter(registration_complete=self.default_value[1])
+        elif self.value() == 'All':
+            return queryset
+
+    def choices(self, cl):
+        for lookup, title in self.lookup_choices:
+            yield {
+                'selected':
+                    self.value() == lookup or
+                    (self.value() is None and lookup == self.default_value[0]),
+                'query_string': cl.get_query_string({
+                                    self.parameter_name:
+                                    lookup,
+                                }, []),
+                'display': title
+            }
+
 class MemberAdminForm(forms.ModelForm):
 
     class Meta:
@@ -165,6 +195,7 @@ class MemberAdmin(CommonAdminMixin, admin.ModelAdmin):
                 ('join_date', 'leave_date'),
                 'comments',
                 'legal_guardians',
+                'dav_badge_no',
                 'active', 'echoed',
                 'user',
              ]
@@ -182,8 +213,8 @@ class MemberAdmin(CommonAdminMixin, admin.ModelAdmin):
         ),
         (_("Others"),
          {
-             'fields': ['dav_badge_no', 'ticket_no', 'allergies', 'tetanus_vaccination', 
+             'fields': ['allergies', 'tetanus_vaccination', 'medication', 'photos_may_be_taken',
-                        'medication', 'photos_may_be_taken','may_cancel_appointment_independently']
+                        'may_cancel_appointment_independently']
          }
         ),
         (_("Organizational"),
@@ -300,8 +331,7 @@ class MemberAdmin(CommonAdminMixin, admin.ModelAdmin):
         return request.user.has_perm('%s.%s' % (self.opts.app_label, 'may_invite_as_user'))
 
     def invite_as_user_action(self, request, queryset):
-        if not request.user.has_perm('members.may_invite_as_user'): # pragma: no cover
+        if not request.user.has_perm('members.may_invite_as_user'):
-            # this should be unreachable, because of allowed_permissions attribute
             messages.error(request, _('Permission denied.'))
             return HttpResponseRedirect(reverse('admin:%s_%s_changelist' % (self.opts.app_label, self.opts.model_name)))
         if "apply" in request.POST:
@@ -433,8 +463,7 @@ class MemberUnconfirmedAdmin(CommonAdminMixin, admin.ModelAdmin):
          }
         ),
     ]
-    list_display = ('name', 'birth_date', 'age', 'get_group', 'confirmed_mail', 'confirmed_alternative_mail',
+    list_display = ('name', 'birth_date', 'age', 'get_group', 'confirmed_mail', 'confirmed_alternative_mail')
-                    'registration_form_uploaded')
     search_fields = ('prename', 'lastname', 'email')
     list_filter = ('group', 'confirmed_mail', 'confirmed_alternative_mail')
     readonly_fields = ['confirmed_mail', 'confirmed_alternative_mail',
@@ -488,15 +517,13 @@ class MemberUnconfirmedAdmin(CommonAdminMixin, admin.ModelAdmin):
         notify_individual = len(queryset.all()) < 10
         success = True
         for member in queryset:
-            confirmed = member.confirm()
+            if member.confirm() and notify_individual:
-            if not confirmed:
+                messages.success(request, _("Successfully confirmed %(name)s.") % {'name': member.name})
-                success = False
+            else:
-            if notify_individual:
+                if notify_individual:
-                if confirmed:
-                    messages.success(request, _("Successfully confirmed %(name)s.") % {'name': member.name})
-                else:
                     messages.error(request,
                             _("Can't confirm. %(name)s has unconfirmed email addresses.") % {'name': member.name})
+                success = False
         if notify_individual:
             return
         if success:
@@ -521,11 +548,6 @@ class MemberUnconfirmedAdmin(CommonAdminMixin, admin.ModelAdmin):
                 wrap(self.demote_to_waiter_view),
                 name="%s_%s_demote" % (self.opts.app_label, self.opts.model_name),
             ),
-            path(
-                "<path:object_id>/request_registration_form/",
-                wrap(self.request_registration_form_view),
-                name="%s_%s_request_registration_form" % (self.opts.app_label, self.opts.model_name),
-            ),
         ]
         return custom_urls + urls
 
@@ -558,18 +580,6 @@ class MemberUnconfirmedAdmin(CommonAdminMixin, admin.ModelAdmin):
             member.demote_to_waiter()
             messages.success(request, _("Successfully demoted %(name)s to waiter.") % {'name': member.name})
 
-    @decorate_admin_view(MemberUnconfirmedProxy)
-    def request_registration_form_view(self, request, member):
-        if "apply" in request.POST:
-            member.request_registration_form()
-            messages.success(request, _("Requested registration form for %(name)s.") % {'name': member.name})
-            return HttpResponseRedirect(reverse('admin:members_memberunconfirmedproxy_change', args=(member.pk,)))
-        context = dict(self.admin_site.each_context(request),
-                       title=_('Request upload registration form'),
-                       opts=self.opts,
-                       member=member)
-        return render(request, 'admin/request_registration_form.html', context=context)
-
     def response_change(self, request, member):
         if "_confirm" in request.POST:
             if member.confirm():
@@ -592,7 +602,7 @@ class WaiterInviteTextForm(forms.Form):
             widget=forms.Textarea(attrs={'rows': 30, 'cols': 100}))
 
 
-class InvitationToGroupAdmin(CommonAdminInlineMixin, admin.TabularInline):
+class InvitationToGroupAdmin(admin.TabularInline):
     model = InvitationToGroup
     fields = ['group', 'date', 'status']
     readonly_fields = ['group', 'date', 'status']
@@ -647,9 +657,6 @@ class MemberWaitingListAdmin(CommonAdminMixin, admin.ModelAdmin):
     def has_add_permission(self, request, obj=None):
         return False
 
-    def has_action_permission(self, request):
-        return request.user.has_perm('members.change_global_memberwaitinglist')
-
     def age(self, obj):
         return obj.birth_date_delta
     age.short_description=_('age')
@@ -662,7 +669,6 @@ class MemberWaitingListAdmin(CommonAdminMixin, admin.ModelAdmin):
             messages.success(request,
                     _("Successfully asked %(name)s to confirm their waiting status.") % {'name': waiter.name})
     ask_for_wait_confirmation.short_description = _('Ask selected waiters to confirm their waiting status')
-    ask_for_wait_confirmation.allowed_permissions = ('action',)
 
     def response_change(self, request, waiter):
         ret = super(MemberWaitingListAdmin, self).response_change(request, waiter)
@@ -677,14 +683,12 @@ class MemberWaitingListAdmin(CommonAdminMixin, admin.ModelAdmin):
             member.request_mail_confirmation()
         messages.success(request, _("Successfully requested mail confirmation from selected waiters."))
     request_mail_confirmation.short_description = _('Request mail confirmation from selected waiters.')
-    request_mail_confirmation.allowed_permissions = ('action',)
 
     def request_required_mail_confirmation(self, request, queryset):
         for member in queryset:
             member.request_mail_confirmation(rerequest=False)
         messages.success(request, _("Successfully re-requested missing mail confirmations from selected waiters."))
     request_required_mail_confirmation.short_description = _('Re-request missing mail confirmations from selected waiters.')
-    request_required_mail_confirmation.allowed_permissions = ('action',)
 
     def get_urls(self):
         urls = super().get_urls()
@@ -724,7 +728,6 @@ class MemberWaitingListAdmin(CommonAdminMixin, admin.ModelAdmin):
     def ask_for_registration_action(self, request, queryset):
         return self.invite_view(request, queryset)
     ask_for_registration_action.short_description = _('Offer waiter a place in a group.')
-    ask_for_registration_action.allowed_permissions = ('action',)
 
     def invite_view(self, request, object_id):
         if type(object_id) == str:
@@ -843,15 +846,13 @@ class GroupAdmin(CommonAdminMixin, admin.ModelAdmin):
             return update_wrapper(wrapper, view)
 
         custom_urls = [
-            path('action/', wrap(self.action_view), name='members_group_action'),
+            path('action/', self.action_view, name='members_group_action'),
         ]
         return custom_urls + urls
 
     def action_view(self, request):
         if "group_overview" in request.POST:
             return self.group_overview(request)
-        elif "group_checklist" in request.POST:
-            return self.group_checklist(request)
 
     def group_overview(self, request):
 
@@ -866,28 +867,6 @@ class GroupAdmin(CommonAdminMixin, admin.ModelAdmin):
 
         return response
 
-    def group_checklist(self, request):
-
-        if not request.user.has_perm('members.view_group'):
-            messages.error(request,
-                _("You are not allowed to create a group checklist."))
-            return HttpResponseRedirect(reverse('admin:%s_%s_changelist' % (self.opts.app_label, self.opts.model_name)))
-
-        ensure_media_dir()
-        n_weeks = settings.GROUP_CHECKLIST_N_WEEKS
-        n_members = settings.GROUP_CHECKLIST_N_MEMBERS
-
-        context = {
-            'groups': self.model.objects.filter(show_website=True), 
-            'settings': settings, 
-            'week_range': range(n_weeks),
-            'member_range': range(n_members),
-            'dates': mondays_until_nth(n_weeks),
-            'weekdays': [long for i, long in WEEKDAYS],
-            'header_text': settings.GROUP_CHECKLIST_TEXT,
-        }
-        return render_tex(f"Gruppen-Checkliste", 'members/group_checklist.tex', context)
-
 
 class ActivityCategoryAdmin(admin.ModelAdmin):
     fields = ['name', 'ljp_category', 'description']
@@ -941,7 +920,7 @@ class StatementOnListForm(forms.ModelForm):
         self.fields['ljp_to'].queryset = excursion.jugendleiter.all()
 
     class Meta:
-        model = StatementOnExcursionProxy
+        model = Statement
         fields = ['night_cost', 'allowance_to', 'subsidy_to', 'ljp_to']
 
     def clean(self):
@@ -959,7 +938,7 @@ class StatementOnListForm(forms.ModelForm):
 
 
 class StatementOnListInline(CommonAdminInlineMixin, nested_admin.NestedStackedInline):
-    model = StatementOnExcursionProxy
+    model = Statement
     extra = 1
     description = _('Please list here all expenses in relation with this excursion and upload relevant bills. These have to be permanently stored for the application of LJP contributions. The short descriptions are used in the seminar report cost overview (possible descriptions are e.g. food, material, etc.).')
     sortable_options = []
@@ -1263,9 +1242,8 @@ class FreizeitAdmin(CommonAdminMixin, nested_admin.NestedModelAdmin):
     sjr_application.short_description = _('Generate SJR application')
 
     def finance_overview(self, request, memberlist):
-        if not hasattr(memberlist, 'statement'):
+        if not memberlist.statement:
             messages.error(request, _("No statement found. Please add a statement and then retry."))
-            return HttpResponseRedirect(reverse('admin:%s_%s_change' % (self.opts.app_label, self.opts.model_name), args=(memberlist.pk,)))
         if "apply" in request.POST:
             if not memberlist.statement.allowance_to_valid:
                 messages.error(request,
@@ -1326,6 +1304,8 @@ class FreizeitAdmin(CommonAdminMixin, nested_admin.NestedModelAdmin):
     def action_view(self, request, object_id):
         if "sjr_application" in request.POST:
             return self.sjr_application(request, Freizeit.objects.get(pk=object_id))
+        if "seminar_vbk" in request.POST:
+            return self.seminar_vbk(request, Freizeit.objects.get(pk=object_id))
         if "seminar_report" in request.POST:
             return self.seminar_report(request, Freizeit.objects.get(pk=object_id))
         if "notes_list" in request.POST:
@@ -1374,13 +1354,13 @@ class KlettertreffAdmin(admin.ModelAdmin):
     inlines = [KlettertreffAttendeeInline]
     list_display = ['__str__', 'date', 'get_jugendleiter']
     search_fields = ('date', 'location', 'topic')
-    list_filter = [('date', DateFieldListFilter), 'group']
+    list_filter = [('date', DateFieldListFilter), 'group__name']
     actions = ['overview']
 
     def overview(self, request, queryset):
-        group = request.GET.get('group__id__exact')
+        group = request.GET.get('group__name')
         if group != None:
-            members = Member.objects.filter(group=group)
+            members = Member.objects.filter(group__name__contains=group)
         else:
             members = Member.objects.all()
         context = {
@@ -1399,20 +1379,6 @@ class KlettertreffAdmin(admin.ModelAdmin):
     #    ForeignKey: {'widget': apply_select2(forms.Select)}
     #}
 
-class MemberTrainingAdminForm(forms.ModelForm):
-    class Meta:
-        model = MemberTraining
-        exclude = []
-        
-        
-class MemberTrainingAdmin(CommonAdminMixin, nested_admin.NestedModelAdmin):
-    form = MemberTrainingAdminForm
-    list_display = ['title', 'member', 'date', 'category', 'get_activities', 'participated', 'passed', 'certificate']
-    search_fields = ['title']
-    list_filter = (('date', DateFieldListFilter), 'category', 'passed', 'activity', 'member')
-    ordering = ('-date',)
-
-
 
 admin.site.register(Member, MemberAdmin)
 admin.site.register(MemberUnconfirmedProxy, MemberUnconfirmedAdmin)
@@ -1423,4 +1389,3 @@ admin.site.register(MemberNoteList, MemberNoteListAdmin)
 admin.site.register(Klettertreff, KlettertreffAdmin)
 admin.site.register(ActivityCategory, ActivityCategoryAdmin)
 admin.site.register(TrainingCategory, TrainingCategoryAdmin)
-admin.site.register(MemberTraining, MemberTrainingAdmin)

jdav_web/members/csv.py

@@ -1,6 +1,6 @@
-from .models import * # pragma: no cover
+from .models import *
-import re # pragma: no cover
+import re
-import csv # pragma: no cover
+import csv
 
 
 def import_from_csv(path, omit_groupless=True): # pragma: no cover

jdav_web/members/locale/de/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-10-10 18:31+0200\n"
+"POT-Creation-Date: 2025-07-25 18:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,28 +18,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: members/admin.py members/models.py
+msgid "Registration complete"
+msgstr "Anmeldung vollständig"
+
 #: members/admin.py
-msgid ""
+msgid "True"
-"Please enter all training courses and further education courses that you "
+msgstr "Ja"
-"have already attended or will be attending soon. Please also upload your "
-"confirmation of participation so that the responsible person can fill in the "
-"'Attended' and 'Passed' fields. If the activity selection does not match "
-"your training, please describe it in the comment field."
-msgstr ""
-"Bitte trage alle Ausbildungen und Fortbildungen ein, die du bereits besucht "
-"hast oder bald besuchst. Lade auch deine Teilnahmebestätigung hoch, damit "
-"von der verantwortlichen Person die Felder 'Teilgenommen' und 'Bestanden' "
-"gepflegt werden können. Wenn die Aktivitätsauswahl nicht zu deiner "
-"Ausbildung passt, dann beschreibe sie im Kommentarfeld."
 
 #: members/admin.py
-msgid ""
+msgid "False"
-"Please enter at least one emergency contact with contact details here. These "
+msgstr "Nein"
-"are necessary for crisis intervention during trips."
+
-msgstr ""
+#: members/admin.py members/tests.py
-"Trage hier bitte mindestens einen Notfallkontakt mit Kontaktdaten ein. Diese "
+msgid "All"
-"sind notwendig für die Krisenintervention auf Ausfahrten und bei "
+msgstr "Alle"
-"Veranstaltungen."
 
 #: members/admin.py
 msgid "The entered IBAN is not valid."
@@ -89,18 +82,18 @@ msgstr "%(name)s hat keine DAV360 E-Mail Adresse oder ist bereits registriert."
 msgid "Successfully invited %(name)s as user."
 msgstr "Erfolgreich %(name)s aufgefordert Zugangsdaten zu wählen."
 
-#: members/admin.py members/tests/basic.py
+#: members/admin.py members/tests.py
 msgid "Successfully invited selected members to join as users."
 msgstr ""
 "Erfolgreich ausgewählte Teilnehmer*innen aufgefordert Zugangsdaten zu wählen."
 
-#: members/admin.py members/tests/basic.py
+#: members/admin.py members/tests.py
 msgid "Some members have been invited, others could not be invited."
 msgstr ""
 "Manche Teilnehmer*innen wurden eingeladen, andere konnten nicht eingeladen "
 "werden."
 
-#: members/admin.py members/tests/basic.py
+#: members/admin.py members/tests.py
 msgid "Permission denied."
 msgstr "Fehlende Berechtigungen."
 
@@ -112,21 +105,21 @@ msgstr "Kompass Zugangsdaten wählen lassen"
 msgid "Invite selected members to join Kompass as users."
 msgstr "Ausgewählte Teilnehmer*innen Kompass Zugangsdaten wählen lassen."
 
-#: members/admin.py members/tests/basic.py
+#: members/admin.py members/tests.py
 msgid "Member not found."
 msgstr "Teilnehmer*in nicht gefunden."
 
-#: members/admin.py members/tests/basic.py
+#: members/admin.py members/tests.py
 #, python-format
 msgid "%(name)s already has login data."
 msgstr "%(name)s hat schon Zugangsdaten."
 
-#: members/admin.py members/tests/basic.py
+#: members/admin.py members/tests.py
 #, python-format
 msgid "The configured email address for %(name)s is not an internal one."
 msgstr "Die für %(name)s eingestellte E-Mail Adresse ist keine DAV360 Adresse."
 
-#: members/admin.py members/tests/basic.py
+#: members/admin.py members/tests.py
 #, python-format
 msgid "%(name)s already has a pending invitation as user."
 msgstr ""
@@ -150,7 +143,7 @@ msgid "Unconfirm selected members."
 msgstr ""
 "Ausgewählte Teilnehmer*innen zu unbestätigten Registrierungen zurücksetzen."
 
-#: members/admin.py members/tests/basic.py
+#: members/admin.py members/tests.py
 msgid "Successfully requested mail confirmation from selected registrations."
 msgstr "Aufforderung zur Bestätigung der Email Adresse versendet."
 
@@ -158,7 +151,7 @@ msgstr "Aufforderung zur Bestätigung der Email Adresse versendet."
 msgid "Request mail confirmation from selected registrations"
 msgstr "Aufforderung zur Bestätigung der Email Adresse versenden"
 
-#: members/admin.py members/tests/basic.py
+#: members/admin.py
 msgid ""
 "Successfully re-requested missing mail confirmations from selected "
 "registrations."
@@ -182,11 +175,11 @@ msgstr "Registrierung von %(name)s erfolgreich bestätigt."
 msgid "Can't confirm. %(name)s has unconfirmed email addresses."
 msgstr "Bestätigung nicht möglich. %(name)s hat unbestätigte Emailadressen."
 
-#: members/admin.py members/tests/basic.py
+#: members/admin.py members/tests.py
 msgid "Successfully confirmed multiple registrations."
 msgstr "Erfolgreich mehrere Registrierungen bestätigt."
 
-#: members/admin.py members/tests/basic.py
+#: members/admin.py members/tests.py
 msgid ""
 "Failed to confirm some registrations because of unconfirmed email addresses."
 msgstr ""
@@ -201,7 +194,7 @@ msgstr "Ausgewählte Registrierungen bestätigen"
 msgid "Demote selected registrations to waiters."
 msgstr "Ausgewählte Registrierungen zurück auf die Warteliste setzen."
 
-#: members/admin.py members/tests/basic.py
+#: members/admin.py members/tests.py
 msgid "Demote member to waiter"
 msgstr "Ausgewählte Registrierung zurück auf die Warteliste setzen."
 
@@ -210,15 +203,6 @@ msgstr "Ausgewählte Registrierung zurück auf die Warteliste setzen."
 msgid "Successfully demoted %(name)s to waiter."
 msgstr "%(name)s zurück auf die Warteliste gesetzt."
 
-#: members/admin.py
-#, python-format
-msgid "Requested registration form for %(name)s."
-msgstr "Anmeldeformular für %(name)s angefragt."
-
-#: members/admin.py
-msgid "Request upload registration form"
-msgstr "Anmeldeformular anfragen"
-
 #: members/admin.py members/models.py
 msgid "Group"
 msgstr "Gruppe"
@@ -273,7 +257,7 @@ msgstr ""
 msgid "Offer waiter a place in a group."
 msgstr "Personen auf der Warteliste einen Gruppenplatz anbieten."
 
-#: members/admin.py members/tests/basic.py
+#: members/admin.py
 msgid "A waiter with this ID does not exist."
 msgstr "Es existiert keine wartende Person mit dieser ID."
 
@@ -317,11 +301,6 @@ msgid "You are not allowed to create a group overview."
 msgstr ""
 "Du hast nicht die notwendigen Rechte um eine Gruppenübersicht zu erstellen."
 
-#: members/admin.py
-msgid "You are not allowed to create a group checklist."
-msgstr ""
-"Du hast nicht die notwendigen Rechte um eine Gruppencheckliste zu erstellen."
-
 #: members/admin.py
 msgid "Difficulty"
 msgstr "Schwierigkeit"
@@ -395,11 +374,11 @@ msgstr "Übersicht erstellen"
 msgid "Invoice"
 msgstr "Beleg"
 
-#: members/admin.py members/tests/basic.py
+#: members/admin.py members/tests.py
 msgid "Excursion not found."
 msgstr "Ausfahrt nicht gefunden."
 
-#: members/admin.py members/tests/basic.py
+#: members/admin.py members/tests.py
 msgid ""
 "This excursion does not have a LJP proposal. Please add one and try again."
 msgstr ""
@@ -428,7 +407,7 @@ msgstr ""
 "nicht sichtbar für Standardbenutzer*innen, nur der Genehmigungszustand wird "
 "in der Übersicht alle Ausfahrten angezeigt."
 
-#: members/admin.py members/tests/basic.py
+#: members/admin.py members/tests.py
 #, python-format
 msgid "You are not allowed to view all members on excursion %(name)s."
 msgstr ""
@@ -451,17 +430,17 @@ msgstr "Landesjugendplan Antrag erstellen"
 msgid "Generate SJR application"
 msgstr "SJR Antrag erstellen"
 
-#: members/admin.py members/tests/basic.py
+#: members/admin.py members/tests.py
 msgid "Please select an invoice."
 msgstr "Bitte wähle einen Beleg aus."
 
-#: members/admin.py members/tests/basic.py
+#: members/admin.py members/tests.py
 msgid "No statement found. Please add a statement and then retry."
 msgstr ""
 "Keine Abrechnung angelegt. Bitte lege eine Abrechnung and und versuche es "
 "erneut."
 
-#: members/admin.py members/tests/basic.py
+#: members/admin.py
 msgid ""
 "The configured recipients of the allowance don't match the regulations. "
 "Please correct this and try again."
@@ -469,7 +448,7 @@ msgstr ""
 "Die ausgewählten Empfänger*innen der Aufwandsentschädigung stimmen nicht mit "
 "den Richtlinien überein. Bitte korrigiere das und versuche es erneut. "
 
-#: members/admin.py members/tests/basic.py
+#: members/admin.py
 msgid ""
 "The excursion is configured to claim LJP contributions. In that case, for "
 "all bills, a proof must be uploaded. Please correct this and try again."
@@ -490,6 +469,15 @@ msgstr ""
 msgid "Finance overview"
 msgstr "Kostenübersicht"
 
+#: members/admin.py
+msgid "Inform youth leaders about sending of crisis intervention list."
+msgstr ""
+"Informiere Jugendleiter:innen über Versand der Kriseninterventionsliste."
+
+#: members/admin.py
+msgid "Send crisis intervention list."
+msgstr "Kriseninterventionsliste verschicken"
+
 #: members/apps.py
 msgid "member administration"
 msgstr "Teilnehmer*innenverwaltung"
@@ -700,10 +688,6 @@ msgstr "Hat Freikarte für Kletterhalle"
 msgid "DAV badge number"
 msgstr "DAV Mitgliedsnummer"
 
-#: members/models.py
-msgid "entrance ticket number"
-msgstr "Eintrittskarten Nummer"
-
 #: members/models.py
 msgid "Knows how to swim"
 msgstr "Kann schwimmen"
@@ -788,10 +772,6 @@ msgstr ""
 msgid "Good conduct certificate valid"
 msgstr "Führungszeugnis gültig"
 
-#: members/models.py
-msgid "Registration complete"
-msgstr "Anmeldung vollständig"
-
 #: members/models.py
 msgid "member"
 msgstr "Teilnehmer*in"
@@ -800,10 +780,6 @@ msgstr "Teilnehmer*in"
 msgid "members"
 msgstr "Teilnehmer*innen"
 
-#: members/models.py
-msgid "Registration form"
-msgstr "Anmeldeformular"
-
 #: members/models.py
 msgid "Upload registration form"
 msgstr "Anmeldeformular hochladen"
@@ -861,15 +837,15 @@ msgstr "Gruppeneinladung"
 msgid "Invitations to groups"
 msgstr "Gruppeneinladungen"
 
-#: members/models.py members/tests/basic.py
+#: members/models.py
 msgid "Rejected"
 msgstr "Abgelehnt"
 
-#: members/models.py members/tests/basic.py
+#: members/models.py
 msgid "Expired"
 msgstr "Abgelaufen"
 
-#: members/models.py members/tests/basic.py
+#: members/models.py
 msgid "Undecided"
 msgstr "Ausstehend"
 
@@ -1036,7 +1012,6 @@ msgid "Excursions"
 msgstr "Ausfahrten"
 
 #: members/models.py
-#, python-format
 msgid "Crisis intervention list for %(excursion)s from %(start)s to %(end)s"
 msgstr "Kriseninterventionsliste für %(excursion)s vom %(start)s bis %(end)s"
 
@@ -1229,11 +1204,11 @@ msgstr "Darf Teilnehmer*innen folgender Gruppen ändern"
 msgid "May delete members of groups"
 msgstr "Darf Teilnehmer*innen folgender Gruppen löschen"
 
-#: members/models.py members/tests/basic.py
+#: members/models.py
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: members/models.py members/tests/basic.py
+#: members/models.py
 msgid "Group permissions"
 msgstr "Gruppenberechtigungen"
 
@@ -1265,10 +1240,6 @@ msgstr "Bestanden"
 msgid "certificate of attendance"
 msgstr "Teilnahmebestätigung"
 
-#: members/models.py
-msgid "(no date)"
-msgstr "(ohne Datum)"
-
 #: members/models.py
 msgid "Training"
 msgstr "Fortbildung"
@@ -1286,25 +1257,19 @@ msgstr "Fortbildungen"
 #: members/templates/admin/invite_for_group_text.html
 #: members/templates/admin/invite_selected_as_user.html
 #: members/templates/admin/invite_selected_for_group.html
-#: members/templates/admin/request_registration_form.html
-#: members/templates/admin/request_registratoin_form.html
 msgid "Home"
 msgstr "Start"
 
 #: members/templates/admin/demote_to_waiter.html
-#: members/templates/admin/request_registration_form.html
-#: members/templates/admin/request_registratoin_form.html
 msgid "Demote to waiter"
 msgstr "Zurück auf die Warteliste setzen"
 
 #: members/templates/admin/demote_to_waiter.html
-#: members/templates/admin/request_registratoin_form.html
 msgid ""
 "Do you want to demote the following unconfirmed registrations to waiters?"
 msgstr "Möchtest du die folgenden Personen zurück auf die Warteliste setzen?"
 
 #: members/templates/admin/demote_to_waiter.html
-#: members/templates/admin/request_registratoin_form.html
 msgid "Demote"
 msgstr "Zurück auf die Warteliste setzen"
 
@@ -1315,8 +1280,6 @@ msgstr "Zurück auf die Warteliste setzen"
 #: members/templates/admin/invite_for_group.html
 #: members/templates/admin/invite_selected_as_user.html
 #: members/templates/admin/invite_selected_for_group.html
-#: members/templates/admin/request_registration_form.html
-#: members/templates/admin/request_registratoin_form.html
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -1543,8 +1506,7 @@ msgstr ""
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: members/templates/admin/freizeit_finance_overview.html
+#: members/templates/admin/freizeit_finance_overview.html members/tests.py
-#: members/tests/basic.py
 msgid "This is the estimated cost and contribution summary:"
 msgstr "Das ist die geschätzte Kosten- und Zuschussübersicht."
 
@@ -1640,7 +1602,7 @@ msgstr ""
 "notwendig. Aus den Informationen, die du in der Ausfahrt angegeben hast, "
 "kann automatisch ein solcher Antrag erstellt werden."
 
-#: members/templates/admin/generate_seminar_report.html members/tests/basic.py
+#: members/templates/admin/generate_seminar_report.html members/tests.py
 msgid "A seminar report consists of multiple components:"
 msgstr "Ein LJP Antrag besteht aus verschiedenen Komponenten:"
 
@@ -1675,7 +1637,7 @@ msgstr ""
 "Eine Kosten- und Teilnehmendenübersicht. Dies ist nicht notwendig für den "
 "eigentlichen Bericht, muss aber langfristig aufbewahrt werden."
 
-#: members/templates/admin/generate_sjr_application.html members/tests/basic.py
+#: members/templates/admin/generate_sjr_application.html members/tests.py
 msgid "Here you can generate an allowance application for the SJR."
 msgstr "Hier kannst du einen SJR-Zuschussantrag erstellen."
 
@@ -1712,8 +1674,7 @@ msgstr ""
 #: members/templates/admin/invite_as_user.html
 #: members/templates/admin/invite_for_group.html
 #: members/templates/admin/invite_selected_as_user.html
-#: members/templates/admin/invite_selected_for_group.html
+#: members/templates/admin/invite_selected_for_group.html members/tests.py
-#: members/tests/basic.py
 msgid "Invite"
 msgstr "Einladen"
 
@@ -1824,21 +1785,6 @@ msgstr "Anzahl Personen:"
 msgid "thereof leaders:"
 msgstr "davon Leitung:"
 
-#: members/templates/admin/request_registration_form.html
-#: members/tests/basic.py
-msgid "Request registration form"
-msgstr "Anmeldeformular anfragen"
-
-#: members/templates/admin/request_registration_form.html
-#, python-format
-msgid "Do you want to ask %(member)s to upload their registration form?"
-msgstr "Möchtest du %(member)s auffordern das Anmeldeformular hochzuladen?"
-
-#: members/templates/admin/request_registration_form.html
-#, python-format
-msgid "Warning: %(member)s has already uploaded a registration form."
-msgstr "Warnung: %(member)s hat bereits ein Anmeldeformular hochgeladen."
-
 #: members/templates/members/change_member.html
 msgid "Participations:"
 msgstr "Ausfahrtteilnahmen:"
@@ -1860,12 +1806,11 @@ msgid "Confirm invitation"
 msgstr "Teilnahme bestätigen"
 
 #: members/templates/members/confirm_invalid.html
-#: members/templates/members/reject_invalid.html members/tests/basic.py
+#: members/templates/members/reject_invalid.html members/tests.py
-#: members/tests/views.py
 msgid "This invitation is invalid or expired."
 msgstr "Diese Einladung ist ungültig oder abgelaufen."
 
-#: members/templates/members/confirm_invitation.html members/tests/views.py
+#: members/templates/members/confirm_invitation.html
 msgid "Confirm trial group meeting invitation"
 msgstr "Teilnahme bestätigen"
 
@@ -1887,7 +1832,7 @@ msgstr ""
 msgid "Confirm trial group meeting"
 msgstr "Teilnahme bestätigen"
 
-#: members/templates/members/confirm_success.html members/tests/views.py
+#: members/templates/members/confirm_success.html
 msgid "Invitation confirmed"
 msgstr "Teilnahme bestätigt"
 
@@ -1920,7 +1865,7 @@ msgstr ""
 msgid "Echo"
 msgstr "Rückmeldung"
 
-#: members/templates/members/echo.html members/tests/basic.py
+#: members/templates/members/echo.html members/tests.py
 msgid ""
 "Here is your current data. Please check if it is up to date and change "
 "accordingly."
@@ -1928,7 +1873,7 @@ msgstr ""
 "Hier siehst du deine aktuellen Daten. Bitte überprüfe alles und passe es bei "
 "Bedarf an."
 
-#: members/templates/members/echo_failed.html members/tests/basic.py
+#: members/templates/members/echo_failed.html members/tests.py
 msgid "Echo failed"
 msgstr "Rückmeldung fehlgeschlagen"
 
@@ -1949,7 +1894,7 @@ msgstr "Wenn du denkst, dass das ein Fehler ist, "
 msgid "contact us."
 msgstr "kontaktiere uns."
 
-#: members/templates/members/echo_password.html members/tests/basic.py
+#: members/templates/members/echo_password.html members/tests.py
 msgid ""
 "Thanks for echoing back. Please enter the password, which you can find in "
 "the email we sent you.\n"
@@ -1971,7 +1916,7 @@ msgstr "Rückmeldung erfolgreich"
 msgid "Thank you"
 msgstr "Danke"
 
-#: members/templates/members/echo_success.html members/tests/basic.py
+#: members/templates/members/echo_success.html members/tests.py
 msgid "Your data was successfully updated."
 msgstr "Deine Daten wurden erfolgreich aktualisiert."
 
@@ -1982,7 +1927,7 @@ msgstr ""
 "Jugendleiter nach einem korrekten Passwort."
 
 #: members/templates/members/invited_registration_failed.html
-#: members/templates/members/register_failed.html members/tests/basic.py
+#: members/templates/members/register_failed.html
 msgid "Registration failed"
 msgstr "Registrierung fehlgeschlagen"
 
@@ -1998,7 +1943,7 @@ msgstr "Registrierung fehlgeschlagen"
 msgid "Registration"
 msgstr "Registrierung"
 
-#: members/templates/members/leave_waitinglist.html members/tests/basic.py
+#: members/templates/members/leave_waitinglist.html members/tests.py
 msgid "Leave waitinglist"
 msgstr "Warteliste verlassen"
 
@@ -2015,8 +1960,7 @@ msgstr ""
 msgid "Yes, leave the waitinglist"
 msgstr "Ja, Warteliste verlassen"
 
-#: members/templates/members/leave_waitinglist_success.html
+#: members/templates/members/leave_waitinglist_success.html members/tests.py
-#: members/tests/basic.py
 msgid "Left waitinglist"
 msgstr "Warteliste verlassen"
 
@@ -2031,19 +1975,16 @@ msgstr ""
 "einem späteren Zeitpunkt wieder auf die Warteliste setzen lassen möchtest "
 "kannst du das auf unserer Webseite machen.\n"
 
-#: members/templates/members/mail_confirmation_invalid.html
+#: members/templates/members/mail_confirmation_invalid.html members/tests.py
-#: members/tests/basic.py
 msgid "Mail confirmation failed"
 msgstr "Emailbestätigung fehlgeschlagen"
 
 #: members/templates/members/mail_confirmation_invalid.html
-#: members/templates/members/waiting_confirmation_invalid.html
+#: members/templates/members/waiting_confirmation_invalid.html members/tests.py
-#: members/tests/basic.py
 msgid "The supplied link is invalid."
 msgstr "Der verwendete Link ist ungültig."
 
-#: members/templates/members/mail_confirmation_success.html
+#: members/templates/members/mail_confirmation_success.html members/tests.py
-#: members/tests/basic.py
 msgid "Mail confirmed"
 msgstr "Emailadresse bestätigt"
 
@@ -2116,7 +2057,7 @@ msgstr "Registrieren"
 msgid "Here you can register for group"
 msgstr "Hier kannst du dich registrieren für die Gruppe"
 
-#: members/templates/members/register_failed.html members/tests/basic.py
+#: members/templates/members/register_failed.html members/tests.py
 msgid "Something went wrong while processing your registration."
 msgstr "Etwas ist schief gelaufen, bei der Verarbeitung deiner Registrierung."
 
@@ -2179,7 +2120,7 @@ msgid "Registration for waiting list."
 msgstr "Registrierung für die Warteliste."
 
 #: members/templates/members/register_waiting_list_success.html
-#: members/tests/basic.py
+#: members/tests.py
 msgid "Your registration for the waiting list was successful."
 msgstr "Du wurdest auf die Warteliste gesetzt."
 
@@ -2277,8 +2218,7 @@ msgstr ""
 "zustimmst, unterschreibe bitte das Formular und lade hier einen Scan oder "
 "ein Bild hoch."
 
-#: members/templates/members/upload_registration_form.html
+#: members/templates/members/upload_registration_form.html members/tests.py
-#: members/tests/basic.py
 msgid ""
 "If you are not an adult yet, please let someone responsible for you sign the "
 "agreement."
@@ -2291,7 +2231,7 @@ msgid "Upload"
 msgstr "Hochladen"
 
 #: members/templates/members/upload_registration_form_invalid.html
-#: members/tests/basic.py
+#: members/tests.py
 msgid "The supplied key for uploading a registration form is invalid."
 msgstr "Der verwendete Link zum Hochladen eines Anmeldeformulars ist ungültig."
 
@@ -2300,7 +2240,7 @@ msgid "Thank you for uploading the registration form."
 msgstr "Danke für das Hochladen des Anmeldeformulars."
 
 #: members/templates/members/upload_registration_form_success.html
-#: members/tests/basic.py
+#: members/tests.py
 msgid "Our team will process your registration shortly."
 msgstr ""
 "Unser Jugendleiter*innenteam wird deine Registrierung so schnell wie möglich "
@@ -2318,13 +2258,11 @@ msgstr ""
 "Leider hast du deinen Wartelistenplatz nicht rechtzeitig bestätigt und hast "
 "somit deinen Platz verloren. Du kannst"
 
-#: members/templates/members/waiting_confirmation_invalid.html
+#: members/templates/members/waiting_confirmation_invalid.html members/tests.py
-#: members/tests/basic.py
 msgid "rejoin the waiting list"
 msgstr "der Warteliste erneut beitreten"
 
-#: members/templates/members/waiting_confirmation_success.html
+#: members/templates/members/waiting_confirmation_success.html members/tests.py
-#: members/tests/basic.py
 msgid "Waiting confirmed"
 msgstr "Wartelistenplatz bestätigt"
 
@@ -2346,23 +2284,19 @@ msgstr ""
 "Danke %(prename)s für dein Interesse auf der Warteliste zu bleiben.\n"
 "Dein Platz wurde bestätigt."
 
-#: members/tests/basic.py
+#: members/tests.py
-msgid "Insufficient permissions."
-msgstr "Unzureichende Berechtigungen."
-
-#: members/tests/basic.py
 msgid "This field is required."
 msgstr ""
 
-#: members/tests/basic.py members/views.py
+#: members/tests.py members/views.py
 msgid "The entered password is wrong."
 msgstr "Das eingegebene Passwort ist falsch."
 
-#: members/tests/basic.py members/views.py
+#: members/tests.py members/views.py
 msgid "invalid"
 msgstr "ungültig"
 
-#: members/tests/basic.py members/views.py
+#: members/tests.py members/views.py
 msgid "expired"
 msgstr "abgelaufen"
 
@@ -2392,22 +2326,6 @@ msgstr "Optionale zusätzliche E-Mailadresse"
 msgid "Invalid emergency contacts"
 msgstr "Ungültige Notfallkontakte"
 
-#~ msgid "True"
-#~ msgstr "Ja"
-
-#~ msgid "False"
-#~ msgstr "Nein"
-
-#~ msgid "All"
-#~ msgstr "Alle"
-
-#~ msgid "Inform youth leaders about sending of crisis intervention list."
-#~ msgstr ""
-#~ "Informiere Jugendleiter:innen über Versand der Kriseninterventionsliste."
-
-#~ msgid "Send crisis intervention list."
-#~ msgstr "Kriseninterventionsliste verschicken"
-
 #~ msgid "You may also choose to include the V32 attachment."
 #~ msgstr ""
 #~ "Ein LJP Antrag benötigt immer ein Formblatt (in unserem Fall V32-1 "

jdav_web/members/migrations/0010_create_default_permission_groups.py

@@ -83,7 +83,7 @@ def create_group_with_perms(apps, schema_editor, name, perm_names):
     Group = apps.get_model("auth", "Group")
     Permission = apps.get_model("auth", "Permission")
     if Group.objects.filter(name=name).exists():
-        raise ValueError("A group with name %s already exists." % name) # pragma: no cover
+        raise ValueError("A group with name %s already exists." % name)
     perms = [ Permission.objects.get(codename=codename, content_type__app_label=app_label) for app_label, codename in perm_names ]
     g = Group.objects.using(db_alias).create(name=name)
     g.permissions.set(perms)

jdav_web/members/migrations/0042_member_ticket_no.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.20 on 2025-06-22 11:31
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('members', '0041_freizeit_crisis_intervention_list_sent_and_more'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='member',
-            name='ticket_no',
-            field=models.CharField(blank=True, default='', max_length=20, verbose_name='entrance ticket number'),
-        ),
-    ]

jdav_web/members/migrations/0043_waitinglist_permissions.py

@@ -1,121 +0,0 @@
-from django.utils.translation import gettext_lazy as _
-from django.db import migrations
-from django.contrib.auth.management import create_permissions
-
-STANDARD_PERMS = [
-    ('members', 'view_member'),
-    ('members', 'view_freizeit'),
-    ('members', 'add_global_freizeit'),
-    ('members', 'view_memberwaitinglist'),
-    ('members', 'view_memberunconfirmedproxy'),
-    ('mailer', 'view_message'),
-    ('mailer', 'add_global_message'),
-    ('finance', 'view_statementunsubmitted'),
-    ('finance', 'add_global_statementunsubmitted'),
-]
-
-FINANCE_PERMS = [
-    ('finance', 'view_bill'),
-    ('finance', 'view_ledger'),
-    ('finance', 'add_ledger'),
-    ('finance', 'change_ledger'),
-    ('finance', 'delete_ledger'),
-    ('finance', 'view_statementsubmitted'),
-    ('finance', 'view_global_statementsubmitted'),
-    ('finance', 'change_global_statementsubmitted'),
-    ('finance', 'view_transaction'),
-    ('finance', 'change_transaction'),
-    ('finance', 'add_transaction'),
-    ('finance', 'delete_transaction'),
-    ('finance', 'process_statementsubmitted'),
-    ('members', 'list_global_freizeit'),
-    ('members', 'view_global_freizeit'),
-]
-
-WAITINGLIST_PERMS = [
-    ('members', 'view_global_memberwaitinglist'),
-    ('members', 'list_global_memberwaitinglist'),
-    ('members', 'change_global_memberwaitinglist'),
-    ('members', 'delete_global_memberwaitinglist'),
-]
-
-TRAINING_PERMS = [
-    ('members', 'change_global_member'),
-    ('members', 'list_global_member'),
-    ('members', 'view_global_member'),
-    ('members', 'add_global_membertraining'),
-    ('members', 'change_global_membertraining'),
-    ('members', 'list_global_membertraining'),
-    ('members', 'view_global_membertraining'),
-    ('members', 'view_trainingcategory'),
-    ('members', 'add_trainingcategory'),
-    ('members', 'change_trainingcategory'),
-    ('members', 'delete_trainingcategory'),
-]
-
-REGISTRATION_PERMS = [
-    ('members', 'may_manage_all_registrations'),
-    ('members', 'change_memberunconfirmedproxy'),
-    ('members', 'delete_memberunconfirmedproxy'),
-]
-
-MATERIAL_PERMS = [
-    ('members', 'list_global_member'),
-    ('material', 'view_materialpart'),
-    ('material', 'change_materialpart'),
-    ('material', 'add_materialpart'),
-    ('material', 'delete_materialpart'),
-    ('material', 'view_materialcategory'),
-    ('material', 'change_materialcategory'),
-    ('material', 'add_materialcategory'),
-    ('material', 'delete_materialcategory'),
-    ('material', 'view_ownership'),
-    ('material', 'change_ownership'),
-    ('material', 'add_ownership'),
-    ('material', 'delete_ownership'),
-]
-
-
-def ensure_group_perms(apps, schema_editor, name, perm_names):
-    """
-    Ensure the group `name` has the permissions `perm_names`. If the group does not
-    exist, create it with the given permissions, otherwise add the missing ones.
-
-    This only adds permissions, already existing ones that are not listed here are not
-    removed.
-    """
-    db_alias = schema_editor.connection.alias
-    Group = apps.get_model("auth", "Group")
-    Permission = apps.get_model("auth", "Permission")
-    perms = [ Permission.objects.get(codename=codename, content_type__app_label=app_label) for app_label, codename in perm_names ]
-    try:
-        g = Group.objects.using(db_alias).get(name=name)
-        for perm in perms:
-            g.permissions.add(perm)
-        g.save()
-    # This case is only executed if users have manually removed one of the standard groups.
-    except Group.DoesNotExist: # pragma: no cover
-        g = Group.objects.using(db_alias).create(name=name)
-        g.permissions.set(perms)
-        g.save()
-
-
-def update_default_permission_groups(apps, schema_editor):
-    ensure_group_perms(apps, schema_editor, "Standard", STANDARD_PERMS)
-    ensure_group_perms(apps, schema_editor, "Finance", FINANCE_PERMS)
-    ensure_group_perms(apps, schema_editor, "Waitinglist", WAITINGLIST_PERMS)
-    ensure_group_perms(apps, schema_editor, "Trainings", TRAINING_PERMS)
-    ensure_group_perms(apps, schema_editor, "Registrations", REGISTRATION_PERMS)
-    ensure_group_perms(apps, schema_editor, "Material", MATERIAL_PERMS)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('members', '0010_create_default_permission_groups'),
-        ('members', '0042_member_ticket_no'),
-    ]
-
-    operations = [
-        migrations.RunPython(update_default_permission_groups, migrations.RunPython.noop),
-    ]

jdav_web/members/migrations/0044_membertraining_activity_and_more.py

@@ -1,42 +0,0 @@
-# Generated by Django 4.2.20 on 2025-10-10 15:50
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('members', '0043_waitinglist_permissions'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='membertraining',
-            name='activity',
-            field=models.ManyToManyField(to='members.activitycategory', verbose_name='Activity'),
-        ),
-        migrations.AlterModelOptions(
-            name='membertraining',
-            options={'default_permissions': ('add_global', 'change_global', 'view_global', 'delete_global', 'list_global', 'view'), 'permissions': (('manage_success_trainings', 'Can edit the success status of trainings.'),), 'verbose_name': 'Training', 'verbose_name_plural': 'Trainings'},
-        ),
-        migrations.AlterField(
-            model_name='membertraining',
-            name='title',
-            field=models.CharField(max_length=150, verbose_name='Title'),
-        ),
-        migrations.AlterField(
-            model_name='membertraining',
-            name='member',
-            field=models.ForeignKey(on_delete=models.deletion.CASCADE, related_name='traininigs', to='members.member', verbose_name='Member'),
-        ),
-        migrations.AlterField(
-            model_name='membertraining',
-            name='participated',
-            field=models.BooleanField(null=True, verbose_name='Participated'),
-        ),
-        migrations.AlterField(
-            model_name='membertraining',
-            name='passed',
-            field=models.BooleanField(null=True, verbose_name='Passed'),
-        ),
-    ]

jdav_web/members/migrations/0045_statement_permissions.py

@@ -1,121 +0,0 @@
-from django.utils.translation import gettext_lazy as _
-from django.db import migrations
-from django.contrib.auth.management import create_permissions
-
-STANDARD_PERMS = [
-    ('members', 'view_member'),
-    ('members', 'view_freizeit'),
-    ('members', 'add_global_freizeit'),
-    ('members', 'view_memberwaitinglist'),
-    ('members', 'view_memberunconfirmedproxy'),
-    ('mailer', 'view_message'),
-    ('mailer', 'add_global_message'),
-    ('finance', 'view_statement'),
-    ('finance', 'add_global_statement'),
-]
-
-FINANCE_PERMS = [
-    ('finance', 'view_bill'),
-    ('finance', 'view_ledger'),
-    ('finance', 'add_ledger'),
-    ('finance', 'change_ledger'),
-    ('finance', 'delete_ledger'),
-    ('finance', 'view_global_statement'),
-    ('finance', 'change_global_statement'),
-    ('finance', 'process_statementsubmitted'),
-    ('finance', 'may_manage_confirmed_statements'),
-    ('finance', 'view_transaction'),
-    ('finance', 'change_transaction'),
-    ('finance', 'add_transaction'),
-    ('finance', 'delete_transaction'),
-    ('members', 'list_global_freizeit'),
-    ('members', 'view_global_freizeit'),
-]
-
-WAITINGLIST_PERMS = [
-    ('members', 'view_global_memberwaitinglist'),
-    ('members', 'list_global_memberwaitinglist'),
-    ('members', 'change_global_memberwaitinglist'),
-    ('members', 'delete_global_memberwaitinglist'),
-]
-
-TRAINING_PERMS = [
-    ('members', 'change_global_member'),
-    ('members', 'list_global_member'),
-    ('members', 'view_global_member'),
-    ('members', 'add_global_membertraining'),
-    ('members', 'change_global_membertraining'),
-    ('members', 'list_global_membertraining'),
-    ('members', 'view_global_membertraining'),
-    ('members', 'view_trainingcategory'),
-    ('members', 'add_trainingcategory'),
-    ('members', 'change_trainingcategory'),
-    ('members', 'delete_trainingcategory'),
-]
-
-REGISTRATION_PERMS = [
-    ('members', 'may_manage_all_registrations'),
-    ('members', 'change_memberunconfirmedproxy'),
-    ('members', 'delete_memberunconfirmedproxy'),
-]
-
-MATERIAL_PERMS = [
-    ('members', 'list_global_member'),
-    ('material', 'view_materialpart'),
-    ('material', 'change_materialpart'),
-    ('material', 'add_materialpart'),
-    ('material', 'delete_materialpart'),
-    ('material', 'view_materialcategory'),
-    ('material', 'change_materialcategory'),
-    ('material', 'add_materialcategory'),
-    ('material', 'delete_materialcategory'),
-    ('material', 'view_ownership'),
-    ('material', 'change_ownership'),
-    ('material', 'add_ownership'),
-    ('material', 'delete_ownership'),
-]
-
-
-def ensure_group_perms(apps, schema_editor, name, perm_names):
-    """
-    Ensure the group `name` has the permissions `perm_names`. If the group does not
-    exist, create it with the given permissions, otherwise add the missing ones.
-
-    This only adds permissions, already existing ones that are not listed here are not
-    removed.
-    """
-    db_alias = schema_editor.connection.alias
-    Group = apps.get_model("auth", "Group")
-    Permission = apps.get_model("auth", "Permission")
-    perms = [ Permission.objects.get(codename=codename, content_type__app_label=app_label) for app_label, codename in perm_names ]
-    try:
-        g = Group.objects.using(db_alias).get(name=name)
-        for perm in perms:
-            g.permissions.add(perm)
-        g.save()
-    # This case is only executed if users have manually removed one of the standard groups.
-    except Group.DoesNotExist: # pragma: no cover
-        g = Group.objects.using(db_alias).create(name=name)
-        g.permissions.set(perms)
-        g.save()
-
-
-def update_default_permission_groups(apps, schema_editor):
-    ensure_group_perms(apps, schema_editor, "Standard", STANDARD_PERMS)
-    ensure_group_perms(apps, schema_editor, "Finance", FINANCE_PERMS)
-    ensure_group_perms(apps, schema_editor, "Waitinglist", WAITINGLIST_PERMS)
-    ensure_group_perms(apps, schema_editor, "Trainings", TRAINING_PERMS)
-    ensure_group_perms(apps, schema_editor, "Registrations", REGISTRATION_PERMS)
-    ensure_group_perms(apps, schema_editor, "Material", MATERIAL_PERMS)
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('finance', '0012_statementonexcursionproxy'),
-        ('members', '0044_membertraining_activity_and_more'),
-    ]
-
-    operations = [
-        migrations.RunPython(update_default_permission_groups, migrations.RunPython.noop),
-    ]

jdav_web/members/models.py

@@ -24,8 +24,7 @@ from django.contrib.auth.models import User
 from django.conf import settings
 from django.core.validators import MinValueValidator
 
-from .rules import may_view, may_change, may_delete, is_own_training, is_oneself, is_leader, is_leader_of_excursion,\
+from .rules import may_view, may_change, may_delete, is_own_training, is_oneself, is_leader, is_leader_of_excursion
-    is_leader_of_relevant_invitation
 from .pdf import render_tex
 import rules
 from contrib.models import CommonModel
@@ -36,6 +35,9 @@ from utils import cvt_to_decimal, coming_midnight
 from dateutil.relativedelta import relativedelta
 from schwifty import IBAN
 
+def generate_random_key():
+    return uuid.uuid4().hex
+
 
 GEMEINSCHAFTS_TOUR = MUSKELKRAFT_ANREISE = MALE = 0
 FUEHRUNGS_TOUR = OEFFENTLICHE_ANREISE = FEMALE = 1
@@ -106,11 +108,6 @@ class Group(models.Model):
         verbose_name = _('group')
         verbose_name_plural = _('groups')
 
-    @property
-    def sorted_members(self):
-        """Returns the members of this group sorted by their last name."""
-        return self.member_set.all().order_by('lastname')
-
     def has_time_info(self):
         # return if the group has all relevant time slot information filled
         return self.weekday and self.start_time and self.end_time
@@ -211,8 +208,7 @@ class Contact(CommonModel):
         for email_fd, confirmed_email_fd, confirm_mail_key_fd in self.email_fields:
             if getattr(self, confirmed_email_fd) and not rerequest:
                 continue
-            if not getattr(self, email_fd): # pragma: no cover
+            if not getattr(self, email_fd):
-                # Only reachable with misconfigured `email_fields`
                 continue
             requested_confirmation = True
             setattr(self, confirmed_email_fd, False)
@@ -324,9 +320,6 @@ class Member(Person):
     has_key = models.BooleanField(_('Has key'), default=False)
     has_free_ticket_gym = models.BooleanField(_('Has a free ticket for the climbing gym'), default=False)
     dav_badge_no = models.CharField(max_length=20, verbose_name=_('DAV badge number'), default='', blank=True)
-    
-    # use this to store a climbing gym customer or membership id, used to print on meeting checklists
-    ticket_no = models.CharField(max_length=20, verbose_name=_('entrance ticket number'), default='', blank=True)   
     swimming_badge = models.BooleanField(verbose_name=_('Knows how to swim'), default=False)
     climbing_badge = models.CharField(max_length=100, verbose_name=_('Climbing badge'), default='', blank=True)
     alpine_experience = models.TextField(verbose_name=_('Alpine experience'), default='', blank=True)
@@ -389,11 +382,6 @@ class Member(Person):
         """Returning the whole place (plz + town)"""
         return "{0} {1}".format(self.plz, self.town)
 
-    @property
-    def ticket_tag(self):
-        """Returning the ticket number stripped of strings and spaces"""
-        return "{" + ''.join(re.findall(r'\d', self.ticket_no)) + "}"
-
     @property
     def iban_valid(self):
         return IBAN(self.iban, allow_invalid=True).is_valid
@@ -566,12 +554,6 @@ class Member(Person):
             waiter.delete()
         return self.request_mail_confirmation(rerequest=False)
 
-    def registration_form_uploaded(self):
-        print(self.registration_form.name)
-        return not self.registration_form.name is None and self.registration_form.name != ""
-    registration_form_uploaded.boolean = True
-    registration_form_uploaded.short_description = _('Registration form')
-
     def registration_ready(self):
         """Returns if the member is currently unconfirmed and all email addresses
         are confirmed."""
@@ -597,16 +579,12 @@ class Member(Person):
     def send_upload_registration_form_link(self):
         if not self.upload_registration_form_key:
             return
+        print(self.name, self.upload_registration_form_key)
         link = self.get_upload_registration_form_link()
         self.send_mail(_('Upload registration form'),
                        settings.UPLOAD_REGISTRATION_FORM_TEXT.format(name=self.prename,
                                                                      link=link))
 
-    def request_registration_form(self):
-        """Ask the member to upload a registration form via email."""
-        self.generate_upload_registration_form_key()
-        self.send_upload_registration_form_link()
-
     def notify_jugendleiters_about_confirmed_mail(self):
         group = ", ".join([g.name for g in self.group.all()])
         # notify jugendleiters of group of registration
@@ -621,16 +599,7 @@ class Member(Person):
                       settings.DEFAULT_SENDING_MAIL,
                       jl.email)
 
-    def filter_queryset_by_permissions(self, queryset=None, annotate=False, model=None): # pragma: no cover
+    def filter_queryset_by_permissions(self, queryset=None, annotate=False, model=None):
-        """
-        Filter the given queryset of objects of type `model` by the permissions of `self`.
-        For example, only returns `Message`s created by `self`.
-
-        This method is used by the `FilteredMemberFieldMixin` to filter the selection
-        in `ForeignKey` and `ManyToMany` fields.
-        """
-        # This method is not used by all models listed below, so covering all cases in tests
-        # is hard and not useful. It is therefore exempt from testing.
         name = model._meta.object_name
         if queryset is None:
             queryset = Member.objects.all()
@@ -643,8 +612,6 @@ class Member(Person):
             return self.filter_statements_by_permissions(queryset, annotate)
         elif name == "Freizeit":
             return self.filter_excursions_by_permissions(queryset, annotate)
-        elif name == "MemberWaitingList":
-            return self.filter_waiters_by_permissions(queryset, annotate)
         elif name == "LJPProposal":
             return queryset
         elif name == "MemberTraining":
@@ -652,9 +619,7 @@ class Member(Person):
         elif name == "NewMemberOnList":
             return queryset
         elif name == "Statement":
-            return self.filter_statements_by_permissions(queryset, annotate)
+            return queryset
-        elif name == "StatementOnExcursionProxy":
-            return self.filter_statements_by_permissions(queryset, annotate)
         elif name == "BillOnExcursionProxy":
             return queryset
         elif name == "Intervention":
@@ -669,8 +634,6 @@ class Member(Person):
             return queryset
         elif name == "MemberUnconfirmedProxy":
             return queryset
-        elif name == "InvitationToGroup":
-            return queryset
         else:
             raise ValueError(name)
 
@@ -749,12 +712,6 @@ class Member(Person):
         queryset = queryset.filter(Q(groups__in=groups) | Q(jugendleiter=self)).distinct()
         return queryset
 
-    def filter_waiters_by_permissions(self, queryset, annotate=False):
-        # ignores annotate
-        # return waiters that have a pending, expired or rejected group invitation for a group
-        # led by the member
-        return queryset.filter(invitationtogroup__group__leiters=self)
-
     def may_list(self, other):
         if self.pk == other.pk:
             return True
@@ -943,7 +900,7 @@ def gen_key():
     return uuid.uuid4().hex
 
 
-class InvitationToGroup(CommonModel):
+class InvitationToGroup(models.Model):
     """An invitation of a waiter to a group."""
     waiter = models.ForeignKey('MemberWaitingList', verbose_name=_('Waiter'), on_delete=models.CASCADE)
     group = models.ForeignKey(Group, verbose_name=_('Group'), on_delete=models.CASCADE)
@@ -956,15 +913,9 @@ class InvitationToGroup(CommonModel):
                                    on_delete=models.SET_NULL,
                                    related_name='created_group_invitations')
 
-    class Meta(CommonModel.Meta):
+    class Meta:
         verbose_name = _('Invitation to group')
         verbose_name_plural = _('Invitations to groups')
-        rules_permissions = {
-            'add_obj': has_global_perm('members.add_global_memberwaitinglist'),
-            'view_obj': is_leader_of_relevant_invitation | has_global_perm('members.view_global_memberwaitinglist'),
-            'change_obj': has_global_perm('members.change_global_memberwaitinglist'),
-            'delete_obj': has_global_perm('members.delete_global_memberwaitinglist'),
-        }
 
     def is_expired(self):
         return self.date < (timezone.now() - timezone.timedelta(days=30)).date()
@@ -1071,7 +1022,7 @@ class MemberWaitingList(Person):
         permissions = (('may_manage_waiting_list', 'Can view and manage the waiting list.'),)
         rules_permissions = {
             'add_obj': has_global_perm('members.add_global_memberwaitinglist'),
-            'view_obj': is_leader_of_relevant_invitation | has_global_perm('members.view_global_memberwaitinglist'),
+            'view_obj': has_global_perm('members.view_global_memberwaitinglist'),
             'change_obj': has_global_perm('members.change_global_memberwaitinglist'),
             'delete_obj': has_global_perm('members.delete_global_memberwaitinglist'),
         }
@@ -1087,8 +1038,8 @@ class MemberWaitingList(Person):
     @property
     def waiting_confirmation_needed(self):
         """Returns if person should be asked to confirm waiting status."""
-        return not self.wait_confirmation_key \
+        return wait_confirmation_key is None \
-            and self.last_wait_confirmation < timezone.now() -\
+            and last_wait_confirmation < timezone.now() -\
                 timezone.timedelta(days=settings.WAITING_CONFIRMATION_FREQUENCY)
 
     def waiting_confirmed(self):
@@ -1151,9 +1102,10 @@ class MemberWaitingList(Person):
         return self.wait_confirmation_key
 
     def may_register(self, key):
+        print("may_register", key)
         try:
             invitation = InvitationToGroup.objects.get(key=key)
-            return self.pk == invitation.waiter.pk and timezone.now().date() < invitation.date + timezone.timedelta(days=30)
+            return self.pk == invitation.waiter.pk and timezone.now() < invitation.date + timezone.timedelta(days=30)
         except InvitationToGroup.DoesNotExist:
             return False
 
@@ -1223,13 +1175,13 @@ class NewMemberOnList(CommonModel):
 
     @property
     def skills(self):
-        activities = [a.name for a in self.memberlist.activity.all()]
+        activities = [a.name for a in memberlist.activity.all()]
         return {k: v for k, v in self.member.get_skills().items() if k in activities}
 
     @property
     def qualities_tex(self):
         qualities = []
-        for activity, value in self.skills.items():
+        for activity, value in self.skills:
             qualities.append("\\textit{%s:} %s" % (activity, value))
         return ", ".join(qualities)
 
@@ -1307,23 +1259,6 @@ class Freizeit(CommonModel):
     def code(self):
         return f"B{self.date:%y}-{self.pk}"
 
-    @staticmethod
-    def filter_queryset_date_next_n_hours(hours, queryset=None):
-        if queryset is None:
-            queryset = Freizeit.objects.all()
-        return queryset.filter(date__lte=timezone.now() + timezone.timedelta(hours=hours),
-                               date__gte=timezone.now())
-
-    @staticmethod
-    def to_notify_crisis_intervention_list():
-        qs = Freizeit.objects.filter(notification_crisis_intervention_list_sent=False)
-        return Freizeit.filter_queryset_date_next_n_hours(48, queryset=qs)
-
-    @staticmethod
-    def to_send_crisis_intervention_list():
-        qs = Freizeit.objects.filter(crisis_intervention_list_sent=False)
-        return Freizeit.filter_queryset_date_next_n_hours(24, queryset=qs)
-
     def get_tour_type(self):
         if self.tour_type == FUEHRUNGS_TOUR:
             return "Führungstour"
@@ -1351,28 +1286,18 @@ class Freizeit(CommonModel):
     @property
     def duration(self):
         # number of nights is number of full days + 1
-        full_days = max(self.night_count - 1, 0)
+        full_days = self.night_count - 1
         extra_days = 0
 
-        if self.date.date() == self.end.date():
+        if self.date.hour <= 12:
-            # excursion starts and ends on the same day
+            extra_days += 1.0
-            hours = max(self.end.hour - self.date.hour, 0)
-            # at least 6 hours counts as full day
-            if hours >= 6:
-                extra_days = 1.0
-            # otherwise half day
-            else:
-                extra_days = 0.5
         else:
-            if self.date.hour <= 12:
+            extra_days += 0.5
-                extra_days += 1.0
-            else:
-                extra_days += 0.5
 
-            if self.end.hour >= 12:
+        if self.end.hour >= 12:
-                extra_days += 1.0
+            extra_days += 1.0
-            else:
+        else:
-                extra_days += 0.5
+            extra_days += 0.5
 
         return full_days + extra_days
 
@@ -1625,6 +1550,7 @@ class Freizeit(CommonModel):
                 'Betreuer/in': str(numbers['staff']),
                 'Auswahl Veranstaltung': 'Auswahl2',
                 'Ort, Datum': '{p}, {d}'.format(p=settings.SEKTION, d=datetime.now().strftime('%d.%m.%Y'))}
+        print(members)
         for i, m in enumerate(members):
             suffix = str(' {}'.format(i + 1))
             # indexing starts at zero, but the listing in the pdf starts at 1
@@ -2095,14 +2021,13 @@ class TrainingCategory(models.Model):
 
 class MemberTraining(CommonModel):
     """Represents a training planned or attended by a member."""
-    member = models.ForeignKey(Member, on_delete=models.CASCADE, related_name='traininigs', verbose_name=_('Member'))
+    member = models.ForeignKey(Member, on_delete=models.CASCADE, related_name='traininigs')
-    title = models.CharField(verbose_name=_('Title'), max_length=150)
+    title = models.CharField(verbose_name=_('Title'), max_length=30)
     date = models.DateField(verbose_name=_('Date'), null=True, blank=True)
     category = models.ForeignKey(TrainingCategory, on_delete=models.PROTECT, verbose_name=_('Category'))
-    activity = models.ManyToManyField(ActivityCategory, verbose_name=_('Activity'))
     comments = models.TextField(verbose_name=_('Comments'), blank=True)
-    participated = models.BooleanField(verbose_name=_('Participated'), null=True)
+    participated = models.BooleanField(verbose_name=_('Participated'))
-    passed = models.BooleanField(verbose_name=_('Passed'), null=True)
+    passed = models.BooleanField(verbose_name=_('Passed'))
     certificate = RestrictedFileField(verbose_name=_('certificate of attendance'),
                                       upload_to='training_forms',
                                       blank=True,
@@ -2112,25 +2037,9 @@ class MemberTraining(CommonModel):
                                                       'image/png',
                                                       'image/gif'])
 
-    def __str__(self):
-        if self.date:
-            return self.title + ' ' + self.date.strftime('%d.%m.%Y')
-        return self.title + ' ' + str(_('(no date)'))
-    
-    def get_activities(self):
-        activity_string = ', '.join(a.name for a in self.activity.all())
-        return activity_string
-
-    get_activities.short_description = _('Activities')
-
-  
     class Meta(CommonModel.Meta):
         verbose_name = _('Training')
         verbose_name_plural = _('Trainings')
-        
-        permissions = (
-            ('manage_success_trainings', 'Can edit the success status of trainings.'),
-        )
         rules_permissions = {
             # sine this is used in an inline, the member and not the training is passed
             'add_obj': is_oneself | has_global_perm('members.add_global_membertraining'),

jdav_web/members/pdf.py

@@ -4,7 +4,6 @@ import os
 import subprocess
 import time
 import glob
-import logging
 from io import BytesIO
 from pypdf import PdfReader, PdfWriter, PageObject
 from django import template
@@ -16,8 +15,6 @@ from contrib.media import media_path, media_dir, serve_media, ensure_media_dir,
 from utils import normalize_filename
 from PIL import Image
 
-logger = logging.getLogger(__name__)
-
 
 def serve_pdf(filename_pdf):
     return serve_media(filename_pdf, 'application/pdf')
@@ -110,7 +107,8 @@ def pdf_add_attachments(pdf_writer, attachments):
             pdf_writer.append(img_pdf_scaled)
         
         except Exception as e:
-            logger.warning(f"Could not add image under filepath {fp}: {e}.")
+            print("Could not add image", fp)
+            print(e)
             
     
 def scale_pdf_page_to_a4(page):

jdav_web/members/rules.py

@@ -1,5 +1,4 @@
 from contrib.rules import memberize_user
-from django.utils import timezone
 from rules import predicate
 
 
@@ -74,10 +73,3 @@ def statement_not_submitted(self, excursion):
     if excursion.statement is None:
         return False
     return not excursion.statement.submitted
-
-
-@predicate
-@memberize_user
-def is_leader_of_relevant_invitation(member, waiter):
-    assert waiter is not None
-    return waiter.invitationtogroup_set.filter(group__leiters=member).exists()

jdav_web/members/tasks.py

@@ -27,7 +27,8 @@ def send_crisis_intervention_list():
     that have not been sent yet.
     """
     no = 0
-    for excursion in Freizeit.to_send_crisis_intervention_list():
+    for excursion in Freizeit.objects.filter(date__date=timezone.now().date(),
+                                             crisis_intervention_list_sent=False):
         excursion.send_crisis_intervention_list()
         no += 1
     return no
@@ -40,7 +41,8 @@ def send_notification_crisis_intervention_list():
     day and that have not been sent yet.
     """
     no = 0
-    for excursion in Freizeit.to_notify_crisis_intervention_list():
+    for excursion in Freizeit.objects.filter(date__date=timezone.now().date() + timezone.timedelta(days=1),
+                                             notification_crisis_intervention_list_sent=False):
         excursion.notify_leaders_crisis_intervention_list()
         no += 1
     return no

jdav_web/members/templates/admin/request_registration_form.html

@@ -1,40 +0,0 @@
-{% extends "admin/base_site.html" %}
-{% load i18n admin_urls static %}
-
-{% block extrahead %}
-    {{ block.super }}
-    {{ media }}
-    <script src="{% static 'admin/js/cancel.js' %}" async></script>
-    <script type="text/javascript" src="{% static "admin/js/vendor/jquery/jquery.js" %}"></script>
-    <script type="text/javascript" src="{% static "admin/js/jquery.init.js" %}"></script>
-{% endblock %}
-
-{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} invite-waiter
-{% endblock %}
-
-{% block breadcrumbs %}
-<div class="breadcrumbs">
-<a href="{% url 'admin:index' %}">{% translate 'Home' %}</a>
-&rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>
-&rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>
-&rsaquo; {% translate 'Demote to waiter' %}
-</div>
-{% endblock %}
-
-{% block content %}
-<h2>{% translate "Request registration form" %}</h2>
-<p>
-{% blocktrans %}Do you want to ask {{ member }} to upload their registration form?{% endblocktrans %}
-</p>
-<p>
-{% if member.registration_form %}
-{% blocktrans %}Warning: {{ member }} has already uploaded a registration form.{% endblocktrans %}
-{% endif %}
-</p>
-
-<form action="" method="post">
-    {% csrf_token %}
-    <input class="default" style="color: $default-link-color" type="submit" name="apply" value="{% translate 'Request registration form' %}">
-    <a href="#" class="button cancel-link">{% translate "Cancel" %}</a>
-</form>
-{% endblock %}

jdav_web/members/templates/admin/request_registratoin_form.html

@@ -1,48 +0,0 @@
-{% extends "admin/base_site.html" %}
-{% load i18n admin_urls static %}
-
-{% block extrahead %}
-    {{ block.super }}
-    {{ media }}
-    <script src="{% static 'admin/js/cancel.js' %}" async></script>
-    <script type="text/javascript" src="{% static "admin/js/vendor/jquery/jquery.js" %}"></script>
-    <script type="text/javascript" src="{% static "admin/js/jquery.init.js" %}"></script>
-{% endblock %}
-
-{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} invite-waiter
-{% endblock %}
-
-{% block breadcrumbs %}
-<div class="breadcrumbs">
-<a href="{% url 'admin:index' %}">{% translate 'Home' %}</a>
-&rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>
-&rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>
-&rsaquo; {% translate 'Demote to waiter' %}
-</div>
-{% endblock %}
-
-{% block content %}
-<h2>{% translate "Demote to waiter" %}</h2>
-<p>
-{% trans "Do you want to demote the following unconfirmed registrations to waiters?" %}
-</p>
-<p>
-<ul>
-    {% for member in queryset %}
-    <li>
-    <a href="{% url 'admin:members_memberunconfirmedproxy_change' 3 %}">{{ member }}</a>
-    </li>
-    {% endfor %}
-</ul>
-</p>
-
-<form action="" method="post">
-    {% csrf_token %}
-    {% if form %}
-    {{form}}
-    {% endif %}
-    <input type="hidden" name="action" value="demote_to_waiter_action">
-    <input class="default" style="color: $default-link-color" type="submit" name="apply" value="{% translate 'Demote' %}">
-    <a href="#" class="button cancel-link">{% translate "Cancel" %}</a>
-</form>
-{% endblock %}

jdav_web/members/templates/members/group_checklist.tex

@@ -1,65 +0,0 @@
-{% extends "members/tex_base.tex" %}
-{% load static common tex_extras %}
-
-{% block headline %}{% endblock %}
-{% block contact %}{% endblock %}
-
-{% block extra-preamble %}
-\usepackage{rotating}
-\usepackage[code=Code39,X=.48mm,ratio=3.5,H=0.5cm]{makebarcode}
-\geometry{reset,margin=1cm, bottom=1.5cm}
-\renewcommand{\arraystretch}{1}
-{% endblock %}
-
-{% block content %}
-{% settings_value 'DEFAULT_STATIC_PATH' as static_root %}
-
-{% for group in groups %}
-\picpos{2.5cm}{16cm}{-0.4cm}{%
-{{ static_root }}/general/img/dav_logo_sektion.png%
-}
-% HEADLINE
-
-{\noindent\Large{Gruppenliste {{ group.name }} }}\\[1mm]
-{% if group.has_time_info %} \noindent {{ weekdays|index:group.weekday|esc_all }}, {{ group.start_time }} - {{ group.end_time }} Uhr\\ {% endif %}
-\noindent {{ header_text }}
-\begin{table}[H]
-  \centering
-%\begin{tabularx}{\textwidth}{lYY|l|l|l|l|l|l|l|l|l|l|l|l|l|l|l|l|l}
-\begin{tabularx}{\textwidth}{X{% for i in week_range %}|l{% endfor%}}
-\toprule
-  \textbf{Name} {% for i in week_range %}
-  & \begin{sideways} {{ dates|index:i|add:group.weekday|date_vs }} \end{sideways}
-{% endfor %} \\
-
-  {% for j in member_range %}
-  {% with m=group.sorted_members|index:j %}
-  {% with codelength=m.ticket_tag|length %}
-  \midrule
-      \begin{tabular}{@{}l}
-         {% if codelength > 2 %}
-          \barcode[
-            X=\dimexpr 3.5mm / \numexpr {{ codelength }} \relax \relax
-          ]{{ m.ticket_tag }}
-        {% else %}
-          \rule{0pt}{5mm}
-        {% endif %} 
-        \vspace{-0.8ex} \\
-        {\small {{ j|plus:1 }} {% if m in group.leiters.all %}\textbf{JL}{% endif %}
-        {{ m.name|esc_all }} {% if codelength > 2 %} - {{ m.ticket_tag }}{% endif %} 
-        \vspace{-3ex} }
-    \end{tabular} 
-      
-  {% for i in week_range %} & {% endfor %}\\
-  {% endwith %}
-  {% endwith %}
-  {% endfor %}
-
-  \bottomrule
-\end{tabularx}
-\end{table}
-
-\clearpage
-{% endfor %}
-
-{% endblock content %}

jdav_web/members/templatetags/tex_extras.py

@@ -1,6 +1,5 @@
 from django import template
 from django.utils.safestring import mark_safe
-from datetime import timedelta
 
 register = template.Library()
 
@@ -15,12 +14,6 @@ def checked_if_true(name, value):
 def esc_all(val):
     return mark_safe(str(val).replace('_', '\\_').replace('&', '\\&').replace('%', '\\%'))
 
-@register.filter
-def index(sequence, position):
-    try:
-        return sequence[position]
-    except (IndexError, TypeError):
-        return ''
 
 @register.filter
 def datetime_short(date):
@@ -31,22 +24,7 @@ def datetime_short(date):
 def date_short(date):
     return date.strftime('%d.%m.%y')
 
-@register.filter
-def date_vs(date):
-    return date.strftime('%d.%m.')
 
 @register.filter
 def time_short(date):
     return date.strftime('%H:%M')
-
-@register.filter
-def add(date, days):
-    if days:
-        return date + timedelta(days=days)
-    return date
-
-@register.filter
-def plus(num1, num2):
-    if num2:
-        return num1 + num2
-    return num1

jdav_web/members/tests/__init__.py

@@ -1,5 +1 @@
 from .basic import *
-from .views import *
-from .tasks import *
-from .rules import *
-from .templatetags import *

jdav_web/members/tests/rules.py

@@ -1,179 +0,0 @@
-from django.test import TestCase
-from django.utils import timezone
-from django.contrib.auth.models import User
-
-from ..models import Member, Group, Freizeit, DIVERSE, GEMEINSCHAFTS_TOUR, MemberTraining, TrainingCategory, LJPProposal
-from ..rules import is_oneself, may_view, may_change, may_delete, is_own_training, is_leader_of_excursion, is_leader, statement_not_submitted, _is_leader
-from finance.models import Statement
-from mailer.models import EmailAddress
-
-
-class RulesTestCase(TestCase):
-    def setUp(self):
-        # Create email address for groups
-        self.email_address = EmailAddress.objects.create(name='test@example.com')
-
-        # Create test users and members
-        self.user1 = User.objects.create_user(username='user1', email='user1@example.com')
-        self.member1 = Member.objects.create(
-            prename='Test',
-            lastname='Member1',
-            birth_date=timezone.now().date(),
-            email='member1@example.com',
-            gender=DIVERSE
-        )
-        self.user1.member = self.member1
-        self.user1.save()
-
-        self.user2 = User.objects.create_user(username='user2', email='user2@example.com')
-        self.member2 = Member.objects.create(
-            prename='Test',
-            lastname='Member2',
-            birth_date=timezone.now().date(),
-            email='member2@example.com',
-            gender=DIVERSE
-        )
-        self.user2.member = self.member2
-        self.user2.save()
-
-        self.user3 = User.objects.create_user(username='user3', email='user3@example.com')
-        self.member3 = Member.objects.create(
-            prename='Test',
-            lastname='Member3',
-            birth_date=timezone.now().date(),
-            email='member3@example.com',
-            gender=DIVERSE
-        )
-        self.user3.member = self.member3
-        self.user3.save()
-
-        # Create test group
-        self.group = Group.objects.create(name='Test Group')
-        self.group.contact_email = self.email_address
-        self.group.leiters.add(self.member2)
-        self.group.save()
-
-        # Create test excursion
-        self.excursion = Freizeit.objects.create(
-            name='Test Excursion',
-            tour_type=GEMEINSCHAFTS_TOUR,
-            kilometers_traveled=10,
-            difficulty=1
-        )
-        self.excursion.jugendleiter.add(self.member1)
-        self.excursion.groups.add(self.group)
-        self.excursion.save()
-
-        # Create training category and training
-        self.training_category = TrainingCategory.objects.create(
-            name='Test Training',
-            permission_needed=False
-        )
-
-        self.training = MemberTraining.objects.create(
-            member=self.member1,
-            title='Test Training',
-            category=self.training_category,
-            participated=True,
-            passed=True
-        )
-
-        # Create LJP proposal
-        self.ljp_proposal = LJPProposal.objects.create(
-            title='Test LJP',
-            excursion=self.excursion
-        )
-
-        # Create statement
-        self.statement_unsubmitted = Statement.objects.create(
-            short_description='Unsubmitted Statement',
-            excursion=self.excursion,
-            status=Statement.UNSUBMITTED
-        )
-
-        self.statement_submitted = Statement.objects.create(
-            short_description='Submitted Statement',
-            status=Statement.SUBMITTED
-        )
-
-    def test_is_oneself(self):
-        """Test is_oneself rule - member can identify themselves."""
-        # Same member
-        self.assertTrue(is_oneself(self.user1, self.member1))
-
-        # Different members
-        self.assertFalse(is_oneself(self.user1, self.member2))
-
-    def test_may(self):
-        """Test `may_` rules."""
-        self.assertTrue(may_view(self.user1, self.member1))
-        self.assertTrue(may_change(self.user1, self.member1))
-        self.assertTrue(may_delete(self.user1, self.member1))
-
-    def test_is_own_training(self):
-        """Test is_own_training rule - member can access their own training."""
-        # Own training
-        self.assertTrue(is_own_training(self.user1, self.training))
-        # Other member's training
-        self.assertFalse(is_own_training(self.user2, self.training))
-
-    def test_is_leader_of_excursion(self):
-        """Test is_leader_of_excursion rule for LJP proposals."""
-        # LJP proposal with excursion - member3 is not a leader
-        self.assertFalse(is_leader_of_excursion(self.user3, self.ljp_proposal))
-        # Directly pass an excursion
-        self.assertTrue(is_leader_of_excursion(self.user1, self.excursion))
-
-    def test_is_leader(self):
-        """Test is_leader rule for excursions."""
-        # Direct excursion leader
-        self.assertTrue(is_leader(self.user1, self.excursion))
-
-        # Group leader (member2 is leader of group that is part of excursion)
-        self.assertTrue(is_leader(self.user2, self.excursion))
-
-        # member3 is unrelated
-        self.assertFalse(is_leader(self.user3, self.excursion))
-
-        # Test user without member attribute
-        user_no_member = User.objects.create_user(username='nomember', email='nomember@example.com')
-        self.assertFalse(is_leader(user_no_member, self.excursion))
-
-        # Test member without pk attribute
-        class MemberNoPk:
-            pass
-        member_no_pk = MemberNoPk()
-        self.assertFalse(_is_leader(member_no_pk, self.excursion))
-
-        # Test member with None pk
-        class MemberNonePk:
-            pk = None
-        member_none_pk = MemberNonePk()
-        self.assertFalse(_is_leader(member_none_pk, self.excursion))
-
-    def test_statement_not_submitted(self):
-        """Test statement_not_submitted rule."""
-        # Unsubmitted statement with excursion
-        self.assertTrue(statement_not_submitted(self.user1, self.excursion))
-
-        # Submitted statement
-        self.excursion.statement = self.statement_submitted
-        self.excursion.save()
-        self.assertFalse(statement_not_submitted(self.user1, self.excursion))
-
-        # Excursion without statement
-        excursion_no_statement = Freizeit.objects.create(
-            name='No Statement Excursion',
-            tour_type=GEMEINSCHAFTS_TOUR,
-            kilometers_traveled=10,
-            difficulty=1
-        )
-        self.assertFalse(statement_not_submitted(self.user1, excursion_no_statement))
-
-        # Test the excursion.statement is None case
-        # Create a special test object to directly trigger
-        class ExcursionWithNoneStatement:
-            def __init__(self):
-                self.statement = None
-        # if excursion.statement is None: return False
-        self.assertFalse(statement_not_submitted(self.user1, ExcursionWithNoneStatement()))

jdav_web/members/tests/tasks.py

@@ -1,142 +0,0 @@
-from unittest.mock import patch, MagicMock
-from django.test import TestCase
-from django.utils import timezone
-from django.conf import settings
-
-from ..models import MemberWaitingList, Freizeit, Group, DIVERSE, GEMEINSCHAFTS_TOUR
-from ..tasks import ask_for_waiting_confirmation, send_crisis_intervention_list, send_notification_crisis_intervention_list
-from mailer.models import EmailAddress
-
-
-class TasksTestCase(TestCase):
-    def setUp(self):
-        # Create test email address
-        self.email_address = EmailAddress.objects.create(name='test@example.com')
-
-        # Create test group
-        self.group = Group.objects.create(name='Test Group')
-        self.group.contact_email = self.email_address
-        self.group.save()
-
-        # Create test waiters
-        now = timezone.now()
-        old_confirmation = now - timezone.timedelta(days=settings.WAITING_CONFIRMATION_FREQUENCY + 1)
-        old_reminder = now - timezone.timedelta(days=settings.CONFIRMATION_REMINDER_FREQUENCY + 1)
-
-        self.waiter1 = MemberWaitingList.objects.create(
-            prename='Test',
-            lastname='Waiter1',
-            birth_date=now.date(),
-            email='waiter1@example.com',
-            gender=DIVERSE,
-            last_wait_confirmation=old_confirmation,
-            last_reminder=old_reminder,
-            sent_reminders=0
-        )
-
-        self.waiter2 = MemberWaitingList.objects.create(
-            prename='Test',
-            lastname='Waiter2',
-            birth_date=now.date(),
-            email='waiter2@example.com',
-            gender=DIVERSE,
-            last_wait_confirmation=old_confirmation,
-            last_reminder=old_reminder,
-            sent_reminders=settings.MAX_REMINDER_COUNT - 1
-        )
-
-        # Create waiter that shouldn't receive reminder (too recent confirmation)
-        self.waiter3 = MemberWaitingList.objects.create(
-            prename='Test',
-            lastname='Waiter3',
-            birth_date=now.date(),
-            email='waiter3@example.com',
-            gender=DIVERSE,
-            last_wait_confirmation=now,
-            last_reminder=old_reminder,
-            sent_reminders=0
-        )
-
-        # Create waiter that shouldn't receive reminder (max reminders reached)
-        self.waiter4 = MemberWaitingList.objects.create(
-            prename='Test',
-            lastname='Waiter4',
-            birth_date=now.date(),
-            email='waiter4@example.com',
-            gender=DIVERSE,
-            last_wait_confirmation=old_confirmation,
-            last_reminder=old_reminder,
-            sent_reminders=settings.MAX_REMINDER_COUNT
-        )
-
-        # Create test excursions
-        today = timezone.now().date()
-        tomorrow = today + timezone.timedelta(days=1)
-
-        self.excursion_today_not_sent = Freizeit.objects.create(
-            name='Today Excursion 1',
-            date=timezone.now() + timezone.timedelta(hours=4),
-            tour_type=GEMEINSCHAFTS_TOUR,
-            kilometers_traveled=10,
-            difficulty=1,
-            crisis_intervention_list_sent=False,
-            notification_crisis_intervention_list_sent=False
-        )
-
-        self.excursion_today_sent = Freizeit.objects.create(
-            name='Today Excursion 2',
-            date=timezone.now() + timezone.timedelta(hours=4),
-            tour_type=GEMEINSCHAFTS_TOUR,
-            kilometers_traveled=10,
-            difficulty=1,
-            crisis_intervention_list_sent=True,
-            notification_crisis_intervention_list_sent=True
-        )
-
-        self.excursion_tomorrow_not_sent = Freizeit.objects.create(
-            name='Tomorrow Excursion 1',
-            date=timezone.now() + timezone.timedelta(days=1, hours=4),
-            tour_type=GEMEINSCHAFTS_TOUR,
-            kilometers_traveled=10,
-            difficulty=1,
-            crisis_intervention_list_sent=False,
-            notification_crisis_intervention_list_sent=False
-        )
-
-        self.excursion_tomorrow_sent = Freizeit.objects.create(
-            name='Tomorrow Excursion 2',
-            date=timezone.now() + timezone.timedelta(days=1, hours=4),
-            tour_type=GEMEINSCHAFTS_TOUR,
-            kilometers_traveled=10,
-            difficulty=1,
-            crisis_intervention_list_sent=True,
-            notification_crisis_intervention_list_sent=True
-        )
-
-    @patch.object(MemberWaitingList, 'ask_for_wait_confirmation')
-    def test_ask_for_waiting_confirmation(self, mock_ask):
-        """Test ask_for_waiting_confirmation task calls correct waiters."""
-        result = ask_for_waiting_confirmation()
-
-        # Should call ask_for_wait_confirmation for waiter1 and waiter2 only
-        self.assertEqual(result, 2)
-        self.assertEqual(mock_ask.call_count, 2)
-
-    @patch.object(Freizeit, 'send_crisis_intervention_list')
-    def test_send_crisis_intervention_list(self, mock_send):
-        """Test send_crisis_intervention_list task calls correct excursions."""
-        result = send_crisis_intervention_list()
-
-        # Should call send_crisis_intervention_list for today's excursions that haven't been sent
-        self.assertEqual(result, 1)
-        self.assertEqual(mock_send.call_count, 1)
-
-    @patch.object(Freizeit, 'notify_leaders_crisis_intervention_list')
-    def test_send_notification_crisis_intervention_list(self, mock_notify):
-        """Test send_notification_crisis_intervention_list task calls correct excursions."""
-        result = send_notification_crisis_intervention_list()
-
-        # Should call notify_leaders_crisis_intervention_list for tomorrow's and todays excursions
-        # that haven't been sent
-        self.assertEqual(result, 2)
-        self.assertEqual(mock_notify.call_count, 2)

jdav_web/members/tests/templatetags.py

@@ -1,80 +0,0 @@
-from django.test import TestCase
-from django.template import Context, Template
-from datetime import datetime, date, timedelta
-from members.templatetags.tex_extras import index, datetime_short, date_short, date_vs, time_short, add, plus
-from members.templatetags.overview_extras import blToColor, render_bool
-
-
-class TexExtrasTestCase(TestCase):
-    def setUp(self):
-        self.test_date = date(2024, 3, 15)
-        self.test_datetime = datetime(2024, 3, 15, 14, 30)
-        self.test_list = ['a', 'b', 'c']
-
-    def test_index_valid_position(self):
-        result = index(self.test_list, 1)
-        self.assertEqual(result, 'b')
-
-    def test_index_invalid_position(self):
-        result = index(self.test_list, 5)
-        self.assertEqual(result, '')
-
-    def test_index_type_error(self):
-        result = index(123, 1)
-        self.assertEqual(result, '')
-
-    def test_datetime_short(self):
-        result = datetime_short(self.test_datetime)
-        self.assertEqual(result, '15.03.2024 14:30')
-
-    def test_date_short(self):
-        result = date_short(self.test_date)
-        self.assertEqual(result, '15.03.24')
-
-    def test_date_vs(self):
-        result = date_vs(self.test_date)
-        self.assertEqual(result, '15.03.')
-
-    def test_time_short(self):
-        result = time_short(self.test_datetime)
-        self.assertEqual(result, '14:30')
-
-    def test_add_with_days(self):
-        result = add(self.test_date, 5)
-        self.assertEqual(result, date(2024, 3, 20))
-
-    def test_add_without_days(self):
-        result = add(self.test_date, None)
-        self.assertEqual(result, self.test_date)
-
-    def test_plus_with_second_number(self):
-        result = plus(10, 5)
-        self.assertEqual(result, 15)
-
-    def test_plus_without_second_number(self):
-        result = plus(10, None)
-        self.assertEqual(result, 10)
-
-
-class OverviewExtrasTestCase(TestCase):
-    def test_blToColor_truthy_value(self):
-        result = blToColor(True)
-        self.assertEqual(result, 'green')
-
-    def test_blToColor_falsy_value(self):
-        result = blToColor(False)
-        self.assertEqual(result, 'red')
-
-    def test_render_bool_non_boolean_value(self):
-        with self.assertRaises(ValueError):
-            render_bool("not_a_boolean")
-
-    def test_render_bool_true(self):
-        result = render_bool(True)
-        self.assertIn('#bcd386', result)
-        self.assertIn('icon-tick', result)
-
-    def test_render_bool_false(self):
-        result = render_bool(False)
-        self.assertIn('#dba4a4', result)
-        self.assertIn('icon-cross', result)

jdav_web/members/tests/utils.py

@@ -22,7 +22,7 @@ from members.models import Member, Group, PermissionMember, PermissionGroup, Fre
         Klettertreff, KlettertreffAttendee, LJPProposal, ActivityCategory, WEEKDAYS,\
         TrainingCategory, Person
 from members.admin import MemberWaitingListAdmin, MemberAdmin, FreizeitAdmin, MemberNoteListAdmin,\
-        MemberUnconfirmedAdmin, FilteredMemberFieldMixin,\
+        MemberUnconfirmedAdmin, RegistrationFilter, FilteredMemberFieldMixin,\
         MemberAdminForm, StatementOnListForm, KlettertreffAdmin, GroupAdmin
 from members.pdf import fill_pdf_form, render_tex, media_path, serve_pdf, find_template, merge_pdfs
 from mailer.models import EmailAddress
@@ -82,9 +82,8 @@ class BasicMemberTestCase(TestCase):
     It creates a few groups and members with different attributes.
     """
     def setUp(self):
-        self.jl = Group.objects.create(name="Jugendleiter", year_from=0, year_to=0)
+        self.jl = Group.objects.create(name="Jugendleiter")
-        self.alp = Group.objects.create(name="Alpenfuechse", year_from=1900, year_to=2000,
+        self.alp = Group.objects.create(name="Alpenfuechse")
-                                        show_website=True)
         self.spiel = Group.objects.create(name="Spielkinder")
 
         self.fritz = Member.objects.create(prename="Fritz", lastname="Wulter", birth_date=timezone.now().date(),

jdav_web/members/tests/views.py

@@ -1,110 +0,0 @@
-from unittest import skip
-from http import HTTPStatus
-from django.test import TestCase, Client
-from django.urls import reverse
-from django.utils import timezone
-from django.utils.translation import gettext as _
-
-from mailer.models import EmailAddress
-from ..models import Member, Group, InvitationToGroup, MemberWaitingList, DIVERSE
-
-
-class ConfirmInvitationViewTestCase(TestCase):
-    def setUp(self):
-        self.client = Client()
-
-        # Create an email address for the group
-        self.email_address = EmailAddress.objects.create(name='testmail')
-
-        # Create a test group
-        self.group = Group.objects.create(name='Test Group')
-        self.group.contact_email = self.email_address
-        self.group.save()
-
-        # Create a waiting list entry
-        self.waiter = MemberWaitingList.objects.create(
-            prename='Waiter',
-            lastname='User',
-            birth_date=timezone.now().date(),
-            email='waiter@example.com',
-            gender=DIVERSE,
-            wait_confirmation_key='test_wait_key',
-            wait_confirmation_key_expire=timezone.now() + timezone.timedelta(days=1)
-        )
-
-        # Create an invitation
-        self.invitation = InvitationToGroup.objects.create(
-            waiter=self.waiter,
-            group=self.group,
-            key='test_invitation_key',
-            date=timezone.now().date()
-        )
-
-    def test_confirm_invitation_get_valid_key(self):
-        """Test GET request with valid key shows invitation confirmation page."""
-        url = reverse('members:confirm_invitation')
-        response = self.client.get(url, {'key': 'test_invitation_key'})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('Confirm trial group meeting invitation'))
-        self.assertContains(response, self.group.name)
-
-    def test_confirm_invitation_get_invalid_key(self):
-        """Test GET request with invalid key shows invalid confirmation page."""
-        url = reverse('members:confirm_invitation')
-
-        # no key
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('This invitation is invalid or expired.'))
-
-        # invalid key
-        response = self.client.get(url, {'key': 'invalid_key'})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('This invitation is invalid or expired.'))
-
-    def test_confirm_invitation_get_rejected_invitation(self):
-        """Test GET request with rejected invitation shows invalid confirmation page."""
-        self.invitation.rejected = True
-        self.invitation.save()
-
-        url = reverse('members:confirm_invitation')
-        response = self.client.get(url, {'key': self.invitation.key})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('This invitation is invalid or expired.'))
-
-    def test_confirm_invitation_get_expired_invitation(self):
-        """Test GET request with expired invitation shows invalid confirmation page."""
-        # Set invitation date to more than 30 days ago to make it expired
-        self.invitation.date = timezone.now().date() - timezone.timedelta(days=31)
-        self.invitation.save()
-
-        url = reverse('members:confirm_invitation')
-        response = self.client.get(url, {'key': self.invitation.key})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('This invitation is invalid or expired.'))
-
-    def test_confirm_invitation_post_invalid_key(self):
-        """Test POST request with invalid key shows invalid confirmation page."""
-        url = reverse('members:confirm_invitation')
-
-        # no key
-        response = self.client.post(url)
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('This invitation is invalid or expired.'))
-
-        # invalid key
-        response = self.client.post(url, {'key': 'invalid_key'})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('This invitation is invalid or expired.'))
-
-    def test_confirm_invitation_post_valid_key(self):
-        """Test POST request with valid key confirms invitation and shows success page."""
-        url = reverse('members:confirm_invitation')
-        response = self.client.post(url, {'key': self.invitation.key})
-        self.assertEqual(response.status_code, HTTPStatus.OK)
-        self.assertContains(response, _('Invitation confirmed'))
-        self.assertContains(response, self.group.name)
-
-        # Verify invitation was not marked as rejected (confirm() sets rejected=False)
-        self.invitation.refresh_from_db()
-        self.assertFalse(self.invitation.rejected)

jdav_web/members/views.py

@@ -9,7 +9,6 @@ from members.models import Member, RegistrationPassword, MemberUnconfirmedProxy,
 from django.urls import reverse
 from django.utils import timezone
 from django.conf import settings
-from django.views.decorators.cache import never_cache
 from .pdf import render_tex, media_path
 
 
@@ -77,7 +76,7 @@ class MemberRegistrationWaitingListForm(ModelForm):
             'prename': _('Prename of the member.'),
             'lastname': _('Lastname of the member.'),
         }
-        required = ['birth_date']
+        required = []
 
 
 class EmergencyContactForm(ModelForm):
@@ -183,7 +182,8 @@ def echo(request):
             member.save()
             if not member.registration_form:
                 # If the member does not have a registration form, forward them to the upload page.
-                member.request_registration_form()
+                member.generate_upload_registration_form_key()
+                member.send_upload_registration_form_link()
                 return HttpResponseRedirect(reverse('members:upload_registration_form') + "?key=" + member.upload_registration_form_key)
             else:
                 return render_echo_success(request, member.prename)
@@ -290,6 +290,7 @@ def register(request):
             new_member.send_upload_registration_form_link()
             return HttpResponseRedirect(reverse('members:upload_registration_form') + "?key=" + new_member.upload_registration_form_key)
         except ValueError as e:
+            print("value error", e)
             # when input is invalid
             if pwd:
                 return render_register(request, group, form, emergency_contacts_formset, pwd=pwd.password,
@@ -297,10 +298,7 @@ def register(request):
             else:
                 return render_register(request, group, form, emergency_contacts_formset, waiter_key=waiter_key)
     # we are not saving yet
-    if pwd:
+    return render_register(request, group, form=None, pwd=pwd.password, waiter_key=waiter_key)
-        return render_register(request, group, form=None, pwd=pwd.password, waiter_key=waiter_key)
-    else:
-        return render_register(request, group, form=None, waiter_key=waiter_key)
 
 
 def render_download_registration_form(request, member):
@@ -317,6 +315,7 @@ def download_registration_form(request):
         return render_download_registration_form(request, member)
     except Member.DoesNotExist:
         return render_upload_registration_form_invalid(request)
+    return render_upload_registration_form_invalid(request)
 
 
 def render_upload_registration_form_invalid(request):
@@ -361,6 +360,7 @@ def upload_registration_form(request):
         return render_upload_registration_form_success(request, member)
     except ValueError as e:
         return render_upload_registration_form(request, member, form, key)
+    return render_upload_registration_form_invalid(request)
 
 
 def confirm_mail(request):
@@ -505,7 +505,6 @@ def render_confirm_success(request, invitation):
                    'timeinfo': invitation.group.get_time_info()})
 
 
-@never_cache
 def confirm_invitation(request):
     if request.method == 'GET' and 'key' in request.GET:
         key = request.GET['key']

jdav_web/startpage/locale/de/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-09-07 02:13+0200\n"
+"POT-Creation-Date: 2025-03-08 16:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,7 +48,7 @@ msgstr "Abschnitt"
 msgid "Sections"
 msgstr "Abschnitte"
 
-#: startpage/models.py startpage/tests.py
+#: startpage/models.py
 msgid "deactivated"
 msgstr "deaktiviert"
 
@@ -80,7 +80,7 @@ msgstr "Einträge"
 msgid "file"
 msgstr "Datei"
 
-#: startpage/models.py startpage/tests.py
+#: startpage/models.py
 msgid "Empty"
 msgstr "Leer"
 
@@ -138,29 +138,5 @@ msgstr ""
 "Dies ist nur ein Platzhalter. Bitte überschreibe diesen Platzhalter wie in "
 "der Dokumentation beschrieben mit einem benutzerdefinierten Text."
 
-#: startpage/templates/startpage/impressum.html
-msgid "Attributions"
-msgstr "Copyright Informationen"
-
-#: startpage/templates/startpage/impressum.html
-msgid "The source code of this website is licensed under"
-msgstr "Der Quelltext dieser Webseite ist lizenziert unter"
-
-#: startpage/templates/startpage/impressum.html
-msgid "Copyright © 2025 JDAV Sektion "
-msgstr "Copyright © 2025 JDAV Sektion "
-
-#: startpage/templates/startpage/impressum.html
-msgid "for the content of this website."
-msgstr "für den Inhalt dieser Webseite."
-
-#: startpage/templates/startpage/impressum.html
-msgid "External assets used on this website:"
-msgstr "Lizenzhinweise für Ressourcen Dritter:"
-
-#: startpage/templates/startpage/impressum.html
-msgid "Background image"
-msgstr "Hintergrundbild"
-
 #~ msgid "Awesome JDAV website being able to do a lot!"
 #~ msgstr "Tolle JDAV Webseite die ganz viel kann!"

jdav_web/startpage/models.py

@@ -88,7 +88,7 @@ class Image(models.Model):
                             max_upload_size=10)
 
     def __str__(self):
-        return os.path.basename(self.f.name) if self.f.name else str(_("Empty"))
+        return os.path.basename(self.f.name) if self.f.name else _("Empty")
 
     class Meta:
         verbose_name = _('image')

jdav_web/startpage/templates/startpage/base.html

@@ -7,7 +7,7 @@
         <link rel="stylesheet" href="{% static 'startpage/css/base.css' %}">
         <link rel="stylesheet" href="{% static 'startpage/css/fonts.css' %}">
         <link rel="stylesheet" href="{% static 'startpage/css/people_grid.css' %}">
-        <link rel="shortcut icon" type="image/svg+xml" href="{% static 'startpage/img/favicon.svg' %}"/>
+        <link rel="shortcut icon" type="image/png" href="{% static 'startpage/img/favicon.png' %}"/>
     </head>
 
     <body>

jdav_web/startpage/templates/startpage/impressum.html

@@ -1,31 +1,8 @@
 {% extends "startpage/base_subsite.html" %}
-{% load static common i18n %}
+{% load static %}
 
 {% block content %}
 
 {% include "startpage/impressum_content.html" %}
 
-{% block attribution %}
-<h1>{% trans "Attributions" %}</h1>
-
-<p>
-{% trans "The source code of this website is licensed under" %}
-<a href="https://www.gnu.org/licenses/agpl-3.0.en.html">AGPLv3</a>.
-{% trans "Copyright © 2025 JDAV Sektion " %} {% settings_value 'SEKTION' %}
-{% trans "for the content of this website." %}
-</p>
-
-<p>
-{% trans "External assets used on this website:" %}
-</p>
-
-<ul>
-<li>
-{% trans "Background image" %}:
-<a href="https://commons.wikimedia.org/wiki/File:Alps_Panorama_(4954145205).jpg">Reza</a>, <a href="https://creativecommons.org/licenses/by/2.0">CC BY 2.0</a>, via Wikimedia Commons
-</li>
-</ul>
-
-{% endblock %}
-
 {% endblock %}

jdav_web/startpage/templates/startpage/navigation.html

@@ -44,7 +44,7 @@ window.onclick = function(event) {
         {% if not redirect_url %}
         <div>
         <button onclick="myFunction()"class="dropbtn">Menü</button>
-        <a class="dropbtn" href="/kompass">Login</a>
+        <a class="nav" href="/kompass">Login</a>
         </div>
         {% endif %}
     </div>

jdav_web/startpage/templates/startpage/people_grid.html

@@ -8,7 +8,7 @@
                 {% if member.image %}
                 <img src="{{member.image.url}}">
                 {% else %}
-                <img src="{% static 'startpage/img/placeholder.svg' %}">
+                <img src="{% static 'startpage/img/placeholder.jpg' %}">
                 {% endif %}
                 <div class="namebox">
                     <div class="name">{{ member.name }}</div>

jdav_web/startpage/templates/startpage/post_people_detail.html

@@ -13,7 +13,7 @@
             {% if member.image %}
             <img src="{{ member.image.url }}">
             {% else %}
-            <img src="{% static 'startpage/img/placeholder.svg' %}">
+            <img src="{% static 'startpage/img/placeholder.jpg' %}">
             {% endif %}
             <div class="namebox">
                 <div class="name">{{ member.name }}</div>

jdav_web/startpage/templates/startpage/post_people_grid.html

@@ -9,7 +9,7 @@
                 {% if member.image %}
                 <img src="{{ member.image.url }}">
                 {% else %}
-                <img src="{% static 'startpage/img/placeholder.svg' %}">
+                <img src="{% static 'startpage/img/placeholder.jpg' %}">
                 {% endif %}
                 <div class="namebox">
                     <div class="name">{{ member.name }}</div>

jdav_web/startpage/tests.py

@@ -1,22 +1,13 @@
-import os
+from django.test import TestCase, Client
-from django.test import TestCase, Client, RequestFactory
+from django.urls import reverse
-from django.urls import reverse, NoReverseMatch
 from django.conf import settings
 from django.templatetags.static import static
 from django.utils import timezone
-from django.utils.translation import gettext_lazy as _
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.template import Template, Context, TemplateSyntaxError, VariableDoesNotExist
-from unittest import mock
-from unittest.mock import Mock
-from importlib import reload
 
 from members.models import Member, Group, DIVERSE
-from startpage import urls
-from startpage.views import redirect, handler500
-from startpage.templatetags.markdown_extras import RenderAsTemplateNode, render_as_template
 
-from .models import Post, Section, Image, Link, MemberOnPost
+from .models import Post, Section, Image
 
 
 class BasicTestCase(TestCase):
@@ -31,7 +22,7 @@ class BasicTestCase(TestCase):
         file = SimpleUploadedFile("post_image.jpg", b"file_content", content_type="image/jpeg")
         staff_post = Post.objects.create(title='Staff', urlname='staff', website_text='This is our staff: Peter.',
                                          section=orga)
-        self.image_with_file = Image.objects.create(post=staff_post, f=file)
+        Image.objects.create(post=staff_post, f=file)
         file = SimpleUploadedFile("member_image.jpg", b"file_content", content_type="image/jpeg")
         m = Member.objects.create(prename='crazy', lastname='cool', birth_date=timezone.now().date(),
                                   email=settings.TEST_MAIL, gender=DIVERSE,
@@ -45,10 +36,6 @@ class BasicTestCase(TestCase):
         crazy_post.groups.add(crazy_group)
         crazy_post.save()
 
-        self.post_no_section = Post.objects.create(title='No Section', urlname='no-section', section=None)
-        self.image_no_file = Image.objects.create(post=staff_post)
-        self.test_link = Link.objects.create(title='Test Link', url='https://example.com')
-
 
 class ModelsTestCase(BasicTestCase):
     def test_str(self):
@@ -76,41 +63,6 @@ class ModelsTestCase(BasicTestCase):
                          '/de/{name}/last-trip'.format(name=settings.REPORTS_SECTION))
         self.assertEqual(post3.absolute_urlname(), reverse('startpage:post', args=(reports.urlname, 'last-trip')))
 
-    def test_post_absolute_section_none(self):
-        """Test Post.absolute_section when section is None"""
-        self.assertEqual(self.post_no_section.absolute_section(), 'Aktuelles')
-
-    def test_post_absolute_urlname_no_section(self):
-        """Test Post.absolute_urlname when section is None"""
-        expected_url = reverse('startpage:post', args=('aktuelles', 'no-section'))
-        self.assertEqual(self.post_no_section.absolute_urlname(), expected_url)
-
-    def test_image_str_without_file(self):
-        """Test Image.__str__ when no file is associated"""
-        self.assertEqual(str(self.image_no_file), str(_('Empty')))
-
-    def test_image_str_with_file(self):
-        """Test Image.__str__ when file is associated"""
-        # The str should return basename of the file
-        expected = os.path.basename(self.image_with_file.f.name)
-        self.assertEqual(str(self.image_with_file), expected)
-
-    def test_link_str(self):
-        """Test Link.__str__ method"""
-        self.assertEqual(str(self.test_link), 'Test Link')
-
-    def test_section_absolute_urlname_no_reverse_match(self):
-        """Test Section.absolute_urlname when NoReverseMatch occurs"""
-        section = Section.objects.get(urlname='orga')
-        with mock.patch('startpage.models.reverse', side_effect=NoReverseMatch):
-            self.assertEqual(section.absolute_urlname(), str(_('deactivated')))
-
-    def test_post_absolute_urlname_no_reverse_match(self):
-        """Test Post.absolute_urlname when NoReverseMatch occurs"""
-        post = Post.objects.get(urlname='staff')
-        with mock.patch('startpage.models.reverse', side_effect=NoReverseMatch):
-            self.assertEqual(post.absolute_urlname(), str(_('deactivated')))
-
 
 class ViewTestCase(BasicTestCase):
     def test_index(self):
@@ -182,62 +134,8 @@ class ViewTestCase(BasicTestCase):
 
     def test_post_image(self):
         c = Client()
-        url = self.image_with_file.f.url
+        staff_post = Post.objects.get(urlname='staff')
+        img = Image.objects.get(post=staff_post)
+        url = img.f.url
         response = c.get('/de' + url)
         self.assertEqual(response.status_code, 200, 'Images on posts should be visible without login.')
-
-    def test_urlpatterns_with_redirect_url(self):
-        """Test URL patterns when STARTPAGE_REDIRECT_URL is not empty"""
-
-        # Mock settings to have a non-empty STARTPAGE_REDIRECT_URL
-        with mock.patch.object(settings, 'STARTPAGE_REDIRECT_URL', 'https://example.com'):
-            # Reload the urls module to trigger the conditional urlpatterns creation
-            reload(urls)
-
-            # Check that urlpatterns contains the redirect view
-            url_names = [pattern.name for pattern in urls.urlpatterns if hasattr(pattern, 'name')]
-            self.assertIn('index', url_names)
-            self.assertEqual(len(urls.urlpatterns), 2)  # Should have index and impressum only
-
-    def test_redirect_view(self):
-        """Test redirect view functionality"""
-        request = RequestFactory().get('/')
-        with mock.patch.object(settings, 'STARTPAGE_REDIRECT_URL', 'https://example.com'):
-            response = redirect(request)
-            self.assertEqual(response.status_code, 302)
-            self.assertEqual(response.url, 'https://example.com')
-
-    def test_handler500(self):
-        """Test custom 500 error handler"""
-        request = RequestFactory().get('/')
-        response = handler500(request)
-        self.assertEqual(response.status_code, 500)
-
-
-class MarkdownExtrasTestCase(TestCase):
-    def test_render_as_template_node_variable_does_not_exist(self):
-        node = RenderAsTemplateNode('nonexistent_var', 'result')
-        context = Context({})
-        result = node.render(context)
-        self.assertEqual(result, '')
-
-    def test_render_as_template_no_arguments(self):
-        token = Mock()
-        token.contents = 'render_as_template'
-        parser = Mock()
-        with self.assertRaises(TemplateSyntaxError):
-            render_as_template(parser, token)
-
-    def test_render_as_template_invalid_syntax(self):
-        token = Mock()
-        token.contents = 'render_as_template "content"'
-        parser = Mock()
-        with self.assertRaises(TemplateSyntaxError):
-            render_as_template(parser, token)
-
-    def test_render_as_template_unquoted_argument(self):
-        token = Mock()
-        token.contents = 'render_as_template content as result'
-        parser = Mock()
-        with self.assertRaises(TemplateSyntaxError):
-            render_as_template(parser, token)

jdav_web/static/admin/css/extra.css

@@ -1,25 +0,0 @@
-span.statement-unsubmitted, span.statement-submitted, span.statement-confirmed {
-    color: black;
-    padding: 4px;
-    padding-left: 6px;
-    padding-right: 6px;
-    border-radius: 10px;
-    width: 20px;
-    min-width: 20px;
-    max-width: 20px;
-}
-
-span.statement-submitted {
-    background-color: #e8e8bd;
-    color: black;
-}
-
-span.statement-unsubmitted {
-    background-color: #f0dada;
-    color: black;
-}
-
-span.statement-confirmed {
-    background-color: #e0eec5;
-    color: black;
-}

jdav_web/static/admin/img/NOTICE.txt

@@ -1,3 +0,0 @@
-- `climber.png`:
-  Paul Sherman (https://commons.wikimedia.org/wiki/File:Rock_climbing_vector.svg),
-  Public Domain, via Wikimedia Commons

jdav_web/static/admin/img/favicon.svg

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
-<style type="text/css">
-	.st0{display:none;}
-	.st1{display:inline;fill:#254D49;}
-	.st2{display:inline;opacity:0.27;fill:url(#SVGID_1_);}
-	.st3{fill:none;stroke:#1B2E2C;stroke-width:3;stroke-miterlimit:10;}
-	.st4{fill:#1B2E2C;}
-	.st5{fill:none;stroke:#508480;stroke-width:3.2;stroke-miterlimit:10;}
-	.st6{fill:#BADDD9;}
-	.st7{fill:#508480;}
-	.st8{opacity:0.36;}
-	.st9{opacity:0.24;fill:#FFFFFF;}
-</style>
-<g id="Hintergrund_x5F_Uni" class="st0">
-	<rect class="st1" width="48" height="48"/>
-</g>
-<g id="Verlauf" class="st0">
-	<radialGradient id="SVGID_1_" cx="23.348" cy="21.0566" r="25.4002" fx="3.9002" fy="4.7179" gradientUnits="userSpaceOnUse">
-		<stop  offset="0" style="stop-color:#000000;stop-opacity:0"/>
-		<stop  offset="1" style="stop-color:#000000"/>
-	</radialGradient>
-	<circle class="st2" cx="23.6" cy="23.6" r="22.9"/>
-</g>
-<g id="Logo_x5F_Schatten">
-	<circle class="st3" cx="24.3" cy="24.3" r="21.7"/>
-	<polygon class="st4" points="21.4,22.9 15.8,42.4 27.5,25.7 33.2,6.2 	"/>
-</g>
-<g id="LogooVordergrund">
-	<circle class="st5" cx="23.7" cy="23.7" r="21.7"/>
-	<g>
-		<polygon class="st6" points="14.9,41.8 26.6,25.1 20.5,22.2 		"/>
-		<polygon class="st7" points="32.3,5.5 20.5,22.2 26.6,25.1 		"/>
-		<polyline class="st8" points="14.9,41.8 26.6,25.1 32.3,5.5 		"/>
-		<circle class="st9" cx="23.6" cy="23.6" r="1.6"/>
-	</g>
-</g>
-</svg>

jdav_web/static/admin/img/favicon_bright.svg

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
-<style type="text/css">
-	.st0{display:none;}
-	.st1{display:inline;fill:#254D49;}
-	.st2{opacity:0.27;fill:url(#SVGID_1_);}
-	.st3{fill:none;stroke:#1B2E2C;stroke-width:3;stroke-miterlimit:10;}
-	.st4{fill:#1B2E2C;}
-	.st5{fill:none;stroke:#508480;stroke-width:3.2;stroke-miterlimit:10;}
-	.st6{fill:#BADDD9;}
-	.st7{fill:#508480;}
-	.st8{opacity:0.36;}
-	.st9{opacity:0.24;fill:#FFFFFF;}
-</style>
-<g id="Hintergrund_x5F_Uni" class="st0">
-	<rect class="st1" width="48" height="48"/>
-</g>
-<g id="Verlauf">
-	<radialGradient id="SVGID_1_" cx="23.348" cy="21.0566" r="25.4002" fx="3.9002" fy="4.7179" gradientUnits="userSpaceOnUse">
-		<stop  offset="0" style="stop-color:#000000;stop-opacity:0"/>
-		<stop  offset="1" style="stop-color:#000000"/>
-	</radialGradient>
-	<circle class="st2" cx="23.6" cy="23.6" r="22.9"/>
-</g>
-<g id="Logo_x5F_Schatten">
-	<circle class="st3" cx="24.3" cy="24.3" r="21.7"/>
-	<polygon class="st4" points="21.4,22.9 15.8,42.4 27.5,25.7 33.2,6.2 	"/>
-</g>
-<g id="LogooVordergrund">
-	<circle class="st5" cx="23.7" cy="23.7" r="21.7"/>
-	<g>
-		<polygon class="st6" points="14.9,41.8 26.6,25.1 20.5,22.2 		"/>
-		<polygon class="st7" points="32.3,5.5 20.5,22.2 26.6,25.1 		"/>
-		<polyline class="st8" points="14.9,41.8 26.6,25.1 32.3,5.5 		"/>
-		<circle class="st9" cx="23.6" cy="23.6" r="1.6"/>
-	</g>
-</g>
-</svg>

jdav_web/static/downtime/502.html

@@ -2,7 +2,7 @@
 <head>
         <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
         <link rel="stylesheet" href="/downtime/base.css">
-        <link rel="shortcut icon" type="image/svg+xml" href="/downtime/favicon.svg"/>
+        <link rel="shortcut icon" type="image/png" href="/downtime/favicon.png"/>
         <title>Wartungsarbeiten</title>
 </head>
 <body>