Note en mode vieux pour la Kokarde de remise des diplomes

.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

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
 

apps/activity/tables.py

@@ -1,6 +1,8 @@
 # Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+import datetime
+
 from django.utils import timezone
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
@@ -75,6 +77,9 @@ def get_row_class(record):
             c += " table-info"
         elif record.note.balance < 0:
             c += " table-danger"
+        # MODE VIEUXCON=ON
+        if (datetime.datetime.utcnow().timestamp() - record.note.created_at.timestamp()) > 3600 * 24 * 365 * 2.5:
+            c += " font-weight-bold underline"
     return c
 
 

apps/activity/templates/activity/activity_form.html

@@ -17,9 +17,6 @@ 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");

apps/activity/views.py

@@ -224,12 +224,13 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView):
         # Keep only users that have a note
         note_qs = note_qs.filter(note__noteuser__isnull=False)
 
-        # Keep only members
-        note_qs = note_qs.filter(
-            note__noteuser__user__memberships__club=activity.attendees_club,
-            note__noteuser__user__memberships__date_start__lte=timezone.now(),
-            note__noteuser__user__memberships__date_end__gte=timezone.now(),
-        )
+#        if activity.activity_type.name != "Pot Vieux":
+#            # Keep only members
+#            note_qs = note_qs.filter(
+#                note__noteuser__user__memberships__club=activity.attendees_club,
+#                note__noteuser__user__memberships__date_start__lte=timezone.now(),
+#                note__noteuser__user__memberships__date_end__gte=timezone.now(),
+#            )
 
         # Filter with permission backend
         note_qs = note_qs.filter(PermissionBackend.filter_queryset(self.request, Alias, "view"))

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')),
 ]

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

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):

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

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)

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")

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
 

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 = [

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'),
-        ),
-    ]

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>

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

apps/permission/fixtures/initial.json

@@ -3111,6 +3111,22 @@
 			"description": "Voir ceux nous ayant pour ami, pour toujours"
 		}
 	},
+	{
+		"model": "permission.permission",
+		"pk": 199,
+		"fields": {
+			"model": [
+				"member",
+				"membership"
+			],
+			"query": "{\"club\": 2}",
+			"type": "view",
+			"mask": 1,
+			"field": "",
+			"permanent": false,
+			"description": "Voir les adhérents Kfet"
+		}
+	},
 	{
 		"model": "permission.role",
 		"pk": 1,
@@ -3594,7 +3610,9 @@
 				168,
 				176,
 				177,
-				197
+                178,
+				197,
+                199
 			]
 		}
 	},

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
 

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'),
-        ),
-    ]

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'

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
 

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't be in her/his first year since he/she has already participated to a WEI."
+        self.assertTrue("This user can'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't belong to the given bus." in str(response.context["form"].errors))
+        self.assertTrue("This team doesn'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],

locale/fr/LC_MESSAGES/django.po

@@ -3388,10 +3388,6 @@ msgstr "Support technique"
 msgid "FAQ (FR)"
 msgstr "FAQ (FR)"
 
-#: note_kfet/templates/base.html:200
-msgid "Charte Info (FR)"
-msgstr "Charte Info (FR)"
-
 #: note_kfet/templates/base_search.html:15
 msgid "Search by attribute such as name…"
 msgstr "Chercher par un attribut tel que le nom …"

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)

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"
         }
     }
 ]

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"

note_kfet/static/css/custom.css

@@ -3,6 +3,10 @@
     text-decoration: underline;
 }
 
+.underline {
+    text-decoration: underline;
+}
+
 /* Opaque tooltip with white background */
 .tooltip.show {
     opacity: 1;
@@ -65,10 +69,14 @@ mark {
 
 /* Last BDE colors */
 .bg-primary {
-/*    background-color: rgb(18, 67, 4) !important; */
+/*    background-color: rgb(0, 0, 0) !important; */
 /* MODE VIEUXCON=ON */
+      /*Listo/*
 /*    background-color: rgb(166, 0, 2) !important; */
-    background-color: rgb(100, 30, 100) !important;
+      /*Finalist*/
+/*    background-color: rgb(0, 119, 139) !important;*/ 
+      /*Saperlist*/
+      background-color: rgb(18, 67, 4) !important;
 }
 
 html {
@@ -83,81 +91,170 @@ body {
 .btn-outline-primary:hover,
 .btn-outline-primary:not(:disabled):not(.disabled).active,
 .btn-outline-primary:not(:disabled):not(.disabled):active {
-   color:  rgb(240, 200, 240);
-    background-color: rgb(30, 120, 150);
-    border-color: rgb(190, 150, 190);
+/*Last BDE*/
+/*   color:  rgb(241, 229, 52);
+    background-color: rgb(228, 35, 132);
+    border-color: rgb(228, 35, 132);*/
+/*Pot Vieux*/
+    /*Finalist*/
+    /*color: #fff;
+    background-color: rgb(0, 119, 139);
+    border-color: rgb(0, 119, 139);*/
+    /*Saperlist*/
+    color: #fff;
+    background-color: rgb(18, 67, 46);
+    border-color: rgb(18, 67, 46);
 }
 
 .btn-outline-primary {
-    color: #a2a;
-    background-color: #6bc;
-    border-color: #719;
+/*Last BDE*/
+/*    color: #fff;
+    background-color: #000;
+    border-color: #464647;*/
+/*Pot Vieux*/
+    /*Finalist*/
+    /*color: rgb(0, 119, 139);
+    background-color: rgba(248, 249, 250, 0.9);
+    border-color: rgb(0, 119, 139);*/
+    /*Saperlist*/
+    color: rgb(18, 67, 46);
+    background-color: rgba(248, 249, 250, 0.9);
+    border-color: rgb(18, 67, 46);
 }
 
 .turbolinks-progress-bar {
-    background-color: #12342E;
+/*Last BDE*/
+    /*background-color: #12432E;*/
+/*Pot Vieux*/
+    /*Finalist*/
+    /*background-color: #01D3FB;*/
+    /*Saperlist*/
+    background-color: #12432E;
 }
 
 .btn-primary:hover,
 .btn-primary:not(:disabled):not(.disabled).active,
 .btn-primary:not(:disabled):not(.disabled):active {
-    color:  rgb(150, 200, 240);
-    background-color: rgb(50, 100, 140);
-    border-color: rgb(0, 0, 0);
+/*Last BDE*/
+/*    color:  rgb(241, 229, 52);
+    background-color: rgb(228, 35, 132);
+    border-color: rgb(228, 35, 132);/*
+/*Pot Vieux*/
+    /*Finalist*/
+    /*color: #fff;
+    background-color: rgb(0, 119, 139);
+    border-color: rgb(0, 119, 139);*/
+    /*Saperlist*/
+    color: #fff;
+    background-color: rgb(18, 67, 46);
+    border-color: rgb(18, 67, 46);
 }
 
 .btn-primary {
-    color:  #eae; 
-    background-color: #616;
-    border-color: #000000;
+/*Last BDE*/
+/*    color:  #fff; 
+    background-color: #000;
+    border-color: #adb5bd;*/
+/*Pot Vieux*/
+    /*Saperlist*/
+    color: rgba(248, 249, 250, 0.9); 
+    background-color: rgb(28, 114, 10);
+    border-color: rgb(18, 67, 46);
 }
 
 .border-primary {
-    border-color: rgb(222, 180, 222) !important; 
+/*Last BDE*/
+/*    border-color: rgb(228, 35, 132) !important;*/ 
+/*Pot Vieux*/
+    /*Saperlist*/
+      border-color: rgb(28, 114, 10) !important;
 }
 
 .btn-secondary {
-    color:  #eae;
-    background-color: #616;
-    border-color: #000000;
+/*Last BDE*/
+/*    color:  #fff; 
+    background-color: #000;
+    border-color: #adb5bd;*/
+/*Pot Vieux*/
+    /*Saperlist*/
+    color: rgba(248, 249, 250, 0.9); 
+    background-color: rgb(28, 114, 10);
+    border-color: rgb(18, 67, 46);
 }
 
 .btn-secondary:hover,
 .btn-secondary:not(:disabled):not(.disabled).active,
 .btn-secondary:not(:disabled):not(.disabled):active {
-    color:  rgb(150, 200, 240);
-    background-color: rgb(50, 100, 140);
-    border-color: rgb(0, 0, 0);
+/*Last BDE*/
+/*    color:  rgb(241, 229, 52);
+    background-color: rgb(228, 35, 132);
+    border-color: rgb(228, 35, 132);/*
+/*Pot Vieux*/
+    /*Finalist*/
+    /*color: #fff;
+    background-color: rgb(0, 119, 139);
+    border-color: rgb(0, 119, 139);*/
+    /*Saperlist*/
+    color: #fff;
+    background-color: rgb(18, 67, 46);
+    border-color: rgb(18, 67, 46);
 }
 
 
 .btn-outline-dark {
-    color: #000000;
-    border-color: #000000;
+    color: #343a40;
+    border-color: #343a40;
 }
 
 .btn-outline-dark:hover,
 .btn-outline-dark:not(:disabled):not(.disabled).active,
 .btn-outline-dark:not(:disabled):not(.disabled):active {
-    color:  rgb(50, 100, 160);
-    background-color: rgb(240, 150, 240);
-    border-color: rgb(50, 100, 160);
+/*Last BDE*/
+/*   color:  rgb(241, 229, 52);
+    background-color: rgb(228, 35, 132);
+    border-color: rgb(228, 35, 132);*/
+/*Pot Vieux*/
+    /*Finalist*/
+    /*color: #fff;
+    background-color: rgb(0, 119, 139);
+    border-color: rgb(0, 119, 139);*/
+    /*Saperlist*/
+    color: #fff;
+    background-color: rgb(18, 67, 46);
+    border-color: rgb(18, 67, 46);
 }
 
 
 a {
-    color: rgb(0, 150, 150);
+/*Last BDE*/
+/*    color: rgb(228, 35, 132);*/
+/*Pot Vieux*/
+    /*Saperlist*/
+      color: rgb(28, 114, 10);
 }
 
 a:hover {
-    color: rgb(200, 0, 200);
+/*Last BDE*/
+/*    color: rgb(228, 35, 132);*/
+/*Pot Vieux*/
+    /*Saperlist*/
+      color: rgb(122, 163, 75);
 }
 
 .form-control:focus {
-    box-shadow: 0 0 0 0.25rem rgb(0 150 150 / 50%);
-    border-color: rgb(0, 200, 200);
+/*Last BDE*/
+/*    box-shadow: 0 0 0 0.25rem rgb(228 35 132 / 50%);
+    border-color: rgb(228, 35, 132);*/
+/*Pot Vieux*/
+    /*Saperlist*/
+    box-shadow: 0 0 0 0.25rem rgba(122, 163, 75, 0.25);
+    border-color: rgb(122, 163, 75);
 }
 
 .btn-outline-primary.focus {
-  box-shadow: 0 0 0 0.25rem rgb(0 150 150 / 22%);
+/*Last BDE*/
+/*  box-shadow: 0 0 0 0.25rem rgb(228 35 132 / 10%);*/
+/*Pot Vieux*/
+    /*Saperlist*/
+    box-shadow: 0 0 0 0.25rem rgba(122, 163, 75, 0.5);
 }

note_kfet/static/js/base.js

@@ -96,11 +96,13 @@ function displayStyle (note) {
   if (!note) { return '' }
   const balance = note.balance
   var css = ''
+  var ms_per_year = 31536000000 // 365 * 24 * 3600 * 1000
   if (balance < -2000) { css += ' text-danger bg-dark' } 
   else if (balance < -1000) { css += ' text-danger' } 
   else if (balance < 0) { css += ' text-warning' }
   if (!note.email_confirmed) { css += ' bg-primary' }
   else if (!note.is_active || (note.membership && note.membership.date_end < new Date().toISOString())) { css += ' bg-info' }
+  if (((Date.now() - Date.parse(note.created_at))/ms_per_year) > 2.5) { css += ' font-weight-bold underline' }
   return css
 }
 

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 %}

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>

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 = [

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

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