Updated FontAwesome from 4.7.0 to 6.4.0

.envrc

@@ -1,6 +1,14 @@
-if [[ ! -d .venv ]]; then
+if [[ ! -f pyproject.toml ]]; then
-  log_error 'No .venv folder found. Use `uv sync` to create one first.'
+  log_error 'No pyproject.toml found. Use `poetry new` or `poetry init` to create one first.'
   exit 2
 fi
 
-. .venv/bin/activate
+local VENV=$(poetry env list --full-path | cut -d' ' -f1)
+if [[ -z $VENV || ! -d $VENV/bin ]]; then
+  log_error 'No poetry virtual environment found. Use `poetry install` to create one first.'
+  exit 2
+fi
+
+export VIRTUAL_ENV=$VENV
+export POETRY_ACTIVE=1
+PATH_add "$VENV/bin"

.github/actions/compile_messages/action.yml

@@ -0,0 +1,8 @@
+name: "Compile messages"
+description: "Compile the gettext translation messages"
+runs:
+  using: composite
+  steps:
+      - name: Setup project
+        run: poetry run ./manage.py compilemessages
+        shell: bash

.github/actions/setup_project/action.yml

@@ -6,41 +6,48 @@ runs:
     - name: Install apt packages
       uses: awalsh128/cache-apt-pkgs-action@latest
       with:
-        packages: gettext
+        packages: gettext libxapian-dev libgraphviz-dev
         version: 1.0  # increment to reset cache
 
-    - name: Install uv
+    - name: Install dependencies
-      uses: astral-sh/setup-uv@v5
+      run: |
-      with:
+        sudo apt update
-        version: "0.5.14"
+        sudo apt install gettext libxapian-dev libgraphviz-dev
-        enable-cache: true
+      shell: bash
-        cache-dependency-glob: "uv.lock"
 
-    - name: "Set up Python"
+    - name: Set up python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
       with:
-        python-version-file: ".python-version"
+        python-version: "3.10"
 
-    - name: Restore cached virtualenv
+    - name: Load cached Poetry installation
-      uses: actions/cache/restore@v4
+      id: cached-poetry
+      uses: actions/cache@v3
       with:
-        key: venv-${{ runner.os }}-${{ hashFiles('.python-version') }}-${{ hashFiles('pyproject.toml') }}-${{ env.CACHE_SUFFIX }}
+        path: ~/.local
-        path: .venv
+        key: poetry-0  # increment to reset cache
+
+    - name: Install Poetry
+      if: steps.cached-poetry.outputs.cache-hit != 'true'
+      shell: bash
+      run: curl -sSL https://install.python-poetry.org | python3 -
+
+    - name: Check pyproject.toml syntax
+      shell: bash
+      run: poetry check
+
+    - name: Load cached dependencies
+      uses: actions/cache@v3
+      with:
+        path: ~/.cache/pypoetry
+        key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-poetry-
 
     - name: Install dependencies
-      run: uv sync
+      run: poetry install -E testing -E docs
       shell: bash
 
-    - name: Install Xapian
-      run: uv run ./manage.py install_xapian
-      shell: bash
-
-    - name: Save cached virtualenv
-      uses: actions/cache/save@v4
-      with:
-        key: venv-${{ runner.os }}-${{ hashFiles('.python-version') }}-${{ hashFiles('pyproject.toml') }}-${{ env.CACHE_SUFFIX }}
-        path: .venv
-
     - name: Compile gettext messages
-      run: uv run ./manage.py compilemessages
+      run: poetry run ./manage.py compilemessages
       shell: bash

.github/actions/setup_xapian/action.yml

@@ -0,0 +1,10 @@
+name: "Setup xapian"
+description: "Setup the xapian indexes"
+runs:
+  using: composite
+  steps:
+    - name: Setup xapian index
+      run: |
+        mkdir -p /dev/shm/search_indexes
+        ln -s /dev/shm/search_indexes sith/search_indexes
+      shell: bash

.github/dependabot.yml

@@ -8,7 +8,11 @@ updates:
   - package-ecosystem: "pip" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
-      interval: "weekly"
+      interval: "daily"
+    # Raise pull requests for version updates
+    # to pip against the `develop` branch
     target-branch: "taiste"
+    reviewers:
+      - "ae-utbm/developpers-v3"
     commit-message:
       prefix: "[UPDATE] "

.github/workflows/ci.yml

@@ -1,45 +1,41 @@
-name: Sith CI
+name: Sith 3 CI
 
 on:
   push:
-    branches: [master, taiste]
+    branches:
+      - master
+      - taiste
   pull_request:
-    branches: [master, taiste]
+    branches:
-  workflow_dispatch:
+      - master
+      - taiste
 
 jobs:
-  pre-commit:
+  black:
-    name: Launch pre-commits checks (ruff)
+    name: Black format
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+      - name: Check out repository
-    - uses: actions/setup-python@v5
+        uses: actions/checkout@v3
-      with:
+      - name: Setup Project
-        python-version-file: ".python-version"
+        uses: ./.github/actions/setup_project
-    - uses: pre-commit/action@v3.0.1
+      - run: poetry run black --check .
-      with:
-        extra_args: --all-files
 
   tests:
     name: Run tests and generate coverage report
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false  # don't interrupt the other test processes
-      matrix:
-        pytest-mark: [slow, not slow]
     steps:
       - name: Check out repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - uses: ./.github/actions/setup_project
-        env:
+      - uses: ./.github/actions/setup_xapian
-          # To avoid race conditions on environment cache
+      - uses: ./.github/actions/compile_messages
-          CACHE_SUFFIX: ${{ matrix.pytest-mark }}
       - name: Run tests
-        run: uv run coverage run -m pytest -m "${{ matrix.pytest-mark }}"
+        run: poetry run coverage run ./manage.py test
       - name: Generate coverage report
         run: |
-          uv run coverage report
+          poetry run coverage report
-          uv run coverage html
+          poetry run coverage html
       - name: Archive code coverage results
         uses: actions/upload-artifact@v3
         with:

.github/workflows/deploy.yml

@@ -14,7 +14,7 @@ jobs:
   
     steps:
     - name: SSH Remote Commands
-      uses: appleboy/ssh-action@v1.1.0
+      uses: appleboy/ssh-action@dce9d565de8d876c11d93fa4fe677c0285a66d78
       with:
         # Proxy
         proxy_host : ${{secrets.PROXY_HOST}}
@@ -31,18 +31,17 @@ jobs:
 
         script_stop: true
 
-        # See https://github.com/ae-utbm/sith/wiki/GitHub-Actions#deployment-action
+        # See https://github.com/ae-utbm/sith3/wiki/GitHub-Actions#deployment-action
         script: |
-          cd ${{secrets.SITH_PATH}}
+          export PATH="/home/sith/.local/bin:$PATH"
+          pushd ${{secrets.SITH_PATH}}
 
-          git fetch
+          git pull
-          git reset --hard origin/master
+          poetry install
-          uv sync --group prod
+          poetry run ./manage.py migrate
-          npm install
+          echo "yes" | poetry run ./manage.py collectstatic
-          uv run ./manage.py install_xapian
+          poetry run ./manage.py compilestatic
-          uv run ./manage.py migrate
+          poetry run ./manage.py compilemessages
-          uv run ./manage.py collectstatic --clear --noinput
-          uv run ./manage.py compilemessages
 
           sudo systemctl restart uwsgi
   
@@ -52,14 +51,14 @@ jobs:
     timeout-minutes: 30
     needs: deployment
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: Sentry Release
-        uses: getsentry/action-release@v1.7.0
+        uses: getsentry/action-release@v1.2.0
         env:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
           SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
           SENTRY_URL: ${{ secrets.SENTRY_URL }}
         with:
-          environment: production
+          environment: production

.github/workflows/deploy_docs.yml

@@ -1,21 +0,0 @@
-name: deploy_docs
-on:
-  push:
-    branches:
-      - master
-permissions:
-  contents: write
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup_project
-      - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
-      - uses: actions/cache@v3
-        with:
-          key: mkdocs-material-${{ env.cache_id }}
-          path: .cache
-          restore-keys: |
-            mkdocs-material-
-      - run: uv run mkdocs gh-deploy --force

.github/workflows/taiste.yml

@@ -1,9 +1,8 @@
-name: Sith taiste
+name: Sith3 taiste
 
 on:
   push:
-    branches: [taiste]
+    branches: [ taiste ]
-  workflow_dispatch:
 
 jobs:
   deployment:
@@ -13,7 +12,7 @@ jobs:
 
     steps:
     - name: SSH Remote Commands
-      uses: appleboy/ssh-action@v1.1.0
+      uses: appleboy/ssh-action@dce9d565de8d876c11d93fa4fe677c0285a66d78
       with:
         # Proxy
         proxy_host : ${{secrets.PROXY_HOST}}
@@ -30,17 +29,34 @@ jobs:
 
         script_stop: true
 
-        # See https://github.com/ae-utbm/sith/wiki/GitHub-Actions#deployment-action
+        # See https://github.com/ae-utbm/sith3/wiki/GitHub-Actions#deployment-action
         script: |
-          cd ${{secrets.SITH_PATH}}
+          export PATH="$HOME/.poetry/bin:$PATH"
+          pushd ${{secrets.SITH_PATH}}
 
-          git fetch
+          git pull
-          git reset --hard origin/taiste
+          poetry install
-          uv sync --group prod
+          poetry run ./manage.py migrate
-          npm install
+          echo "yes" | poetry run ./manage.py collectstatic
-          uv run ./manage.py install_xapian
+          poetry run ./manage.py compilestatic
-          uv run ./manage.py migrate
+          poetry run ./manage.py compilemessages
-          uv run ./manage.py collectstatic --clear --noinput
-          uv run ./manage.py compilemessages
 
           sudo systemctl restart uwsgi
+
+  sentry:
+    runs-on: ubuntu-latest
+    environment: taiste
+    timeout-minutes: 30
+    needs: deployment
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Sentry Release
+        uses: getsentry/action-release@v1.2.0
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+          SENTRY_URL: ${{ secrets.SENTRY_URL }}
+        with:
+          environment: taiste

.gitignore

@@ -1,4 +1,4 @@
-*.sqlite3
+db.sqlite3
 *.log
 *.pyc
 *.mo
@@ -8,7 +8,7 @@ pyrightconfig.json
 dist/
 .vscode/
 .idea/
-.venv/
+env/
 doc/html
 data/
 galaxy/test_galaxy_state.json
@@ -17,7 +17,4 @@ sith/settings_custom.py
 sith/search_indexes/
 .coverage
 coverage_report/
-node_modules/
+doc/_build
-
-# compiled documentation
-site/

.pre-commit-config.yaml

@@ -1,26 +0,0 @@
-repos:
-  - repo: https://github.com/astral-sh/ruff-pre-commit
-    # Ruff version.
-    rev: v0.8.3
-    hooks:
-      - id: ruff  # just check the code, and print the errors
-      - id: ruff  # actually fix the fixable errors, but print nothing
-        args: ["--fix", "--silent"]
-      # Run the formatter.
-      - id: ruff-format
-  - repo: https://github.com/biomejs/pre-commit
-    rev: "v0.1.0"  # Use the sha / tag you want to point at
-    hooks:
-      - id: biome-check
-        additional_dependencies: ["@biomejs/biome@1.9.3"]
-  - repo: https://github.com/rtts/djhtml
-    rev: 3.0.7
-    hooks:
-      - id: djhtml
-        name: format templates
-        entry: djhtml --tabwidth 2
-        types: ["jinja"]
-      - id: djcss
-        name: format scss files
-        entry: djcss --tabwidth 2
-        types: ["scss"]

.python-version

@@ -1 +0,0 @@
-3.12

.readthedocs.yml

@@ -0,0 +1,26 @@
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Allow installing xapian-bindings in pip
+build:
+  apt_packages:
+    - libxapian-dev
+
+# Build documentation in the doc/ directory with Sphinx
+sphinx:
+  configuration: doc/conf.py
+
+# Optionally build your docs in additional formats such as PDF and ePub
+formats: all
+
+# Optionally set the version of Python and requirements required to build your docs
+python:
+  version: "3.8"
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs

README.md

@@ -1,21 +1,40 @@
-# Sith
+<p align="center">
+  <a href="#">
+    <img src="https://img.shields.io/badge/Code%20Style-Black-000000?style=for-the-badge">
+  </a>
+  <a href="#">
+    <img src="https://img.shields.io/github/checks-status/ae-utbm/sith3/master?logo=github&style=for-the-badge&label=BUILD">
+  </a>
+  <a href="https://sith-ae.readthedocs.io/">
+    <img src="https://img.shields.io/readthedocs/sith-ae?logo=readthedocs&style=for-the-badge">
+  </a>
+  <a href="https://discord.gg/XK9WfPsUFm">
+    <img src="https://img.shields.io/discord/971448179075731476?label=Discord&logo=discord&style=for-the-badge">
+  </a>
+</p>
 
-[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](#)
+<h3 align="center">This is the source code of the UTBM's student association available at https://ae.utbm.fr/.</h3>
-[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
-[![CI status](https://github.com/ae-utbm/sith/actions/workflows/ci.yml/badge.svg)](#)
-[![Docs status](https://github.com/ae-utbm/sith/actions/workflows/deploy_docs.yml/badge.svg)](https://ae-utbm.github.io/sith)
-[![Built with Material for MkDocs](https://img.shields.io/badge/Material_for_MkDocs-526CFE?style=default&logo=MaterialForMkDocs&logoColor=white)](https://squidfunk.github.io/mkdocs-material/)
-[![Checked with Biome](https://img.shields.io/badge/Checked_with-Biome-60a5fa?style=flat&logo=biome)](https://biomejs.dev)
-[![discord](https://img.shields.io/discord/971448179075731476?label=discord&logo=discord&style=default)](https://discord.gg/xk9wfpsufm)
 
-### This is the source code of the UTBM's student association available at [https://ae.utbm.fr/](https://ae.utbm.fr/).
+<p align="justify">All documentation is in the <code>docs</code> directory and online at https://sith-ae.readthedocs.io/. This documentation is written in French because it targets a French audience and it's too much work to maintain two versions. The code and code comments are strictly written in English.</p>
 
-All documentation is in the `docs` directory and online at [https://ae-utbm.github.io/sith](https://ae-utbm.github.io/sith). This documentation is written in French because it targets a French audience and it's too much work to maintain two versions. The code and code comments are strictly written in English.
+<h4>If you want to contribute, here's how we recommend to read the docs:</h4>
 
-#### If you want to contribute, here's how we recommend to read the docs:
+<ul>
-
+  <li>
-* First, it's advised to read the about part of the project to understand the goals and the mindset of the current and previous maintainers and know what to expect to learn.
+    <p align="justify">
-* If in the first part you realize that you need more background about what we use, we provide some links to tutorials and documentation at the end of our documentation. Feel free to use it and complete it with what you found helpful.
+      First, it's advised to read the about part of the project to understand the goals and the mindset of the current and previous maintainers and know what to expect to learn.
-* Keep in mind that this documentation is thought to be read in order.
+    </p>
+  </li>
+  <li>
+    <p align="justify">
+      If in the first part you realize that you need more background about what we use, we provide some links to tutorials and documentation at the end of our documentation. Feel free to use it and complete it with what you found helpful.
+    </p>
+  </li>
+  <li>
+    <p align="justify">
+      Keep in mind that this documentation is thought to be read in order.
+    </p>
+  </li>
+</ul>
 
 > This project is licensed under GNU GPL, see the LICENSE file at the top of the repository for more details.

accounting/__init__.py

@@ -1,3 +1,4 @@
+# -*- coding:utf-8 -*
 #
 # Copyright 2023 © AE UTBM
 # ae@utbm.fr / ae.info@utbm.fr
@@ -5,10 +6,10 @@
 # This file is part of the website of the UTBM Student Association (AE UTBM),
 # https://ae.utbm.fr.
 #
-# You can find the source code of the website at https://github.com/ae-utbm/sith
+# You can find the source code of the website at https://github.com/ae-utbm/sith3
 #
 # LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# SEE : https://raw.githubusercontent.com/ae-utbm/sith/master/LICENSE
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #

accounting/admin.py

@@ -1,3 +1,4 @@
+# -*- coding:utf-8 -*
 #
 # Copyright 2023 © AE UTBM
 # ae@utbm.fr / ae.info@utbm.fr
@@ -5,26 +6,18 @@
 # This file is part of the website of the UTBM Student Association (AE UTBM),
 # https://ae.utbm.fr.
 #
-# You can find the source code of the website at https://github.com/ae-utbm/sith
+# You can find the source code of the website at https://github.com/ae-utbm/sith3
 #
 # LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# SEE : https://raw.githubusercontent.com/ae-utbm/sith/master/LICENSE
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
 
 from django.contrib import admin
 
-from accounting.models import (
+from accounting.models import *
-    AccountingType,
+
-    BankAccount,
-    ClubAccount,
-    Company,
-    GeneralJournal,
-    Label,
-    Operation,
-    SimplifiedAccountingType,
-)
 
 admin.site.register(BankAccount)
 admin.site.register(ClubAccount)

accounting/api.py

@@ -1,23 +0,0 @@
-from typing import Annotated
-
-from annotated_types import MinLen
-from ninja_extra import ControllerBase, api_controller, paginate, route
-from ninja_extra.pagination import PageNumberPaginationExtra
-from ninja_extra.schemas import PaginatedResponseSchema
-
-from accounting.models import ClubAccount, Company
-from accounting.schemas import ClubAccountSchema, CompanySchema
-from core.api_permissions import CanAccessLookup
-
-
-@api_controller("/lookup", permissions=[CanAccessLookup])
-class AccountingController(ControllerBase):
-    @route.get("/club-account", response=PaginatedResponseSchema[ClubAccountSchema])
-    @paginate(PageNumberPaginationExtra, page_size=50)
-    def search_club_account(self, search: Annotated[str, MinLen(1)]):
-        return ClubAccount.objects.filter(name__icontains=search).values()
-
-    @route.get("/company", response=PaginatedResponseSchema[CompanySchema])
-    @paginate(PageNumberPaginationExtra, page_size=50)
-    def search_company(self, search: Annotated[str, MinLen(1)]):
-        return Company.objects.filter(name__icontains=search).values()

accounting/migrations/0001_initial.py

@@ -1,10 +1,10 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-import django.core.validators
-import django.db.models.deletion
 from django.db import migrations, models
-
+import django.core.validators
 import accounting.models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

accounting/migrations/0002_auto_20160824_2152.py

@@ -1,7 +1,8 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-import django.db.models.deletion
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -100,6 +101,6 @@ class Migration(migrations.Migration):
             ),
         ),
         migrations.AlterUniqueTogether(
-            name="operation", unique_together={("number", "journal")}
+            name="operation", unique_together=set([("number", "journal")])
         ),
     ]

accounting/migrations/0003_auto_20160824_2203.py

@@ -1,7 +1,8 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-import phonenumber_field.modelfields
 from django.db import migrations, models
+import phonenumber_field.modelfields
 
 
 class Migration(migrations.Migration):

accounting/migrations/0004_auto_20161005_1505.py

@@ -1,7 +1,8 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-import django.db.models.deletion
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -45,6 +46,6 @@ class Migration(migrations.Migration):
             ),
         ),
         migrations.AlterUniqueTogether(
-            name="label", unique_together={("name", "club_account")}
+            name="label", unique_together=set([("name", "club_account")])
         ),
     ]

accounting/migrations/0005_auto_20170324_0917.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 from django.db import migrations, models

accounting/models.py

@@ -1,3 +1,4 @@
+# -*- coding:utf-8 -*
 #
 # Copyright 2023 © AE UTBM
 # ae@utbm.fr / ae.info@utbm.fr
@@ -5,56 +6,46 @@
 # This file is part of the website of the UTBM Student Association (AE UTBM),
 # https://ae.utbm.fr.
 #
-# You can find the source code of the website at https://github.com/ae-utbm/sith
+# You can find the source code of the website at https://github.com/ae-utbm/sith3
 #
 # LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# SEE : https://raw.githubusercontent.com/ae-utbm/sith/master/LICENSE
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
 
-from decimal import Decimal
-
-from django.conf import settings
-from django.core import validators
-from django.core.exceptions import ValidationError
-from django.db import models
-from django.template import defaultfilters
 from django.urls import reverse
+from django.core.exceptions import ValidationError
+from django.core import validators
+from django.db import models
+from django.conf import settings
 from django.utils.translation import gettext_lazy as _
+from django.template import defaultfilters
+
 from phonenumber_field.modelfields import PhoneNumberField
 
+from decimal import Decimal
+from core.models import User, SithFile
 from club.models import Club
-from core.models import SithFile, User
 
 
 class CurrencyField(models.DecimalField):
-    """Custom database field used for currency."""
+    """
+    This is a custom database field used for currency
+    """
 
     def __init__(self, *args, **kwargs):
         kwargs["max_digits"] = 12
         kwargs["decimal_places"] = 2
-        super().__init__(*args, **kwargs)
+        super(CurrencyField, self).__init__(*args, **kwargs)
 
     def to_python(self, value):
         try:
-            return super().to_python(value).quantize(Decimal("0.01"))
+            return super(CurrencyField, self).to_python(value).quantize(Decimal("0.01"))
         except AttributeError:
             return None
 
 
-if settings.TESTING:
-    from model_bakery import baker
-
-    baker.generators.add(
-        CurrencyField,
-        lambda: baker.random_gen.gen_decimal(max_digits=8, decimal_places=2),
-    )
-else:  # pragma: no cover
-    # baker is only used in tests, so we don't need coverage for this part
-    pass
-
-
 # Accounting classes
 
 
@@ -71,8 +62,31 @@ class Company(models.Model):
     class Meta:
         verbose_name = _("company")
 
-    def __str__(self):
+    def is_owned_by(self, user):
-        return self.name
+        """
+        Method to see if that object can be edited by the given user
+        """
+        if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
+            return True
+        return False
+
+    def can_be_edited_by(self, user):
+        """
+        Method to see if that object can be edited by the given user
+        """
+        for club in user.memberships.filter(end_date=None).all():
+            if club and club.role == settings.SITH_CLUB_ROLES_ID["Treasurer"]:
+                return True
+        return False
+
+    def can_be_viewed_by(self, user):
+        """
+        Method to see if that object can be viewed by the given user
+        """
+        for club in user.memberships.filter(end_date=None).all():
+            if club and club.role >= settings.SITH_CLUB_ROLES_ID["Treasurer"]:
+                return True
+        return False
 
     def get_absolute_url(self):
         return reverse("accounting:co_edit", kwargs={"co_id": self.id})
@@ -80,21 +94,8 @@ class Company(models.Model):
     def get_display_name(self):
         return self.name
 
-    def is_owned_by(self, user):
+    def __str__(self):
-        """Check if that object can be edited by the given user."""
+        return self.name
-        return user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
-
-    def can_be_edited_by(self, user):
-        """Check if that object can be edited by the given user."""
-        return user.memberships.filter(
-            end_date=None, club__role=settings.SITH_CLUB_ROLES_ID["Treasurer"]
-        ).exists()
-
-    def can_be_viewed_by(self, user):
-        """Check if that object can be viewed by the given user."""
-        return user.memberships.filter(
-            end_date=None, club__role_gte=settings.SITH_CLUB_ROLES_ID["Treasurer"]
-        ).exists()
 
 
 class BankAccount(models.Model):
@@ -112,20 +113,24 @@ class BankAccount(models.Model):
         verbose_name = _("Bank account")
         ordering = ["club", "name"]
 
-    def __str__(self):
-        return self.name
-
-    def get_absolute_url(self):
-        return reverse("accounting:bank_details", kwargs={"b_account_id": self.id})
-
     def is_owned_by(self, user):
-        """Check if that object can be edited by the given user."""
+        """
+        Method to see if that object can be edited by the given user
+        """
         if user.is_anonymous:
             return False
         if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
             return True
         m = self.club.get_membership_for(user)
-        return m is not None and m.role >= settings.SITH_CLUB_ROLES_ID["Treasurer"]
+        if m is not None and m.role >= settings.SITH_CLUB_ROLES_ID["Treasurer"]:
+            return True
+        return False
+
+    def get_absolute_url(self):
+        return reverse("accounting:bank_details", kwargs={"b_account_id": self.id})
+
+    def __str__(self):
+        return self.name
 
 
 class ClubAccount(models.Model):
@@ -147,33 +152,48 @@ class ClubAccount(models.Model):
         verbose_name = _("Club account")
         ordering = ["bank_account", "name"]
 
-    def __str__(self):
+    def is_owned_by(self, user):
-        return self.name
+        """
+        Method to see if that object can be edited by the given user
+        """
+        if user.is_anonymous:
+            return False
+        if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
+            return True
+        return False
+
+    def can_be_edited_by(self, user):
+        """
+        Method to see if that object can be edited by the given user
+        """
+        m = self.club.get_membership_for(user)
+        if m and m.role == settings.SITH_CLUB_ROLES_ID["Treasurer"]:
+            return True
+        return False
+
+    def can_be_viewed_by(self, user):
+        """
+        Method to see if that object can be viewed by the given user
+        """
+        m = self.club.get_membership_for(user)
+        if m and m.role >= settings.SITH_CLUB_ROLES_ID["Treasurer"]:
+            return True
+        return False
+
+    def has_open_journal(self):
+        for j in self.journals.all():
+            if not j.closed:
+                return True
+        return False
+
+    def get_open_journal(self):
+        return self.journals.filter(closed=False).first()
 
     def get_absolute_url(self):
         return reverse("accounting:club_details", kwargs={"c_account_id": self.id})
 
-    def is_owned_by(self, user):
+    def __str__(self):
-        """Check if that object can be edited by the given user."""
+        return self.name
-        if user.is_anonymous:
-            return False
-        return user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
-
-    def can_be_edited_by(self, user):
-        """Check if that object can be edited by the given user."""
-        m = self.club.get_membership_for(user)
-        return m and m.role == settings.SITH_CLUB_ROLES_ID["Treasurer"]
-
-    def can_be_viewed_by(self, user):
-        """Check if that object can be viewed by the given user."""
-        m = self.club.get_membership_for(user)
-        return m and m.role >= settings.SITH_CLUB_ROLES_ID["Treasurer"]
-
-    def has_open_journal(self):
-        return self.journals.filter(closed=False).exists()
-
-    def get_open_journal(self):
-        return self.journals.filter(closed=False).first()
 
     def get_display_name(self):
         return _("%(club_account)s on %(bank_account)s") % {
@@ -183,7 +203,9 @@ class ClubAccount(models.Model):
 
 
 class GeneralJournal(models.Model):
-    """Class storing all the operations for a period of time."""
+    """
+    Class storing all the operations for a period of time
+    """
 
     start_date = models.DateField(_("start date"))
     end_date = models.DateField(_("end date"), null=True, blank=True, default=None)
@@ -203,29 +225,37 @@ class GeneralJournal(models.Model):
         verbose_name = _("General journal")
         ordering = ["-start_date"]
 
-    def __str__(self):
-        return self.name
-
-    def get_absolute_url(self):
-        return reverse("accounting:journal_details", kwargs={"j_id": self.id})
-
     def is_owned_by(self, user):
-        """Check if that object can be edited by the given user."""
+        """
+        Method to see if that object can be edited by the given user
+        """
         if user.is_anonymous:
             return False
         if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
             return True
-        return self.club_account.can_be_edited_by(user)
+        if self.club_account.can_be_edited_by(user):
+            return True
+        return False
 
     def can_be_edited_by(self, user):
-        """Check if that object can be edited by the given user."""
+        """
+        Method to see if that object can be edited by the given user
+        """
         if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
             return True
-        return self.club_account.can_be_edited_by(user)
+        if self.club_account.can_be_edited_by(user):
+            return True
+        return False
 
     def can_be_viewed_by(self, user):
         return self.club_account.can_be_viewed_by(user)
 
+    def get_absolute_url(self):
+        return reverse("accounting:journal_details", kwargs={"j_id": self.id})
+
+    def __str__(self):
+        return self.name
+
     def update_amounts(self):
         self.amount = 0
         self.effective_amount = 0
@@ -242,7 +272,9 @@ class GeneralJournal(models.Model):
 
 
 class Operation(models.Model):
-    """An operation is a line in the journal, a debit or a credit."""
+    """
+    An operation is a line in the journal, a debit or a credit
+    """
 
     number = models.IntegerField(_("number"))
     journal = models.ForeignKey(
@@ -325,18 +357,6 @@ class Operation(models.Model):
         unique_together = ("number", "journal")
         ordering = ["-number"]
 
-    def __str__(self):
-        return f"{self.amount} € | {self.date} | {self.accounting_type} | {self.done}"
-
-    def save(self, *args, **kwargs):
-        if self.number is None:
-            self.number = self.journal.operations.count() + 1
-        super().save(*args, **kwargs)
-        self.journal.update_amounts()
-
-    def get_absolute_url(self):
-        return reverse("accounting:journal_details", kwargs={"j_id": self.journal.id})
-
     def __getattribute__(self, attr):
         if attr == "target":
             return self.get_target()
@@ -344,7 +364,7 @@ class Operation(models.Model):
             return object.__getattribute__(self, attr)
 
     def clean(self):
-        super().clean()
+        super(Operation, self).clean()
         if self.date is None:
             raise ValidationError(_("The date must be set."))
         elif self.date < self.journal.start_date:
@@ -390,8 +410,16 @@ class Operation(models.Model):
             tar = Company.objects.filter(id=self.target_id).first()
         return tar
 
+    def save(self):
+        if self.number is None:
+            self.number = self.journal.operations.count() + 1
+        super(Operation, self).save()
+        self.journal.update_amounts()
+
     def is_owned_by(self, user):
-        """Check if that object can be edited by the given user."""
+        """
+        Method to see if that object can be edited by the given user
+        """
         if user.is_anonymous:
             return False
         if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
@@ -399,22 +427,40 @@ class Operation(models.Model):
         if self.journal.closed:
             return False
         m = self.journal.club_account.club.get_membership_for(user)
-        return m is not None and m.role >= settings.SITH_CLUB_ROLES_ID["Treasurer"]
+        if m is not None and m.role >= settings.SITH_CLUB_ROLES_ID["Treasurer"]:
+            return True
+        return False
 
     def can_be_edited_by(self, user):
-        """Check if that object can be edited by the given user."""
+        """
+        Method to see if that object can be edited by the given user
+        """
         if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
             return True
         if self.journal.closed:
             return False
         m = self.journal.club_account.club.get_membership_for(user)
-        return m is not None and m.role == settings.SITH_CLUB_ROLES_ID["Treasurer"]
+        if m is not None and m.role == settings.SITH_CLUB_ROLES_ID["Treasurer"]:
+            return True
+        return False
+
+    def get_absolute_url(self):
+        return reverse("accounting:journal_details", kwargs={"j_id": self.journal.id})
+
+    def __str__(self):
+        return "%d € | %s | %s | %s" % (
+            self.amount,
+            self.date,
+            self.accounting_type,
+            self.done,
+        )
 
 
 class AccountingType(models.Model):
-    """Accounting types.
+    """
+    Class describing the accounting types.
 
-    Those are numbers used in accounting to classify operations
+    Thoses are numbers used in accounting to classify operations
     """
 
     code = models.CharField(
@@ -441,21 +487,27 @@ class AccountingType(models.Model):
         verbose_name = _("accounting type")
         ordering = ["movement_type", "code"]
 
-    def __str__(self):
+    def is_owned_by(self, user):
-        return self.code + " - " + self.get_movement_type_display() + " - " + self.label
+        """
+        Method to see if that object can be edited by the given user
+        """
+        if user.is_anonymous:
+            return False
+        if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
+            return True
+        return False
 
     def get_absolute_url(self):
         return reverse("accounting:type_list")
 
-    def is_owned_by(self, user):
+    def __str__(self):
-        """Check if that object can be edited by the given user."""
+        return self.code + " - " + self.get_movement_type_display() + " - " + self.label
-        if user.is_anonymous:
-            return False
-        return user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
 
 
 class SimplifiedAccountingType(models.Model):
-    """Simplified version of `AccountingType`."""
+    """
+    Class describing the simplified accounting types.
+    """
 
     label = models.CharField(_("label"), max_length=128)
     accounting_type = models.ForeignKey(
@@ -469,15 +521,6 @@ class SimplifiedAccountingType(models.Model):
         verbose_name = _("simplified type")
         ordering = ["accounting_type__movement_type", "accounting_type__code"]
 
-    def __str__(self):
-        return (
-            f"{self.get_movement_type_display()} "
-            f"- {self.accounting_type.code} - {self.label}"
-        )
-
-    def get_absolute_url(self):
-        return reverse("accounting:simple_type_list")
-
     @property
     def movement_type(self):
         return self.accounting_type.movement_type
@@ -485,9 +528,21 @@ class SimplifiedAccountingType(models.Model):
     def get_movement_type_display(self):
         return self.accounting_type.get_movement_type_display()
 
+    def get_absolute_url(self):
+        return reverse("accounting:simple_type_list")
+
+    def __str__(self):
+        return (
+            self.get_movement_type_display()
+            + " - "
+            + self.accounting_type.code
+            + " - "
+            + self.label
+        )
+
 
 class Label(models.Model):
-    """Label allow a club to sort its operations."""
+    """Label allow a club to sort its operations"""
 
     name = models.CharField(_("label"), max_length=64)
     club_account = models.ForeignKey(

accounting/schemas.py

@@ -1,15 +0,0 @@
-from ninja import ModelSchema
-
-from accounting.models import ClubAccount, Company
-
-
-class ClubAccountSchema(ModelSchema):
-    class Meta:
-        model = ClubAccount
-        fields = ["id", "name"]
-
-
-class CompanySchema(ModelSchema):
-    class Meta:
-        model = Company
-        fields = ["id", "name"]

accounting/static/bundled/accounting/components/ajax-select-index.ts

@@ -1,60 +0,0 @@
-import { AjaxSelect } from "#core:core/components/ajax-select-base";
-import { registerComponent } from "#core:utils/web-components";
-import type { TomOption } from "tom-select/dist/types/types";
-import type { escape_html } from "tom-select/dist/types/utils";
-import {
-  type ClubAccountSchema,
-  type CompanySchema,
-  accountingSearchClubAccount,
-  accountingSearchCompany,
-} from "#openapi";
-
-@registerComponent("club-account-ajax-select")
-export class ClubAccountAjaxSelect extends AjaxSelect {
-  protected valueField = "id";
-  protected labelField = "name";
-  protected searchField = ["code", "name"];
-
-  protected async search(query: string): Promise<TomOption[]> {
-    const resp = await accountingSearchClubAccount({ query: { search: query } });
-    if (resp.data) {
-      return resp.data.results;
-    }
-    return [];
-  }
-
-  protected renderOption(item: ClubAccountSchema, sanitize: typeof escape_html) {
-    return `<div class="select-item">
-            <span class="select-item-text">${sanitize(item.name)}</span>
-          </div>`;
-  }
-
-  protected renderItem(item: ClubAccountSchema, sanitize: typeof escape_html) {
-    return `<span>${sanitize(item.name)}</span>`;
-  }
-}
-
-@registerComponent("company-ajax-select")
-export class CompanyAjaxSelect extends AjaxSelect {
-  protected valueField = "id";
-  protected labelField = "name";
-  protected searchField = ["code", "name"];
-
-  protected async search(query: string): Promise<TomOption[]> {
-    const resp = await accountingSearchCompany({ query: { search: query } });
-    if (resp.data) {
-      return resp.data.results;
-    }
-    return [];
-  }
-
-  protected renderOption(item: CompanySchema, sanitize: typeof escape_html) {
-    return `<div class="select-item">
-            <span class="select-item-text">${sanitize(item.name)}</span>
-          </div>`;
-  }
-
-  protected renderItem(item: CompanySchema, sanitize: typeof escape_html) {
-    return `<span>${sanitize(item.name)}</span>`;
-  }
-}

accounting/templates/accounting/accountingtype_list.jinja

@@ -1,27 +1,27 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-  {% trans %}Accounting type list{% endtrans %}
+{% trans %}Accounting type list{% endtrans %}
 {% endblock %}
 
 {% block content %}
-  <div id="accounting">
+    <div id="accounting">
-    <p>
+        <p>
-      <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
+        <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
-      {% trans %}Accounting types{% endtrans %}
+        {% trans %}Accounting types{% endtrans %}
-    </p>
+        </p>
-    <hr>
+        <hr>
-    <p><a href="{{ url('accounting:type_new') }}">{% trans %}New accounting type{% endtrans %}</a></p>
+        <p><a href="{{ url('accounting:type_new') }}">{% trans %}New accounting type{% endtrans %}</a></p>
-    {% if accountingtype_list %}
+        {% if accountingtype_list %}
-      <h3>{% trans %}Accounting type list{% endtrans %}</h3>
+        <h3>{% trans %}Accounting type list{% endtrans %}</h3>
-      <ul>
+        <ul>
-        {% for a in accountingtype_list  %}
+            {% for a in accountingtype_list  %}
-          <li><a href="{{ url('accounting:type_edit', type_id=a.id) }}">{{ a }}</a></li>
+            <li><a href="{{ url('accounting:type_edit', type_id=a.id) }}">{{ a }}</a></li>
-        {% endfor %}
+            {% endfor %}
-      </ul>
+        </ul>
-    {% else %}
+        {% else %}
-      {% trans %}There is no types in this website.{% endtrans %}
+        {% trans %}There is no types in this website.{% endtrans %}
-    {% endif %}
+        {% endif %}
-  </div>
+    </div>
 {% endblock %}
 

accounting/templates/accounting/bank_account_details.jinja

@@ -1,37 +1,37 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-  {% trans %}Bank account: {% endtrans %}{{ object.name }}
+{% trans %}Bank account: {% endtrans %}{{ object.name }}
 {% endblock %}
 
 {% block content %}
-  <div id="accounting">
+    <div id="accounting">
-    <p>
+        <p>
-      <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
+        <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
-      {{ object.name }}
+        {{ object.name }}
-    </p>
+        </p>
-    <hr>
+        <hr>
-    <h2>{% trans %}Bank account: {% endtrans %}{{ object.name }}</h2>
+        <h2>{% trans %}Bank account: {% endtrans %}{{ object.name }}</h2>
-    {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) and not object.club_accounts.exists() %}
+        {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) and not object.club_accounts.exists() %}
-      <a href="{{ url('accounting:bank_delete', b_account_id=object.id) }}">{% trans %}Delete{% endtrans %}</a>
+        <a href="{{ url('accounting:bank_delete', b_account_id=object.id) }}">{% trans %}Delete{% endtrans %}</a>
-    {% endif %}
+        {% endif %}
-    <h4>{% trans %}Infos{% endtrans %}</h4>
+        <h4>{% trans %}Infos{% endtrans %}</h4>
-    <ul>
+        <ul>
-      <li><strong>{% trans %}IBAN: {% endtrans %}</strong>{{ object.iban }}</li>
+            <li><strong>{% trans %}IBAN: {% endtrans %}</strong>{{ object.iban }}</li>
-      <li><strong>{% trans %}Number: {% endtrans %}</strong>{{ object.number }}</li>
+            <li><strong>{% trans %}Number: {% endtrans %}</strong>{{ object.number }}</li>
-    </ul>
+        </ul>
-    <p><a href="{{ url('accounting:club_new') }}?parent={{ object.id }}">{% trans %}New club account{% endtrans %}</a></p>
+        <p><a href="{{ url('accounting:club_new') }}?parent={{ object.id }}">{% trans %}New club account{% endtrans %}</a></p>
-    <ul>
+        <ul>
-      {% for c in object.club_accounts.all() %}
+        {% for c in object.club_accounts.all() %}
-        <li><a href="{{ url('accounting:club_details', c_account_id=c.id) }}">{{ c }}</a>
+            <li><a href="{{ url('accounting:club_details', c_account_id=c.id) }}">{{ c }}</a>
-          - <a href="{{ url('accounting:club_edit', c_account_id=c.id) }}">{% trans %}Edit{% endtrans %}</a>
+                - <a href="{{ url('accounting:club_edit', c_account_id=c.id) }}">{% trans %}Edit{% endtrans %}</a>
-          {% if c.journals.count() == 0 %}
+                {% if c.journals.count() == 0 %}
-            - <a href="{{ url('accounting:club_delete', c_account_id=c.id) }}">{% trans %}Delete{% endtrans %}</a>
+                - <a href="{{ url('accounting:club_delete', c_account_id=c.id) }}">{% trans %}Delete{% endtrans %}</a>
-          {% endif %}
+                {% endif %}
-        </li>
+                </li>
-      {% endfor %}
+        {% endfor %}
-    </ul>
+        </ul>
-  </div>
+    </div>
 {% endblock %}
 
 

accounting/templates/accounting/bank_account_list.jinja

@@ -1,32 +1,32 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-  {% trans %}Bank account list{% endtrans %}
+{% trans %}Bank account list{% endtrans %}
 {% endblock %}
 
 {% block content %}
-  <div id="accounting">
+    <div id="accounting">
-    <h4>
+        <h4>
-      {% trans %}Accounting{% endtrans %}
+        {% trans %}Accounting{% endtrans %}
-    </h4>
+        </h4>
-    {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
+        {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
-      <p><a href="{{ url('accounting:simple_type_list') }}">{% trans %}Manage simplified types{% endtrans %}</a></p>
+        <p><a href="{{ url('accounting:simple_type_list') }}">{% trans %}Manage simplified types{% endtrans %}</a></p>
-      <p><a href="{{ url('accounting:type_list') }}">{% trans %}Manage accounting types{% endtrans %}</a></p>
+        <p><a href="{{ url('accounting:type_list') }}">{% trans %}Manage accounting types{% endtrans %}</a></p>
-      <p><a href="{{ url('accounting:bank_new') }}">{% trans %}New bank account{% endtrans %}</a></p>
+        <p><a href="{{ url('accounting:bank_new') }}">{% trans %}New bank account{% endtrans %}</a></p>
-    {% endif %}
+        {% endif %}
-    {% if bankaccount_list %}
+        {% if bankaccount_list %}
-      <h3>{% trans %}Bank account list{% endtrans %}</h3>
+        <h3>{% trans %}Bank account list{% endtrans %}</h3>
-      <ul>
+            <ul>
-        {% for a in object_list  %}
+                {% for a in object_list  %}
-          <li><a href="{{ url('accounting:bank_details', b_account_id=a.id) }}">{{ a }}</a>
+                <li><a href="{{ url('accounting:bank_details', b_account_id=a.id) }}">{{ a }}</a>
-            - <a href="{{ url('accounting:bank_edit', b_account_id=a.id) }}">{% trans %}Edit{% endtrans %}</a>
+                    - <a href="{{ url('accounting:bank_edit', b_account_id=a.id) }}">{% trans %}Edit{% endtrans %}</a>
-          </li>
+                </li>
-        {% endfor %}
+                {% endfor %}
-      </ul>
+            </ul>
-    {% else %}
+        {% else %}
-      {% trans %}There is no accounts in this website.{% endtrans %}
+        {% trans %}There is no accounts in this website.{% endtrans %}
-    {% endif %}
+        {% endif %}
-  </div>
+    </div>
 {% endblock %}
 
 

accounting/templates/accounting/club_account_details.jinja

@@ -1,68 +1,68 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-  {% trans %}Club account:{% endtrans %} {{ object.name }}
+{% trans %}Club account:{% endtrans %} {{ object.name }}
 {% endblock %}
 
 {% block content %}
-  <div id="accounting">
+    <div id="accounting">
-    <p>
+        <p>
-      <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
+        <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
-      <a href="{{ url('accounting:bank_details', b_account_id=object.bank_account.id) }}">{{object.bank_account }}</a> >
+        <a href="{{ url('accounting:bank_details', b_account_id=object.bank_account.id) }}">{{object.bank_account }}</a> >
-      {{ object }}
+        {{ object }}
-    </p>
+        </p>
-    <hr>
+        <hr>
-    <h2>{% trans %}Club account:{% endtrans %} {{ object.name }}</h2>
+        <h2>{% trans %}Club account:{% endtrans %} {{ object.name }}</h2>
-    {% if user.is_root and not object.journals.exists() %}
+        {% if user.is_root and not object.journals.exists() %}
-      <a href="{{ url('accounting:club_delete', c_account_id=object.id) }}">{% trans %}Delete{% endtrans %}</a>
+        <a href="{{ url('accounting:club_delete', c_account_id=object.id) }}">{% trans %}Delete{% endtrans %}</a>
-    {% endif %}
+        {% endif %}
-    {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
+        {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
-      <p><a href="{{ url('accounting:label_new') }}?parent={{ object.id }}">{% trans %}New label{% endtrans %}</a></p>
+        <p><a href="{{ url('accounting:label_new') }}?parent={{ object.id }}">{% trans %}New label{% endtrans %}</a></p>
-    {% endif %}
+        {% endif %}
-    <p><a href="{{ url('accounting:label_list', clubaccount_id=object.id) }}">{% trans %}Label list{% endtrans %}</a></p>
+        <p><a href="{{ url('accounting:label_list', clubaccount_id=object.id) }}">{% trans %}Label list{% endtrans %}</a></p>
-    {% if not object.has_open_journal() %}
+        {% if not object.has_open_journal() %}
-      <p><a href="{{ url('accounting:journal_new') }}?parent={{ object.id }}">{% trans %}New journal{% endtrans %}</a></p>
+        <p><a href="{{ url('accounting:journal_new') }}?parent={{ object.id }}">{% trans %}New journal{% endtrans %}</a></p>
-    {% else %}
+        {% else %}
-      <p>{% trans %}You can not create new journal while you still have one opened{% endtrans %}</p>
+        <p>{% trans %}You can not create new journal while you still have one opened{% endtrans %}</p>
-    {% endif %}
+        {% endif %}
-    <table>
+        <table>
-      <thead>
+            <thead>
-        <tr>
+            <tr>
-          <td>{% trans %}Name{% endtrans %}</td>
+                <td>{% trans %}Name{% endtrans %}</td>
-          <td>{% trans %}Start{% endtrans %}</td>
+                <td>{% trans %}Start{% endtrans %}</td>
-          <td>{% trans %}End{% endtrans %}</td>
+                <td>{% trans %}End{% endtrans %}</td>
-          <td>{% trans %}Amount{% endtrans %}</td>
+                <td>{% trans %}Amount{% endtrans %}</td>
-          <td>{% trans %}Effective amount{% endtrans %}</td>
+                <td>{% trans %}Effective amount{% endtrans %}</td>
-          <td>{% trans %}Closed{% endtrans %}</td>
+                <td>{% trans %}Closed{% endtrans %}</td>
-          <td>{% trans %}Actions{% endtrans %}</td>
+                <td>{% trans %}Actions{% endtrans %}</td>
-        </tr>
+            </tr>
-      </thead>
+            </thead>
-      <tbody>
+            <tbody>
-        {% for j in object.journals.all() %}
+            {% for j in object.journals.all() %}
-          <tr>
+            <tr>
-            <td>{{ j.name }}</td>
+                <td>{{ j.name }}</td>
-            <td>{{ j.start_date }}</td>
+                <td>{{ j.start_date }}</td>
-            {% if j.end_date %}
+                {% if j.end_date %}
-              <td>{{ j.end_date }}</td>
+                <td>{{ j.end_date }}</td>
-            {% else %}
+                {% else %}
-              <td> - </td>
+                <td> - </td>
-            {% endif %}
+                {% endif %}
-            <td>{{ j.amount }} €</td>
+                <td>{{ j.amount }} €</td>
-            <td>{{ j.effective_amount }} €</td>
+                <td>{{ j.effective_amount }} €</td>
-            {% if j.closed %}
+                {% if j.closed %}
-              <td>{% trans %}Yes{% endtrans %}</td>
+                <td>{% trans %}Yes{% endtrans %}</td>
-            {% else %}
+                {% else %}
-              <td>{% trans %}No{% endtrans %}</td>
+                <td>{% trans %}No{% endtrans %}</td>
-            {% endif %}
+                {% endif %}
-            <td> <a href="{{ url('accounting:journal_details', j_id=j.id) }}">{% trans %}View{% endtrans %}</a>
+                <td> <a href="{{ url('accounting:journal_details', j_id=j.id) }}">{% trans %}View{% endtrans %}</a>
-              <a href="{{ url('accounting:journal_edit', j_id=j.id) }}">{% trans %}Edit{% endtrans %}</a>
+                    <a href="{{ url('accounting:journal_edit', j_id=j.id) }}">{% trans %}Edit{% endtrans %}</a>
-              {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) and j.operations.count() == 0 %}
+                    {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) and j.operations.count() == 0 %}
-                <a href="{{ url('accounting:journal_delete', j_id=j.id) }}">{% trans %}Delete{% endtrans %}</a>
+                        <a href="{{ url('accounting:journal_delete', j_id=j.id) }}">{% trans %}Delete{% endtrans %}</a>
-              {% endif %}
+                    {% endif %}
-            </td>
+                    </td>
-          </tr>
+            </tr>
-        {% endfor %}
+            {% endfor %}
-      </tbody>
+            </tbody>
-    </table>
+        </table>
-  </div>
+    </div>
 {% endblock %}

accounting/templates/accounting/co_list.jinja

@@ -1,30 +1,30 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-  {% trans %}Company list{% endtrans %}
+{% trans %}Company list{% endtrans %}
 {% endblock %}
 
 {% block content %}
-  <div id="accounting">
+    <div id="accounting">
-    {% if user.is_root
+        {% if user.is_root
-    or user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
+           or user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
-    %}
+        %}
-    <p><a href="{{ url('accounting:co_new') }}">{% trans %}Create new company{% endtrans %}</a></p>
+        <p><a href="{{ url('accounting:co_new') }}">{% trans %}Create new company{% endtrans %}</a></p>
-{% endif %}
+        {% endif %}
-<br/>
+        <br/>
-<table>
+        <table>
-  <thead>
+            <thead>
-    <tr>
+            <tr>
-      <td>{% trans %}Companies{% endtrans %}</td>
+                <td>{% trans %}Companies{% endtrans %}</td>
-    </tr>
+            </tr>
-  </thead>
+            </thead>
-  <tbody>
+            <tbody>
-    {% for o in object_list %}
+                {% for o in object_list %}
-      <tr>
+                    <tr>
-        <td><a href="{{ url('accounting:co_edit', co_id=o.id) }}">{{ o.get_display_name() }}</a></td>
+                        <td><a href="{{ url('accounting:co_edit', co_id=o.id) }}">{{ o.get_display_name() }}</a></td>
-      </tr>
+                    </tr>
-    {% endfor %}
+                {% endfor %}
-  </tbody>
+            </tbody>
-</table>
+        </table>
-</div>
+    </div>
 {% endblock %}

accounting/templates/accounting/journal_details.jinja

@@ -1,103 +1,103 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-  {% trans %}General journal:{% endtrans %} {{ object.name }}
+{% trans %}General journal:{% endtrans %} {{ object.name }}
 {% endblock %}
 
 {% block content %}
-  <div id="accounting">
+    <div id="accounting">
-    <p>
+        <p>
-      <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
+        <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
-      <a href="{{ url('accounting:bank_details', b_account_id=object.club_account.bank_account.id) }}">{{object.club_account.bank_account }}</a> >
+        <a href="{{ url('accounting:bank_details', b_account_id=object.club_account.bank_account.id) }}">{{object.club_account.bank_account }}</a> >
-      <a href="{{ url('accounting:club_details', c_account_id=object.club_account.id) }}">{{ object.club_account }}</a> >
+        <a href="{{ url('accounting:club_details', c_account_id=object.club_account.id) }}">{{ object.club_account }}</a> >
-      {{ object.name }}
+        {{ object.name }}
-    </p>
+        </p>
-    <hr>
+        <hr>
-    <h2>{% trans %}General journal:{% endtrans %} {{ object.name }}</h2>
+        <h2>{% trans %}General journal:{% endtrans %} {{ object.name }}</h2>
-    <p><a href="{{ url('accounting:label_new') }}?parent={{ object.club_account.id }}">{% trans %}New label{% endtrans %}</a></p>
+        <p><a href="{{ url('accounting:label_new') }}?parent={{ object.club_account.id }}">{% trans %}New label{% endtrans %}</a></p>
-    <p><a href="{{ url('accounting:label_list', clubaccount_id=object.club_account.id) }}">{% trans %}Label list{% endtrans %}</a></p>
+        <p><a href="{{ url('accounting:label_list', clubaccount_id=object.club_account.id) }}">{% trans %}Label list{% endtrans %}</a></p>
-    <p><a href="{{ url('accounting:co_list') }}">{% trans %}Company list{% endtrans %}</a></p>
+        <p><a href="{{ url('accounting:co_list') }}">{% trans %}Company list{% endtrans %}</a></p>
-    <p><strong>{% trans %}Amount: {% endtrans %}</strong>{{ object.amount }} € -
+        <p><strong>{% trans %}Amount: {% endtrans %}</strong>{{ object.amount }} € -
-      <strong>{% trans %}Effective amount: {% endtrans %}</strong>{{ object.effective_amount }} €</p>
+        <strong>{% trans %}Effective amount: {% endtrans %}</strong>{{ object.effective_amount }} €</p>
-    {% if object.closed %}
+        {% if object.closed %}
-      <p>{% trans %}Journal is closed, you can not create operation{% endtrans %}</p>
+        <p>{% trans %}Journal is closed, you can not create operation{% endtrans %}</p>
-    {% else %}
+        {% else %}
-      <p><a href="{{ url('accounting:op_new', j_id=object.id) }}">{% trans %}New operation{% endtrans %}</a></p>
+        <p><a href="{{ url('accounting:op_new', j_id=object.id) }}">{% trans %}New operation{% endtrans %}</a></p>
-      </br>
+        </br>
-    {% endif %}
+        {% endif %}
-    <div class="journal-table">
+        <div class="journal-table">
-      <table>
+        <table>
-        <thead>
+            <thead>
-          <tr>
-            <td>{% trans %}Nb{% endtrans %}</td>
-            <td>{% trans %}Date{% endtrans %}</td>
-            <td>{% trans %}Label{% endtrans %}</td>
-            <td>{% trans %}Amount{% endtrans %}</td>
-            <td>{% trans %}Payment mode{% endtrans %}</td>
-            <td>{% trans %}Target{% endtrans %}</td>
-            <td>{% trans %}Code{% endtrans %}</td>
-            <td>{% trans %}Nature{% endtrans %}</td>
-            <td>{% trans %}Done{% endtrans %}</td>
-            <td>{% trans %}Comment{% endtrans %}</td>
-            <td>{% trans %}File{% endtrans %}</td>
-            <td>{% trans %}Actions{% endtrans %}</td>
-            <td>{% trans %}PDF{% endtrans %}</td>
-          </tr>
-        </thead>
-        <tbody>
-          {% for o in object.operations.all() %}
             <tr>
-              <td>{{ o.number }}</td>
+                <td>{% trans %}Nb{% endtrans %}</td>
-              <td>{{ o.date }}</td>
+                <td>{% trans %}Date{% endtrans %}</td>
-              <td>{{ o.label or "" }}</td>
+                <td>{% trans %}Label{% endtrans %}</td>
-              {% if o.accounting_type.movement_type == "DEBIT" %}
+                <td>{% trans %}Amount{% endtrans %}</td>
-                <td class="neg-amount">&nbsp;{{ o.amount }}&nbsp;€</td>
+                <td>{% trans %}Payment mode{% endtrans %}</td>
-              {% else %}
+                <td>{% trans %}Target{% endtrans %}</td>
-                <td class="pos-amount">&nbsp;{{ o.amount }}&nbsp;€</td>
+                <td>{% trans %}Code{% endtrans %}</td>
-              {% endif %}
+                <td>{% trans %}Nature{% endtrans %}</td>
-              <td>{{ o.get_mode_display() }}</td>
+                <td>{% trans %}Done{% endtrans %}</td>
-              {% if o.target_type == "OTHER" %}
+                <td>{% trans %}Comment{% endtrans %}</td>
+                <td>{% trans %}File{% endtrans %}</td>
+                <td>{% trans %}Actions{% endtrans %}</td>
+                <td>{% trans %}PDF{% endtrans %}</td>
+            </tr>
+            </thead>
+            <tbody>
+            {% for o in object.operations.all() %}
+            <tr>
+                <td>{{ o.number }}</td>
+                <td>{{ o.date }}</td>
+                <td>{{ o.label or "" }}</td>
+                {% if o.accounting_type.movement_type == "DEBIT" %}
+                    <td class="neg-amount">&nbsp;{{ o.amount }}&nbsp;€</td>
+                {% else %}
+                    <td class="pos-amount">&nbsp;{{ o.amount }}&nbsp;€</td>
+                {% endif %}
+                <td>{{ o.get_mode_display() }}</td>
+                {% if o.target_type == "OTHER" %}
                 <td>{{ o.target_label }}</td>
-              {% else %}
+                {% else %}
                 <td><a href="{{ o.target.get_absolute_url() }}">{{ o.target.get_display_name() }}</a></td>
-              {% endif %}
+                {% endif %}
-              <td>{{ o.accounting_type.code }}</td>
+                <td>{{ o.accounting_type.code }}</td>
-              <td>{{ o.accounting_type.label }}</td>
+                <td>{{ o.accounting_type.label }}</td>
-              {% if o.done %}
+                {% if o.done %}
                 <td>{% trans %}Yes{% endtrans %}</td>
-              {% else %}
+                {% else %}
                 <td>{% trans %}No{% endtrans %}</td>
-              {% endif %}
+                {% endif %}
-              <td>{{ o.remark }}
+                <td>{{ o.remark }}
                 {% if not o.linked_operation and o.target_type == "ACCOUNT" and not o.target.has_open_journal() %}
-                  <p><strong>
+                    <p><strong>
-                    {% trans %}Warning: this operation has no linked operation because the targeted club account has no opened journal.{% endtrans %}
+    {% trans %}Warning: this operation has no linked operation because the targeted club account has no opened journal.{% endtrans %}
-                  </strong></p>
+                </strong></p>
-                  <p><strong>
+                <p><strong>
-                    {% trans url=o.target.get_absolute_url() %}Open a journal in <a href="{{ url }}">this club account</a>, then save this operation again to make the linked operation.{% endtrans %}
+    {% trans url=o.target.get_absolute_url() %}Open a journal in <a href="{{ url }}">this club account</a>, then save this operation again to make the linked operation.{% endtrans %}
-                  </strong></p>
+            </strong></p>
                 {% endif %}
-              </td>
+                </td>
-              {% if o.invoice %}
+                {% if o.invoice %}
                 <td><a href="{{ url('core:download', file_id=o.invoice.id) }}">{{ o.invoice.name }}</a></td>
-              {% else %}
+                {% else %}
                 <td>-</td>
-              {% endif %}
-              <td>
-                {%
-                if o.journal.club_account.bank_account.name not in ["AE TI", "TI"]
-                or user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
-                %}
-                {% if not o.journal.closed %}
-                  <a href="{{ url('accounting:op_edit', op_id=o.id) }}">{% trans %}Edit{% endtrans %}</a>
                 {% endif %}
-          {% endif %}
+                <td>
-        </td>
+                    {%
-        <td><a href="{{ url('accounting:op_pdf', op_id=o.id) }}">{% trans %}Generate{% endtrans %}</a></td>
+                        if o.journal.club_account.bank_account.name not in ["AE TI", "TI"]
-      </tr>
+                        or user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
-{% endfor %}
+                    %}
-</tbody>
+                        {% if not o.journal.closed %}
-</table>
+                            <a href="{{ url('accounting:op_edit', op_id=o.id) }}">{% trans %}Edit{% endtrans %}</a>
-</div>
+                        {% endif %}
-</div>
+                    {% endif %}
+                </td>
+                <td><a href="{{ url('accounting:op_pdf', op_id=o.id) }}">{% trans %}Generate{% endtrans %}</a></td>
+            </tr>
+            {% endfor %}
+            </tbody>
+        </table>
+        </div>
+    </div>
 {% endblock %}

accounting/templates/accounting/journal_statement_accounting.jinja

@@ -1,33 +1,33 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-  {% trans %}General journal:{% endtrans %} {{ object.name }}
+{% trans %}General journal:{% endtrans %} {{ object.name }}
 {% endblock %}
 
 
 {% block content %}
-  <div id="accounting">
+<div id="accounting">
     <h3>{% trans %}Accounting statement: {% endtrans %} {{ object.name }}</h3>
 
     <table>
-      <thead>
+        <thead>
-        <tr>
+            <tr>
-          <td>{% trans %}Operation type{% endtrans %}</td>
+                <td>{% trans %}Operation type{% endtrans %}</td>
-          <td>{% trans %}Sum{% endtrans %}</td>
+                <td>{% trans %}Sum{% endtrans %}</td>
-        </tr>
+            </tr>
-      </thead>
+        </thead>
-      <tbody>
+        <tbody>
-        {% for k,v in statement.items() %}
+            {% for k,v in statement.items() %}
-          <tr>
+            <tr>
-            <td>{{ k }}</td>
+                <td>{{ k }}</td>
-            <td>{{ "%.2f" % v }}</td>
+                <td>{{ "%.2f" % v }}</td>
-          </tr>
+            </tr>
-        {% endfor %}
+            {% endfor %}
-      </tbody>
+        </tbody>
 
     </table>
 
     <p><strong>{% trans %}Amount: {% endtrans %}</strong>{{ "%.2f" % object.amount }} €</p>
     <p><strong>{% trans %}Effective amount: {% endtrans %}</strong>{{ "%.2f" %object.effective_amount }} €</p>
-  </div>
+</div>
 {% endblock %}

accounting/templates/accounting/journal_statement_nature.jinja

@@ -1,57 +1,57 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-  {% trans %}General journal:{% endtrans %} {{ object.name }}
+{% trans %}General journal:{% endtrans %} {{ object.name }}
 {% endblock %}
 
 {% macro display_tables(dict) %}
-  <div id="accounting">
+<div id="accounting">
     <h6>{% trans %}Credit{% endtrans %}</h6>
     <table>
-      <thead>
+        <thead>
-        <tr>
+            <tr>
-          <td>{% trans %}Nature of operation{% endtrans %}</td>
+                <td>{% trans %}Nature of operation{% endtrans %}</td>
-          <td>{% trans %}Sum{% endtrans %}</td>
+                <td>{% trans %}Sum{% endtrans %}</td>
-        </tr>
+            </tr>
-      </thead>
+        </thead>
-      <tbody>
+        <tbody>
-        {% for k,v in dict['CREDIT'].items() %}
+            {% for k,v in dict['CREDIT'].items() %}
-          <tr>
+            <tr>
-            <td>{{ k }}</td>
+                <td>{{ k }}</td>
-            <td>{{ "%.2f" % v }}</td>
+                <td>{{ "%.2f" % v }}</td>
-          </tr>
+            </tr>
-        {% endfor %}
+            {% endfor %}
-      </tbody>
+        </tbody>
     </table>
     {% trans %}Total: {% endtrans %}{{ "%.2f" % dict['CREDIT_sum'] }}
 
     <h6>{% trans %}Debit{% endtrans %}</h6>
     <table>
-      <thead>
+        <thead>
-        <tr>
+            <tr>
-          <td>{% trans %}Nature of operation{% endtrans %}</td>
+                <td>{% trans %}Nature of operation{% endtrans %}</td>
-          <td>{% trans %}Sum{% endtrans %}</td>
+                <td>{% trans %}Sum{% endtrans %}</td>
-        </tr>
+            </tr>
-      </thead>
+        </thead>
-      <tbody>
+        <tbody>
-        {% for k,v in dict['DEBIT'].items() %}
+            {% for k,v in dict['DEBIT'].items() %}
-          <tr>
+            <tr>
-            <td>{{ k }}</td>
+                <td>{{ k }}</td>
-            <td>{{ "%.2f" % v }}</td>
+                <td>{{ "%.2f" % v }}</td>
-          </tr>
+            </tr>
-        {% endfor %}
+            {% endfor %}
-      </tbody>
+        </tbody>
     </table>
     {% trans %}Total: {% endtrans %}{{ "%.2f" % dict['DEBIT_sum'] }}
-{% endmacro %}
+    {% endmacro %}
 
-{% block content %}
+    {% block content %}
-  <h3>{% trans %}Statement by nature: {% endtrans %} {{ object.name }}</h3>
+    <h3>{% trans %}Statement by nature: {% endtrans %} {{ object.name }}</h3>
 
-  {% for k,v in statement.items() %}
+    {% for k,v in statement.items() %}
-    <h4 style="background: lightblue; padding: 4px;">{{ k }} : {{ "%.2f" % (v['CREDIT_sum'] - v['DEBIT_sum']) }}</h4>
+        <h4 style="background: lightblue; padding: 4px;">{{ k }} : {{ "%.2f" % (v['CREDIT_sum'] - v['DEBIT_sum']) }}</h4>
     {{ display_tables(v) }}
     <hr>
-  {% endfor %}
+    {% endfor %}
-  </div>
+</div>
 {% endblock %}

accounting/templates/accounting/journal_statement_person.jinja

@@ -1,37 +1,37 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-  {% trans %}General journal:{% endtrans %} {{ object.name }}
+{% trans %}General journal:{% endtrans %} {{ object.name }}
 {% endblock %}
 
 
 {% block content %}
-  <div id="accounting">
+<div id="accounting">
     <h3>{% trans %}Statement by person: {% endtrans %} {{ object.name }}</h3>
 
     <h4>{% trans %}Credit{% endtrans %}</h4>
 
     <table>
-      <thead>
+        <thead>
-        <tr>
+            <tr>
-          <td>{% trans %}Target of the operation{% endtrans %}</td>
+                <td>{% trans %}Target of the operation{% endtrans %}</td>
-          <td>{% trans %}Sum{% endtrans %}</td>
+                <td>{% trans %}Sum{% endtrans %}</td>
-        </tr>
+            </tr>
-      </thead>
+        </thead>
-      <tbody>
+        <tbody>
-        {% for key in credit_statement.keys() %}
+            {% for key in credit_statement.keys() %}
-          <tr>
+            <tr>
-            {% if key.target_type == "OTHER" %}
+                {% if key.target_type == "OTHER" %}
-              <td>{{ o.target_label }}</td>
+                <td>{{ o.target_label }}</td>
-            {% elif key %}
+                {% elif key %}
-              <td><a href="{{ key.get_absolute_url() }}">{{ key.get_display_name() }}</a></td>
+                <td><a href="{{ key.get_absolute_url() }}">{{ key.get_display_name() }}</a></td>
-            {% else %}
+                {% else %}
-              <td></td>
+                <td></td>
-            {% endif %}
+                {% endif %}
-            <td>{{ "%.2f" % credit_statement[key] }}</td>
+                <td>{{ "%.2f" % credit_statement[key] }}</td>
-          </tr>
+            </tr>
-        {% endfor %}
+            {% endfor %}
-      </tbody>
+        </tbody>
 
     </table>
 
@@ -40,29 +40,29 @@
     <h4>{% trans %}Debit{% endtrans %}</h4>
 
     <table>
-      <thead>
+        <thead>
-        <tr>
+            <tr>
-          <td>{% trans %}Target of the operation{% endtrans %}</td>
+                <td>{% trans %}Target of the operation{% endtrans %}</td>
-          <td>{% trans %}Sum{% endtrans %}</td>
+                <td>{% trans %}Sum{% endtrans %}</td>
-        </tr>
+            </tr>
-      </thead>
+        </thead>
-      <tbody>
+        <tbody>
-        {% for key in debit_statement.keys() %}
+            {% for key in debit_statement.keys() %}
-          <tr>
+            <tr>
-            {% if key.target_type == "OTHER" %}
+                {% if key.target_type == "OTHER" %}
-              <td>{{ o.target_label }}</td>
+                <td>{{ o.target_label }}</td>
-            {% elif key %}
+                {% elif key %}
-              <td><a href="{{ key.get_absolute_url() }}">{{ key.get_display_name() }}</a></td>
+                <td><a href="{{ key.get_absolute_url() }}">{{ key.get_display_name() }}</a></td>
-            {% else %}
+                {% else %}
-              <td></td>
+                <td></td>
-            {% endif %}
+                {% endif %}
-            <td>{{ "%.2f" % debit_statement[key] }}</td>
+                <td>{{ "%.2f" % debit_statement[key] }}</td>
-          </tr>
+            </tr>
-        {% endfor %}
+            {% endfor %}
-      </tbody>
+        </tbody>
 
     </table>
 
     <p>Total : {{ "%.2f" % total_debit }}</p>
-  </div>
+</div>
 {% endblock %}

accounting/templates/accounting/label_list.jinja

@@ -1,36 +1,36 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-  {% trans %}Label list{% endtrans %}
+{% trans %}Label list{% endtrans %}
 {% endblock %}
 
 {% block content %}
-  <div id="accounting">
+    <div id="accounting">
-    <p>
+        <p>
-      <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
+        <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
-      <a href="{{ url('accounting:bank_details', b_account_id=object.bank_account.id) }}">{{object.bank_account }}</a> >
+        <a href="{{ url('accounting:bank_details', b_account_id=object.bank_account.id) }}">{{object.bank_account }}</a> >
-      <a href="{{ url('accounting:club_details', c_account_id=object.id) }}">{{ object }}</a>
+        <a href="{{ url('accounting:club_details', c_account_id=object.id) }}">{{ object }}</a>
-    </p>
+        </p>
-    <hr>
+        <hr>
-    <p><a href="{{ url('accounting:club_details', c_account_id=object.id) }}">{% trans %}Back to club account{% endtrans %}</a></p>
+        <p><a href="{{ url('accounting:club_details', c_account_id=object.id) }}">{% trans %}Back to club account{% endtrans %}</a></p>
-    {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
+        {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
-      <p><a href="{{ url('accounting:label_new') }}?parent={{ object.id }}">{% trans %}New label{% endtrans %}</a></p>
+        <p><a href="{{ url('accounting:label_new') }}?parent={{ object.id }}">{% trans %}New label{% endtrans %}</a></p>
-    {% endif %}
+        {% endif %}
-    {% if object.labels.all() %}
+        {% if object.labels.all() %}
-      <h3>{% trans %}Label list{% endtrans %}</h3>
+        <h3>{% trans %}Label list{% endtrans %}</h3>
-      <ul>
+        <ul>
-        {% for l in object.labels.all()  %}
+            {% for l in object.labels.all()  %}
-          <li><a href="{{ url('accounting:label_edit', label_id=l.id) }}">{{ l }}</a>
+            <li><a href="{{ url('accounting:label_edit', label_id=l.id) }}">{{ l }}</a>
             {% if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID) %}
-              -
+             -
-              <a href="{{ url('accounting:label_delete', label_id=l.id) }}">{% trans %}Delete{% endtrans %}</a>
+                <a href="{{ url('accounting:label_delete', label_id=l.id) }}">{% trans %}Delete{% endtrans %}</a>
             {% endif %}
-          </li>
+            </li>
-        {% endfor %}
+            {% endfor %}
-      </ul>
+        </ul>
-    {% else %}
+        {% else %}
-      {% trans %}There is no label in this club account.{% endtrans %}
+        {% trans %}There is no label in this club account.{% endtrans %}
-    {% endif %}
+        {% endif %}
-  </div>
+    </div>
 {% endblock %}
 

accounting/templates/accounting/operation_edit.jinja

@@ -1,123 +1,123 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-  {% trans %}Edit operation{% endtrans %}
+{% trans %}Edit operation{% endtrans %}
 {% endblock %}
 
 {% block content %}
-  <div id="accounting">
+<div id="accounting">
     <p>
-      <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
+    <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
-      <a href="{{ url('accounting:bank_details', b_account_id=object.club_account.bank_account.id) }}">{{object.club_account.bank_account }}</a> >
+    <a href="{{ url('accounting:bank_details', b_account_id=object.club_account.bank_account.id) }}">{{object.club_account.bank_account }}</a> >
-      <a href="{{ url('accounting:club_details', c_account_id=object.club_account.id) }}">{{ object.club_account }}</a> >
+    <a href="{{ url('accounting:club_details', c_account_id=object.club_account.id) }}">{{ object.club_account }}</a> >
-      <a href="{{ url('accounting:journal_details', j_id=object.id) }}">{{ object.name }}</a> >
+    <a href="{{ url('accounting:journal_details', j_id=object.id) }}">{{ object.name }}</a> >
-      {% trans %}Edit operation{% endtrans %}
+    {% trans %}Edit operation{% endtrans %}
     </p>
     <hr>
     <h2>{% trans %}Edit operation{% endtrans %}</h2>
     <form action="" method="post">
-      {% csrf_token %}
+        {% csrf_token %}
-      {{ form.non_field_errors() }}
+        {{ form.non_field_errors() }}
-      {{ form.journal }}
+        {{ form.journal }}
-      {{ form.target_id }}
+        {{ form.target_id }}
-      <p>{{ form.amount.errors }}<label for="{{ form.amount.name }}">{{ form.amount.label }}</label> {{ form.amount }}</p>
+        <p>{{ form.amount.errors }}<label for="{{ form.amount.name }}">{{ form.amount.label }}</label> {{ form.amount }}</p>
-      <p>{{ form.remark.errors }}<label for="{{ form.remark.name }}">{{ form.remark.label }}</label> {{ form.remark }}</p>
+        <p>{{ form.remark.errors }}<label for="{{ form.remark.name }}">{{ form.remark.label }}</label> {{ form.remark }}</p>
-      <br />
+        <br />
-      <strong>{% trans %}Warning: if you select <em>Account</em>, the opposite operation will be created in the target account. If you don't want that, select <em>Club</em> instead of <em>Account</em>.{% endtrans %}</strong>
+        <strong>{% trans %}Warning: if you select <em>Account</em>, the opposite operation will be created in the target account. If you don't want that, select <em>Club</em> instead of <em>Account</em>.{% endtrans %}</strong>
-      <p>{{ form.target_type.errors }}<label for="{{ form.target_type.name }}">{{ form.target_type.label }}</label> {{ form.target_type }}</p>
+        <p>{{ form.target_type.errors }}<label for="{{ form.target_type.name }}">{{ form.target_type.label }}</label> {{ form.target_type }}</p>
-      {{ form.user }}
+            {{ form.user }}
-      {{ form.club }}
+            {{ form.club }}
-      {{ form.club_account }}
+            {{ form.club_account }}
-      {{ form.company }}
+            {{ form.company }}
-      {{ form.target_label }}
+            {{ form.target_label }}
-      <span id="id_need_link_full"><label>{{ form.need_link.label }}</label> {{ form.need_link }}</span>
+            <span id="id_need_link_full"><label>{{ form.need_link.label }}</label> {{ form.need_link }}</span>
-      <p>{{ form.date.errors }}<label for="{{ form.date.name }}">{{ form.date.label }}</label> {{ form.date }}</p>
+        <p>{{ form.date.errors }}<label for="{{ form.date.name }}">{{ form.date.label }}</label> {{ form.date }}</p>
-      <p>{{ form.mode.errors }}<label for="{{ form.mode.name }}">{{ form.mode.label }}</label> {{ form.mode }}</p>
+        <p>{{ form.mode.errors }}<label for="{{ form.mode.name }}">{{ form.mode.label }}</label> {{ form.mode }}</p>
-      <p>{{ form.cheque_number.errors }}<label for="{{ form.cheque_number.name }}">{{ form.cheque_number.label }}</label> {{
+        <p>{{ form.cheque_number.errors }}<label for="{{ form.cheque_number.name }}">{{ form.cheque_number.label }}</label> {{
         form.cheque_number }}</p>
-      <p>{{ form.invoice.errors }}<label for="{{ form.invoice.name }}">{{ form.invoice.label }}</label> {{ form.invoice }}</p>
+        <p>{{ form.invoice.errors }}<label for="{{ form.invoice.name }}">{{ form.invoice.label }}</label> {{ form.invoice }}</p>
-      <p>{{ form.simpleaccounting_type.errors }}<label for="{{ form.simpleaccounting_type.name }}">{{
+        <p>{{ form.simpleaccounting_type.errors }}<label for="{{ form.simpleaccounting_type.name }}">{{
-        form.simpleaccounting_type.label }}</label> {{ form.simpleaccounting_type }}</p>
+            form.simpleaccounting_type.label }}</label> {{ form.simpleaccounting_type }}</p>
-      <p>{{ form.accounting_type.errors }}<label for="{{ form.accounting_type.name }}">{{ form.accounting_type.label }}</label> {{
+        <p>{{ form.accounting_type.errors }}<label for="{{ form.accounting_type.name }}">{{ form.accounting_type.label }}</label> {{
         form.accounting_type }}</p>
-      <p>{{ form.label.errors }}<label for="{{ form.label.name }}">{{ form.label.label }}</label> {{ form.label }}</p>
+        <p>{{ form.label.errors }}<label for="{{ form.label.name }}">{{ form.label.label }}</label> {{ form.label }}</p>
-      <p>{{ form.done.errors }}<label for="{{ form.done.name }}">{{ form.done.label }}</label> {{ form.done }}</p>
+        <p>{{ form.done.errors }}<label for="{{ form.done.name }}">{{ form.done.label }}</label> {{ form.done }}</p>
-      {% if form.instance.linked_operation %}
+        {% if form.instance.linked_operation %}
         {% set obj = form.instance.linked_operation %}
         <p><strong>{% trans %}Linked operation:{% endtrans %}</strong><br>
-          <a href="{{ url('accounting:bank_details', b_account_id=obj.journal.club_account.bank_account.id) }}">
+        <a href="{{ url('accounting:bank_details', b_account_id=obj.journal.club_account.bank_account.id) }}">
-            {{obj.journal.club_account.bank_account }}</a> >
+                {{obj.journal.club_account.bank_account }}</a> >
-          <a href="{{ url('accounting:club_details', c_account_id=obj.journal.club_account.id) }}">{{ obj.journal.club_account }}</a> >
+        <a href="{{ url('accounting:club_details', c_account_id=obj.journal.club_account.id) }}">{{ obj.journal.club_account }}</a> >
-          <a href="{{ url('accounting:journal_details', j_id=obj.journal.id) }}">{{ obj.journal }}</a> >
+        <a href="{{ url('accounting:journal_details', j_id=obj.journal.id) }}">{{ obj.journal }}</a> >
-          n°{{ obj.number }}
+        n°{{ obj.number }}
         </p>
-      {% endif %}
+        {% endif %}
-      <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
+        <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
     </form>
-{% endblock %}
+    {% endblock %}
 
-{% block script %}
+    {% block script %}
-  {{ super() }}
+        {{ super() }}
-  <script>
+    <script>
     $( function() {
-      var target_type = $('#id_target_type');
+            var target_type = $('#id_target_type');
-      var user = $('user-ajax-select');
+            var user = $('#id_user_wrapper');
-      var club = $('club-ajax-select');
+            var club = $('#id_club_wrapper');
-      var club_account = $('club-account-ajax-select');
+            var club_account = $('#id_club_account_wrapper');
-      var company = $('company-ajax-select');
+            var company = $('#id_company_wrapper');
-      var other = $('#id_target_label');
+            var other = $('#id_target_label');
-      var need_link = $('#id_need_link_full');
+            var need_link = $('#id_need_link_full');
-      function update_targets () {
+            function update_targets () {
-        if (target_type.val() == "USER") {
+                if (target_type.val() == "USER") {
-          console.log(user);
+                    console.log(user);
-          user.show();
+                    user.show();
-          club.hide();
+                    club.hide();
-          club_account.hide();
+                    club_account.hide();
-          company.hide();
+                    company.hide();
-          other.hide();
+                    other.hide();
-          need_link.hide();
+                    need_link.hide();
-        } else if (target_type.val() == "ACCOUNT") {
+                } else if (target_type.val() == "ACCOUNT") {
-          club_account.show();
+                    club_account.show();
-          need_link.show();
+                    need_link.show();
-          user.hide();
+                    user.hide();
-          club.hide();
+                    club.hide();
-          company.hide();
+                    company.hide();
-          other.hide();
+                    other.hide();
-        } else if (target_type.val() == "CLUB") {
+                } else if (target_type.val() == "CLUB") {
-          club.show();
+                    club.show();
-          user.hide();
+                    user.hide();
-          club_account.hide();
+                    club_account.hide();
-          company.hide();
+                    company.hide();
-          other.hide();
+                    other.hide();
-          need_link.hide();
+                    need_link.hide();
-        } else if (target_type.val() == "COMPANY") {
+                } else if (target_type.val() == "COMPANY") {
-          company.show();
+                    company.show();
-          user.hide();
+                    user.hide();
-          club_account.hide();
+                    club_account.hide();
-          club.hide();
+                    club.hide();
-          other.hide();
+                    other.hide();
-          need_link.hide();
+                    need_link.hide();
-        } else if (target_type.val() == "OTHER") {
+                } else if (target_type.val() == "OTHER") {
-          other.show();
+                    other.show();
-          user.hide();
+                    user.hide();
-          club.hide();
+                    club.hide();
-          club_account.hide();
+                    club_account.hide();
-          company.hide();
+                    company.hide();
-          need_link.hide();
+                    need_link.hide();
-        } else {
+                } else {
-          company.hide();
+                    company.hide();
-          user.hide();
+                    user.hide();
-          club_account.hide();
+                    club_account.hide();
-          club.hide();
+                    club.hide();
-          other.hide();
+                    other.hide();
-          need_link.hide();
+                    need_link.hide();
-        }
+                }
-      }
+            }
-      update_targets();
+            update_targets();
-      target_type.change(update_targets);
+            target_type.change(update_targets);
-    } );
+            } );
-  </script>
+    </script>
-  </div>
+</div>
 {% endblock %}
 
 

accounting/templates/accounting/refound_account.jinja

@@ -1,16 +1,16 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-  {% trans %}Refound account{% endtrans %}
+{% trans %}Refound account{% endtrans %}
 {% endblock %}
 
 {% block content %}
-  <div id="accounting">
+	<div id="accounting">
-    <h3>{% trans %}Refound account{% endtrans %}</h3>
+	    <h3>{% trans %}Refound account{% endtrans %}</h3>
-    <form action="" method="post">
+	    <form action="" method="post">
-      {% csrf_token %}
+	        {% csrf_token %}
-      {{ form.as_p() }}
+	        {{ form.as_p() }}
-      <p><input type="submit" value="{% trans %}Refound{% endtrans %}" /></p>
+	        <p><input type="submit" value="{% trans %}Refound{% endtrans %}" /></p>
-    </form>
+	    </form>
-  </div>
+	</div>
 {% endblock %}

accounting/templates/accounting/simplifiedaccountingtype_list.jinja

@@ -1,27 +1,27 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-  {% trans %}Simplified type list{% endtrans %}
+{% trans %}Simplified type list{% endtrans %}
 {% endblock %}
 
 {% block content %}
-  <div id="accounting">
+    <div id="accounting">
-    <p>
+        <p>
-      <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
+        <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
-      {% trans %}Simplified types{% endtrans %}
+        {% trans %}Simplified types{% endtrans %}
-    </p>
+        </p>
-    <hr>
+        <hr>
-    <p><a href="{{ url('accounting:simple_type_new') }}">{% trans %}New simplified type{% endtrans %}</a></p>
+        <p><a href="{{ url('accounting:simple_type_new') }}">{% trans %}New simplified type{% endtrans %}</a></p>
-    {% if simplifiedaccountingtype_list %}
+        {% if simplifiedaccountingtype_list %}
-      <h3>{% trans %}Simplified type list{% endtrans %}</h3>
+        <h3>{% trans %}Simplified type list{% endtrans %}</h3>
-      <ul>
+        <ul>
-        {% for a in simplifiedaccountingtype_list  %}
+            {% for a in simplifiedaccountingtype_list  %}
-          <li><a href="{{ url('accounting:simple_type_edit', type_id=a.id) }}">{{ a }}</a></li>
+            <li><a href="{{ url('accounting:simple_type_edit', type_id=a.id) }}">{{ a }}</a></li>
-        {% endfor %}
+            {% endfor %}
-      </ul>
+        </ul>
-    {% else %}
+        {% else %}
-      {% trans %}There is no types in this website.{% endtrans %}
+        {% trans %}There is no types in this website.{% endtrans %}
-    {% endif %}
+        {% endif %}
-  </div>
+    </div>
 {% endblock %}
 

accounting/tests.py

@@ -1,3 +1,4 @@
+# -*- coding:utf-8 -*
 #
 # Copyright 2023 © AE UTBM
 # ae@utbm.fr / ae.info@utbm.fr
@@ -5,93 +6,98 @@
 # This file is part of the website of the UTBM Student Association (AE UTBM),
 # https://ae.utbm.fr.
 #
-# You can find the source code of the website at https://github.com/ae-utbm/sith
+# You can find the source code of the website at https://github.com/ae-utbm/sith3
 #
 # LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# SEE : https://raw.githubusercontent.com/ae-utbm/sith/master/LICENSE
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
 
-from datetime import date, timedelta
-
 from django.test import TestCase
 from django.urls import reverse
+from django.core.management import call_command
+from datetime import date, timedelta
 
+from core.models import User
 from accounting.models import (
-    AccountingType,
     GeneralJournal,
-    Label,
     Operation,
+    Label,
+    AccountingType,
     SimplifiedAccountingType,
 )
-from core.models import User
 
 
-class TestRefoundAccount(TestCase):
+class RefoundAccountTest(TestCase):
-    @classmethod
+    def setUp(self):
-    def setUpTestData(cls):
+        self.skia = User.objects.filter(username="skia").first()
-        cls.skia = User.objects.get(username="skia")
         # reffil skia's account
-        cls.skia.customer.amount = 800
+        self.skia.customer.amount = 800
-        cls.skia.customer.save()
+        self.skia.customer.save()
-        cls.refound_account_url = reverse("accounting:refound_account")
 
     def test_permission_denied(self):
-        self.client.force_login(User.objects.get(username="guy"))
+        self.client.login(username="guy", password="plop")
         response_post = self.client.post(
-            self.refound_account_url, {"user": self.skia.id}
+            reverse("accounting:refound_account"), {"user": self.skia.id}
         )
-        response_get = self.client.get(self.refound_account_url)
+        response_get = self.client.get(reverse("accounting:refound_account"))
-        assert response_get.status_code == 403
+        self.assertTrue(response_get.status_code == 403)
-        assert response_post.status_code == 403
+        self.assertTrue(response_post.status_code == 403)
 
     def test_root_granteed(self):
-        self.client.force_login(User.objects.get(username="root"))
+        self.client.login(username="root", password="plop")
-        response = self.client.post(self.refound_account_url, {"user": self.skia.id})
+        response_post = self.client.post(
-        self.assertRedirects(response, self.refound_account_url)
+            reverse("accounting:refound_account"), {"user": self.skia.id}
-        self.skia.refresh_from_db()
+        )
-        response = self.client.get(self.refound_account_url)
+        self.skia = User.objects.filter(username="skia").first()
-        assert response.status_code == 200
+        response_get = self.client.get(reverse("accounting:refound_account"))
-        assert '<form action="" method="post">' in str(response.content)
+        self.assertFalse(response_get.status_code == 403)
-        assert self.skia.customer.amount == 0
+        self.assertTrue('<form action="" method="post">' in str(response_get.content))
+        self.assertFalse(response_post.status_code == 403)
+        self.assertTrue(self.skia.customer.amount == 0)
 
     def test_comptable_granteed(self):
-        self.client.force_login(User.objects.get(username="comptable"))
+        self.client.login(username="comptable", password="plop")
-        response = self.client.post(self.refound_account_url, {"user": self.skia.id})
+        response_post = self.client.post(
-        self.assertRedirects(response, self.refound_account_url)
+            reverse("accounting:refound_account"), {"user": self.skia.id}
-        self.skia.refresh_from_db()
+        )
-        response = self.client.get(self.refound_account_url)
+        self.skia = User.objects.filter(username="skia").first()
-        assert response.status_code == 200
+        response_get = self.client.get(reverse("accounting:refound_account"))
-        assert '<form action="" method="post">' in str(response.content)
+        self.assertFalse(response_get.status_code == 403)
-        assert self.skia.customer.amount == 0
+        self.assertTrue('<form action="" method="post">' in str(response_get.content))
+        self.assertFalse(response_post.status_code == 403)
+        self.assertTrue(self.skia.customer.amount == 0)
 
 
-class TestJournal(TestCase):
+class JournalTest(TestCase):
-    @classmethod
+    def setUp(self):
-    def setUpTestData(cls):
+        self.journal = GeneralJournal.objects.filter(id=1).first()
-        cls.journal = GeneralJournal.objects.get(id=1)
 
     def test_permission_granted(self):
-        self.client.force_login(User.objects.get(username="comptable"))
+        self.client.login(username="comptable", password="plop")
         response_get = self.client.get(
             reverse("accounting:journal_details", args=[self.journal.id])
         )
 
-        assert response_get.status_code == 200
+        self.assertTrue(response_get.status_code == 200)
-        assert "<td>M\\xc3\\xa9thode de paiement</td>" in str(response_get.content)
+        self.assertTrue(
+            "<td>M\\xc3\\xa9thode de paiement</td>" in str(response_get.content)
+        )
 
     def test_permission_not_granted(self):
-        self.client.force_login(User.objects.get(username="skia"))
+        self.client.login(username="skia", password="plop")
         response_get = self.client.get(
             reverse("accounting:journal_details", args=[self.journal.id])
         )
 
-        assert response_get.status_code == 403
+        self.assertTrue(response_get.status_code == 403)
-        assert "<td>M\xc3\xa9thode de paiement</td>" not in str(response_get.content)
+        self.assertFalse(
+            "<td>M\xc3\xa9thode de paiement</td>" in str(response_get.content)
+        )
 
 
-class TestOperation(TestCase):
+class OperationTest(TestCase):
     def setUp(self):
         self.tomorrow_formatted = (date.today() + timedelta(days=1)).strftime(
             "%d/%m/%Y"
@@ -102,8 +108,9 @@ class TestOperation(TestCase):
             code="443", label="Ce code n'existe pas", movement_type="CREDIT"
         )
         at.save()
-        label = Label.objects.create(club_account=self.journal.club_account, name="bob")
+        l = Label(club_account=self.journal.club_account, name="bob")
-        self.client.force_login(User.objects.get(username="comptable"))
+        l.save()
+        self.client.login(username="comptable", password="plop")
         self.op1 = Operation(
             journal=self.journal,
             date=date.today(),
@@ -111,7 +118,7 @@ class TestOperation(TestCase):
             remark="Test bilan",
             mode="CASH",
             done=True,
-            label=label,
+            label=l,
             accounting_type=at,
             target_type="USER",
             target_id=self.skia.id,
@@ -124,7 +131,7 @@ class TestOperation(TestCase):
             remark="Test bilan",
             mode="CASH",
             done=True,
-            label=label,
+            label=l,
             accounting_type=at,
             target_type="USER",
             target_id=self.skia.id,
@@ -132,7 +139,8 @@ class TestOperation(TestCase):
         self.op2.save()
 
     def test_new_operation(self):
-        at = AccountingType.objects.get(code="604")
+        self.client.login(username="comptable", password="plop")
+        at = AccountingType.objects.filter(code="604").first()
         response = self.client.post(
             reverse("accounting:op_new", args=[self.journal.id]),
             {
@@ -164,7 +172,8 @@ class TestOperation(TestCase):
         self.assertTrue("<td>Le fantome de la nuit</td>" in str(response_get.content))
 
     def test_bad_new_operation(self):
-        AccountingType.objects.get(code="604")
+        self.client.login(username="comptable", password="plop")
+        AccountingType.objects.filter(code="604").first()
         response = self.client.post(
             reverse("accounting:op_new", args=[self.journal.id]),
             {
@@ -190,7 +199,7 @@ class TestOperation(TestCase):
         )
 
     def test_new_operation_not_authorized(self):
-        self.client.force_login(self.skia)
+        self.client.login(username="skia", password="plop")
         at = AccountingType.objects.filter(code="604").first()
         response = self.client.post(
             reverse("accounting:op_new", args=[self.journal.id]),
@@ -216,7 +225,8 @@ class TestOperation(TestCase):
             self.journal.operations.filter(target_label="Le fantome du jour").exists()
         )
 
-    def test_operation_simple_accounting(self):
+    def test__operation_simple_accounting(self):
+        self.client.login(username="comptable", password="plop")
         sat = SimplifiedAccountingType.objects.all().first()
         response = self.client.post(
             reverse("accounting:op_new", args=[self.journal.id]),
@@ -237,14 +247,15 @@ class TestOperation(TestCase):
                 "done": False,
             },
         )
-        assert response.status_code != 403
+        self.assertFalse(response.status_code == 403)
-        assert self.journal.operations.filter(amount=23).exists()
+        self.assertTrue(self.journal.operations.filter(amount=23).exists())
         response_get = self.client.get(
             reverse("accounting:journal_details", args=[self.journal.id])
         )
-        assert "<td>Le fantome de l&#39;aurore</td>" in str(response_get.content)
+        self.assertTrue(
-
+            "<td>Le fantome de l&#39;aurore</td>" in str(response_get.content)
-        assert (
+        )
+        self.assertTrue(
             self.journal.operations.filter(amount=23)
             .values("accounting_type")
             .first()["accounting_type"]
@@ -252,37 +263,47 @@ class TestOperation(TestCase):
         )
 
     def test_nature_statement(self):
+        self.client.login(username="comptable", password="plop")
         response = self.client.get(
             reverse("accounting:journal_nature_statement", args=[self.journal.id])
         )
         self.assertContains(response, "bob (Troll Penché) : 3.00", status_code=200)
 
     def test_person_statement(self):
+        self.client.login(username="comptable", password="plop")
         response = self.client.get(
             reverse("accounting:journal_person_statement", args=[self.journal.id])
         )
         self.assertContains(response, "Total : 5575.72", status_code=200)
         self.assertContains(response, "Total : 71.42")
-        content = response.content.decode()
+        self.assertContains(
-        self.assertInHTML(
+            response,
-            """<td><a href="/user/1/">S&#39; Kia</a></td><td>3.00</td>""", content
+            """
+                <td><a href="/user/1/">S&#39; Kia</a></td>
+                
+                <td>3.00</td>""",
         )
-        self.assertInHTML(
+        self.assertContains(
-            """<td><a href="/user/1/">S&#39; Kia</a></td><td>823.00</td>""", content
+            response,
+            """
+                <td><a href="/user/1/">S&#39; Kia</a></td>
+                
+                <td>823.00</td>""",
         )
 
     def test_accounting_statement(self):
+        self.client.login(username="comptable", password="plop")
         response = self.client.get(
             reverse("accounting:journal_accounting_statement", args=[self.journal.id])
         )
-        assert response.status_code == 200
+        self.assertContains(
-        self.assertInHTML(
+            response,
             """
             <tr>
                 <td>443 - Crédit - Ce code n&#39;existe pas</td>
                 <td>3.00</td>
             </tr>""",
-            response.content.decode(),
+            status_code=200,
         )
         self.assertContains(
             response,

accounting/urls.py

@@ -1,3 +1,4 @@
+# -*- coding:utf-8 -*
 #
 # Copyright 2023 © AE UTBM
 # ae@utbm.fr / ae.info@utbm.fr
@@ -5,51 +6,17 @@
 # This file is part of the website of the UTBM Student Association (AE UTBM),
 # https://ae.utbm.fr.
 #
-# You can find the source code of the website at https://github.com/ae-utbm/sith
+# You can find the source code of the website at https://github.com/ae-utbm/sith3
 #
 # LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# SEE : https://raw.githubusercontent.com/ae-utbm/sith/master/LICENSE
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
 
 from django.urls import path
 
-from accounting.views import (
+from accounting.views import *
-    AccountingTypeCreateView,
-    AccountingTypeEditView,
-    AccountingTypeListView,
-    BankAccountCreateView,
-    BankAccountDeleteView,
-    BankAccountDetailView,
-    BankAccountEditView,
-    BankAccountListView,
-    ClubAccountCreateView,
-    ClubAccountDeleteView,
-    ClubAccountDetailView,
-    ClubAccountEditView,
-    CompanyCreateView,
-    CompanyEditView,
-    CompanyListView,
-    JournalAccountingStatementView,
-    JournalCreateView,
-    JournalDeleteView,
-    JournalDetailView,
-    JournalEditView,
-    JournalNatureStatementView,
-    JournalPersonStatementView,
-    LabelCreateView,
-    LabelDeleteView,
-    LabelEditView,
-    LabelListView,
-    OperationCreateView,
-    OperationEditView,
-    OperationPDFView,
-    RefoundAccountView,
-    SimplifiedAccountingTypeCreateView,
-    SimplifiedAccountingTypeEditView,
-    SimplifiedAccountingTypeListView,
-)
 
 urlpatterns = [
     # Accounting types

accounting/views.py

@@ -1,3 +1,4 @@
+# -*- coding:utf-8 -*
 #
 # Copyright 2023 © AE UTBM
 # ae@utbm.fr / ae.info@utbm.fr
@@ -5,62 +6,57 @@
 # This file is part of the website of the UTBM Student Association (AE UTBM),
 # https://ae.utbm.fr.
 #
-# You can find the source code of the website at https://github.com/ae-utbm/sith
+# You can find the source code of the website at https://github.com/ae-utbm/sith3
 #
 # LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# SEE : https://raw.githubusercontent.com/ae-utbm/sith/master/LICENSE
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
 
-import collections
+from django.views.generic import ListView, DetailView
-
+from django.views.generic.edit import UpdateView, CreateView, DeleteView, FormView
-from django import forms
+from django.urls import reverse_lazy, reverse
-from django.conf import settings
+from django.utils.translation import gettext_lazy as _
+from django.forms.models import modelform_factory
 from django.core.exceptions import PermissionDenied, ValidationError
+from django.forms import HiddenInput
 from django.db import transaction
 from django.db.models import Sum
-from django.forms import HiddenInput
+from django.conf import settings
-from django.forms.models import modelform_factory
+from django import forms
 from django.http import HttpResponse
-from django.urls import reverse, reverse_lazy
+import collections
-from django.utils.translation import gettext_lazy as _
+
-from django.views.generic import DetailView, ListView
+from ajax_select.fields import AutoCompleteSelectField
-from django.views.generic.edit import CreateView, DeleteView, FormView, UpdateView
 
-from accounting.models import (
-    AccountingType,
-    BankAccount,
-    ClubAccount,
-    Company,
-    GeneralJournal,
-    Label,
-    Operation,
-    SimplifiedAccountingType,
-)
-from accounting.widgets.select import (
-    AutoCompleteSelectClubAccount,
-    AutoCompleteSelectCompany,
-)
-from club.models import Club
-from club.widgets.select import AutoCompleteSelectClub
-from core.models import User
 from core.views import (
-    CanCreateMixin,
+    CanViewMixin,
     CanEditMixin,
     CanEditPropMixin,
-    CanViewMixin,
+    CanCreateMixin,
     TabedViewMixin,
 )
-from core.views.forms import SelectDate, SelectFile
+from core.views.forms import SelectFile, SelectDate
-from core.views.widgets.select import AutoCompleteSelectUser
+from accounting.models import (
-from counter.models import Counter, Product, Selling
+    BankAccount,
+    ClubAccount,
+    GeneralJournal,
+    Operation,
+    AccountingType,
+    Company,
+    SimplifiedAccountingType,
+    Label,
+)
+from counter.models import Counter, Selling, Product
 
 # Main accounting view
 
 
 class BankAccountListView(CanViewMixin, ListView):
-    """A list view for the admins."""
+    """
+    A list view for the admins
+    """
 
     model = BankAccount
     template_name = "accounting/bank_account_list.jinja"
@@ -71,14 +67,18 @@ class BankAccountListView(CanViewMixin, ListView):
 
 
 class SimplifiedAccountingTypeListView(CanViewMixin, ListView):
-    """A list view for the admins."""
+    """
+    A list view for the admins
+    """
 
     model = SimplifiedAccountingType
     template_name = "accounting/simplifiedaccountingtype_list.jinja"
 
 
 class SimplifiedAccountingTypeEditView(CanViewMixin, UpdateView):
-    """An edit view for the admins."""
+    """
+    An edit view for the admins
+    """
 
     model = SimplifiedAccountingType
     pk_url_kwarg = "type_id"
@@ -87,7 +87,9 @@ class SimplifiedAccountingTypeEditView(CanViewMixin, UpdateView):
 
 
 class SimplifiedAccountingTypeCreateView(CanCreateMixin, CreateView):
-    """Create an accounting type (for the admins)."""
+    """
+    Create an accounting type (for the admins)
+    """
 
     model = SimplifiedAccountingType
     fields = ["label", "accounting_type"]
@@ -98,14 +100,18 @@ class SimplifiedAccountingTypeCreateView(CanCreateMixin, CreateView):
 
 
 class AccountingTypeListView(CanViewMixin, ListView):
-    """A list view for the admins."""
+    """
+    A list view for the admins
+    """
 
     model = AccountingType
     template_name = "accounting/accountingtype_list.jinja"
 
 
 class AccountingTypeEditView(CanViewMixin, UpdateView):
-    """An edit view for the admins."""
+    """
+    An edit view for the admins
+    """
 
     model = AccountingType
     pk_url_kwarg = "type_id"
@@ -114,7 +120,9 @@ class AccountingTypeEditView(CanViewMixin, UpdateView):
 
 
 class AccountingTypeCreateView(CanCreateMixin, CreateView):
-    """Create an accounting type (for the admins)."""
+    """
+    Create an accounting type (for the admins)
+    """
 
     model = AccountingType
     fields = ["code", "label", "movement_type"]
@@ -125,7 +133,9 @@ class AccountingTypeCreateView(CanCreateMixin, CreateView):
 
 
 class BankAccountEditView(CanViewMixin, UpdateView):
-    """An edit view for the admins."""
+    """
+    An edit view for the admins
+    """
 
     model = BankAccount
     pk_url_kwarg = "b_account_id"
@@ -134,7 +144,9 @@ class BankAccountEditView(CanViewMixin, UpdateView):
 
 
 class BankAccountDetailView(CanViewMixin, DetailView):
-    """A detail view, listing every club account."""
+    """
+    A detail view, listing every club account
+    """
 
     model = BankAccount
     pk_url_kwarg = "b_account_id"
@@ -142,7 +154,9 @@ class BankAccountDetailView(CanViewMixin, DetailView):
 
 
 class BankAccountCreateView(CanCreateMixin, CreateView):
-    """Create a bank account (for the admins)."""
+    """
+    Create a bank account (for the admins)
+    """
 
     model = BankAccount
     fields = ["name", "club", "iban", "number"]
@@ -152,7 +166,9 @@ class BankAccountCreateView(CanCreateMixin, CreateView):
 class BankAccountDeleteView(
     CanEditPropMixin, DeleteView
 ):  # TODO change Delete to Close
-    """Delete a bank account (for the admins)."""
+    """
+    Delete a bank account (for the admins)
+    """
 
     model = BankAccount
     pk_url_kwarg = "b_account_id"
@@ -164,7 +180,9 @@ class BankAccountDeleteView(
 
 
 class ClubAccountEditView(CanViewMixin, UpdateView):
-    """An edit view for the admins."""
+    """
+    An edit view for the admins
+    """
 
     model = ClubAccount
     pk_url_kwarg = "c_account_id"
@@ -173,7 +191,9 @@ class ClubAccountEditView(CanViewMixin, UpdateView):
 
 
 class ClubAccountDetailView(CanViewMixin, DetailView):
-    """A detail view, listing every journal."""
+    """
+    A detail view, listing every journal
+    """
 
     model = ClubAccount
     pk_url_kwarg = "c_account_id"
@@ -181,15 +201,17 @@ class ClubAccountDetailView(CanViewMixin, DetailView):
 
 
 class ClubAccountCreateView(CanCreateMixin, CreateView):
-    """Create a club account (for the admins)."""
+    """
+    Create a club account (for the admins)
+    """
 
     model = ClubAccount
     fields = ["name", "club", "bank_account"]
     template_name = "core/create.jinja"
 
     def get_initial(self):
-        ret = super().get_initial()
+        ret = super(ClubAccountCreateView, self).get_initial()
-        if "parent" in self.request.GET:
+        if "parent" in self.request.GET.keys():
             obj = BankAccount.objects.filter(id=int(self.request.GET["parent"])).first()
             if obj is not None:
                 ret["bank_account"] = obj.id
@@ -199,7 +221,9 @@ class ClubAccountCreateView(CanCreateMixin, CreateView):
 class ClubAccountDeleteView(
     CanEditPropMixin, DeleteView
 ):  # TODO change Delete to Close
-    """Delete a club account (for the admins)."""
+    """
+    Delete a club account (for the admins)
+    """
 
     model = ClubAccount
     pk_url_kwarg = "c_account_id"
@@ -215,14 +239,17 @@ class JournalTabsMixin(TabedViewMixin):
         return _("Journal")
 
     def get_list_of_tabs(self):
-        return [
+        tab_list = []
+        tab_list.append(
             {
                 "url": reverse(
                     "accounting:journal_details", kwargs={"j_id": self.object.id}
                 ),
                 "slug": "journal",
                 "name": _("Journal"),
-            },
+            }
+        )
+        tab_list.append(
             {
                 "url": reverse(
                     "accounting:journal_nature_statement",
@@ -230,7 +257,9 @@ class JournalTabsMixin(TabedViewMixin):
                 ),
                 "slug": "nature_statement",
                 "name": _("Statement by nature"),
-            },
+            }
+        )
+        tab_list.append(
             {
                 "url": reverse(
                     "accounting:journal_person_statement",
@@ -238,7 +267,9 @@ class JournalTabsMixin(TabedViewMixin):
                 ),
                 "slug": "person_statement",
                 "name": _("Statement by person"),
-            },
+            }
+        )
+        tab_list.append(
             {
                 "url": reverse(
                     "accounting:journal_accounting_statement",
@@ -246,12 +277,15 @@ class JournalTabsMixin(TabedViewMixin):
                 ),
                 "slug": "accounting_statement",
                 "name": _("Accounting statement"),
-            },
+            }
-        ]
+        )
+        return tab_list
 
 
 class JournalCreateView(CanCreateMixin, CreateView):
-    """Create a general journal."""
+    """
+    Create a general journal
+    """
 
     model = GeneralJournal
     form_class = modelform_factory(
@@ -262,8 +296,8 @@ class JournalCreateView(CanCreateMixin, CreateView):
     template_name = "core/create.jinja"
 
     def get_initial(self):
-        ret = super().get_initial()
+        ret = super(JournalCreateView, self).get_initial()
-        if "parent" in self.request.GET:
+        if "parent" in self.request.GET.keys():
             obj = ClubAccount.objects.filter(id=int(self.request.GET["parent"])).first()
             if obj is not None:
                 ret["club_account"] = obj.id
@@ -271,7 +305,9 @@ class JournalCreateView(CanCreateMixin, CreateView):
 
 
 class JournalDetailView(JournalTabsMixin, CanViewMixin, DetailView):
-    """A detail view, listing every operation."""
+    """
+    A detail view, listing every operation
+    """
 
     model = GeneralJournal
     pk_url_kwarg = "j_id"
@@ -280,7 +316,9 @@ class JournalDetailView(JournalTabsMixin, CanViewMixin, DetailView):
 
 
 class JournalEditView(CanEditMixin, UpdateView):
-    """Update a general journal."""
+    """
+    Update a general journal
+    """
 
     model = GeneralJournal
     pk_url_kwarg = "j_id"
@@ -289,7 +327,9 @@ class JournalEditView(CanEditMixin, UpdateView):
 
 
 class JournalDeleteView(CanEditPropMixin, DeleteView):
-    """Delete a club account (for the admins)."""
+    """
+    Delete a club account (for the admins)
+    """
 
     model = GeneralJournal
     pk_url_kwarg = "j_id"
@@ -299,7 +339,7 @@ class JournalDeleteView(CanEditPropMixin, DeleteView):
     def dispatch(self, request, *args, **kwargs):
         self.object = self.get_object()
         if self.object.operations.count() == 0:
-            return super().dispatch(request, *args, **kwargs)
+            return super(JournalDeleteView, self).dispatch(request, *args, **kwargs)
         else:
             raise PermissionDenied
 
@@ -333,30 +373,12 @@ class OperationForm(forms.ModelForm):
             "invoice": SelectFile,
         }
 
-    user = forms.ModelChoiceField(
+    user = AutoCompleteSelectField("users", help_text=None, required=False)
-        help_text=None,
+    club_account = AutoCompleteSelectField(
-        required=False,
+        "club_accounts", help_text=None, required=False
-        widget=AutoCompleteSelectUser,
-        queryset=User.objects.all(),
-    )
-    club_account = forms.ModelChoiceField(
-        help_text=None,
-        required=False,
-        widget=AutoCompleteSelectClubAccount,
-        queryset=ClubAccount.objects.all(),
-    )
-    club = forms.ModelChoiceField(
-        help_text=None,
-        required=False,
-        widget=AutoCompleteSelectClub,
-        queryset=Club.objects.all(),
-    )
-    company = forms.ModelChoiceField(
-        help_text=None,
-        required=False,
-        widget=AutoCompleteSelectCompany,
-        queryset=Company.objects.all(),
     )
+    club = AutoCompleteSelectField("clubs", help_text=None, required=False)
+    company = AutoCompleteSelectField("companies", help_text=None, required=False)
     need_link = forms.BooleanField(
         label=_("Link this operation to the target account"),
         required=False,
@@ -365,7 +387,7 @@ class OperationForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         club_account = kwargs.pop("club_account", None)
-        super().__init__(*args, **kwargs)
+        super(OperationForm, self).__init__(*args, **kwargs)
         if club_account:
             self.fields["label"].queryset = club_account.labels.order_by("name").all()
         if self.instance.target_type == "USER":
@@ -378,8 +400,8 @@ class OperationForm(forms.ModelForm):
             self.fields["company"].initial = self.instance.target_id
 
     def clean(self):
-        self.cleaned_data = super().clean()
+        self.cleaned_data = super(OperationForm, self).clean()
-        if "target_type" in self.cleaned_data:
+        if "target_type" in self.cleaned_data.keys():
             if (
                 self.cleaned_data.get("user") is None
                 and self.cleaned_data.get("club") is None
@@ -408,7 +430,7 @@ class OperationForm(forms.ModelForm):
         return self.cleaned_data
 
     def save(self):
-        ret = super().save()
+        ret = super(OperationForm, self).save()
         if (
             self.instance.target_type == "ACCOUNT"
             and not self.instance.linked_operation
@@ -446,7 +468,9 @@ class OperationForm(forms.ModelForm):
 
 
 class OperationCreateView(CanCreateMixin, CreateView):
-    """Create an operation."""
+    """
+    Create an operation
+    """
 
     model = Operation
     form_class = OperationForm
@@ -458,21 +482,23 @@ class OperationCreateView(CanCreateMixin, CreateView):
         return self.form_class(club_account=ca, **self.get_form_kwargs())
 
     def get_initial(self):
-        ret = super().get_initial()
+        ret = super(OperationCreateView, self).get_initial()
         if self.journal is not None:
             ret["journal"] = self.journal.id
         return ret
 
     def get_context_data(self, **kwargs):
-        """Add journal to the context."""
+        """Add journal to the context"""
-        kwargs = super().get_context_data(**kwargs)
+        kwargs = super(OperationCreateView, self).get_context_data(**kwargs)
         if self.journal:
             kwargs["object"] = self.journal
         return kwargs
 
 
 class OperationEditView(CanEditMixin, UpdateView):
-    """An edit view, working as detail for the moment."""
+    """
+    An edit view, working as detail for the moment
+    """
 
     model = Operation
     pk_url_kwarg = "op_id"
@@ -480,27 +506,29 @@ class OperationEditView(CanEditMixin, UpdateView):
     template_name = "accounting/operation_edit.jinja"
 
     def get_context_data(self, **kwargs):
-        """Add journal to the context."""
+        """Add journal to the context"""
-        kwargs = super().get_context_data(**kwargs)
+        kwargs = super(OperationEditView, self).get_context_data(**kwargs)
         kwargs["object"] = self.object.journal
         return kwargs
 
 
 class OperationPDFView(CanViewMixin, DetailView):
-    """Display the PDF of a given operation."""
+    """
+    Display the PDF of a given operation
+    """
 
     model = Operation
     pk_url_kwarg = "op_id"
 
     def get(self, request, *args, **kwargs):
+        from reportlab.pdfgen import canvas
+        from reportlab.lib.units import cm
+        from reportlab.platypus import Table, TableStyle
         from reportlab.lib import colors
         from reportlab.lib.pagesizes import letter
-        from reportlab.lib.units import cm
         from reportlab.lib.utils import ImageReader
-        from reportlab.pdfbase import pdfmetrics
         from reportlab.pdfbase.ttfonts import TTFont
-        from reportlab.pdfgen import canvas
+        from reportlab.pdfbase import pdfmetrics
-        from reportlab.platypus import Table, TableStyle
 
         pdfmetrics.registerFont(TTFont("DejaVu", "DejaVuSerif.ttf"))
 
@@ -571,7 +599,7 @@ class OperationPDFView(CanViewMixin, DetailView):
         payment_mode = ""
         for m in settings.SITH_ACCOUNTING_PAYMENT_METHOD:
             if m[0] == mode:
-                payment_mode += "[\u00d7]"
+                payment_mode += "[\u00D7]"
             else:
                 payment_mode += "[  ]"
             payment_mode += " %s\n" % (m[1])
@@ -639,7 +667,9 @@ class OperationPDFView(CanViewMixin, DetailView):
 
 
 class JournalNatureStatementView(JournalTabsMixin, CanViewMixin, DetailView):
-    """Display a statement sorted by labels."""
+    """
+    Display a statement sorted by labels
+    """
 
     model = GeneralJournal
     pk_url_kwarg = "j_id"
@@ -650,17 +680,19 @@ class JournalNatureStatementView(JournalTabsMixin, CanViewMixin, DetailView):
         ret = collections.OrderedDict()
         statement = collections.OrderedDict()
         total_sum = 0
-        for sat in [
+        for sat in [None] + list(
-            None,
+            SimplifiedAccountingType.objects.order_by("label").all()
-            *list(SimplifiedAccountingType.objects.order_by("label")),
+        ):
-        ]:
+            sum = queryset.filter(
-            amount = queryset.filter(
                 accounting_type__movement_type=movement_type, simpleaccounting_type=sat
             ).aggregate(amount_sum=Sum("amount"))["amount_sum"]
-            label = sat.label if sat is not None else ""
+            if sat:
-            if amount:
+                sat = sat.label
-                total_sum += amount
+            else:
-                statement[label] = amount
+                sat = ""
+            if sum:
+                total_sum += sum
+                statement[sat] = sum
         ret[movement_type] = statement
         ret[movement_type + "_sum"] = total_sum
         return ret
@@ -683,23 +715,28 @@ class JournalNatureStatementView(JournalTabsMixin, CanViewMixin, DetailView):
             self.statement(self.object.operations.filter(label=None).all(), "DEBIT")
         )
         statement[_("No label operations")] = no_label_statement
-        for label in labels:
+        for l in labels:
             l_stmt = collections.OrderedDict()
-            journals = self.object.operations.filter(label=label).all()
+            l_stmt.update(
-            l_stmt.update(self.statement(journals, "CREDIT"))
+                self.statement(self.object.operations.filter(label=l).all(), "CREDIT")
-            l_stmt.update(self.statement(journals, "DEBIT"))
+            )
-            statement[label] = l_stmt
+            l_stmt.update(
+                self.statement(self.object.operations.filter(label=l).all(), "DEBIT")
+            )
+            statement[l] = l_stmt
         return statement
 
     def get_context_data(self, **kwargs):
-        """Add infos to the context."""
+        """Add infos to the context"""
-        kwargs = super().get_context_data(**kwargs)
+        kwargs = super(JournalNatureStatementView, self).get_context_data(**kwargs)
         kwargs["statement"] = self.big_statement()
         return kwargs
 
 
 class JournalPersonStatementView(JournalTabsMixin, CanViewMixin, DetailView):
-    """Calculate a dictionary with operation target and sum of operations."""
+    """
+    Calculate a dictionary with operation target and sum of operations
+    """
 
     model = GeneralJournal
     pk_url_kwarg = "j_id"
@@ -729,8 +766,8 @@ class JournalPersonStatementView(JournalTabsMixin, CanViewMixin, DetailView):
         return sum(self.statement(movement_type).values())
 
     def get_context_data(self, **kwargs):
-        """Add journal to the context."""
+        """Add journal to the context"""
-        kwargs = super().get_context_data(**kwargs)
+        kwargs = super(JournalPersonStatementView, self).get_context_data(**kwargs)
         kwargs["credit_statement"] = self.statement("CREDIT")
         kwargs["debit_statement"] = self.statement("DEBIT")
         kwargs["total_credit"] = self.total("CREDIT")
@@ -739,7 +776,9 @@ class JournalPersonStatementView(JournalTabsMixin, CanViewMixin, DetailView):
 
 
 class JournalAccountingStatementView(JournalTabsMixin, CanViewMixin, DetailView):
-    """Calculate a dictionary with operation type and sum of operations."""
+    """
+    Calculate a dictionary with operation type and sum of operations
+    """
 
     model = GeneralJournal
     pk_url_kwarg = "j_id"
@@ -757,8 +796,8 @@ class JournalAccountingStatementView(JournalTabsMixin, CanViewMixin, DetailView)
         return statement
 
     def get_context_data(self, **kwargs):
-        """Add journal to the context."""
+        """Add journal to the context"""
-        kwargs = super().get_context_data(**kwargs)
+        kwargs = super(JournalAccountingStatementView, self).get_context_data(**kwargs)
         kwargs["statement"] = self.statement()
         return kwargs
 
@@ -772,7 +811,9 @@ class CompanyListView(CanViewMixin, ListView):
 
 
 class CompanyCreateView(CanCreateMixin, CreateView):
-    """Create a company."""
+    """
+    Create a company
+    """
 
     model = Company
     fields = ["name"]
@@ -781,7 +822,9 @@ class CompanyCreateView(CanCreateMixin, CreateView):
 
 
 class CompanyEditView(CanCreateMixin, UpdateView):
-    """Edit a company."""
+    """
+    Edit a company
+    """
 
     model = Company
     pk_url_kwarg = "co_id"
@@ -809,8 +852,8 @@ class LabelCreateView(
     template_name = "core/create.jinja"
 
     def get_initial(self):
-        ret = super().get_initial()
+        ret = super(LabelCreateView, self).get_initial()
-        if "parent" in self.request.GET:
+        if "parent" in self.request.GET.keys():
             obj = ClubAccount.objects.filter(id=int(self.request.GET["parent"])).first()
             if obj is not None:
                 ret["club_account"] = obj.id
@@ -834,17 +877,15 @@ class LabelDeleteView(CanEditMixin, DeleteView):
 
 
 class CloseCustomerAccountForm(forms.Form):
-    user = forms.ModelChoiceField(
+    user = AutoCompleteSelectField(
-        label=_("Refound this account"),
+        "users", label=_("Refound this account"), help_text=None, required=True
-        help_text=None,
-        required=True,
-        widget=AutoCompleteSelectUser,
-        queryset=User.objects.all(),
     )
 
 
 class RefoundAccountView(FormView):
-    """Create a selling with the same amount than the current user money."""
+    """
+    Create a selling with the same amount than the current user money
+    """
 
     template_name = "accounting/refound_account.jinja"
     form_class = CloseCustomerAccountForm
@@ -856,19 +897,19 @@ class RefoundAccountView(FormView):
             raise PermissionDenied
 
     def dispatch(self, request, *arg, **kwargs):
-        res = super().dispatch(request, *arg, **kwargs)
+        res = super(RefoundAccountView, self).dispatch(request, *arg, **kwargs)
         if self.permission(request.user):
             return res
 
     def post(self, request, *arg, **kwargs):
         self.operator = request.user
         if self.permission(request.user):
-            return super().post(self, request, *arg, **kwargs)
+            return super(RefoundAccountView, self).post(self, request, *arg, **kwargs)
 
     def form_valid(self, form):
         self.customer = form.cleaned_data["user"]
         self.create_selling()
-        return super().form_valid(form)
+        return super(RefoundAccountView, self).form_valid(form)
 
     def get_success_url(self):
         return reverse("accounting:refound_account")

accounting/widgets/select.py

@@ -1,39 +0,0 @@
-from pydantic import TypeAdapter
-
-from accounting.models import ClubAccount, Company
-from accounting.schemas import ClubAccountSchema, CompanySchema
-from core.views.widgets.select import AutoCompleteSelect, AutoCompleteSelectMultiple
-
-_js = ["bundled/accounting/components/ajax-select-index.ts"]
-
-
-class AutoCompleteSelectClubAccount(AutoCompleteSelect):
-    component_name = "club-account-ajax-select"
-    model = ClubAccount
-    adapter = TypeAdapter(list[ClubAccountSchema])
-
-    js = _js
-
-
-class AutoCompleteSelectMultipleClubAccount(AutoCompleteSelectMultiple):
-    component_name = "club-account-ajax-select"
-    model = ClubAccount
-    adapter = TypeAdapter(list[ClubAccountSchema])
-
-    js = _js
-
-
-class AutoCompleteSelectCompany(AutoCompleteSelect):
-    component_name = "company-ajax-select"
-    model = Company
-    adapter = TypeAdapter(list[CompanySchema])
-
-    js = _js
-
-
-class AutoCompleteSelectMultipleCompany(AutoCompleteSelectMultiple):
-    component_name = "company-ajax-select"
-    model = Company
-    adapter = TypeAdapter(list[CompanySchema])
-
-    js = _js

antispam/admin.py

@@ -1,10 +0,0 @@
-from django.contrib import admin
-
-from antispam.models import ToxicDomain
-
-
-@admin.register(ToxicDomain)
-class ToxicDomainAdmin(admin.ModelAdmin):
-    list_display = ("domain", "is_externally_managed", "created")
-    search_fields = ("domain", "is_externally_managed", "created")
-    list_filter = ("is_externally_managed",)

antispam/apps.py

@@ -1,7 +0,0 @@
-from django.apps import AppConfig
-
-
-class AntispamConfig(AppConfig):
-    default_auto_field = "django.db.models.BigAutoField"
-    verbose_name = "antispam"
-    name = "antispam"

antispam/forms.py

@@ -1,18 +0,0 @@
-import re
-
-from django import forms
-from django.core.validators import EmailValidator
-from django.utils.translation import gettext_lazy as _
-
-from antispam.models import ToxicDomain
-
-
-class AntiSpamEmailField(forms.EmailField):
-    """An email field that email addresses with a known toxic domain."""
-
-    def run_validators(self, value: str):
-        super().run_validators(value)
-        # Domain part should exist since email validation is guaranteed to run first
-        domain = re.search(EmailValidator.domain_regex, value)
-        if ToxicDomain.objects.filter(domain=domain[0]).exists():
-            raise forms.ValidationError(_("Email domain is not allowed."))

antispam/management/commands/update_spam_database.py

@@ -1,69 +0,0 @@
-import requests
-from django.conf import settings
-from django.core.management import BaseCommand
-from django.db.models import Max
-from django.utils import timezone
-
-from antispam.models import ToxicDomain
-
-
-class Command(BaseCommand):
-    """Update blocked ips/mails database"""
-
-    help = "Update blocked ips/mails database"
-
-    def add_arguments(self, parser):
-        parser.add_argument(
-            "--force", action="store_true", help="Force re-creation even if up to date"
-        )
-
-    def _should_update(self, *, force: bool = False) -> bool:
-        if force:
-            return True
-        oldest = ToxicDomain.objects.filter(is_externally_managed=True).aggregate(
-            res=Max("created")
-        )["res"]
-        return not (oldest and timezone.now() < (oldest + timezone.timedelta(days=1)))
-
-    def _download_domains(self, providers: list[str]) -> set[str]:
-        domains = set()
-        for provider in providers:
-            res = requests.get(provider)
-            if not res.ok:
-                self.stderr.write(
-                    f"Source {provider} responded with code {res.status_code}"
-                )
-                continue
-            domains |= set(res.content.decode().splitlines())
-        return domains
-
-    def _update_domains(self, domains: set[str]):
-        # Cleanup database
-        ToxicDomain.objects.filter(is_externally_managed=True).delete()
-
-        # Create database
-        ToxicDomain.objects.bulk_create(
-            [
-                ToxicDomain(domain=domain, is_externally_managed=True)
-                for domain in domains
-            ],
-            ignore_conflicts=True,
-        )
-        self.stdout.write("Domain database updated")
-
-    def handle(self, *args, **options):
-        if not self._should_update(force=options["force"]):
-            self.stdout.write("Domain database is up to date")
-            return
-        self.stdout.write("Updating domain database")
-
-        domains = self._download_domains(settings.TOXIC_DOMAINS_PROVIDERS)
-
-        if not domains:
-            self.stderr.write(
-                "No domains could be fetched from settings.TOXIC_DOMAINS_PROVIDERS. "
-                "Please, have a look at your settings."
-            )
-            return
-
-        self._update_domains(domains)

antispam/migrations/0001_initial.py

@@ -1,35 +0,0 @@
-# Generated by Django 4.2.14 on 2024-08-03 23:05
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    initial = True
-
-    dependencies = []
-
-    operations = [
-        migrations.CreateModel(
-            name="ToxicDomain",
-            fields=[
-                (
-                    "domain",
-                    models.URLField(
-                        max_length=253,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="domain",
-                    ),
-                ),
-                ("created", models.DateTimeField(auto_now_add=True)),
-                (
-                    "is_externally_managed",
-                    models.BooleanField(
-                        default=False,
-                        help_text="True if kept up-to-date using external toxic domain providers, else False",
-                        verbose_name="is externally managed",
-                    ),
-                ),
-            ],
-        ),
-    ]

antispam/models.py

@@ -1,19 +0,0 @@
-from django.db import models
-from django.utils.translation import gettext_lazy as _
-
-
-class ToxicDomain(models.Model):
-    """Domain marked as spam in public databases"""
-
-    domain = models.URLField(_("domain"), max_length=253, primary_key=True)
-    created = models.DateTimeField(auto_now_add=True)
-    is_externally_managed = models.BooleanField(
-        _("is externally managed"),
-        default=False,
-        help_text=_(
-            "True if kept up-to-date using external toxic domain providers, else False"
-        ),
-    )
-
-    def __str__(self) -> str:
-        return self.domain

api/__init__.py

@@ -0,0 +1,15 @@
+# -*- coding:utf-8 -*
+#
+# Copyright 2023 © AE UTBM
+# ae@utbm.fr / ae.info@utbm.fr
+#
+# This file is part of the website of the UTBM Student Association (AE UTBM),
+# https://ae.utbm.fr.
+#
+# You can find the source code of the website at https://github.com/ae-utbm/sith3
+#
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
+# OR WITHIN THE LOCAL FILE "LICENSE"
+#
+#

api/admin.py

@@ -0,0 +1,19 @@
+# -*- coding:utf-8 -*
+#
+# Copyright 2023 © AE UTBM
+# ae@utbm.fr / ae.info@utbm.fr
+#
+# This file is part of the website of the UTBM Student Association (AE UTBM),
+# https://ae.utbm.fr.
+#
+# You can find the source code of the website at https://github.com/ae-utbm/sith3
+#
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
+# OR WITHIN THE LOCAL FILE "LICENSE"
+#
+#
+
+from django.contrib import admin
+
+# Register your models here.

api/models.py

@@ -0,0 +1,19 @@
+# -*- coding:utf-8 -*
+#
+# Copyright 2023 © AE UTBM
+# ae@utbm.fr / ae.info@utbm.fr
+#
+# This file is part of the website of the UTBM Student Association (AE UTBM),
+# https://ae.utbm.fr.
+#
+# You can find the source code of the website at https://github.com/ae-utbm/sith3
+#
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
+# OR WITHIN THE LOCAL FILE "LICENSE"
+#
+#
+
+from django.db import models
+
+# Create your models here.

api/tests.py

@@ -0,0 +1,19 @@
+# -*- coding:utf-8 -*
+#
+# Copyright 2023 © AE UTBM
+# ae@utbm.fr / ae.info@utbm.fr
+#
+# This file is part of the website of the UTBM Student Association (AE UTBM),
+# https://ae.utbm.fr.
+#
+# You can find the source code of the website at https://github.com/ae-utbm/sith3
+#
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
+# OR WITHIN THE LOCAL FILE "LICENSE"
+#
+#
+
+from django.test import TestCase
+
+# Create your tests here.

api/urls.py

@@ -0,0 +1,50 @@
+# -*- coding:utf-8 -*
+#
+# Copyright 2023 © AE UTBM
+# ae@utbm.fr / ae.info@utbm.fr
+#
+# This file is part of the website of the UTBM Student Association (AE UTBM),
+# https://ae.utbm.fr.
+#
+# You can find the source code of the website at https://github.com/ae-utbm/sith3
+#
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
+# OR WITHIN THE LOCAL FILE "LICENSE"
+#
+#
+
+from django.urls import re_path, path, include
+
+from api.views import *
+from rest_framework import routers
+
+# Router config
+router = routers.DefaultRouter()
+router.register(r"counter", CounterViewSet, basename="api_counter")
+router.register(r"user", UserViewSet, basename="api_user")
+router.register(r"club", ClubViewSet, basename="api_club")
+router.register(r"group", GroupViewSet, basename="api_group")
+
+# Launderette
+router.register(
+    r"launderette/place", LaunderettePlaceViewSet, basename="api_launderette_place"
+)
+router.register(
+    r"launderette/machine",
+    LaunderetteMachineViewSet,
+    basename="api_launderette_machine",
+)
+router.register(
+    r"launderette/token", LaunderetteTokenViewSet, basename="api_launderette_token"
+)
+
+urlpatterns = [
+    # API
+    re_path(r"^", include(router.urls)),
+    re_path(r"^login/", include("rest_framework.urls", namespace="rest_framework")),
+    re_path(r"^markdown$", RenderMarkdown, name="api_markdown"),
+    re_path(r"^mailings$", FetchMailingLists, name="mailings_fetch"),
+    re_path(r"^uv$", uv_endpoint, name="uv_endpoint"),
+    path("sas/<int:user>", all_pictures_of_user_endpoint, name="all_pictures_of_user"),
+]

api/views/__init__.py

@@ -0,0 +1,73 @@
+# -*- coding:utf-8 -*
+#
+# Copyright 2023 © AE UTBM
+# ae@utbm.fr / ae.info@utbm.fr
+#
+# This file is part of the website of the UTBM Student Association (AE UTBM),
+# https://ae.utbm.fr.
+#
+# You can find the source code of the website at https://github.com/ae-utbm/sith3
+#
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
+# OR WITHIN THE LOCAL FILE "LICENSE"
+#
+#
+
+from rest_framework.response import Response
+from rest_framework import viewsets
+from django.core.exceptions import PermissionDenied
+from rest_framework.decorators import action
+from django.db.models.query import QuerySet
+
+from core.views import can_view, can_edit
+
+
+def check_if(obj, user, test):
+    """
+    Detect if it's a single object or a queryset
+    aply a given test on individual object and return global permission
+    """
+    if isinstance(obj, QuerySet):
+        for o in obj:
+            if test(o, user) is False:
+                return False
+        return True
+    else:
+        return test(obj, user)
+
+
+class ManageModelMixin:
+    @action(detail=True)
+    def id(self, request, pk=None):
+        """
+        Get by id (api/v1/router/{pk}/id/)
+        """
+        self.queryset = get_object_or_404(self.queryset.filter(id=pk))
+        serializer = self.get_serializer(self.queryset)
+        return Response(serializer.data)
+
+
+class RightModelViewSet(ManageModelMixin, viewsets.ModelViewSet):
+    def dispatch(self, request, *arg, **kwargs):
+        res = super(RightModelViewSet, self).dispatch(request, *arg, **kwargs)
+        obj = self.queryset
+        user = self.request.user
+        try:
+            if request.method == "GET" and check_if(obj, user, can_view):
+                return res
+            if request.method != "GET" and check_if(obj, user, can_edit):
+                return res
+        except:
+            pass  # To prevent bug with Anonymous user
+        raise PermissionDenied
+
+
+from .api import *
+from .counter import *
+from .user import *
+from .club import *
+from .group import *
+from .launderette import *
+from .uv import *
+from .sas import *

api/views/api.py

@@ -0,0 +1,34 @@
+# -*- coding:utf-8 -*
+#
+# Copyright 2023 © AE UTBM
+# ae@utbm.fr / ae.info@utbm.fr
+#
+# This file is part of the website of the UTBM Student Association (AE UTBM),
+# https://ae.utbm.fr.
+#
+# You can find the source code of the website at https://github.com/ae-utbm/sith3
+#
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
+# OR WITHIN THE LOCAL FILE "LICENSE"
+#
+#
+
+from rest_framework.response import Response
+from rest_framework.decorators import api_view, renderer_classes
+from rest_framework.renderers import StaticHTMLRenderer
+
+from core.templatetags.renderer import markdown
+
+
+@api_view(["POST"])
+@renderer_classes((StaticHTMLRenderer,))
+def RenderMarkdown(request):
+    """
+    Render Markdown
+    """
+    try:
+        data = markdown(request.POST["text"])
+    except:
+        data = "Error"
+    return Response(data)

api/views/club.py

@@ -0,0 +1,56 @@
+# -*- coding:utf-8 -*
+#
+# Copyright 2023 © AE UTBM
+# ae@utbm.fr / ae.info@utbm.fr
+#
+# This file is part of the website of the UTBM Student Association (AE UTBM),
+# https://ae.utbm.fr.
+#
+# You can find the source code of the website at https://github.com/ae-utbm/sith3
+#
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
+# OR WITHIN THE LOCAL FILE "LICENSE"
+#
+#
+
+from rest_framework.response import Response
+from rest_framework import serializers
+from rest_framework.decorators import api_view, renderer_classes
+from rest_framework.renderers import StaticHTMLRenderer
+
+from django.conf import settings
+from django.core.exceptions import PermissionDenied
+
+from club.models import Club, Mailing
+
+from api.views import RightModelViewSet
+
+
+class ClubSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Club
+        fields = ("id", "name", "unix_name", "address", "members")
+
+
+class ClubViewSet(RightModelViewSet):
+    """
+    Manage Clubs (api/v1/club/)
+    """
+
+    serializer_class = ClubSerializer
+    queryset = Club.objects.all()
+
+
+@api_view(["GET"])
+@renderer_classes((StaticHTMLRenderer,))
+def FetchMailingLists(request):
+    key = request.GET.get("key", "")
+    if key != settings.SITH_MAILING_FETCH_KEY:
+        raise PermissionDenied
+    data = ""
+    for mailing in Mailing.objects.filter(
+        is_moderated=True, club__is_active=True
+    ).all():
+        data += mailing.fetch_format() + "\n"
+    return Response(data)

api/views/counter.py

@@ -0,0 +1,52 @@
+# -*- coding:utf-8 -*
+#
+# Copyright 2023 © AE UTBM
+# ae@utbm.fr / ae.info@utbm.fr
+#
+# This file is part of the website of the UTBM Student Association (AE UTBM),
+# https://ae.utbm.fr.
+#
+# You can find the source code of the website at https://github.com/ae-utbm/sith3
+#
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
+# OR WITHIN THE LOCAL FILE "LICENSE"
+#
+#
+
+from rest_framework import serializers
+from rest_framework.response import Response
+from rest_framework.decorators import action
+
+from counter.models import Counter
+
+from api.views import RightModelViewSet
+
+
+class CounterSerializer(serializers.ModelSerializer):
+    is_open = serializers.BooleanField(read_only=True)
+    barman_list = serializers.ListField(
+        child=serializers.IntegerField(), read_only=True
+    )
+
+    class Meta:
+        model = Counter
+        fields = ("id", "name", "type", "club", "products", "is_open", "barman_list")
+
+
+class CounterViewSet(RightModelViewSet):
+    """
+    Manage Counters (api/v1/counter/)
+    """
+
+    serializer_class = CounterSerializer
+    queryset = Counter.objects.all()
+
+    @action(detail=False)
+    def bar(self, request):
+        """
+        Return all bars (api/v1/counter/bar/)
+        """
+        self.queryset = self.queryset.filter(type="BAR")
+        serializer = self.get_serializer(self.queryset, many=True)
+        return Response(serializer.data)

api/views/group.py

@@ -0,0 +1,35 @@
+# -*- coding:utf-8 -*
+#
+# Copyright 2023 © AE UTBM
+# ae@utbm.fr / ae.info@utbm.fr
+#
+# This file is part of the website of the UTBM Student Association (AE UTBM),
+# https://ae.utbm.fr.
+#
+# You can find the source code of the website at https://github.com/ae-utbm/sith3
+#
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
+# OR WITHIN THE LOCAL FILE "LICENSE"
+#
+#
+
+from rest_framework import serializers
+
+from core.models import RealGroup
+
+from api.views import RightModelViewSet
+
+
+class GroupSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = RealGroup
+
+
+class GroupViewSet(RightModelViewSet):
+    """
+    Manage Groups (api/v1/group/)
+    """
+
+    serializer_class = GroupSerializer
+    queryset = RealGroup.objects.all()

api/views/launderette.py

@@ -0,0 +1,128 @@
+# -*- coding:utf-8 -*
+#
+# Copyright 2023 © AE UTBM
+# ae@utbm.fr / ae.info@utbm.fr
+#
+# This file is part of the website of the UTBM Student Association (AE UTBM),
+# https://ae.utbm.fr.
+#
+# You can find the source code of the website at https://github.com/ae-utbm/sith3
+#
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
+# OR WITHIN THE LOCAL FILE "LICENSE"
+#
+#
+
+from rest_framework import serializers
+from rest_framework.response import Response
+from rest_framework.decorators import action
+
+from launderette.models import Launderette, Machine, Token
+
+from api.views import RightModelViewSet
+
+
+class LaunderettePlaceSerializer(serializers.ModelSerializer):
+    machine_list = serializers.ListField(
+        child=serializers.IntegerField(), read_only=True
+    )
+    token_list = serializers.ListField(child=serializers.IntegerField(), read_only=True)
+
+    class Meta:
+        model = Launderette
+        fields = (
+            "id",
+            "name",
+            "counter",
+            "machine_list",
+            "token_list",
+            "get_absolute_url",
+        )
+
+
+class LaunderetteMachineSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Machine
+        fields = ("id", "name", "type", "is_working", "launderette")
+
+
+class LaunderetteTokenSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Token
+        fields = (
+            "id",
+            "name",
+            "type",
+            "launderette",
+            "borrow_date",
+            "user",
+            "is_avaliable",
+        )
+
+
+class LaunderettePlaceViewSet(RightModelViewSet):
+    """
+    Manage Launderette (api/v1/launderette/place/)
+    """
+
+    serializer_class = LaunderettePlaceSerializer
+    queryset = Launderette.objects.all()
+
+
+class LaunderetteMachineViewSet(RightModelViewSet):
+    """
+    Manage Washing Machines (api/v1/launderette/machine/)
+    """
+
+    serializer_class = LaunderetteMachineSerializer
+    queryset = Machine.objects.all()
+
+
+class LaunderetteTokenViewSet(RightModelViewSet):
+    """
+    Manage Launderette's tokens (api/v1/launderette/token/)
+    """
+
+    serializer_class = LaunderetteTokenSerializer
+    queryset = Token.objects.all()
+
+    @action(detail=False)
+    def washing(self, request):
+        """
+        Return all washing tokens (api/v1/launderette/token/washing)
+        """
+        self.queryset = self.queryset.filter(type="WASHING")
+        serializer = self.get_serializer(self.queryset, many=True)
+        return Response(serializer.data)
+
+    @action(detail=False)
+    def drying(self, request):
+        """
+        Return all drying tokens (api/v1/launderette/token/drying)
+        """
+        self.queryset = self.queryset.filter(type="DRYING")
+        serializer = self.get_serializer(self.queryset, many=True)
+        return Response(serializer.data)
+
+    @action(detail=False)
+    def avaliable(self, request):
+        """
+        Return all avaliable tokens (api/v1/launderette/token/avaliable)
+        """
+        self.queryset = self.queryset.filter(
+            borrow_date__isnull=True, user__isnull=True
+        )
+        serializer = self.get_serializer(self.queryset, many=True)
+        return Response(serializer.data)
+
+    @action(detail=False)
+    def unavaliable(self, request):
+        """
+        Return all unavaliable tokens (api/v1/launderette/token/unavaliable)
+        """
+        self.queryset = self.queryset.filter(
+            borrow_date__isnull=False, user__isnull=False
+        )
+        serializer = self.get_serializer(self.queryset, many=True)
+        return Response(serializer.data)

api/views/sas.py

@@ -0,0 +1,42 @@
+from typing import List
+from rest_framework.decorators import api_view, renderer_classes
+from rest_framework.exceptions import PermissionDenied
+from rest_framework.generics import get_object_or_404
+from rest_framework.renderers import JSONRenderer
+from rest_framework.request import Request
+from rest_framework.response import Response
+
+from core.views import can_edit
+from core.models import User
+from sas.models import Picture
+
+
+def all_pictures_of_user(user: User) -> List[Picture]:
+    return [
+        relation.picture
+        for relation in user.pictures.exclude(picture=None)
+        .order_by("-picture__parent__date", "id")
+        .select_related("picture__parent")
+    ]
+
+
+@api_view(["GET"])
+@renderer_classes((JSONRenderer,))
+def all_pictures_of_user_endpoint(request: Request, user: int):
+    requested_user: User = get_object_or_404(User, pk=user)
+    if not can_edit(requested_user, request.user):
+        raise PermissionDenied
+
+    return Response(
+        [
+            {
+                "name": f"{picture.parent.name} - {picture.name}",
+                "date": picture.date,
+                "author": str(picture.owner),
+                "full_size_url": picture.get_download_url(),
+                "compressed_url": picture.get_download_compressed_url(),
+                "thumb_url": picture.get_download_thumb_url(),
+            }
+            for picture in all_pictures_of_user(requested_user)
+        ]
+    )

api/views/user.py

@@ -0,0 +1,60 @@
+# -*- coding:utf-8 -*
+#
+# Copyright 2023 © AE UTBM
+# ae@utbm.fr / ae.info@utbm.fr
+#
+# This file is part of the website of the UTBM Student Association (AE UTBM),
+# https://ae.utbm.fr.
+#
+# You can find the source code of the website at https://github.com/ae-utbm/sith3
+#
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
+# OR WITHIN THE LOCAL FILE "LICENSE"
+#
+#
+
+import datetime
+
+from rest_framework import serializers
+from rest_framework.response import Response
+from rest_framework.decorators import action
+
+from core.models import User
+
+from api.views import RightModelViewSet
+
+
+class UserSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = User
+        fields = (
+            "id",
+            "first_name",
+            "last_name",
+            "email",
+            "date_of_birth",
+            "nick_name",
+            "is_active",
+            "date_joined",
+        )
+
+
+class UserViewSet(RightModelViewSet):
+    """
+    Manage Users (api/v1/user/)
+    Only show active users
+    """
+
+    serializer_class = UserSerializer
+    queryset = User.objects.filter(is_active=True)
+
+    @action(detail=False)
+    def birthday(self, request):
+        """
+        Return all users born today (api/v1/user/birstdays)
+        """
+        date = datetime.datetime.today()
+        self.queryset = self.queryset.filter(date_of_birth=date)
+        serializer = self.get_serializer(self.queryset, many=True)
+        return Response(serializer.data)

api/views/uv.py

@@ -0,0 +1,127 @@
+from rest_framework.response import Response
+from rest_framework.decorators import api_view, renderer_classes
+from rest_framework.renderers import JSONRenderer
+from django.core.exceptions import PermissionDenied
+from django.conf import settings
+from rest_framework import serializers
+import urllib.request
+import json
+
+from pedagogy.views import CanCreateUVFunctionMixin
+
+
+@api_view(["GET"])
+@renderer_classes((JSONRenderer,))
+def uv_endpoint(request):
+    if not CanCreateUVFunctionMixin.can_create_uv(request.user):
+        raise PermissionDenied
+
+    params = request.query_params
+    if "year" not in params or "code" not in params:
+        raise serializers.ValidationError("Missing query parameter")
+
+    short_uv, full_uv = find_uv("fr", params["year"], params["code"])
+    if short_uv is None or full_uv is None:
+        return Response(status=204)
+
+    return Response(make_clean_uv(short_uv, full_uv))
+
+
+def find_uv(lang, year, code):
+    """
+    Uses the UTBM API to find an UV.
+    short_uv is the UV entry in the UV list. It is returned as it contains
+    information which are not in full_uv.
+    full_uv is the detailed representation of an UV.
+    """
+    # query the UV list
+    uvs_url = settings.SITH_PEDAGOGY_UTBM_API + "/uvs/{}/{}".format(lang, year)
+    response = urllib.request.urlopen(uvs_url)
+    uvs = json.loads(response.read().decode("utf-8"))
+
+    try:
+        # find the first UV which matches the code
+        short_uv = next(uv for uv in uvs if uv["code"] == code)
+    except StopIteration:
+        return (None, None)
+
+    # get detailed information about the UV
+    uv_url = settings.SITH_PEDAGOGY_UTBM_API + "/uv/{}/{}/{}/{}".format(
+        lang, year, code, short_uv["codeFormation"]
+    )
+    response = urllib.request.urlopen(uv_url)
+    full_uv = json.loads(response.read().decode("utf-8"))
+
+    return (short_uv, full_uv)
+
+
+def make_clean_uv(short_uv, full_uv):
+    """
+    Cleans the data up so that it corresponds to our data representation.
+    """
+    res = {}
+
+    res["credit_type"] = short_uv["codeCategorie"]
+
+    # probably wrong on a few UVs as we pick the first UV we find but
+    # availability depends on the formation
+    semesters = {
+        (True, True): "AUTUMN_AND_SPRING",
+        (True, False): "AUTUMN",
+        (False, True): "SPRING",
+    }
+    res["semester"] = semesters.get(
+        (short_uv["ouvertAutomne"], short_uv["ouvertPrintemps"]), "CLOSED"
+    )
+
+    langs = {"es": "SP", "en": "EN", "de": "DE"}
+    res["language"] = langs.get(full_uv["codeLangue"], "FR")
+
+    if full_uv["departement"] == "Pôle Humanités":
+        res["department"] = "HUMA"
+    else:
+        departments = {
+            "AL": "IMSI",
+            "AE": "EE",
+            "GI": "GI",
+            "GC": "EE",
+            "GM": "MC",
+            "TC": "TC",
+            "GP": "IMSI",
+            "ED": "EDIM",
+            "AI": "GI",
+            "AM": "MC",
+        }
+        res["department"] = departments.get(full_uv["codeFormation"], "NA")
+
+    res["credits"] = full_uv["creditsEcts"]
+
+    activities = ("CM", "TD", "TP", "THE", "TE")
+    for activity in activities:
+        res["hours_{}".format(activity)] = 0
+    for activity in full_uv["activites"]:
+        if activity["code"] in activities:
+            res["hours_{}".format(activity["code"])] += activity["nbh"] // 60
+
+    # wrong if the manager changes depending on the semester
+    semester = full_uv.get("automne", None)
+    if not semester:
+        semester = full_uv.get("printemps", {})
+    res["manager"] = semester.get("responsable", "")
+
+    res["title"] = full_uv["libelle"]
+
+    descriptions = {
+        "objectives": "objectifs",
+        "program": "programme",
+        "skills": "acquisitionCompetences",
+        "key_concepts": "acquisitionNotions",
+    }
+
+    for res_key, full_uv_key in descriptions.items():
+        res[res_key] = full_uv[full_uv_key]
+        # if not found or the API did not return a string
+        if type(res[res_key]) != str:
+            res[res_key] = ""
+
+    return res

biome.json

@@ -1,29 +0,0 @@
-{
-  "$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
-  "vcs": {
-    "enabled": true,
-    "clientKind": "git",
-    "useIgnoreFile": true
-  },
-  "files": {
-    "ignoreUnknown": false,
-    "ignore": ["*.min.*", "staticfiles/generated"]
-  },
-  "formatter": {
-    "enabled": true,
-    "indentStyle": "space",
-    "lineWidth": 88
-  },
-  "organizeImports": {
-    "enabled": true
-  },
-  "linter": {
-    "enabled": true,
-    "rules": {
-      "all": true
-    }
-  },
-  "javascript": {
-    "globals": ["Alpine", "$", "jQuery", "gettext", "interpolate"]
-  }
-}

club/__init__.py

@@ -1,3 +1,4 @@
+# -*- coding:utf-8 -*
 #
 # Copyright 2023 © AE UTBM
 # ae@utbm.fr / ae.info@utbm.fr
@@ -5,10 +6,10 @@
 # This file is part of the website of the UTBM Student Association (AE UTBM),
 # https://ae.utbm.fr.
 #
-# You can find the source code of the website at https://github.com/ae-utbm/sith
+# You can find the source code of the website at https://github.com/ae-utbm/sith3
 #
 # LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# SEE : https://raw.githubusercontent.com/ae-utbm/sith/master/LICENSE
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #

club/admin.py

@@ -1,3 +1,4 @@
+# -*- coding:utf-8 -*
 #
 # Copyright 2023 © AE UTBM
 # ae@utbm.fr / ae.info@utbm.fr
@@ -5,13 +6,14 @@
 # This file is part of the website of the UTBM Student Association (AE UTBM),
 # https://ae.utbm.fr.
 #
-# You can find the source code of the website at https://github.com/ae-utbm/sith
+# You can find the source code of the website at https://github.com/ae-utbm/sith3
 #
 # LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
-# SEE : https://raw.githubusercontent.com/ae-utbm/sith/master/LICENSE
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith3/master/LICENSE
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
+from ajax_select import make_ajax_form
 from django.contrib import admin
 
 from club.models import Club, Membership
@@ -20,14 +22,6 @@ from club.models import Club, Membership
 @admin.register(Club)
 class ClubAdmin(admin.ModelAdmin):
     list_display = ("name", "unix_name", "parent", "is_active")
-    search_fields = ("name", "unix_name")
-    autocomplete_fields = (
-        "parent",
-        "board_group",
-        "members_group",
-        "home",
-        "page",
-    )
 
 
 @admin.register(Membership)
@@ -39,4 +33,4 @@ class MembershipAdmin(admin.ModelAdmin):
         "user__last_name",
         "club__name",
     )
-    autocomplete_fields = ("user",)
+    form = make_ajax_form(Membership, {"user": "users"})

club/api.py

@@ -1,22 +0,0 @@
-from typing import Annotated
-
-from annotated_types import MinLen
-from ninja_extra import ControllerBase, api_controller, paginate, route
-from ninja_extra.pagination import PageNumberPaginationExtra
-from ninja_extra.schemas import PaginatedResponseSchema
-
-from club.models import Club
-from club.schemas import ClubSchema
-from core.api_permissions import CanAccessLookup
-
-
-@api_controller("/club")
-class ClubController(ControllerBase):
-    @route.get(
-        "/search",
-        response=PaginatedResponseSchema[ClubSchema],
-        permissions=[CanAccessLookup],
-    )
-    @paginate(PageNumberPaginationExtra, page_size=50)
-    def search_club(self, search: Annotated[str, MinLen(1)]):
-        return Club.objects.filter(name__icontains=search).values()

club/forms.py

@@ -1,3 +1,4 @@
+# -*- coding:utf-8 -*
 #
 # Copyright 2016,2017
 # - Skia <skia@libskia.so>
@@ -22,15 +23,18 @@
 #
 #
 
-from django import forms
 from django.conf import settings
+from django import forms
 from django.utils.translation import gettext_lazy as _
 
-from club.models import Club, Mailing, MailingSubscription, Membership
+from ajax_select.fields import AutoCompleteSelectField, AutoCompleteSelectMultipleField
+
+from club.models import Mailing, MailingSubscription, Club, Membership
+
 from core.models import User
 from core.views.forms import SelectDate, SelectDateTime
-from core.views.widgets.select import AutoCompleteSelectMultipleUser
 from counter.models import Counter
+from core.views.forms import TzAwareDateTimeField
 
 
 class ClubEditForm(forms.ModelForm):
@@ -39,27 +43,28 @@ class ClubEditForm(forms.ModelForm):
         fields = ["address", "logo", "short_description"]
 
     def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+        super(ClubEditForm, self).__init__(*args, **kwargs)
         self.fields["short_description"].widget = forms.Textarea()
 
 
 class MailingForm(forms.Form):
-    """Form handling mailing lists right."""
+    """
+    Form handling mailing lists right
+    """
 
     ACTION_NEW_MAILING = 1
     ACTION_NEW_SUBSCRIPTION = 2
     ACTION_REMOVE_SUBSCRIPTION = 3
 
-    subscription_users = forms.ModelMultipleChoiceField(
+    subscription_users = AutoCompleteSelectMultipleField(
+        "users",
         label=_("Users to add"),
         help_text=_("Search users to add (one or more)."),
         required=False,
-        widget=AutoCompleteSelectMultipleUser,
-        queryset=User.objects.all(),
     )
 
     def __init__(self, club_id, user_id, mailings, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+        super(MailingForm, self).__init__(*args, **kwargs)
 
         self.fields["action"] = forms.TypedChoiceField(
             choices=(
@@ -104,15 +109,24 @@ class MailingForm(forms.Form):
         )
 
     def check_required(self, cleaned_data, field):
-        """If the given field doesn't exist or has no value, add a required error on it."""
+        """
+        If the given field doesn't exist or has no value, add a required error on it
+        """
         if not cleaned_data.get(field, None):
             self.add_error(field, _("This field is required"))
 
     def clean_subscription_users(self):
-        """Convert given users into real users and check their validity."""
+        """
-        cleaned_data = super().clean()
+        Convert given users into real users and check their validity
+        """
+        cleaned_data = super(MailingForm, self).clean()
         users = []
         for user in cleaned_data["subscription_users"]:
+            user = User.objects.filter(id=user).first()
+            if not user:
+                raise forms.ValidationError(
+                    _("One of the selected users doesn't exist"), code="invalid"
+                )
             if not user.email:
                 raise forms.ValidationError(
                     _("One of the selected users doesn't have an email address"),
@@ -122,9 +136,9 @@ class MailingForm(forms.Form):
         return users
 
     def clean(self):
-        cleaned_data = super().clean()
+        cleaned_data = super(MailingForm, self).clean()
 
-        if "action" not in cleaned_data:
+        if not "action" in cleaned_data:
             # If there is no action provided, we can stop here
             raise forms.ValidationError(_("An action is required"), code="invalid")
 
@@ -145,19 +159,15 @@ class MailingForm(forms.Form):
 
 
 class SellingsForm(forms.Form):
-    begin_date = forms.DateTimeField(
+    begin_date = TzAwareDateTimeField(label=_("Begin date"), required=False)
-        label=_("Begin date"), widget=SelectDateTime, required=False
+    end_date = TzAwareDateTimeField(label=_("End date"), required=False)
-    )
-    end_date = forms.DateTimeField(
-        label=_("End date"), widget=SelectDateTime, required=False
-    )
 
     counters = forms.ModelMultipleChoiceField(
         Counter.objects.order_by("name").all(), label=_("Counter"), required=False
     )
 
     def __init__(self, club, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+        super(SellingsForm, self).__init__(*args, **kwargs)
         self.fields["products"] = forms.ModelMultipleChoiceField(
             club.products.order_by("name").filter(archived=False).all(),
             label=_("Products"),
@@ -171,17 +181,18 @@ class SellingsForm(forms.Form):
 
 
 class ClubMemberForm(forms.Form):
-    """Form handling the members of a club."""
+    """
+    Form handling the members of a club
+    """
 
     error_css_class = "error"
     required_css_class = "required"
 
-    users = forms.ModelMultipleChoiceField(
+    users = AutoCompleteSelectMultipleField(
+        "users",
         label=_("Users to add"),
         help_text=_("Search users to add (one or more)."),
         required=False,
-        widget=AutoCompleteSelectMultipleUser,
-        queryset=User.objects.all(),
     )
 
     def __init__(self, *args, **kwargs):
@@ -193,7 +204,7 @@ class ClubMemberForm(forms.Form):
                 self.club.members.filter(end_date=None).order_by("-role").all()
             )
         self.request_user_membership = self.club.get_membership_for(self.request_user)
-        super().__init__(*args, **kwargs)
+        super(ClubMemberForm, self).__init__(*args, **kwargs)
 
         # Using a ModelForm binds too much the form with the model and we don't want that
         # We want the view to process the model creation since they are multiple users
@@ -229,13 +240,18 @@ class ClubMemberForm(forms.Form):
             self.fields.pop("start_date")
 
     def clean_users(self):
-        """Check that the user is not trying to add an user already in the club.
-
-        Also check that the user is valid and has a valid subscription.
         """
-        cleaned_data = super().clean()
+        Check that the user is not trying to add an user already in the club
+        Also check that the user is valid and has a valid subscription
+        """
+        cleaned_data = super(ClubMemberForm, self).clean()
         users = []
-        for user in cleaned_data["users"]:
+        for user_id in cleaned_data["users"]:
+            user = User.objects.filter(id=user_id).first()
+            if not user:
+                raise forms.ValidationError(
+                    _("One of the selected users doesn't exist"), code="invalid"
+                )
             if not user.is_subscribed:
                 raise forms.ValidationError(
                     _("User must be subscriber to take part to a club"), code="invalid"
@@ -248,8 +264,10 @@ class ClubMemberForm(forms.Form):
         return users
 
     def clean(self):
-        """Check user rights for adding an user."""
+        """
-        cleaned_data = super().clean()
+        Check user rights for adding an user
+        """
+        cleaned_data = super(ClubMemberForm, self).clean()
 
         if "start_date" in cleaned_data and not cleaned_data["start_date"]:
             # Drop start_date if allowed to edition but not specified

club/migrations/0001_initial.py

@@ -1,8 +1,9 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+from django.db import migrations, models
 import django.core.validators
 import django.db.models.deletion
-from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

club/migrations/0002_auto_20160824_2152.py

@@ -1,8 +1,9 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-import django.db.models.deletion
-from django.conf import settings
 from django.db import migrations, models
+from django.conf import settings
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

club/migrations/0003_auto_20160902_2042.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 from django.db import migrations, models

club/migrations/0004_auto_20160915_1057.py

@@ -1,8 +1,9 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-import django.db.models.deletion
-from django.conf import settings
 from django.db import migrations, models
+from django.conf import settings
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

club/migrations/0005_auto_20161120_1149.py

@@ -1,7 +1,8 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-import django.db.models.deletion
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

club/migrations/0006_auto_20161229_0040.py

@@ -1,7 +1,8 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-import django.utils.timezone
 from django.db import migrations, models
+import django.utils.timezone
 
 
 class Migration(migrations.Migration):

club/migrations/0007_auto_20170324_0917.py

@@ -1,6 +1,7 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

club/migrations/0008_auto_20170515_2214.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 from django.db import migrations, models

club/migrations/0009_auto_20170822_2232.py

@@ -1,11 +1,11 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+from django.db import migrations, models
+from django.conf import settings
 import re
-
 import django.core.validators
 import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -109,6 +109,6 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterUniqueTogether(
             name="mailingsubscription",
-            unique_together={("user", "email", "mailing")},
+            unique_together=set([("user", "email", "mailing")]),
         ),
     ]

club/migrations/0010_auto_20170912_2028.py

@@ -1,8 +1,22 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-import django.db.models.deletion
 from django.db import migrations, models
 
+from club.models import Club
+from core.operations import PsqlRunOnly
+import django.db.models.deletion
+
+
+def generate_club_pages(apps, schema_editor):
+    def recursive_generate_club_page(club):
+        club.make_page()
+        for child in Club.objects.filter(parent=club).all():
+            recursive_generate_club_page(child)
+
+    for club in Club.objects.filter(parent=None).all():
+        recursive_generate_club_page(club)
+
 
 class Migration(migrations.Migration):
     dependencies = [("core", "0024_auto_20170906_1317"), ("club", "0010_club_logo")]
@@ -35,4 +49,11 @@ class Migration(migrations.Migration):
                 null=True,
             ),
         ),
+        PsqlRunOnly(
+            "SET CONSTRAINTS ALL IMMEDIATE", reverse_sql=migrations.RunSQL.noop
+        ),
+        migrations.RunPython(generate_club_pages),
+        PsqlRunOnly(
+            migrations.RunSQL.noop, reverse_sql="SET CONSTRAINTS ALL IMMEDIATE"
+        ),
     ]

club/migrations/0010_club_logo.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 from django.db import migrations, models

club/migrations/0011_auto_20180426_2013.py

@@ -1,9 +1,9 @@
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-import django.db.models.deletion
 from django.db import migrations, models
-
 import club.models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -15,7 +15,7 @@ class Migration(migrations.Migration):
             name="owner_group",
             field=models.ForeignKey(
                 on_delete=django.db.models.deletion.CASCADE,
-                default=club.models.get_default_owner_group,
+                default=club.models.Club.get_default_owner_group,
                 related_name="owned_club",
                 to="core.Group",
             ),

club/migrations/0012_club_board_group_club_members_group.py

@@ -1,106 +0,0 @@
-# Generated by Django 4.2.16 on 2024-11-20 17:08
-
-import django.db.models.deletion
-import django.db.models.functions.datetime
-from django.conf import settings
-from django.db import migrations, models
-from django.db.migrations.state import StateApps
-from django.db.models import Q
-from django.utils.timezone import localdate
-
-
-def migrate_meta_groups(apps: StateApps, schema_editor):
-    """Attach the existing meta groups to the clubs.
-
-    Until now, the meta groups were not attached to the clubs,
-    nor to the users.
-    This creates actual foreign relationships between the clubs
-    and theirs groups and the users and theirs groups.
-
-    Warnings:
-        When the meta groups associated with the clubs aren't found,
-        they are created.
-        Thus the migration shouldn't fail, and all the clubs will
-        have their groups.
-        However, there will probably be some groups that have
-        not been found but exist nonetheless,
-        so there will be duplicates and dangling groups.
-        There must be a manual cleanup after this migration.
-    """
-    Group = apps.get_model("core", "Group")
-    Club = apps.get_model("club", "Club")
-
-    meta_groups = Group.objects.filter(is_meta=True)
-    clubs = list(Club.objects.all())
-    for club in clubs:
-        club.board_group = meta_groups.get_or_create(
-            name=club.unix_name + settings.SITH_BOARD_SUFFIX,
-            defaults={"is_meta": True},
-        )[0]
-        club.members_group = meta_groups.get_or_create(
-            name=club.unix_name + settings.SITH_MEMBER_SUFFIX,
-            defaults={"is_meta": True},
-        )[0]
-        club.save()
-        club.refresh_from_db()
-        memberships = club.members.filter(
-            Q(end_date=None) | Q(end_date__gt=localdate())
-        ).select_related("user")
-        club.members_group.users.set([m.user for m in memberships])
-        club.board_group.users.set(
-            [
-                m.user
-                for m in memberships.filter(role__gt=settings.SITH_MAXIMUM_FREE_ROLE)
-            ]
-        )
-
-
-# steps of the migration :
-# - Create a nullable field for the board group and the member group
-# - Edit those new fields to make them point to currently existing meta groups
-# - When this data migration is done, make the fields non-nullable
-class Migration(migrations.Migration):
-    dependencies = [
-        ("core", "0040_alter_user_options_user_user_permissions_and_more"),
-        ("club", "0011_auto_20180426_2013"),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name="club",
-            name="edit_groups",
-        ),
-        migrations.RemoveField(
-            model_name="club",
-            name="owner_group",
-        ),
-        migrations.RemoveField(
-            model_name="club",
-            name="view_groups",
-        ),
-        migrations.AddField(
-            model_name="club",
-            name="board_group",
-            field=models.OneToOneField(
-                blank=True,
-                null=True,
-                on_delete=django.db.models.deletion.PROTECT,
-                related_name="club_board",
-                to="core.group",
-            ),
-        ),
-        migrations.AddField(
-            model_name="club",
-            name="members_group",
-            field=models.OneToOneField(
-                blank=True,
-                null=True,
-                on_delete=django.db.models.deletion.PROTECT,
-                related_name="club",
-                to="core.group",
-            ),
-        ),
-        migrations.RunPython(
-            migrate_meta_groups, reverse_code=migrations.RunPython.noop, elidable=True
-        ),
-    ]

club/migrations/0013_alter_club_board_group_alter_club_members_group_and_more.py

@@ -1,36 +0,0 @@
-# Generated by Django 4.2.17 on 2025-01-04 16:46
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [("club", "0012_club_board_group_club_members_group")]
-
-    operations = [
-        migrations.AlterField(
-            model_name="club",
-            name="board_group",
-            field=models.OneToOneField(
-                on_delete=django.db.models.deletion.PROTECT,
-                related_name="club_board",
-                to="core.group",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="club",
-            name="members_group",
-            field=models.OneToOneField(
-                on_delete=django.db.models.deletion.PROTECT,
-                related_name="club",
-                to="core.group",
-            ),
-        ),
-        migrations.AddConstraint(
-            model_name="membership",
-            constraint=models.CheckConstraint(
-                check=models.Q(("end_date__gte", models.F("start_date"))),
-                name="end_after_start",
-            ),
-        ),
-    ]

club/models.py

@@ -1,3 +1,4 @@
+# -*- coding:utf-8 -*
 #
 # Copyright 2016,2017
 # - Skia <skia@libskia.so>
@@ -21,35 +22,31 @@
 # Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 #
-from __future__ import annotations
+from typing import Optional
 
-from typing import Iterable, Self
-
-from django.conf import settings
-from django.core import validators
 from django.core.cache import cache
-from django.core.exceptions import ObjectDoesNotExist, ValidationError
+from django.db import models
-from django.core.validators import RegexValidator, validate_email
+from django.core import validators
-from django.db import models, transaction
+from django.conf import settings
-from django.db.models import Exists, F, OuterRef, Q
+from django.db.models import Q
+from django.utils.timezone import now
+from django.utils.translation import gettext_lazy as _
+from django.core.exceptions import ValidationError, ObjectDoesNotExist
+from django.db import transaction
 from django.urls import reverse
 from django.utils import timezone
+from django.core.validators import RegexValidator, validate_email
 from django.utils.functional import cached_property
-from django.utils.timezone import localdate
-from django.utils.translation import gettext_lazy as _
 
-from core.models import Group, Notification, Page, SithFile, User
+from core.models import User, MetaGroup, Group, SithFile, RealGroup, Notification, Page
 
 # Create your models here.
 
 
-# This function prevents generating migration upon settings change
-def get_default_owner_group():
-    return settings.SITH_GROUP_ROOT_ID
-
-
 class Club(models.Model):
-    """The Club class, made as a tree to allow nice tidy organization."""
+    """
+    The Club class, made as a tree to allow nice tidy organization
+    """
 
     id = models.AutoField(primary_key=True, db_index=True)
     name = models.CharField(_("name"), max_length=64)
@@ -79,6 +76,23 @@ class Club(models.Model):
         _("short description"), max_length=1000, default="", blank=True, null=True
     )
     address = models.CharField(_("address"), max_length=254)
+
+    # This function prevents generating migration upon settings change
+    def get_default_owner_group():
+        return settings.SITH_GROUP_ROOT_ID
+
+    owner_group = models.ForeignKey(
+        Group,
+        related_name="owned_club",
+        default=get_default_owner_group,
+        on_delete=models.CASCADE,
+    )
+    edit_groups = models.ManyToManyField(
+        Group, related_name="editable_club", blank=True
+    )
+    view_groups = models.ManyToManyField(
+        Group, related_name="viewable_club", blank=True
+    )
     home = models.OneToOneField(
         SithFile,
         related_name="home_of_club",
@@ -90,57 +104,18 @@ class Club(models.Model):
     page = models.OneToOneField(
         Page, related_name="club", blank=True, null=True, on_delete=models.CASCADE
     )
-    members_group = models.OneToOneField(
-        Group, related_name="club", on_delete=models.PROTECT
-    )
-    board_group = models.OneToOneField(
-        Group, related_name="club_board", on_delete=models.PROTECT
-    )
 
     class Meta:
         ordering = ["name", "unix_name"]
 
-    def __str__(self):
-        return self.name
-
-    @transaction.atomic()
-    def save(self, *args, **kwargs):
-        creation = self._state.adding
-        if not creation:
-            db_club = Club.objects.get(id=self.id)
-            if self.unix_name != db_club.unix_name:
-                self.home.name = self.unix_name
-                self.home.save()
-            if self.name != db_club.name:
-                self.board_group.name = f"{self.name} - Bureau"
-                self.board_group.save()
-                self.members_group.name = f"{self.name} - Membres"
-                self.members_group.save()
-        if creation:
-            self.board_group = Group.objects.create(
-                name=f"{self.name} - Bureau", is_manually_manageable=False
-            )
-            self.members_group = Group.objects.create(
-                name=f"{self.name} - Membres", is_manually_manageable=False
-            )
-        super().save(*args, **kwargs)
-        if creation:
-            self.make_home()
-        self.make_page()
-        cache.set(f"sith_club_{self.unix_name}", self)
-
-    def get_absolute_url(self):
-        return reverse("club:club_view", kwargs={"club_id": self.id})
-
     @cached_property
-    def president(self) -> Membership | None:
+    def president(self):
-        """Fetch the membership of the current president of this club."""
         return self.members.filter(
             role=settings.SITH_CLUB_ROLES_ID["President"], end_date=None
         ).first()
 
     def check_loop(self):
-        """Raise a validation error when a loop is found within the parent list."""
+        """Raise a validation error when a loop is found within the parent list"""
         objs = []
         cur = self
         while cur.parent is not None:
@@ -152,18 +127,36 @@ class Club(models.Model):
     def clean(self):
         self.check_loop()
 
-    def make_home(self) -> None:
+    def _change_unixname(self, old_name, new_name):
-        if self.home:
+        c = Club.objects.filter(unix_name=new_name).first()
-            return
+        if c is None:
-        home_root = SithFile.objects.filter(parent=None, name="clubs").first()
+            # Update all the groups names
-        root = User.objects.filter(username="root").first()
+            Group.objects.filter(name=old_name).update(name=new_name)
-        if home_root and root:
+            Group.objects.filter(name=old_name + settings.SITH_BOARD_SUFFIX).update(
-            home = SithFile(parent=home_root, name=self.unix_name, owner=root)
+                name=new_name + settings.SITH_BOARD_SUFFIX
-            home.save()
+            )
-            self.home = home
+            Group.objects.filter(name=old_name + settings.SITH_MEMBER_SUFFIX).update(
-            self.save()
+                name=new_name + settings.SITH_MEMBER_SUFFIX
+            )
 
-    def make_page(self) -> None:
+            if self.home:
+                self.home.name = new_name
+                self.home.save()
+
+        else:
+            raise ValidationError(_("A club with that unix_name already exists"))
+
+    def make_home(self):
+        if not self.home:
+            home_root = SithFile.objects.filter(parent=None, name="clubs").first()
+            root = User.objects.filter(username="root").first()
+            if home_root and root:
+                home = SithFile(parent=home_root, name=self.unix_name, owner=root)
+                home.save()
+                self.home = home
+                self.save()
+
+    def make_page(self):
         root = User.objects.filter(username="root").first()
         if not self.page:
             club_root = Page.objects.filter(name=settings.SITH_CLUB_ROOT_PAGE).first()
@@ -193,40 +186,74 @@ class Club(models.Model):
             self.page.parent = self.parent.page
             self.page.save(force_lock=True)
 
-    def delete(self, *args, **kwargs) -> tuple[int, dict[str, int]]:
+    @transaction.atomic()
+    def save(self, *args, **kwargs):
+        old = Club.objects.filter(id=self.id).first()
+        creation = old is None
+        if not creation and old.unix_name != self.unix_name:
+            self._change_unixname(self.unix_name)
+        super(Club, self).save(*args, **kwargs)
+        if creation:
+            board = MetaGroup(name=self.unix_name + settings.SITH_BOARD_SUFFIX)
+            board.save()
+            member = MetaGroup(name=self.unix_name + settings.SITH_MEMBER_SUFFIX)
+            member.save()
+            subscribers = Group.objects.filter(
+                name=settings.SITH_MAIN_MEMBERS_GROUP
+            ).first()
+            self.make_home()
+            self.home.edit_groups.set([board])
+            self.home.view_groups.set([member, subscribers])
+            self.home.save()
+        self.make_page()
+        cache.set(f"sith_club_{self.unix_name}", self)
+
+    def delete(self, *args, **kwargs):
+        super().delete(*args, **kwargs)
         # Invalidate the cache of this club and of its memberships
         for membership in self.members.ongoing().select_related("user"):
             cache.delete(f"membership_{self.id}_{membership.user.id}")
         cache.delete(f"sith_club_{self.unix_name}")
-        self.board_group.delete()
-        self.members_group.delete()
-        return super().delete(*args, **kwargs)
 
-    def get_display_name(self) -> str:
+    def __str__(self):
         return self.name
 
-    def is_owned_by(self, user: User) -> bool:
+    def get_absolute_url(self):
-        """Method to see if that object can be super edited by the given user."""
+        return reverse("club:club_view", kwargs={"club_id": self.id})
+
+    def get_display_name(self):
+        return self.name
+
+    def is_owned_by(self, user):
+        """
+        Method to see if that object can be super edited by the given user
+        """
         if user.is_anonymous:
             return False
-        return user.is_root or user.is_board_member
+        return user.is_board_member
 
-    def get_full_logo_url(self) -> str:
+    def get_full_logo_url(self):
-        return f"https://{settings.SITH_URL}{self.logo.url}"
+        return "https://%s%s" % (settings.SITH_URL, self.logo.url)
 
-    def can_be_edited_by(self, user: User) -> bool:
+    def can_be_edited_by(self, user):
-        """Method to see if that object can be edited by the given user."""
+        """
+        Method to see if that object can be edited by the given user
+        """
         return self.has_rights_in_club(user)
 
-    def can_be_viewed_by(self, user: User) -> bool:
+    def can_be_viewed_by(self, user):
-        """Method to see if that object can be seen by the given user."""
+        """
-        return user.was_subscribed
+        Method to see if that object can be seen by the given user
+        """
+        sub = User.objects.filter(pk=user.pk).first()
+        if sub is None:
+            return False
+        return sub.was_subscribed
 
-    def get_membership_for(self, user: User) -> Membership | None:
+    def get_membership_for(self, user: User) -> Optional["Membership"]:
-        """Return the current membership the given user.
+        """
-
+        Return the current membership the given user.
-        Note:
+        The result is cached.
-            The result is cached.
         """
         if user.is_anonymous:
             return None
@@ -241,17 +268,22 @@ class Club(models.Model):
                 cache.set(f"membership_{self.id}_{user.id}", membership)
         return membership
 
-    def has_rights_in_club(self, user: User) -> bool:
+    def has_rights_in_club(self, user):
-        return user.is_in_group(pk=self.board_group_id)
+        m = self.get_membership_for(user)
+        return m is not None and m.role > settings.SITH_MAXIMUM_FREE_ROLE
 
 
 class MembershipQuerySet(models.QuerySet):
-    def ongoing(self) -> Self:
+    def ongoing(self) -> "MembershipQuerySet":
-        """Filter all memberships which are not finished yet."""
+        """
-        return self.filter(Q(end_date=None) | Q(end_date__gt=localdate()))
+        Filter all memberships which are not finished yet
+        """
+        # noinspection PyTypeChecker
+        return self.filter(Q(end_date=None) | Q(end_date__gte=timezone.now()))
 
-    def board(self) -> Self:
+    def board(self) -> "MembershipQuerySet":
-        """Filter all memberships where the user is/was in the board.
+        """
+        Filter all memberships where the user is/was in the board.
 
         Be aware that users who were in the board in the past
         are included, even if there are no more members.
@@ -259,71 +291,51 @@ class MembershipQuerySet(models.QuerySet):
         If you want to get the users who are currently in the board,
         mind combining this with the :meth:`ongoing` queryset method
         """
+        # noinspection PyTypeChecker
         return self.filter(role__gt=settings.SITH_MAXIMUM_FREE_ROLE)
 
-    def update(self, **kwargs) -> int:
+    def update(self, **kwargs):
-        """Refresh the cache and edit group ownership.
+        """
+        Work just like the default Django's update() method,
+        but add a cache refresh for the elements of the queryset.
 
-        Update the cache, when necessary, remove
+        Be aware that this adds a db query to retrieve the updated objects
-        users from club groups they are no more in
-        and add them in the club groups they should be in.
-
-        Be aware that this adds three db queries :
-        one to retrieve the updated memberships,
-        one to perform group removal and one to perform
-        group attribution.
         """
         nb_rows = super().update(**kwargs)
-        if nb_rows == 0:
-            # if no row was affected, no need to refresh the cache
-            return 0
-
-        cache_memberships = {}
-        memberships = set(self.select_related("club"))
-        # delete all User-Group relations and recreate the necessary ones
-        # It's more concise to write and more reliable
-        Membership._remove_club_groups(memberships)
-        Membership._add_club_groups(memberships)
-        for member in memberships:
-            cache_key = f"membership_{member.club_id}_{member.user_id}"
-            if member.end_date is None:
-                cache_memberships[cache_key] = member
-            else:
-                cache_memberships[cache_key] = "not_member"
-        cache.set_many(cache_memberships)
-        return nb_rows
-
-    def delete(self) -> tuple[int, dict[str, int]]:
-        """Work just like the default Django's delete() method,
-        but add a cache invalidation for the elements of the queryset
-        before the deletion,
-        and a removal of the user from the club groups.
-
-        Be aware that this adds some db queries :
-
-        - 1 to retrieve the deleted elements in order to perform
-          post-delete operations.
-          As we can't know if a delete will affect rows or not,
-          this query will always happen
-        - 1 query to remove the users from the club groups.
-          If the delete operation affected no row,
-          this query won't happen.
-        """
-        memberships = set(self.all())
-        nb_rows, rows_counts = super().delete()
         if nb_rows > 0:
-            Membership._remove_club_groups(memberships)
+            # if at least a row was affected, refresh the cache
-            cache.set_many(
+            for membership in self.all():
-                {
+                if membership.end_date is not None:
-                    f"membership_{m.club_id}_{m.user_id}": "not_member"
+                    cache.set(
-                    for m in memberships
+                        f"membership_{membership.club_id}_{membership.user_id}",
-                }
+                        "not_member",
-            )
+                    )
-        return nb_rows, rows_counts
+                else:
+                    cache.set(
+                        f"membership_{membership.club_id}_{membership.user_id}",
+                        membership,
+                    )
+
+    def delete(self):
+        """
+        Work just like the default Django's delete() method,
+        but add a cache invalidation for the elements of the queryset
+        before the deletion.
+
+        Be aware that this adds a db query to retrieve the deleted element.
+        As this first query take place before the deletion operation,
+        it will be performed even if the deletion fails.
+        """
+        ids = list(self.values_list("club_id", "user_id"))
+        nb_rows, _ = super().delete()
+        if nb_rows > 0:
+            for club_id, user_id in ids:
+                cache.set(f"membership_{club_id}_{user_id}", "not_member")
 
 
 class Membership(models.Model):
-    """The Membership class makes the connection between User and Clubs.
+    """
+    The Membership class makes the connection between User and Clubs
 
     Both Users and Clubs can have many Membership objects:
        - a user can be a member of many clubs at a time
@@ -362,142 +374,54 @@ class Membership(models.Model):
 
     objects = MembershipQuerySet.as_manager()
 
-    class Meta:
-        constraints = [
-            models.CheckConstraint(
-                check=Q(end_date__gte=F("start_date")), name="end_after_start"
-            ),
-        ]
-
     def __str__(self):
         return (
-            f"{self.club.name} - {self.user.username} "
+            self.club.name
-            f"- {settings.SITH_CLUB_ROLES[self.role]} "
+            + " - "
-            f"- {str(_('past member')) if self.end_date is not None else ''}"
+            + self.user.username
+            + " - "
+            + str(settings.SITH_CLUB_ROLES[self.role])
+            + str(" - " + str(_("past member")) if self.end_date is not None else "")
         )
 
-    def save(self, *args, **kwargs):
+    def is_owned_by(self, user):
-        super().save(*args, **kwargs)
+        """
-        # a save may either be an update or a creation
+        Method to see if that object can be super edited by the given user
-        # and may result in either an ongoing or an ended membership.
+        """
-        # It could also be a retrogradation from the board to being a simple member.
+        if user.is_anonymous:
-        # To avoid problems, the user is removed from the club groups beforehand ;
+            return False
-        # he will be added back if necessary
+        return user.is_board_member
-        self._remove_club_groups([self])
+
-        if self.end_date is None:
+    def can_be_edited_by(self, user: User) -> bool:
-            self._add_club_groups([self])
+        """
-            cache.set(f"membership_{self.club_id}_{self.user_id}", self)
+        Check if that object can be edited by the given user
-        else:
+        """
-            cache.set(f"membership_{self.club_id}_{self.user_id}", "not_member")
+        if user.is_root or user.is_board_member:
+            return True
+        membership = self.club.get_membership_for(user)
+        if membership is not None and membership.role >= self.role:
+            return True
+        return False
 
     def get_absolute_url(self):
         return reverse("club:club_members", kwargs={"club_id": self.club_id})
 
-    def is_owned_by(self, user: User) -> bool:
+    def save(self, *args, **kwargs):
-        """Method to see if that object can be super edited by the given user."""
+        super().save(*args, **kwargs)
-        if user.is_anonymous:
+        if self.end_date is None:
-            return False
+            cache.set(f"membership_{self.club_id}_{self.user_id}", self)
-        return user.is_root or user.is_board_member
+        else:
-
+            cache.set(f"membership_{self.club_id}_{self.user_id}", "not_member")
-    def can_be_edited_by(self, user: User) -> bool:
-        """Check if that object can be edited by the given user."""
-        if user.is_root or user.is_board_member:
-            return True
-        membership = self.club.get_membership_for(user)
-        return membership is not None and membership.role >= self.role
 
     def delete(self, *args, **kwargs):
-        self._remove_club_groups([self])
         super().delete(*args, **kwargs)
         cache.delete(f"membership_{self.club_id}_{self.user_id}")
 
-    @staticmethod
-    def _remove_club_groups(
-        memberships: Iterable[Membership],
-    ) -> tuple[int, dict[str, int]]:
-        """Remove users of those memberships from the club groups.
-
-        For example, if a user is in the Troll club board,
-        he is in the board group and the members group of the Troll.
-        After calling this function, he will be in neither.
-
-        Returns:
-            The result of the deletion queryset.
-
-        Warnings:
-            If this function isn't used in combination
-            with an actual deletion of the memberships,
-            it will result in an inconsistent state,
-            where users will be in the clubs, without
-            having the associated rights.
-        """
-        clubs = {m.club_id for m in memberships}
-        users = {m.user_id for m in memberships}
-        groups = Group.objects.filter(Q(club__in=clubs) | Q(club_board__in=clubs))
-        return User.groups.through.objects.filter(
-            Q(group__in=groups) & Q(user__in=users)
-        ).delete()
-
-    @staticmethod
-    def _add_club_groups(
-        memberships: Iterable[Membership],
-    ) -> list[User.groups.through]:
-        """Add users of those memberships to the club groups.
-
-        For example, if a user just joined the Troll club board,
-        he will be added in both the members group and the board group
-        of the club.
-
-        Returns:
-            The created User-Group relations.
-
-        Warnings:
-            If this function isn't used in combination
-            with an actual update/creation of the memberships,
-            it will result in an inconsistent state,
-            where users will have the rights associated to the
-            club, without actually being part of it.
-        """
-        # only active membership (i.e. `end_date=None`)
-        # grant the attribution of club groups.
-        memberships = [m for m in memberships if m.end_date is None]
-        if not memberships:
-            return []
-
-        if sum(1 for m in memberships if not hasattr(m, "club")) > 1:
-            # if more than one membership hasn't its `club` attribute set
-            # it's less expensive to reload the whole query with
-            # a select_related than perform a distinct query
-            # to fetch each club.
-            ids = {m.id for m in memberships}
-            memberships = list(
-                Membership.objects.filter(id__in=ids).select_related("club")
-            )
-        club_groups = []
-        for membership in memberships:
-            club_groups.append(
-                User.groups.through(
-                    user_id=membership.user_id,
-                    group_id=membership.club.members_group_id,
-                )
-            )
-            if membership.role > settings.SITH_MAXIMUM_FREE_ROLE:
-                club_groups.append(
-                    User.groups.through(
-                        user_id=membership.user_id,
-                        group_id=membership.club.board_group_id,
-                    )
-                )
-        return User.groups.through.objects.bulk_create(
-            club_groups, ignore_conflicts=True
-        )
-
 
 class Mailing(models.Model):
-    """A Mailing list for a club.
+    """
-
+    This class correspond to a mailing list
-    Warning:
+    Remember that mailing lists should be validated by UTBM
-        Remember that mailing lists should be validated by UTBM.
     """
 
     club = models.ForeignKey(
@@ -530,25 +454,6 @@ class Mailing(models.Model):
         on_delete=models.CASCADE,
     )
 
-    def __str__(self):
-        return "%s - %s" % (self.club, self.email_full)
-
-    def save(self, *args, **kwargs):
-        if not self.is_moderated:
-            unread_notif_subquery = Notification.objects.filter(
-                user=OuterRef("pk"), type="MAILING_MODERATION", viewed=False
-            )
-            for user in User.objects.filter(
-                ~Exists(unread_notif_subquery),
-                groups__id__in=[settings.SITH_GROUP_COM_ADMIN_ID],
-            ):
-                Notification(
-                    user=user,
-                    url=reverse("com:mailing_admin"),
-                    type="MAILING_MODERATION",
-                ).save(*args, **kwargs)
-        super().save(*args, **kwargs)
-
     def clean(self):
         if Mailing.objects.filter(email=self.email).exists():
             raise ValidationError(_("This mailing list already exists."))
@@ -556,7 +461,7 @@ class Mailing(models.Model):
             self.is_moderated = True
         else:
             self.moderator = None
-        super().clean()
+        super(Mailing, self).clean()
 
     @property
     def email_full(self):
@@ -578,15 +483,39 @@ class Mailing(models.Model):
 
     def delete(self, *args, **kwargs):
         self.subscriptions.all().delete()
-        super().delete()
+        super(Mailing, self).delete()
 
     def fetch_format(self):
-        destination = "".join(s.fetch_format() for s in self.subscriptions.all())
+        resp = self.email + ": "
-        return f"{self.email}: {destination}"
+        for sub in self.subscriptions.all():
+            resp += sub.fetch_format()
+        return resp
+
+    def save(self):
+        if not self.is_moderated:
+            for user in (
+                RealGroup.objects.filter(id=settings.SITH_GROUP_COM_ADMIN_ID)
+                .first()
+                .users.all()
+            ):
+                if not user.notifications.filter(
+                    type="MAILING_MODERATION", viewed=False
+                ).exists():
+                    Notification(
+                        user=user,
+                        url=reverse("com:mailing_admin"),
+                        type="MAILING_MODERATION",
+                    ).save()
+        super(Mailing, self).save()
+
+    def __str__(self):
+        return "%s - %s" % (self.club, self.email_full)
 
 
 class MailingSubscription(models.Model):
-    """Link between user and mailing list."""
+    """
+    This class makes the link between user and mailing list
+    """
 
     mailing = models.ForeignKey(
         Mailing,
@@ -609,9 +538,6 @@ class MailingSubscription(models.Model):
     class Meta:
         unique_together = (("user", "email", "mailing"),)
 
-    def __str__(self):
-        return "(%s) - %s : %s" % (self.mailing, self.get_username, self.email)
-
     def clean(self):
         if not self.user and not self.email:
             raise ValidationError(_("At least user or email is required"))
@@ -626,7 +552,7 @@ class MailingSubscription(models.Model):
                     )
         except ObjectDoesNotExist:
             pass
-        super().clean()
+        super(MailingSubscription, self).clean()
 
     def is_owned_by(self, user):
         if user.is_anonymous:
@@ -654,3 +580,6 @@ class MailingSubscription(models.Model):
 
     def fetch_format(self):
         return self.get_email + " "
+
+    def __str__(self):
+        return "(%s) - %s : %s" % (self.mailing, self.get_username, self.email)

club/schemas.py

@@ -1,9 +0,0 @@
-from ninja import ModelSchema
-
-from club.models import Club
-
-
-class ClubSchema(ModelSchema):
-    class Meta:
-        model = Club
-        fields = ["id", "name"]

club/static/bundled/club/components/ajax-select-index.ts

@@ -1,30 +0,0 @@
-import { AjaxSelect } from "#core:core/components/ajax-select-base";
-import { registerComponent } from "#core:utils/web-components";
-import type { TomOption } from "tom-select/dist/types/types";
-import type { escape_html } from "tom-select/dist/types/utils";
-import { type ClubSchema, clubSearchClub } from "#openapi";
-
-@registerComponent("club-ajax-select")
-export class ClubAjaxSelect extends AjaxSelect {
-  protected valueField = "id";
-  protected labelField = "name";
-  protected searchField = ["code", "name"];
-
-  protected async search(query: string): Promise<TomOption[]> {
-    const resp = await clubSearchClub({ query: { search: query } });
-    if (resp.data) {
-      return resp.data.results;
-    }
-    return [];
-  }
-
-  protected renderOption(item: ClubSchema, sanitize: typeof escape_html) {
-    return `<div class="select-item">
-            <span class="select-item-text">${sanitize(item.name)}</span>
-          </div>`;
-  }
-
-  protected renderItem(item: ClubSchema, sanitize: typeof escape_html) {
-    return `<span>${sanitize(item.name)}</span>`;
-  }
-}

club/templates/club/club_detail.jinja

@@ -2,16 +2,16 @@
 {% from 'core/macros.jinja' import user_profile_link %}
 
 {% block content %}
-  <div id="club_detail">
+	<div id="club_detail">
-    {% if club.logo %}
+		{% if club.logo %}
-      <div class="club_logo"><img src="{{ club.logo.url }}" alt="{{ club.unix_name }}"></div>
+			<div class="club_logo"><img src="{{ club.logo.url }}" alt="{{ club.unix_name }}"></div>
-    {% endif %}
+		{% endif %}
-    {% if page_revision %}
+		{% if page_revision %}
-      {{ page_revision|markdown }}
+			{{ page_revision|markdown }}
-    {% else %}
+ 		{% else %}
-      <h3>{% trans %}Club{% endtrans %}</h3>
+ 		<h3>{% trans %}Club{% endtrans %}</h3>
-    {% endif %}
+	    {% endif %}
-  </div>
+    </div>
 {% endblock %}
 
 

club/templates/club/club_list.jinja

@@ -1,48 +1,48 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-  {% trans %}Club list{% endtrans %}
+{% trans %}Club list{% endtrans %}
 {% endblock %}
 
 {% macro display_club(club) -%}
 
-  {% if club.is_active or user.is_root %}
+        {% if club.is_active or user.is_root %}
+        
+        <li><a href="{{ url('club:club_view', club_id=club.id) }}">{{ club.name }}</a>
+        
+        {% if not club.is_active %}
+            ({% trans %}inactive{% endtrans %})
+        {% endif %}
 
-    <li><a href="{{ url('club:club_view', club_id=club.id) }}">{{ club.name }}</a>
+        {% if club.president %} - <a href="{{ url('core:user_profile', user_id=club.president.user.id) }}">{{ club.president.user }}</a>{% endif %}
+        {% if club.short_description %}<p>{{ club.short_description|markdown }}</p>{% endif %}
+            
+        {% endif %}
 
-      {% if not club.is_active %}
+        {%- if club.children.all()|length != 0 %}
-        ({% trans %}inactive{% endtrans %})
+        <ul>
-      {% endif %}
+            {%- for c in club.children.order_by('name') %}
-
+                {{ display_club(c) }}
-      {% if club.president %} - <a href="{{ url('core:user_profile', user_id=club.president.user.id) }}">{{ club.president.user }}</a>{% endif %}
+            {%- endfor %}
-      {% if club.short_description %}<p>{{ club.short_description|markdown }}</p>{% endif %}
+        </ul>
-
+        {%- endif -%}
-  {% endif %}
+    </li>
-
-  {%- if club.children.all()|length != 0 %}
-    <ul>
-      {%- for c in club.children.order_by('name') %}
-        {{ display_club(c) }}
-      {%- endfor %}
-    </ul>
-  {%- endif -%}
-  </li>
 {%- endmacro %}
 
 {% block content %}
-  {% if user.is_root %}
+    {% if user.is_root %}
     <p><a href="{{ url('club:club_new') }}">{% trans %}New club{% endtrans %}</a></p>
-  {% endif %}
+    {% endif %}
-  {% if club_list %}
+    {% if club_list %}
     <h3>{% trans %}Club list{% endtrans %}</h3>
     <ul>
-      {%- for c in club_list.all().order_by('name') if c.parent is none %}
+        {%- for c in club_list.all().order_by('name') if c.parent is none %}
         {{ display_club(c) }}
-      {%- endfor %}
+        {%- endfor %}
     </ul>
-  {% else %}
+    {% else %}
     {% trans %}There is no club in this website.{% endtrans %}
-  {% endif %}
+    {% endif %}
 {% endblock %}
 
 

club/templates/club/club_members.jinja

@@ -2,81 +2,81 @@
 {% from 'core/macros.jinja' import user_profile_link, select_all_checkbox %}
 
 {% block content %}
-  <h2>{% trans %}Club members{% endtrans %}</h2>
+    <h2>{% trans %}Club members{% endtrans %}</h2>
-  {% if members %}
+    {% if members %}
     <form action="{{ url('club:club_members', club_id=club.id) }}" id="users_old" method="post">
-      {% csrf_token %}
+        {% csrf_token %}
-      {% set users_old = dict(form.users_old | groupby("choice_label")) %}
+        {% set users_old = dict(form.users_old | groupby("choice_label")) %}
-      {% if users_old %}
+        {% if users_old %}
-        {{ select_all_checkbox("users_old") }}
+            {{ select_all_checkbox("users_old") }}
-        <p></p>
+            <p></p>
-      {% endif %}
+        {% endif %}
-      <table>
+        <table>
-        <thead>
+            <thead>
-          <tr>
+                <tr>
-            <td>{% trans %}User{% endtrans %}</td>
+                    <td>{% trans %}User{% endtrans %}</td>
-            <td>{% trans %}Role{% endtrans %}</td>
+                    <td>{% trans %}Role{% endtrans %}</td>
-            <td>{% trans %}Description{% endtrans %}</td>
+                    <td>{% trans %}Description{% endtrans %}</td>
-            <td>{% trans %}Since{% endtrans %}</td>
+                    <td>{% trans %}Since{% endtrans %}</td>
-            {% if users_old %}
+                    {% if users_old %}
-              <td>{% trans %}Mark as old{% endtrans %}</td>
+                        <td>{% trans %}Mark as old{% endtrans %}</td>
-            {% endif %}
+                    {% endif %}
-          </tr>
+                </tr>
-        </thead>
+            </thead>
-        <tbody>
+            <tbody>
-          {% for m in members %}
+            {% for m in members %}
-            <tr>
+                <tr>
-              <td>{{ user_profile_link(m.user) }}</td>
+                    <td>{{ user_profile_link(m.user) }}</td>
-              <td>{{ settings.SITH_CLUB_ROLES[m.role] }}</td>
+                    <td>{{ settings.SITH_CLUB_ROLES[m.role] }}</td>
-              <td>{{ m.description }}</td>
+                    <td>{{ m.description }}</td>
-              <td>{{ m.start_date }}</td>
+                    <td>{{ m.start_date }}</td>
-              {% if users_old %}
+                    {% if users_old %}
-                <td>
+                        <td>
-                  {% set user_old = users_old[m.user.get_display_name()] %}
+                        {% set user_old = users_old[m.user.get_display_name()] %}
-                  {% if user_old %}
+                        {% if user_old %}
-                    {{ user_old[0].tag() }}
+                            {{ user_old[0].tag() }}
-                  {% endif %}
+                        {% endif %}
-                </td>
+                        </td>
-              {% endif %}
+                    {% endif %}
-            </tr>
+                </tr>
-          {% endfor %}
+            {% endfor %}
-        </tbody>
+            </tbody>
-      </table>
+        </table>
-      {{ form.users_old.errors }}
+        {{ form.users_old.errors }}
-      {% if users_old %}
+        {% if users_old %}
-        <p></p>
+            <p></p>
-        <input type="submit" name="submit" value="{% trans %}Mark as old{% endtrans %}">
+            <input type="submit" name="submit" value="{% trans %}Mark as old{% endtrans %}">
-      {% endif %}
+        {% endif %}
     </form>
-  {% else %}
+    {% else %}
     <p>{% trans %}There are no members in this club.{% endtrans %}</p>
-  {% endif %}
-  <form action="{{ url('club:club_members', club_id=club.id) }}" id="add_users" method="post">
-    {% csrf_token %}
-    {{ form.non_field_errors() }}
-    <p>
-      {{ form.users.errors }}
-      <label for="{{ form.users.id_for_label }}">{{ form.users.label }} :</label>
-      {{ form.users }}
-      <span class="helptext">{{ form.users.help_text }}</span>
-    </p>
-    <p>
-      {{ form.role.errors }}
-      <label for="{{ form.role.id_for_label }}">{{ form.role.label }} :</label>
-      {{ form.role }}
-    </p>
-    {% if form.start_date %}
-      <p>
-        {{ form.start_date.errors }}
-        <label for="{{ form.start_date.id_for_label }}">{{ form.start_date.label }} :</label>
-        {{ form.start_date }}
-      </p>
     {% endif %}
-    <p>
+    <form action="{{ url('club:club_members', club_id=club.id) }}" id="add_users" method="post">
-      {{ form.description.errors }}
+        {% csrf_token %}
-      <label for="{{ form.description.id_for_label }}">{{ form.description.label }} :</label>
+        {{ form.non_field_errors() }}
-      {{ form.description }}
+        <p>
-    </p>
+            {{ form.users.errors }}
-    <p><input type="submit" value="{% trans %}Add{% endtrans %}" /></p>
+            <label for="{{ form.users.id_for_label }}">{{ form.users.label }} :</label>
-  </form>
+            {{ form.users }}
+            <span class="helptext">{{ form.users.help_text }}</span>
+        </p>
+        <p>
+            {{ form.role.errors }}
+            <label for="{{ form.role.id_for_label }}">{{ form.role.label }} :</label>
+            {{ form.role }}
+        </p>
+        {% if form.start_date %}
+        <p>
+            {{ form.start_date.errors }}
+            <label for="{{ form.start_date.id_for_label }}">{{ form.start_date.label }} :</label>
+            {{ form.start_date }}
+        </p>
+        {% endif %}
+        <p>
+            {{ form.description.errors }}
+            <label for="{{ form.description.id_for_label }}">{{ form.description.label }} :</label>
+            {{ form.description }}
+        </p>
+        <p><input type="submit" value="{% trans %}Add{% endtrans %}" /></p>
+    </form>
 {% endblock %}

club/templates/club/club_old_members.jinja

@@ -2,27 +2,27 @@
 {% from 'core/macros.jinja' import user_profile_link %}
 
 {% block content %}
-  <h2>{% trans %}Club old members{% endtrans %}</h2>
+    <h2>{% trans %}Club old members{% endtrans %}</h2>
-  <table>
+    <table>
-    <thead>
+        <thead>
-      <td>{% trans %}User{% endtrans %}</td>
+            <td>{% trans %}User{% endtrans %}</td>
-      <td>{% trans %}Role{% endtrans %}</td>
+            <td>{% trans %}Role{% endtrans %}</td>
-      <td>{% trans %}Description{% endtrans %}</td>
+            <td>{% trans %}Description{% endtrans %}</td>
-      <td>{% trans %}From{% endtrans %}</td>
+            <td>{% trans %}From{% endtrans %}</td>
-      <td>{% trans %}To{% endtrans %}</td>
+            <td>{% trans %}To{% endtrans %}</td>
-    </thead>
+        </thead>
-    <tbody>
+        <tbody>
-      {% for m in club.members.exclude(end_date=None).order_by('-role', 'description', '-end_date').all() %}
+        {% for m in club.members.exclude(end_date=None).order_by('-role', 'description', '-end_date').all() %}
-        <tr>
+            <tr>
-          <td>{{ user_profile_link(m.user) }}</td>
+                <td>{{ user_profile_link(m.user) }}</td>
-          <td>{{ settings.SITH_CLUB_ROLES[m.role] }}</td>
+                <td>{{ settings.SITH_CLUB_ROLES[m.role] }}</td>
-          <td>{{ m.description }}</td>
+                <td>{{ m.description }}</td>
-          <td>{{ m.start_date }}</td>
+                <td>{{ m.start_date }}</td>
-          <td>{{ m.end_date }}</td>
+                <td>{{ m.end_date }}</td>
-        </tr>
+            </tr>
-      {% endfor %}
+        {% endfor %}
-    </tbody>
+        </tbody>
-  </table>
+    </table>
 {% endblock %}
 
 

club/templates/club/club_sellings.jinja

@@ -1,94 +1,66 @@
 {% extends "core/base.jinja" %}
-{% from 'core/macros.jinja' import user_profile_link %}
+{% from 'core/macros.jinja' import user_profile_link, paginate %}
-
-{# This page uses a custom macro instead of the core `paginate_jinja` and `paginate_alpine`
-because it works with a somewhat dynamic form,
-but was written before Alpine was introduced in the project.
-TODO : rewrite the pagination used in this template an Alpine one
-#}
-{% macro paginate(page_obj, paginator, js_action) %}
-  {% set js = js_action|default('') %}
-  {% if page_obj.has_previous() or page_obj.has_next() %}
-    {% if page_obj.has_previous() %}
-      <a {% if js %} type="submit" onclick="{{ js }}" {% endif %} href="?page={{ page_obj.previous_page_number() }}">{% trans %}Previous{% endtrans %}</a>
-    {% else %}
-      <span class="disabled">{% trans %}Previous{% endtrans %}</span>
-    {% endif %}
-    {% for i in paginator.page_range %}
-      {% if page_obj.number == i %}
-        <span class="active">{{ i }} <span class="sr-only">({% trans %}current{% endtrans %})</span></span>
-      {% else %}
-        <a {% if js %} type="submit" onclick="{{ js }}" {% endif %} href="?page={{ i }}">{{ i }}</a>
-      {% endif %}
-    {% endfor %}
-    {% if page_obj.has_next() %}
-      <a {% if js %} type="submit" onclick="{{ js }}" {% endif %} href="?page={{ page_obj.next_page_number() }}">{% trans %}Next{% endtrans %}</a>
-    {% else %}
-      <span class="disabled">{% trans %}Next{% endtrans %}</span>
-    {% endif %}
-  {% endif %}
-{% endmacro %}
 
 {% block content %}
-  <h3>{% trans %}Sales{% endtrans %}</h3>
+<h3>{% trans %}Sellings{% endtrans %}</h3>
-  <form id="form" action="?page=1" method="post">
+<form id="form" action="?page=1" method="post">
     {% csrf_token %}
     {{ form }}
     <p><input type="submit" value="{% trans %}Show{% endtrans %}" /></p>
     <p><input type="submit" value="{% trans %}Download as cvs{% endtrans %}" formaction="{{ url('club:sellings_csv', club_id=object.id) }}"/></p>
-  </form>
+</form>
-  <p>
+<p>
-    {% trans %}Quantity: {% endtrans %}{{ total_quantity }} {% trans %}units{% endtrans %}<br/>
+{% trans %}Quantity: {% endtrans %}{{ total_quantity }} {% trans %}units{% endtrans %}<br/>
-    {% trans %}Total: {% endtrans %}{{ total }} €<br/>
+{% trans %}Total: {% endtrans %}{{ total }} €<br/>
-    {% trans %}Benefit: {% endtrans %}{{ benefit }} €
+{% trans %}Benefit: {% endtrans %}{{ benefit }} €
-  </p>
+</p>
-  <table>
+<table>
     <thead>
-      <tr>
+        <tr>
-        <td>{% trans %}Date{% endtrans %}</td>
+            <td>{% trans %}Date{% endtrans %}</td>
-        <td>{% trans %}Counter{% endtrans %}</td>
+            <td>{% trans %}Counter{% endtrans %}</td>
-        <td>{% trans %}Barman{% endtrans %}</td>
+            <td>{% trans %}Barman{% endtrans %}</td>
-        <td>{% trans %}Customer{% endtrans %}</td>
+            <td>{% trans %}Customer{% endtrans %}</td>
-        <td>{% trans %}Label{% endtrans %}</td>
+            <td>{% trans %}Label{% endtrans %}</td>
-        <td>{% trans %}Quantity{% endtrans %}</td>
+            <td>{% trans %}Quantity{% endtrans %}</td>
-        <td>{% trans %}Total{% endtrans %}</td>
+            <td>{% trans %}Total{% endtrans %}</td>
-        <td>{% trans %}Payment method{% endtrans %}</td>
+            <td>{% trans %}Payment method{% endtrans %}</td>
-      </tr>
+        </tr>
     </thead>
     <tbody>
-      {% for s in paginated_result %}
+    {% for s in paginated_result %}
         <tr>
-          <td>{{ s.date|localtime|date(DATETIME_FORMAT) }} {{ s.date|localtime|time(DATETIME_FORMAT) }}</td>
+            <td>{{ s.date|localtime|date(DATETIME_FORMAT) }} {{ s.date|localtime|time(DATETIME_FORMAT) }}</td>
-          <td>{{ s.counter }}</td>
+            <td>{{ s.counter }}</td>
-          {% if s.seller %}
+            {% if s.seller %}
             <td><a href="{{ s.seller.get_absolute_url() }}">{{ s.seller.get_display_name() }}</a></td>
-          {% else %}
+            {% else %}
             <td></td>
-          {% endif %}
+            {% endif %}
-          {% if s.customer %}
+            {% if s.customer %}
             <td><a href="{{ s.customer.user.get_absolute_url() }}">{{ s.customer.user.get_display_name() }}</a></td>
-          {% else %}
+            {% else %}
             <td></td>
-          {% endif %}
+            {% endif %}
-          <td>{{ s.label }}</td>
+            <td>{{ s.label }}</td>
-          <td>{{ s.quantity }}</td>
+            <td>{{ s.quantity }}</td>
-          <td>{{ s.quantity * s.unit_price }} €</td>
+            <td>{{ s.quantity * s.unit_price }} €</td>
-          <td>{{ s.get_payment_method_display() }}</td>
+            <td>{{ s.get_payment_method_display() }}</td>
-          {% if s.is_owned_by(user) %}
+            {% if s.is_owned_by(user) %}
-            <td><a href="{{ url('counter:selling_delete', selling_id=s.id) }}">{% trans %}Delete{% endtrans %}</a></td>
+                <td><a href="{{ url('counter:selling_delete', selling_id=s.id) }}">{% trans %}Delete{% endtrans %}</a></td>
-          {% endif %}
+            {% endif %}
         </tr>
-      {% endfor %}
+    {% endfor %}
     </tbody>
-  </table>
+</table>
-  <script type="text/javascript">
+<script type="text/javascript">
     function formPagination(link){
-      $("form").attr("action", link.href);
+        $("form").attr("action", link.href);
-      link.href = "javascript:void(0)"; // block link action
+        link.href = "javascript:void(0)"; // block link action
-      $("form").submit();
+        $("form").submit();
     }
-  </script>
+</script>
-  {{ paginate(paginated_result, paginator, "formPagination(this)") }}
+{{ paginate(paginated_result, paginator, "formPagination(this)") }}
 {% endblock %}
 
 

club/templates/club/club_tools.jinja

@@ -1,46 +1,46 @@
 {% extends "core/base.jinja" %}
 
 {% block content %}
-  <h3>{% trans %}Club tools{% endtrans %}</h3>
+<h3>{% trans %}Club tools{% endtrans %}</h3>
-  <div>
+<div>
     <h4>{% trans %}Communication:{% endtrans %}</h4>
     <ul>
-      <li> <a href="{{ url('com:news_new') }}?club={{ object.id }}">{% trans %}Create a news{% endtrans %}</a></li>
+        <li> <a href="{{ url('com:news_new') }}?club={{ object.id }}">{% trans %}Create a news{% endtrans %}</a></li>
-      <li> <a href="{{ url('com:weekmail_article') }}?club={{ object.id }}">{% trans %}Post in the Weekmail{% endtrans %}</a></li>
+        <li> <a href="{{ url('com:weekmail_article') }}?club={{ object.id }}">{% trans %}Post in the Weekmail{% endtrans %}</a></li>
-      {% if object.trombi %}
+        {% if object.trombi %}
         <li> <a href="{{ url('trombi:detail', trombi_id=object.trombi.id) }}">{% trans %}Edit Trombi{% endtrans %}</a></li>
-      {% else %}
+        {% else %}
         <li> <a href="{{ url('trombi:create', club_id=object.id) }}">{% trans %}New Trombi{% endtrans %}</a></li>
         <li> <a href="{{ url('club:poster_list', club_id=object.id) }}">{% trans %}Posters{% endtrans %}</a></li>
-      {% endif %}
+        {% endif %}
     </ul>
     <h4>{% trans %}Counters:{% endtrans %}</h4>
     <ul>
-      {% if object.unix_name == settings.SITH_LAUNDERETTE_MANAGER['unix_name'] %}
+    {% if object.unix_name == settings.SITH_LAUNDERETTE_MANAGER['unix_name'] %}
-        {% for l in Launderette.objects.all() %}
+    {% for l in Launderette.objects.all() %}
-          <li><a href="{{ url('launderette:main_click', launderette_id=l.id) }}">{{ l }}</a></li>
+        <li><a href="{{ url('launderette:main_click', launderette_id=l.id) }}">{{ l }}</a></li>
-        {% endfor %}
+    {% endfor %}
-      {% elif object.counters.filter(type="OFFICE")|count > 0 %}
+    {% elif object.counters.filter(type="OFFICE")|count > 0 %}
         {% for c in object.counters.filter(type="OFFICE") %}
-          <li>{{ c }}:
+        <li>{{ c }}:
             <a href="{{ url('counter:details', counter_id=c.id) }}">View</a>
             <a href="{{ url('counter:admin', counter_id=c.id) }}">Edit</a>
-          </li>
+        </li>
         {% endfor %}
-      {% endif %}
+    {% endif %}
     </ul>
     {% if object.club_account.exists() %}
-      <h4>{% trans %}Accounting: {% endtrans %}</h4>
+        <h4>{% trans %}Accouting: {% endtrans %}</h4>
-      <ul>
+        <ul>
         {% for ca in object.club_account.all() %}
-          <li><a href="{{ url('accounting:club_details', c_account_id=ca.id) }}">{{ ca.get_display_name() }}</a></li>
+            <li><a href="{{ url('accounting:club_details', c_account_id=ca.id) }}">{{ ca.get_display_name() }}</a></li>
         {% endfor %}
-      </ul>
+        </ul>
     {% endif %}
     {% if object.unix_name == settings.SITH_LAUNDERETTE_MANAGER['unix_name'] %}
-      <li><a href="{{ url('launderette:launderette_list') }}">{% trans %}Manage launderettes{% endtrans %}</a></li>
+    <li><a href="{{ url('launderette:launderette_list') }}">{% trans %}Manage launderettes{% endtrans %}</a></li>
     {% endif %}
-  </div>
+</div>
 {% endblock %}
 
 

club/templates/club/mailing.jinja

@@ -2,107 +2,107 @@
 {% from 'core/macros.jinja' import select_all_checkbox %}
 
 {% block title %}
-  {% trans %}Mailing lists{% endtrans %}
+{% trans %}Mailing lists{% endtrans %}
 {% endblock %}
 
 {% block content %}
 
-  <b>{% trans %}Remember : mailing lists need to be moderated, if your new created list is not shown wait until moderation takes action{% endtrans %}</b>
+    <b>{% trans %}Remember : mailing lists need to be moderated, if your new created list is not shown wait until moderation takes action{% endtrans %}</b>
 
-  {% if mailings_not_moderated %}
+    {% if mailings_not_moderated %}
-    <p>{% trans %}Mailing lists waiting for moderation{% endtrans %}</p>
+        <p>{% trans %}Mailing lists waiting for moderation{% endtrans %}</p>
-    <ul>
+        <ul>
-      {% for mailing in mailings_not_moderated %}
+            {% for mailing in mailings_not_moderated %}
-        <li>{{ mailing.email_full }}<a href="{{ url('club:mailing_delete', mailing_id=mailing.id) }}"> - {% trans %}Delete{% endtrans %}</a></li>
+                <li>{{ mailing.email_full }}<a href="{{ url('club:mailing_delete', mailing_id=mailing.id) }}"> - {% trans %}Delete{% endtrans %}</a></li>
-      {% endfor %}
+            {% endfor %}
-    </ul>
+        </ul>
-  {% endif %}
+    {% endif %}
 
-  {% if mailings_moderated %}
+    {% if mailings_moderated %}
     {% for mailing in mailings_moderated %}
-      <h2>{% trans %}Mailing{% endtrans %} {{ mailing.email_full }}
+    <h2>{% trans %}Mailing{% endtrans %} {{ mailing.email_full }}
         {%- if user.is_owner(mailing) -%}
-          <a href="{{ url('club:mailing_delete', mailing_id=mailing.id) }}"> - {% trans %}Delete{% endtrans %}</a>
+        <a href="{{ url('club:mailing_delete', mailing_id=mailing.id) }}"> - {% trans %}Delete{% endtrans %}</a>
         {%- endif -%}
-      </h2>
+    </h2>
-      <form method="GET" action="{{ url('club:mailing_generate', mailing_id=mailing.id) }}" style="display:inline-block;">
+    <form method="GET" action="{{ url('club:mailing_generate', mailing_id=mailing.id) }}" style="display:inline-block;">
         <input type="submit" name="generateMalingList" value="{% trans %}Generate mailing list{% endtrans %}">
-      </form>
+    </form>
-      {% set form_mailing_removal = form["removal_" + mailing.id|string] %}
+    {% set form_mailing_removal = form["removal_" + mailing.id|string] %}
-      {% if form_mailing_removal.field.choices %}
+    {% if form_mailing_removal.field.choices %}
-        {% set ms = dict(mailing.subscriptions.all() | groupby('id')) %}
+    {% set ms = dict(mailing.subscriptions.all() | groupby('id')) %}
-        <form action="{{ url('club:mailing', club_id=club.id) }}" id="{{ form_mailing_removal.auto_id }}" method="post" enctype="multipart/form-data">
+    <form action="{{ url('club:mailing', club_id=club.id) }}" id="{{ form_mailing_removal.auto_id }}" method="post" enctype="multipart/form-data">
-          <p style="margin-bottom: 1em;">{{ select_all_checkbox(form_mailing_removal.auto_id) }}</p>
+        <p style="margin-bottom: 1em;">{{ select_all_checkbox(form_mailing_removal.auto_id) }}</p>
-          {% csrf_token %}
+        {% csrf_token %}
-          <input hidden type="number" name="{{ form.action.name }}" value="{{ form_actions.REMOVE_SUBSCRIPTION }}" />
+        <input hidden type="number" name="{{ form.action.name }}" value="{{ form_actions.REMOVE_SUBSCRIPTION }}" />
-          <table>
+        <table>
             <thead>
-              <tr>
+                <tr>
-                <td>{% trans %}User{% endtrans %}</td>
+                    <td>{% trans %}User{% endtrans %}</td>
-                <td>{% trans %}Email{% endtrans %}</td>
+                    <td>{% trans %}Email{% endtrans %}</td>
-                <td>{% trans %}Delete{% endtrans %}</td>
+                    <td>{% trans %}Delete{% endtrans %}</td>
-              </tr>
+                </tr>
             </thead>
             <tbody>
-              {% for widget in form_mailing_removal.subwidgets %}
+                {% for widget in form_mailing_removal.subwidgets %}
                 {% set user = ms[widget.data.value.value][0] %}
                 <tr>
-                  <td>{{ user.get_username }}</td>
+                    <td>{{ user.get_username }}</td>
-                  <td>{{ user.get_email }}</td>
+                    <td>{{ user.get_email }}</td>
-                  <td>{{ widget.tag() }}</td>
+                    <td>{{ widget.tag() }}</td>
                 </tr>
-              {% endfor %}
+                {% endfor %}
             </tbody>
-          </table>
+        </table>
-          {{ form_mailing_removal.errors }}
+        {{ form_mailing_removal.errors }}
-          <p><input type="submit" value="{% trans %}Remove from mailing list{% endtrans %}" /></p>
+        <p><input type="submit" value="{% trans %}Remove from mailing list{% endtrans %}" /></p>
-        </form>
+    </form>
 
-      {% else %}
+    {% else %}
         <p><b>{% trans %}There is no subscriber for this mailing list{% endtrans %}</b></p>
-      {% endif %}
+    {% endif %}
     {% endfor %}
 
-  {% else %}
+    {% else %}
     <p>{% trans %}No mailing list existing for this club{% endtrans %}</p>
-  {% endif %}
+    {% endif %}
 
-  <p>{{ form.non_field_errors() }}</p>
+    <p>{{ form.non_field_errors() }}</p>
-  {% if mailings_moderated %}
+    {% if mailings_moderated %}
-    <h2>{% trans %}New member{% endtrans %}</h2>
+        <h2>{% trans %}New member{% endtrans %}</h2>
+        <form action="{{ url('club:mailing', club_id=club.id) }}" method="post" enctype="multipart/form-data">
+            {% csrf_token %}
+            <p>
+                {{ form.subscription_mailing.errors }}
+                <label for="{{ form.subscription_mailing.id_for_label }}">{{ form.subscription_mailing.label }}</label>
+                {{ form.subscription_mailing }}
+            </p>
+            <p>
+                {{ form.subscription_users.errors }}
+                <label for="{{ form.subscription_users.id_for_label }}">{{ form.subscription_users.label }}</label>
+                {{ form.subscription_users }}
+                <span class="helptext">{{ form.subscription_users.help_text }}</span>
+            </p>
+            <p>
+                {{ form.subscription_email.errors }}
+                <label for="{{ form.subscription_email.id_for_label }}">{{ form.subscription_email.label }}</label>
+                {{ form.subscription_email }}
+            </p>
+            <input hidden type="number" name="{{ form.action.name }}" value="{{ form_actions.NEW_SUBSCRIPTION }}" />
+            <p><input type="submit" value="{% trans %}Add to mailing list{% endtrans %}" /></p>
+        </form>
+    {% endif %}
+
+    <h2>{% trans %}New mailing{% endtrans %}</h2>
     <form action="{{ url('club:mailing', club_id=club.id) }}" method="post" enctype="multipart/form-data">
-      {% csrf_token %}
+        {% csrf_token %}
-      <p>
+        <p>
-        {{ form.subscription_mailing.errors }}
+            {{ form.mailing_email.errors }}
-        <label for="{{ form.subscription_mailing.id_for_label }}">{{ form.subscription_mailing.label }}</label>
+            <label for="{{ form.mailing_email.id_for_label }}">{{ form.mailing_email.label }}</label>
-        {{ form.subscription_mailing }}
+            {{ form.mailing_email }}
-      </p>
+        </p>
-      <p>
+        <input hidden type="number" name="{{ form.action.name }}" value="{{ form_actions.NEW_MALING }}" />
-        {{ form.subscription_users.errors }}
+        <p><input type="submit" value="{% trans %}Create mailing list{% endtrans %}" /></p>
-        <label for="{{ form.subscription_users.id_for_label }}">{{ form.subscription_users.label }}</label>
-        {{ form.subscription_users }}
-        <span class="helptext">{{ form.subscription_users.help_text }}</span>
-      </p>
-      <p>
-        {{ form.subscription_email.errors }}
-        <label for="{{ form.subscription_email.id_for_label }}">{{ form.subscription_email.label }}</label>
-        {{ form.subscription_email }}
-      </p>
-      <input hidden type="number" name="{{ form.action.name }}" value="{{ form_actions.NEW_SUBSCRIPTION }}" />
-      <p><input type="submit" value="{% trans %}Add to mailing list{% endtrans %}" /></p>
     </form>
-  {% endif %}
-
-  <h2>{% trans %}New mailing{% endtrans %}</h2>
-  <form action="{{ url('club:mailing', club_id=club.id) }}" method="post" enctype="multipart/form-data">
-    {% csrf_token %}
-    <p>
-      {{ form.mailing_email.errors }}
-      <label for="{{ form.mailing_email.id_for_label }}">{{ form.mailing_email.label }}</label>
-      {{ form.mailing_email }}
-    </p>
-    <input hidden type="number" name="{{ form.action.name }}" value="{{ form_actions.NEW_MALING }}" />
-    <p><input type="submit" value="{% trans %}Create mailing list{% endtrans %}" /></p>
-  </form>
 
 {% endblock %}

club/templates/club/page_history.jinja

@@ -2,11 +2,11 @@
 {% from 'core/macros_pages.jinja' import page_history %}
 
 {% block content %}
-  {% if club.page %}
+	{% if club.page %}
-    {{ page_history(club.page) }}
+	{{ page_history(club.page) }}
-  {% else %}
+	{% else %}
-    {% trans %}No page existing for this club{% endtrans %}
+	    {% trans %}No page existing for this club{% endtrans %}
-  {% endif %}
+	{% endif %}
 {% endblock %}
 
 

club/templates/club/pagerev_edit.jinja

@@ -2,7 +2,7 @@
 {% from 'core/macros_pages.jinja' import page_edit_form %}
 
 {% block content %}
-  {{ page_edit_form(page, form, url('club:club_edit_page', club_id=page.club.id), csrf_token) }}
+{{ page_edit_form(page, form, url('club:club_edit_page', club_id=page.club.id), csrf_token) }}
 {% endblock %}
 
 

club/templates/club/stats.jinja

@@ -1,48 +1,48 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-  {% trans %}Club stats{% endtrans %}
+{% trans %}Club stats{% endtrans %}
 {% endblock %}
 
 {% block content %}
-  {% if club_list %}
+    {% if club_list %}
     <h3>{% trans %}Club stats{% endtrans %}</h3>
     <form action="" method="GET">
-      {% csrf_token %}
+        {% csrf_token %}
-      <p>
+        <p>
         <select name="branch">
-          {% for b in settings.SITH_PROFILE_DEPARTMENTS %}
+            {% for b in settings.SITH_PROFILE_DEPARTMENTS %}
-            <option value="{{ b[0] }}">{{ b[0] }}</option>
+                <option value="{{ b[0] }}">{{ b[0] }}</option>
-          {% endfor %}
+            {% endfor %}
         </select>
-      </p>
+        </p>
-      <p><input type="submit" value="{% trans %}Show{% endtrans %}" /></p>
+        <p><input type="submit" value="{% trans %}Show{% endtrans %}" /></p>
     </form>
     <table>
-      <thead>
+        <thead>
-        <tr>
+            <tr>
-          <td>Club</td>
+                <td>Club</td>
-          <td>Member number</td>
+                <td>Member number</td>
-          <td>Old member number</td>
+                <td>Old member number</td>
-        </tr>
+            </tr>
-      </thead>
+        </thead>
-      <tbody>
+        <tbody>
         {% for c in club_list.order_by('id') %}
-          {% set members = c.members.all() %}
+            {% set members = c.members.all() %}
-          {% if request.GET['branch'] %}
+            {% if request.GET['branch'] %}
             {% set members = members.filter(user__department=request.GET['branch']) %}
-          {% endif %}
+            {% endif %}
-          <tr>
+            <tr>
-            <td>{{ c.get_display_name() }}</td>
+                <td>{{ c.get_display_name() }}</td>
-            <td>{{ members.filter(end_date=None, role__gt=settings.SITH_MAXIMUM_FREE_ROLE).count() }}</td>
+                <td>{{ members.filter(end_date=None, role__gt=settings.SITH_MAXIMUM_FREE_ROLE).count() }}</td>
-            <td>{{ members.exclude(end_date=None, role__gt=settings.SITH_MAXIMUM_FREE_ROLE).count() }}</td>
+                <td>{{ members.exclude(end_date=None, role__gt=settings.SITH_MAXIMUM_FREE_ROLE).count() }}</td>
-          </tr>
+            </tr>
         {% endfor %}
-      </tbody>
+        </tbody>
     </table>
-  {% else %}
+    {% else %}
     {% trans %}There is no club in this website.{% endtrans %}
-  {% endif %}
+    {% endif %}
 {% endblock %}
 
 

club/urls.py

@@ -1,3 +1,4 @@
+# -*- coding:utf-8 -*
 #
 # Copyright 2016,2017
 # - Skia <skia@libskia.so>
@@ -24,32 +25,7 @@
 
 from django.urls import path
 
-from club.views import (
+from club.views import *
-    ClubCreateView,
-    ClubEditPropView,
-    ClubEditView,
-    ClubListView,
-    ClubMailingView,
-    ClubMembersView,
-    ClubOldMembersView,
-    ClubPageEditView,
-    ClubPageHistView,
-    ClubRevView,
-    ClubSellingCSVView,
-    ClubSellingView,
-    ClubStatView,
-    ClubToolsView,
-    ClubView,
-    MailingAutoGenerationView,
-    MailingDeleteView,
-    MailingSubscriptionDeleteView,
-    MembershipDeleteView,
-    MembershipSetOldView,
-    PosterCreateView,
-    PosterDeleteView,
-    PosterEditView,
-    PosterListView,
-)
 
 urlpatterns = [
     path("", ClubListView.as_view(), name="club_list"),
@@ -57,20 +33,32 @@ urlpatterns = [
     path("stats/", ClubStatView.as_view(), name="club_stats"),
     path("<int:club_id>/", ClubView.as_view(), name="club_view"),
     path(
-        "<int:club_id>/rev/<int:rev_id>/", ClubRevView.as_view(), name="club_view_rev"
+        "<int:club_id>/rev/<int:rev_id>/",
+        ClubRevView.as_view(),
+        name="club_view_rev",
     ),
     path("<int:club_id>/hist/", ClubPageHistView.as_view(), name="club_hist"),
     path("<int:club_id>/edit/", ClubEditView.as_view(), name="club_edit"),
-    path("<int:club_id>/edit/page/", ClubPageEditView.as_view(), name="club_edit_page"),
+    path(
+        "<int:club_id>/edit/page/",
+        ClubPageEditView.as_view(),
+        name="club_edit_page",
+    ),
     path("<int:club_id>/members/", ClubMembersView.as_view(), name="club_members"),
     path(
         "<int:club_id>/elderlies/",
         ClubOldMembersView.as_view(),
         name="club_old_members",
     ),
-    path("<int:club_id>/sellings/", ClubSellingView.as_view(), name="club_sellings"),
     path(
-        "<int:club_id>/sellings/csv/", ClubSellingCSVView.as_view(), name="sellings_csv"
+        "<int:club_id>/sellings/",
+        ClubSellingView.as_view(),
+        name="club_sellings",
+    ),
+    path(
+        "<int:club_id>/sellings/csv/",
+        ClubSellingCSVView.as_view(),
+        name="sellings_csv",
     ),
     path("<int:club_id>/prop/", ClubEditPropView.as_view(), name="club_prop"),
     path("<int:club_id>/tools/", ClubToolsView.as_view(), name="tools"),
@@ -102,7 +90,9 @@ urlpatterns = [
     ),
     path("<int:club_id>/poster/", PosterListView.as_view(), name="poster_list"),
     path(
-        "<int:club_id>/poster/create/", PosterCreateView.as_view(), name="poster_create"
+        "<int:club_id>/poster/create/",
+        PosterCreateView.as_view(),
+        name="poster_create",
     ),
     path(
         "<int:club_id>/poster/<int:poster_id>/edit/",

club/views.py

@@ -1,3 +1,4 @@
+# -*- coding:utf-8 -*
 #
 # Copyright 2016,2017
 # - Skia <skia@libskia.so>
@@ -25,43 +26,51 @@
 import csv
 
 from django.conf import settings
-from django.core.exceptions import NON_FIELD_ERRORS, PermissionDenied, ValidationError
+from django import forms
-from django.core.paginator import InvalidPage, Paginator
+from django.views.generic import ListView, DetailView, TemplateView, View
-from django.db.models import Sum
+from django.views.generic.edit import DeleteView
+from django.views.generic.detail import SingleObjectMixin
+from django.views.generic.edit import UpdateView, CreateView
 from django.http import (
-    Http404,
     HttpResponseRedirect,
+    HttpResponse,
+    Http404,
     StreamingHttpResponse,
 )
-from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse, reverse_lazy
 from django.utils import timezone
-from django.utils.translation import gettext as _t
 from django.utils.translation import gettext_lazy as _
-from django.views.generic import DetailView, ListView, TemplateView, View
+from django.utils.translation import gettext as _t
-from django.views.generic.edit import CreateView, DeleteView, UpdateView
+from django.core.exceptions import PermissionDenied, ValidationError, NON_FIELD_ERRORS
+from django.core.paginator import Paginator, InvalidPage
+from django.shortcuts import get_object_or_404, redirect
+from django.db.models import Sum
+
 
-from club.forms import ClubEditForm, ClubMemberForm, MailingForm, SellingsForm
-from club.models import Club, Mailing, MailingSubscription, Membership
-from com.views import (
-    PosterCreateBaseView,
-    PosterDeleteBaseView,
-    PosterEditBaseView,
-    PosterListBaseView,
-)
-from core.models import PageRev
 from core.views import (
     CanCreateMixin,
+    CanViewMixin,
     CanEditMixin,
     CanEditPropMixin,
-    CanViewMixin,
-    DetailFormView,
-    PageEditViewBase,
-    TabedViewMixin,
     UserIsRootMixin,
+    TabedViewMixin,
+    PageEditViewBase,
+    DetailFormView,
 )
+from core.models import PageRev
+
 from counter.models import Selling
 
+from com.views import (
+    PosterListBaseView,
+    PosterCreateBaseView,
+    PosterEditBaseView,
+    PosterDeleteBaseView,
+)
+
+from club.models import Club, Membership, Mailing, MailingSubscription
+from club.forms import MailingForm, ClubEditForm, ClubMemberForm, SellingsForm
+
 
 class ClubTabsMixin(TabedViewMixin):
     def get_tabs_title(self):
@@ -71,13 +80,14 @@ class ClubTabsMixin(TabedViewMixin):
         return self.object.get_display_name()
 
     def get_list_of_tabs(self):
-        tab_list = [
+        tab_list = []
+        tab_list.append(
             {
                 "url": reverse("club:club_view", kwargs={"club_id": self.object.id}),
                 "slug": "infos",
                 "name": _("Infos"),
             }
-        ]
+        )
         if self.request.user.can_view(self.object):
             tab_list.append(
                 {
@@ -174,14 +184,18 @@ class ClubTabsMixin(TabedViewMixin):
 
 
 class ClubListView(ListView):
-    """List the Clubs."""
+    """
+    List the Clubs
+    """
 
     model = Club
     template_name = "club/club_list.jinja"
 
 
 class ClubView(ClubTabsMixin, DetailView):
-    """Front page of a Club."""
+    """
+    Front page of a Club
+    """
 
     model = Club
     pk_url_kwarg = "club_id"
@@ -189,22 +203,24 @@ class ClubView(ClubTabsMixin, DetailView):
     current_tab = "infos"
 
     def get_context_data(self, **kwargs):
-        kwargs = super().get_context_data(**kwargs)
+        kwargs = super(ClubView, self).get_context_data(**kwargs)
         if self.object.page and self.object.page.revisions.exists():
             kwargs["page_revision"] = self.object.page.revisions.last().content
         return kwargs
 
 
 class ClubRevView(ClubView):
-    """Display a specific page revision."""
+    """
+    Display a specific page revision
+    """
 
     def dispatch(self, request, *args, **kwargs):
         obj = self.get_object()
         self.revision = get_object_or_404(PageRev, pk=kwargs["rev_id"], page__club=obj)
-        return super().dispatch(request, *args, **kwargs)
+        return super(ClubRevView, self).dispatch(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
-        kwargs = super().get_context_data(**kwargs)
+        kwargs = super(ClubRevView, self).get_context_data(**kwargs)
         kwargs["page_revision"] = self.revision.content
         return kwargs
 
@@ -217,7 +233,7 @@ class ClubPageEditView(ClubTabsMixin, PageEditViewBase):
         self.club = get_object_or_404(Club, pk=kwargs["club_id"])
         if not self.club.page:
             raise Http404
-        return super().dispatch(request, *args, **kwargs)
+        return super(ClubPageEditView, self).dispatch(request, *args, **kwargs)
 
     def get_object(self):
         self.page = self.club.page
@@ -228,7 +244,9 @@ class ClubPageEditView(ClubTabsMixin, PageEditViewBase):
 
 
 class ClubPageHistView(ClubTabsMixin, CanViewMixin, DetailView):
-    """Modification hostory of the page."""
+    """
+    Modification hostory of the page
+    """
 
     model = Club
     pk_url_kwarg = "club_id"
@@ -237,7 +255,9 @@ class ClubPageHistView(ClubTabsMixin, CanViewMixin, DetailView):
 
 
 class ClubToolsView(ClubTabsMixin, CanEditMixin, DetailView):
-    """Tools page of a Club."""
+    """
+    Tools page of a Club
+    """
 
     model = Club
     pk_url_kwarg = "club_id"
@@ -246,7 +266,9 @@ class ClubToolsView(ClubTabsMixin, CanEditMixin, DetailView):
 
 
 class ClubMembersView(ClubTabsMixin, CanViewMixin, DetailFormView):
-    """View of a club's members."""
+    """
+    View of a club's members
+    """
 
     model = Club
     pk_url_kwarg = "club_id"
@@ -255,20 +277,22 @@ class ClubMembersView(ClubTabsMixin, CanViewMixin, DetailFormView):
     current_tab = "members"
 
     def get_form_kwargs(self):
-        kwargs = super().get_form_kwargs()
+        kwargs = super(ClubMembersView, self).get_form_kwargs()
         kwargs["request_user"] = self.request.user
         kwargs["club"] = self.get_object()
         kwargs["club_members"] = self.members
         return kwargs
 
     def get_context_data(self, *args, **kwargs):
-        kwargs = super().get_context_data(*args, **kwargs)
+        kwargs = super(ClubMembersView, self).get_context_data(*args, **kwargs)
         kwargs["members"] = self.members
         return kwargs
 
     def form_valid(self, form):
-        """Check user rights."""
+        """
-        resp = super().form_valid(form)
+        Check user rights
+        """
+        resp = super(ClubMembersView, self).form_valid(form)
 
         data = form.clean()
         users = data.pop("users", [])
@@ -283,7 +307,7 @@ class ClubMembersView(ClubTabsMixin, CanViewMixin, DetailFormView):
 
     def dispatch(self, request, *args, **kwargs):
         self.members = self.get_object().members.ongoing().order_by("-role")
-        return super().dispatch(request, *args, **kwargs)
+        return super(ClubMembersView, self).dispatch(request, *args, **kwargs)
 
     def get_success_url(self, **kwargs):
         return reverse_lazy(
@@ -292,7 +316,9 @@ class ClubMembersView(ClubTabsMixin, CanViewMixin, DetailFormView):
 
 
 class ClubOldMembersView(ClubTabsMixin, CanViewMixin, DetailView):
-    """Old members of a club."""
+    """
+    Old members of a club
+    """
 
     model = Club
     pk_url_kwarg = "club_id"
@@ -301,7 +327,9 @@ class ClubOldMembersView(ClubTabsMixin, CanViewMixin, DetailView):
 
 
 class ClubSellingView(ClubTabsMixin, CanEditMixin, DetailFormView):
-    """Sellings of a club."""
+    """
+    Sellings of a club
+    """
 
     model = Club
     pk_url_kwarg = "club_id"
@@ -313,12 +341,12 @@ class ClubSellingView(ClubTabsMixin, CanEditMixin, DetailFormView):
     def dispatch(self, request, *args, **kwargs):
         try:
             self.asked_page = int(request.GET.get("page", 1))
-        except ValueError as e:
+        except ValueError:
-            raise Http404 from e
+            raise Http404
-        return super().dispatch(request, *args, **kwargs)
+        return super(ClubSellingView, self).dispatch(request, *args, **kwargs)
 
     def get_form_kwargs(self):
-        kwargs = super().get_form_kwargs()
+        kwargs = super(ClubSellingView, self).get_form_kwargs()
         kwargs["club"] = self.object
         return kwargs
 
@@ -326,7 +354,7 @@ class ClubSellingView(ClubTabsMixin, CanEditMixin, DetailFormView):
         return self.get(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
-        kwargs = super().get_context_data(**kwargs)
+        kwargs = super(ClubSellingView, self).get_context_data(**kwargs)
         qs = Selling.objects.filter(club=self.object)
 
         kwargs["result"] = qs[:0]
@@ -370,17 +398,19 @@ class ClubSellingView(ClubTabsMixin, CanEditMixin, DetailFormView):
         kwargs["paginator"] = Paginator(kwargs["result"], self.paginate_by)
         try:
             kwargs["paginated_result"] = kwargs["paginator"].page(self.asked_page)
-        except InvalidPage as e:
+        except InvalidPage:
-            raise Http404 from e
+            raise Http404
 
         return kwargs
 
 
 class ClubSellingCSVView(ClubSellingView):
-    """Generate sellings in csv for a given period."""
+    """
+    Generate sellings in csv for a given period
+    """
 
     class StreamWriter:
-        """Implements a file-like interface for streaming the CSV."""
+        """Implements a file-like interface for streaming the CSV"""
 
         def write(self, value):
             """Write the value by returning it, instead of storing in a buffer."""
@@ -396,8 +426,7 @@ class ClubSellingCSVView(ClubSellingView):
             row.append(selling.customer.user.get_display_name())
         else:
             row.append("")
-        row = [
+        row = row + [
-            *row,
             selling.label,
             selling.quantity,
             selling.quantity * selling.unit_price,
@@ -408,7 +437,7 @@ class ClubSellingCSVView(ClubSellingView):
             row.append(selling.product.purchase_price)
             row.append(selling.product.selling_price - selling.product.purchase_price)
         else:
-            row = [*row, "", "", ""]
+            row = row + ["", "", ""]
         return row
 
     def get(self, request, *args, **kwargs):
@@ -455,7 +484,9 @@ class ClubSellingCSVView(ClubSellingView):
 
 
 class ClubEditView(ClubTabsMixin, CanEditMixin, UpdateView):
-    """Edit a Club's main informations (for the club's members)."""
+    """
+    Edit a Club's main informations (for the club's members)
+    """
 
     model = Club
     pk_url_kwarg = "club_id"
@@ -465,7 +496,9 @@ class ClubEditView(ClubTabsMixin, CanEditMixin, UpdateView):
 
 
 class ClubEditPropView(ClubTabsMixin, CanEditPropMixin, UpdateView):
-    """Edit the properties of a Club object (for the Sith admins)."""
+    """
+    Edit the properties of a Club object (for the Sith admins)
+    """
 
     model = Club
     pk_url_kwarg = "club_id"
@@ -475,7 +508,9 @@ class ClubEditPropView(ClubTabsMixin, CanEditPropMixin, UpdateView):
 
 
 class ClubCreateView(CanCreateMixin, CreateView):
-    """Create a club (for the Sith admin)."""
+    """
+    Create a club (for the Sith admin)
+    """
 
     model = Club
     pk_url_kwarg = "club_id"
@@ -484,7 +519,9 @@ class ClubCreateView(CanCreateMixin, CreateView):
 
 
 class MembershipSetOldView(CanEditMixin, DetailView):
-    """Set a membership as beeing old."""
+    """
+    Set a membership as beeing old
+    """
 
     model = Membership
     pk_url_kwarg = "membership_id"
@@ -513,7 +550,9 @@ class MembershipSetOldView(CanEditMixin, DetailView):
 
 
 class MembershipDeleteView(UserIsRootMixin, DeleteView):
-    """Delete a membership (for admins only)."""
+    """
+    Delete a membership (for admins only)
+    """
 
     model = Membership
     pk_url_kwarg = "membership_id"
@@ -527,13 +566,15 @@ class ClubStatView(TemplateView):
     template_name = "club/stats.jinja"
 
     def get_context_data(self, **kwargs):
-        kwargs = super().get_context_data(**kwargs)
+        kwargs = super(ClubStatView, self).get_context_data(**kwargs)
         kwargs["club_list"] = Club.objects.all()
         return kwargs
 
 
 class ClubMailingView(ClubTabsMixin, CanEditMixin, DetailFormView):
-    """A list of mailing for a given club."""
+    """
+    A list of mailing for a given club
+    """
 
     model = Club
     form_class = MailingForm
@@ -542,7 +583,7 @@ class ClubMailingView(ClubTabsMixin, CanEditMixin, DetailFormView):
     current_tab = "mailing"
 
     def get_form_kwargs(self):
-        kwargs = super().get_form_kwargs()
+        kwargs = super(ClubMailingView, self).get_form_kwargs()
         kwargs["club_id"] = self.get_object().id
         kwargs["user_id"] = self.request.user.id
         kwargs["mailings"] = self.mailings
@@ -550,10 +591,10 @@ class ClubMailingView(ClubTabsMixin, CanEditMixin, DetailFormView):
 
     def dispatch(self, request, *args, **kwargs):
         self.mailings = Mailing.objects.filter(club_id=self.get_object().id).all()
-        return super().dispatch(request, *args, **kwargs)
+        return super(ClubMailingView, self).dispatch(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
-        kwargs = super().get_context_data(**kwargs)
+        kwargs = super(ClubMailingView, self).get_context_data(**kwargs)
         kwargs["club"] = self.get_object()
         kwargs["user"] = self.request.user
         kwargs["mailings"] = self.mailings
@@ -570,8 +611,10 @@ class ClubMailingView(ClubTabsMixin, CanEditMixin, DetailFormView):
         }
         return kwargs
 
-    def add_new_mailing(self, cleaned_data) -> ValidationError | None:
+    def add_new_mailing(self, cleaned_data) -> ValidationError:
-        """Create a new mailing list from the form."""
+        """
+        Create a new mailing list from the form
+        """
         mailing = Mailing(
             club=self.get_object(),
             email=cleaned_data["mailing_email"],
@@ -585,8 +628,10 @@ class ClubMailingView(ClubTabsMixin, CanEditMixin, DetailFormView):
         mailing.save()
         return None
 
-    def add_new_subscription(self, cleaned_data) -> ValidationError | None:
+    def add_new_subscription(self, cleaned_data) -> ValidationError:
-        """Add mailing subscriptions for each user given and/or for the specified email in form."""
+        """
+        Add mailing subscriptions for each user given and/or for the specified email in form
+        """
         users_to_save = []
 
         for user in cleaned_data["subscription_users"]:
@@ -620,16 +665,20 @@ class ClubMailingView(ClubTabsMixin, CanEditMixin, DetailFormView):
         return None
 
     def remove_subscription(self, cleaned_data):
-        """Remove specified users from a mailing list."""
+        """
+        Remove specified users from a mailing list
+        """
         fields = [
-            val for key, val in cleaned_data.items() if key.startswith("removal_")
+            cleaned_data[key]
+            for key in cleaned_data.keys()
+            if key.startswith("removal_")
         ]
         for field in fields:
             for sub in field:
                 sub.delete()
 
     def form_valid(self, form):
-        resp = super().form_valid(form)
+        resp = super(ClubMailingView, self).form_valid(form)
 
         cleaned_data = form.clean()
         error = None
@@ -661,7 +710,7 @@ class MailingDeleteView(CanEditMixin, DeleteView):
 
     def dispatch(self, request, *args, **kwargs):
         self.club_id = self.get_object().club.id
-        return super().dispatch(request, *args, **kwargs)
+        return super(MailingDeleteView, self).dispatch(request, *args, **kwargs)
 
     def get_success_url(self, **kwargs):
         if self.redirect_page:
@@ -677,7 +726,9 @@ class MailingSubscriptionDeleteView(CanEditMixin, DeleteView):
 
     def dispatch(self, request, *args, **kwargs):
         self.club_id = self.get_object().mailing.club.id
-        return super().dispatch(request, *args, **kwargs)
+        return super(MailingSubscriptionDeleteView, self).dispatch(
+            request, *args, **kwargs
+        )
 
     def get_success_url(self, **kwargs):
         return reverse_lazy("club:mailing", kwargs={"club_id": self.club_id})
@@ -688,7 +739,7 @@ class MailingAutoGenerationView(View):
         self.mailing = get_object_or_404(Mailing, pk=kwargs["mailing_id"])
         if not request.user.can_edit(self.mailing):
             raise PermissionDenied
-        return super().dispatch(request, *args, **kwargs)
+        return super(MailingAutoGenerationView, self).dispatch(request, *args, **kwargs)
 
     def get(self, request, *args, **kwargs):
         club = self.mailing.club
@@ -702,25 +753,25 @@ class MailingAutoGenerationView(View):
 
 
 class PosterListView(ClubTabsMixin, PosterListBaseView, CanViewMixin):
-    """List communication posters."""
+    """List communication posters"""
 
     def get_object(self):
         return self.club
 
     def get_context_data(self, **kwargs):
-        kwargs = super().get_context_data(**kwargs)
+        kwargs = super(PosterListView, self).get_context_data(**kwargs)
         kwargs["app"] = "club"
         kwargs["club"] = self.club
         return kwargs
 
 
 class PosterCreateView(PosterCreateBaseView, CanCreateMixin):
-    """Create communication poster."""
+    """Create communication poster"""
 
     pk_url_kwarg = "club_id"
 
     def get_object(self):
-        obj = super().get_object()
+        obj = super(PosterCreateView, self).get_object()
         if not obj:
             return self.club
         return obj
@@ -730,19 +781,19 @@ class PosterCreateView(PosterCreateBaseView, CanCreateMixin):
 
 
 class PosterEditView(ClubTabsMixin, PosterEditBaseView, CanEditMixin):
-    """Edit communication poster."""
+    """Edit communication poster"""
 
     def get_success_url(self):
         return reverse_lazy("club:poster_list", kwargs={"club_id": self.club.id})
 
     def get_context_data(self, **kwargs):
-        kwargs = super().get_context_data(**kwargs)
+        kwargs = super(PosterEditView, self).get_context_data(**kwargs)
         kwargs["app"] = "club"
         return kwargs
 
 
 class PosterDeleteView(PosterDeleteBaseView, ClubTabsMixin, CanEditMixin):
-    """Delete communication poster."""
+    """Delete communication poster"""
 
     def get_success_url(self):
         return reverse_lazy("club:poster_list", kwargs={"club_id": self.club.id})

club/widgets/select.py

@@ -1,23 +0,0 @@
-from pydantic import TypeAdapter
-
-from club.models import Club
-from club.schemas import ClubSchema
-from core.views.widgets.select import AutoCompleteSelect, AutoCompleteSelectMultiple
-
-_js = ["bundled/club/components/ajax-select-index.ts"]
-
-
-class AutoCompleteSelectClub(AutoCompleteSelect):
-    component_name = "club-ajax-select"
-    model = Club
-    adapter = TypeAdapter(list[ClubSchema])
-
-    js = _js
-
-
-class AutoCompleteSelectMultipleClub(AutoCompleteSelectMultiple):
-    component_name = "club-ajax-select"
-    model = Club
-    adapter = TypeAdapter(list[ClubSchema])
-
-    js = _js