Merge branch 'Fix_time_zone_calendar.ics' into 'main'

Update views.py - Fix calendar.ics See merge request bde/nk20!237
Update views.py
2025-06-24 19:20:29 +02:00 · 2024-03-22 16:19:51 +01:00 · 2024-03-11 10:25:48 +01:00
38 changed files with 940 additions and 1075 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -7,10 +7,25 @@ stages:
 variables:
  GIT_SUBMODULE_STRATEGY: recursive

-# Ubuntu 22.04
-py310-django50:
+# Debian Buster
+py37-django22:
  stage: test
-  image: ubuntu:22.04
+  image: debian:buster-backports
+  before_script:
+    - >
+        apt-get update &&
+        apt-get install --no-install-recommends -t buster-backports -y
+        python3-django python3-django-crispy-forms
+        python3-django-extensions python3-django-filters python3-django-polymorphic
+        python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
+        python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
+        python3-bs4 python3-setuptools tox texlive-xetex
+  script: tox -e py37-django22
+
+# Ubuntu 20.04
+py38-django22:
+  stage: test
+  image: ubuntu:20.04
  before_script:
    # Fix tzdata prompt
    - ln -sf /usr/share/zoneinfo/Europe/Paris /etc/localtime && echo Europe/Paris > /etc/timezone
@ -22,12 +37,12 @@ py310-django50:
        python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
        python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
        python3-bs4 python3-setuptools tox texlive-xetex
-  script: tox -e py310-django50
+  script: tox -e py38-django22

-# Debian Bookworm
-py311-django50:
+# Debian Bullseye
+py39-django22:
  stage: test
-  image: debian:bookworm
+  image: debian:bullseye
  before_script:
    - >
        apt-get update &&
@ -37,11 +52,11 @@ py311-django50:
        python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
        python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
        python3-bs4 python3-setuptools tox texlive-xetex
-  script: tox -e py311-django50
+  script: tox -e py39-django22

 linters:
  stage: quality-assurance
-  image: debian:bullseye
+  image: debian:buster-backports
  before_script:
    - apt-get update && apt-get install -y tox
  script: tox -e linters
--- a/apps/activity/forms.py
+++ b/apps/activity/forms.py
@ -1,8 +1,6 @@
 # Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

-from bootstrap_datepicker_plus.widgets import DateTimePickerInput
-
 from datetime import timedelta
 from random import shuffle

@ -12,7 +10,7 @@ from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from member.models import Club
 from note.models import Note, NoteUser
-from note_kfet.inputs import Autocomplete
+from note_kfet.inputs import Autocomplete, DateTimePickerInput
 from note_kfet.middlewares import get_current_request
 from permission.backends import PermissionBackend

--- a/apps/activity/migrations/0003_auto_20240323_1422.py
+++ b/apps/activity/migrations/0003_auto_20240323_1422.py
@ -1,18 +0,0 @@
-# Generated by Django 2.2.28 on 2024-03-23 13:22
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('activity', '0002_auto_20200904_2341'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='activity',
-            name='description',
-            field=models.TextField(blank=True, default='', verbose_name='description'),
-        ),
-    ]
--- a/apps/activity/models.py
+++ b/apps/activity/models.py
@ -66,8 +66,6 @@ class Activity(models.Model):

    description = models.TextField(
        verbose_name=_('description'),
-        blank=True,
-        default="",
    )

    location = models.CharField(
--- a/apps/activity/templates/activity/activity_form.html
+++ b/apps/activity/templates/activity/activity_form.html
@ -17,27 +17,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
    </form>
  </div>
 </div>
-{% endblock %}
-
-{% block extrajavascript %}
-<script>
-  var date_end = document.getElementById("id_date_end");
-  var date_start = document.getElementById("id_date_start");
-  
-  function update_date_end (){
-    if(date_end.value=="" || date_end.value<date_start.value){
-      date_end.value = date_start.value;
-    };
-  };
-  
-  function update_date_start (){
-    if(date_start.value=="" || date_end.value<date_start.value){
-      date_start.value = date_end.value;
-    };
-  };
-  
-  date_start.addEventListener('focusout', update_date_end);
-  date_end.addEventListener('focusout', update_date_start);
-  
-</script>
-{% endblock %}
+{% endblock %}
--- a/apps/activity/views.py
+++ b/apps/activity/views.py
@ -76,7 +76,6 @@ class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView
        context['upcoming'] = ActivityTable(
            data=upcoming_activities.filter(PermissionBackend.filter_queryset(self.request, Activity, "view")),
            prefix='upcoming-',
-            order_by='date_start',
        )

        started_activities = self.get_queryset().filter(open=True, valid=True).distinct().all()
@ -316,8 +315,8 @@ X-WR-CALNAME:Kfet Calendar
 NAME:Kfet Calendar
 CALSCALE:GREGORIAN
 BEGIN:VTIMEZONE
-TZID:Europe/Berlin
-X-LIC-LOCATION:Europe/Berlin
+TZID:Europe/Paris
+X-LIC-LOCATION:Europe/Paris
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
--- a/apps/api/urls.py
+++ b/apps/api/urls.py
@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.conf import settings
-from django.urls import include, re_path
+from django.conf.urls import url, include
 from rest_framework import routers

 from .views import UserInformationView
@ -47,7 +47,7 @@ app_name = 'api'
 # Wire up our API using automatic URL routing.
 # Additionally, we include login URLs for the browsable API.
 urlpatterns = [
-    re_path('^', include(router.urls)),
-    re_path('^me/', UserInformationView.as_view()),
-    re_path('^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
+    url('^', include(router.urls)),
+    url('^me/', UserInformationView.as_view()),
+    url('^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
 ]
--- a/apps/member/forms.py
+++ b/apps/member/forms.py
@ -3,7 +3,6 @@

 import io

-from bootstrap_datepicker_plus.widgets import DatePickerInput
 from PIL import Image, ImageSequence
 from django import forms
 from django.conf import settings
@ -14,7 +13,7 @@ from django.forms import CheckboxSelectMultiple
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from note.models import NoteSpecial, Alias
-from note_kfet.inputs import Autocomplete, AmountInput
+from note_kfet.inputs import Autocomplete, AmountInput, DatePickerInput
 from permission.models import PermissionMask, Role

 from .models import Profile, Club, Membership
@ -33,7 +32,7 @@ class UserForm(forms.ModelForm):
        # Django usernames can only contain letters, numbers, @, ., +, - and _.
        # We want to allow users to have uncommon and unpractical usernames:
        # That is their problem, and we have normalized aliases for us.
-        return super()._get_validation_exclusions() | {"username"}
+        return super()._get_validation_exclusions() + ["username"]

    class Meta:
        model = User
--- a/apps/member/tests/test_login.py
+++ b/apps/member/tests/test_login.py
@ -44,7 +44,7 @@ class TemplateLoggedInTests(TestCase):
        self.assertRedirects(response, settings.LOGIN_REDIRECT_URL, 302, 302)

    def test_logout(self):
-        response = self.client.post(reverse("logout"))
+        response = self.client.get(reverse("logout"))
        self.assertEqual(response.status_code, 200)

    def test_admin_index(self):
--- a/apps/member/views.py
+++ b/apps/member/views.py
@ -26,7 +26,7 @@ from permission.backends import PermissionBackend
 from permission.models import Role
 from permission.views import ProtectQuerysetMixin, ProtectedCreateView

-from .forms import UserForm, ProfileForm, ImageForm, ClubForm, MembershipForm, \
+from .forms import UserForm, ProfileForm, ImageForm, ClubForm, MembershipForm,\
    CustomAuthenticationForm, MembershipRolesForm
 from .models import Club, Membership
 from .tables import ClubTable, UserTable, MembershipTable, ClubManagerTable
--- a/apps/note/api/urls.py
+++ b/apps/note/api/urls.py
@ -13,7 +13,7 @@ def register_note_urls(router, path):
    router.register(path + '/note', NotePolymorphicViewSet)
    router.register(path + '/alias', AliasViewSet)
    router.register(path + '/trust', TrustViewSet)
-    router.register(path + '/consumer', ConsumerViewSet, basename="consumer")
+    router.register(path + '/consumer', ConsumerViewSet)

    router.register(path + '/transaction/category', TemplateCategoryViewSet)
    router.register(path + '/transaction/transaction', TransactionViewSet)
--- a/apps/note/api/views.py
+++ b/apps/note/api/views.py
@ -13,7 +13,7 @@ from rest_framework import status
 from api.viewsets import ReadProtectedModelViewSet, ReadOnlyProtectedModelViewSet
 from permission.backends import PermissionBackend

-from .serializers import NotePolymorphicSerializer, AliasSerializer, ConsumerSerializer, \
+from .serializers import NotePolymorphicSerializer, AliasSerializer, ConsumerSerializer,\
    TemplateCategorySerializer, TransactionTemplateSerializer, TransactionPolymorphicSerializer, \
    TrustSerializer
 from ..models.notes import Note, Alias, NoteUser, NoteClub, NoteSpecial, Trust
@ -179,10 +179,19 @@ class ConsumerViewSet(ReadOnlyProtectedModelViewSet):
            # We match first an alias if it is matched without normalization,
            # then if the normalized pattern matches a normalized alias.
            queryset = queryset.filter(
-                Q(**{f'name{suffix}': alias_prefix + alias})
-                | Q(**{f'normalized_name{suffix}': alias_prefix + Alias.normalize(alias)})
-                | Q(**{f'normalized_name{suffix}': alias_prefix + alias.lower()})
-            )
+                **{f'name{suffix}': alias_prefix + alias}
+            ).union(
+                queryset.filter(
+                    Q(**{f'normalized_name{suffix}': alias_prefix + Alias.normalize(alias)})
+                    & ~Q(**{f'name{suffix}': alias_prefix + alias})
+                ),
+                all=True).union(
+                queryset.filter(
+                    Q(**{f'normalized_name{suffix}': alias_prefix + alias.lower()})
+                    & ~Q(**{f'normalized_name{suffix}': alias_prefix + Alias.normalize(alias)})
+                    & ~Q(**{f'name{suffix}': alias_prefix + alias})
+                ),
+                all=True)

        queryset = queryset if settings.DATABASES[queryset.db]["ENGINE"] == 'django.db.backends.postgresql' \
            else queryset.order_by("name")
--- a/apps/note/forms.py
+++ b/apps/note/forms.py
@ -1,15 +1,13 @@
 # Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
-
 from datetime import datetime

-from bootstrap_datepicker_plus.widgets import DateTimePickerInput
 from django import forms
 from django.contrib.contenttypes.models import ContentType
 from django.forms import CheckboxSelectMultiple
 from django.utils.timezone import make_aware
 from django.utils.translation import gettext_lazy as _
-from note_kfet.inputs import Autocomplete, AmountInput
+from note_kfet.inputs import Autocomplete, AmountInput, DateTimePickerInput

 from .models import TransactionTemplate, NoteClub, Alias

--- a/apps/note/migrations/0002_create_special_notes.py
+++ b/apps/note/migrations/0002_create_special_notes.py
@ -18,7 +18,6 @@ def create_special_notes(apps, schema_editor):
 class Migration(migrations.Migration):
    dependencies = [
        ('note', '0001_initial'),
-        ('logs', '0001_initial'),
    ]

    operations = [
--- a/apps/note/migrations/0007_alter_note_polymorphic_ctype_and_more.py
+++ b/apps/note/migrations/0007_alter_note_polymorphic_ctype_and_more.py
@ -1,25 +0,0 @@
-# Generated by Django 5.0.7 on 2024-07-11 09:24
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contenttypes', '0002_remove_content_type_name'),
-        ('note', '0006_trust'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='note',
-            name='polymorphic_ctype',
-            field=models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_%(app_label)s.%(class)s_set+', to='contenttypes.contenttype'),
-        ),
-        migrations.AlterField(
-            model_name='transaction',
-            name='polymorphic_ctype',
-            field=models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_%(app_label)s.%(class)s_set+', to='contenttypes.contenttype'),
-        ),
-    ]
--- a/apps/note/templates/note/amount_input.html
+++ b/apps/note/templates/note/amount_input.html
@ -9,7 +9,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
           name="{{ widget.name }}"
           {# Other attributes are loaded  #}
           {% for name, value in widget.attrs.items %}
-                {% if value != False %}{{ name }}{% if value != True %}="{{ value|stringformat:'s' }}"{% endif %}{% endif %}
+                {% ifnotequal value False %}{{ name }}{% ifnotequal value True %}="{{ value|stringformat:'s' }}"{% endifnotequal %}{% endifnotequal %}
            {% endfor %}>
    <div class="input-group-append">
        <span class="input-group-text">€</span>
--- a/apps/note/tests/test_transactions.py
+++ b/apps/note/tests/test_transactions.py
@ -10,7 +10,7 @@ from django.urls import reverse
 from django.utils import timezone
 from permission.models import Role

-from ..api.views import AliasViewSet, ConsumerViewSet, NotePolymorphicViewSet, TemplateCategoryViewSet, \
+from ..api.views import AliasViewSet, ConsumerViewSet, NotePolymorphicViewSet, TemplateCategoryViewSet,\
    TransactionTemplateViewSet, TransactionViewSet
 from ..models import NoteUser, Transaction, TemplateCategory, TransactionTemplate, RecurrentTransaction, \
    MembershipTransaction, SpecialTransaction, NoteSpecial, Alias, Note
--- a/apps/registration/forms.py
+++ b/apps/registration/forms.py
@ -5,7 +5,7 @@ from django import forms
 from django.contrib.auth.forms import UserCreationForm
 from django.contrib.auth.models import User
 from django.utils.translation import gettext_lazy as _
-# from member.models import Club
+from member.models import Club
 from note.models import NoteSpecial, Alias
 from note_kfet.inputs import AmountInput

@ -116,11 +116,11 @@ class ValidationForm(forms.Form):
        initial=True,
    )

-#     If the bda exists
-#     if Club.objects.filter(name__iexact="bda").exists():
-#         The user can join the bda club at the inscription
-#         join_bda = forms.BooleanField(
-#             label=_("Join BDA Club"),
-#             required=False,
-#             initial=True,
-#         )
+    # If the bda exists
+    if Club.objects.filter(name__iexact="bda").exists():
+        # The user can join the bda club at the inscription
+        join_bda = forms.BooleanField(
+            label=_("Join BDA Club"),
+            required=False,
+            initial=True,
+        )
--- a/apps/treasury/api/views.py
+++ b/apps/treasury/api/views.py
@ -5,7 +5,7 @@ from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework.filters import SearchFilter
 from api.viewsets import ReadProtectedModelViewSet

-from .serializers import InvoiceSerializer, ProductSerializer, RemittanceTypeSerializer, RemittanceSerializer, \
+from .serializers import InvoiceSerializer, ProductSerializer, RemittanceTypeSerializer, RemittanceSerializer,\
    SogeCreditSerializer
 from ..models import Invoice, Product, RemittanceType, Remittance, SogeCredit

--- a/apps/treasury/migrations/0008_auto_20240322_0045.py
+++ b/apps/treasury/migrations/0008_auto_20240322_0045.py
@ -1,23 +0,0 @@
-# Generated by Django 2.2.28 on 2024-03-21 23:45
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('treasury', '0007_auto_20240311_1549'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='invoice',
-            name='payment_date',
-            field=models.CharField(default='', max_length=255, verbose_name='Payment date'),
-        ),
-        migrations.AddField(
-            model_name='invoice',
-            name='quotation',
-            field=models.BooleanField(default=False, verbose_name='Quotation'),
-        ),
-    ]
--- a/apps/treasury/migrations/0009_alter_sogecredit_transactions.py
+++ b/apps/treasury/migrations/0009_alter_sogecredit_transactions.py
@ -1,19 +0,0 @@
-# Generated by Django 5.0.7 on 2024-07-11 09:24
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('note', '0007_alter_note_polymorphic_ctype_and_more'),
-        ('treasury', '0008_auto_20240322_0045'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='sogecredit',
-            name='transactions',
-            field=models.ManyToManyField(blank=True, related_name='+', to='note.membershiptransaction', verbose_name='membership transactions'),
-        ),
-    ]
--- a/apps/treasury/models.py
+++ b/apps/treasury/models.py
@ -41,10 +41,6 @@ class Invoice(models.Model):
        ),
        verbose_name=_("BDE"),
    )
-    quotation = models.BooleanField(
-        default=False,
-        verbose_name=_("Quotation"),
-    )

    object = models.CharField(
        max_length=255,
@ -69,12 +65,6 @@ class Invoice(models.Model):
        verbose_name=_("Date"),
    )

-    payment_date = models.CharField(
-        default="",
-        max_length=255,
-        verbose_name=_("Payment date"),
-    )
-
    acquitted = models.BooleanField(
        verbose_name=_("Acquitted"),
        default=False,
--- a/apps/treasury/templates/treasury/invoice_sample.tex
+++ b/apps/treasury/templates/treasury/invoice_sample.tex
@ -76,11 +76,8 @@

 \def\FactureNum            {{"{"}}{{ obj.id }}}    % Numéro de facture
 \def\FactureAcquittee    {% if obj.acquitted %} {oui} {% else %} {non} {% endif %}     % Facture acquittée : oui/non
-\def\Devis	 {% if obj.quotation %} {oui} {% else %} {non} {% endif %}
-  % Devis : oui/non
 \def\FactureLieu    {{"{"}}{{ obj.place|escape_tex }}}    % Lieu de l'édition de la facture
 \def\FactureDate    {{"{"}}{{ obj.date }}}    % Date de l'édition de la facture
-\def\FacturePaymentDate {{"{"}}{{ obj.payment_date|escape_tex }}}	% Date de paiement de la facture
 \def\FactureObjet   {{"{"}}{{ obj.object|escape_tex }} }    % Objet du document
 % Description de la facture
 \def\FactureDescr   {{"{"}}{{ obj.description|escape_tex }}}
@ -121,12 +118,10 @@
 % Nom et adresse de la société
 \MonNom \\
 \MonAdresseRue \\
-\MonAdresseVille \\
-\ifthenelse{\equal{\Devis}{oui}}{
-Devis n°\FactureNum
-}{
+\MonAdresseVille
+
 Facture n°\FactureNum
-}
+

 {\addtolength{\leftskip}{10.5cm} %in ERT
   \ClientNom    \\
@ -144,7 +139,6 @@ Facture n°\FactureNum

 \textnormal{\FactureDescr}

-
 ~\\

 \begin{center}
@ -160,11 +154,6 @@ Facture n°\FactureNum
 \ifthenelse{\equal{\FactureAcquittee}{oui}}{
    Facture acquittée.
 }{
-    Echéance de paiement : \FacturePaymentDate
-    
-    Conditions d'escompte : Aucune
-    
-    Taux de pénalité en cas de non paiement ou retard de paiement : 0 \%

    À régler par chèque ou par virement bancaire :

@ -187,6 +176,5 @@ Facture n°\FactureNum
 TVA non applicable, article 293 B du CGI.
 \end{center}

-
 \end{document}
 {% endlanguage %}
--- a/apps/treasury/tests/test_treasury.py
+++ b/apps/treasury/tests/test_treasury.py
@ -69,11 +69,9 @@ class TestInvoices(TestCase):
        response = self.client.post(reverse("treasury:invoice_create"), data={
            "id": 42,
            "object": "Same object",
-            "quotation": True,
            "description": "Longer description",
            "name": "Me and others",
            "address": "Alwways earth",
-            "payment_date": "Maybe someday...",
            "acquitted": True,
            "products-0-designation": "Designation",
            "products-0-quantity": 1,
@ -99,10 +97,8 @@ class TestInvoices(TestCase):
            "object": "Same object",
            "description": "Longer description",
            "name": "Me and others",
-            "quotation": False,
            "address": "Always earth",
            "acquitted": True,
-            "payment_date": "Never",
            "locked": True,
            "products-0-designation": "Designation",
            "products-0-quantity": 1,
--- a/apps/treasury/urls.py
+++ b/apps/treasury/urls.py
@ -3,8 +3,8 @@

 from django.urls import path

-from .views import InvoiceCreateView, InvoiceListView, InvoiceUpdateView, InvoiceDeleteView, InvoiceRenderView, \
-    RemittanceListView, RemittanceCreateView, RemittanceUpdateView, LinkTransactionToRemittanceView, \
+from .views import InvoiceCreateView, InvoiceListView, InvoiceUpdateView, InvoiceDeleteView, InvoiceRenderView,\
+    RemittanceListView, RemittanceCreateView, RemittanceUpdateView, LinkTransactionToRemittanceView,\
    UnlinkTransactionToRemittanceView, SogeCreditListView, SogeCreditManageView

 app_name = 'treasury'
--- a/apps/wei/forms/registration.py
+++ b/apps/wei/forms/registration.py
@ -1,14 +1,13 @@
 # Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

-from bootstrap_datepicker_plus.widgets import DatePickerInput
 from django import forms
 from django.contrib.auth.models import User
 from django.db.models import Q
 from django.forms import CheckboxSelectMultiple
 from django.utils.translation import gettext_lazy as _
 from note.models import NoteSpecial, NoteUser
-from note_kfet.inputs import AmountInput, Autocomplete, ColorWidget
+from note_kfet.inputs import AmountInput, DatePickerInput, Autocomplete, ColorWidget

 from ..models import WEIClub, WEIRegistration, Bus, BusTeam, WEIMembership, WEIRole

--- a/apps/wei/tests/test_wei_registration.py
+++ b/apps/wei/tests/test_wei_registration.py
@ -439,7 +439,7 @@ class TestWEIRegistration(TestCase):
            emergency_contact_phone='+33123456789',
        ))
        self.assertEqual(response.status_code, 200)
-        self.assertTrue("This user can&#x27;t be in her/his first year since he/she has already participated to a WEI."
+        self.assertTrue("This user can&#39;t be in her/his first year since he/she has already participated to a WEI."
                        in str(response.context["form"].errors))

        # Check that if the WEI is started, we can't register anyone
@ -635,7 +635,7 @@ class TestWEIRegistration(TestCase):
        ))
        self.assertEqual(response.status_code, 200)
        self.assertFalse(response.context["form"].is_valid())
-        self.assertTrue("This team doesn&#x27;t belong to the given bus." in str(response.context["form"].errors))
+        self.assertTrue("This team doesn&#39;t belong to the given bus." in str(response.context["form"].errors))

        response = self.client.post(reverse("wei:validate_registration", kwargs=dict(pk=self.registration.pk)), dict(
            roles=[WEIRole.objects.get(name="GC WEI").id],
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
--- a/note_kfet/admin.py
+++ b/note_kfet/admin.py
@ -25,13 +25,19 @@ admin_site.register(Site, SiteAdmin)

 # Add external apps model
 if "oauth2_provider" in settings.INSTALLED_APPS:
-    from oauth2_provider.admin import ApplicationAdmin, GrantAdmin, AccessTokenAdmin, RefreshTokenAdmin
-    from oauth2_provider.models import Application, Grant, AccessToken, RefreshToken
+    from oauth2_provider.admin import Application, ApplicationAdmin, Grant, \
+        GrantAdmin, AccessToken, AccessTokenAdmin, RefreshToken, RefreshTokenAdmin
    admin_site.register(Application, ApplicationAdmin)
    admin_site.register(Grant, GrantAdmin)
    admin_site.register(AccessToken, AccessTokenAdmin)
    admin_site.register(RefreshToken, RefreshTokenAdmin)

+if "django_htcpcp_tea" in settings.INSTALLED_APPS:
+    from django_htcpcp_tea.admin import *
+    from django_htcpcp_tea.models import *
+    admin_site.register(Pot, PotAdmin)
+    admin_site.register(TeaType, TeaTypeAdmin)
+    admin_site.register(Addition, AdditionAdmin)

 if "mailer" in settings.INSTALLED_APPS:
    from mailer.admin import *
@ -44,3 +50,9 @@ if "rest_framework" in settings.INSTALLED_APPS:
    from rest_framework.authtoken.admin import *
    from rest_framework.authtoken.models import *
    admin_site.register(Token, TokenAdmin)
+
+if "cas_server" in settings.INSTALLED_APPS:
+    from cas_server.admin import *
+    from cas_server.models import *
+    admin_site.register(ServicePattern, ServicePatternAdmin)
+    admin_site.register(FederatedIendityProvider, FederatedIendityProviderAdmin)
--- a/note_kfet/fixtures/initial.json
+++ b/note_kfet/fixtures/initial.json
@ -4,7 +4,7 @@
        "pk": 1,
        "fields": {
            "domain": "note.crans.org",
-            "name": "La Note Kfet 🍪"
+            "name": "La Note Kfet \ud83c\udf7b"
        }
    }
 ]
--- a/note_kfet/settings/base.py
+++ b/note_kfet/settings/base.py
@ -41,7 +41,7 @@ INSTALLED_APPS = [
    'bootstrap_datepicker_plus',
    'colorfield',
    'crispy_forms',
-    'crispy_bootstrap4',
+    'django_htcpcp_tea',
    'django_tables2',
    'mailer',
    'phonenumber_field',
@ -90,6 +90,7 @@ MIDDLEWARE = [
    'django.middleware.clickjacking.XFrameOptionsMiddleware',
    'django.middleware.locale.LocaleMiddleware',
    'django.contrib.sites.middleware.CurrentSiteMiddleware',
+    'django_htcpcp_tea.middleware.HTCPCPTeaMiddleware',
    'note_kfet.middlewares.SessionMiddleware',
    'note_kfet.middlewares.LoginByIPMiddleware',
    'note_kfet.middlewares.TurbolinksMiddleware',
@ -294,6 +295,3 @@ PHONENUMBER_DEFAULT_REGION = 'FR'

 # We add custom information to CAS, in order to give a normalized name to other services
 CAS_AUTH_CLASS = 'member.auth.CustomAuthUser'
-
-# Default field for primary key
-DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
--- a/note_kfet/templates/autocomplete_model.html
+++ b/note_kfet/templates/autocomplete_model.html
@ -8,7 +8,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
   {% if widget.value != None and widget.value != "" %}value="{{ widget.value }}"{% endif %}
   name="{{ widget.name }}_name" autocomplete="off"
    {% for name, value in widget.attrs.items %}
-        {% if value != False %}{{ name }}{% if value != True %}="{{ value|stringformat:'s' }}"{% endif %}{% endif %}
+        {% ifnotequal value False %}{{ name }}{% ifnotequal value True %}="{{ value|stringformat:'s' }}"{% endifnotequal %}{% endifnotequal %}
    {% endfor %}
    aria-describedby="{{widget.attrs.id}}_tooltip">
    {% if widget.resetable %}
--- a/note_kfet/templates/base.html
+++ b/note_kfet/templates/base.html
@ -126,12 +126,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
                                <a class="dropdown-item" href="{% url 'member:user_detail' pk=request.user.pk %}">
                                    <i class="fa fa-user"></i> {% trans "My account" %}
                                </a>
-                                <form method="post" action="{% url 'logout' %}">
-                                  {% csrf_token %}
-                                  <button class="dropdown-item" type="submit">
+                                <a class="dropdown-item" href="{% url 'logout' %}">
                                    <i class="fa fa-sign-out"></i> {% trans "Log out" %}
-                                  </button>
-                                </form>
+                                </a>
                            </div>
                        </li>
                    {% else %}
@ -197,8 +194,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
                           class="text-muted">{% trans "Contact us" %}</a> &mdash;
                        <a href="mailto:{{ "SUPPORT_EMAIL" | getenv }}"
                           class="text-muted">{% trans "Technical Support" %}</a> &mdash;
-                        <a href="https://perso.crans.org/club-bde/charte_informatique.pdf"
-                           class="text-muted">{% trans "Charte Info (FR)" %}</a> &mdash;
                        <a href="https://note.crans.org/doc/faq/"
                           class="text-muted">{% trans "FAQ (FR)" %}</a> &mdash;
                    </span>
--- a/note_kfet/urls.py
+++ b/note_kfet/urls.py
@ -30,6 +30,9 @@ urlpatterns = [
    path('accounts/', include('django.contrib.auth.urls')),
    path('api/', include('api.urls')),
    path('permission/', include('permission.urls')),
+
+    # Make coffee
+    path('coffee/', include('django_htcpcp_tea.urls')),
 ]

 # During development, serve static and media files
@ -43,6 +46,11 @@ if "oauth2_provider" in settings.INSTALLED_APPS:
        path('o/', include('oauth2_provider.urls', namespace='oauth2_provider'))
    )

+if "cas_server" in settings.INSTALLED_APPS:
+    urlpatterns.append(
+        path('cas/', include('cas_server.urls', namespace='cas_server'))
+    )
+
 if "debug_toolbar" in settings.INSTALLED_APPS:
    import debug_toolbar
    urlpatterns = [
--- a/requirements.txt
+++ b/requirements.txt
@ -1,17 +1,19 @@
-beautifulsoup4~=4.12.3
-crispy-bootstrap4~=2024.1
-Django~=5.0.7
-django-bootstrap-datepicker-plus~=5.0.5
-django-colorfield~=0.11.0
-django-crispy-forms~=2.2
-django-extensions~=3.2.3
-django-filter~=24.2
-django-mailer~=2.3.2
-django-oauth-toolkit~=2.4.0
-django-phonenumber-field~=8.0.0
-django-polymorphic~=3.1.0
-django-rest-polymorphic~=0.1.10
-django-tables2~=2.7.0
-djangorestframework~=3.15.2
-phonenumbers~=8.13.40
+beautifulsoup4~=4.7.1
+Django~=2.2.15
+django-bootstrap-datepicker-plus~=3.0.5
+django-cas-server~=1.2.0
+django-colorfield~=0.3.2
+django-crispy-forms~=1.7.2
+django-extensions>=2.1.4
+django-filter~=2.1
+django-htcpcp-tea~=0.3.1
+django-mailer~=2.0.1
+django-oauth-toolkit~=1.3.3
+django-phonenumber-field~=5.0.0
+django-polymorphic>=2.0.3,<3.0.0
+djangorestframework>=3.9.0,<3.13.0
+django-rest-polymorphic~=0.1.9
+django-tables2~=2.3.1
+python-memcached~=1.59
+phonenumbers~=8.9.10
 Pillow>=5.4.1
--- a/tox.ini
+++ b/tox.ini
@ -1,10 +1,13 @@
 [tox]
 envlist =
+    # Debian Buster Python
+    py37-django22
+
    # Ubuntu 20.04 Python
-    py310-django50
+    py38-django22

    # Debian Bullseye Python
-    py311-django50
+    py39-django22

    linters
 skipsdist = True
Author	SHA1	Message	Date
charliep	76e3b608c1	Merge branch 'Fix_time_zone_calendar.ics' into 'main' Update views.py - Fix calendar.ics See merge request bde/nk20!237	2024-03-22 16:19:51 +01:00
charliep	6c61daf1c5	Update views.py Passage à la time zone Europe/Paris	2024-03-11 10:25:48 +01:00