{% blocktrans trimmed %}
Adding someone as a friend enables them to initiate transactions coming
from your account (while keeping your balance positive). This is
@@ -33,6 +33,13 @@ SPDX-License-Identifier: GPL-3.0-or-later
friends without needing additional rights among them.
{% endblocktrans %}
+
+
+
+ {% trans "People having you as a friend" %}
+
+ {% render_table trusted_by %}
+
{% endblock %}
{% block extrajavascript %}
diff --git a/apps/member/tests/test_memberships.py b/apps/member/tests/test_memberships.py
index 2dc6dd41..de9f3d3d 100644
--- a/apps/member/tests/test_memberships.py
+++ b/apps/member/tests/test_memberships.py
@@ -183,7 +183,7 @@ class TestMemberships(TestCase):
club = Club.objects.get(name="Kfet")
else:
club = Club.objects.create(
- name="Second club " + ("with BDE" if bde_parent else "without BDE"),
+ name="Second club without BDE",
parent_club=None,
email="newclub@example.com",
require_memberships=True,
@@ -335,6 +335,7 @@ class TestMemberships(TestCase):
ml_sports_registration=True,
ml_art_registration=True,
report_frequency=7,
+ VSS_charter_read=True
))
self.assertRedirects(response, self.user.profile.get_absolute_url(), 302, 200)
self.assertTrue(User.objects.filter(username="toto changed").exists())
diff --git a/apps/member/views.py b/apps/member/views.py
index 2f6348a6..066a7ef3 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -8,7 +8,6 @@ from django.contrib.auth import logout
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.auth.models import User
from django.contrib.auth.views import LoginView
-from django.contrib.contenttypes.models import ContentType
from django.db import transaction
from django.db.models import Q, F
from django.shortcuts import redirect
@@ -21,7 +20,7 @@ from django_tables2.views import SingleTableView
from rest_framework.authtoken.models import Token
from note.models import Alias, NoteClub, NoteUser, Trust
from note.models.transactions import Transaction, SpecialTransaction
-from note.tables import HistoryTable, AliasTable, TrustTable
+from note.tables import HistoryTable, AliasTable, TrustTable, TrustedTable
from note_kfet.middlewares import _set_current_request
from permission.backends import PermissionBackend
from permission.models import Role
@@ -258,17 +257,18 @@ class ProfileTrustView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
note = context['object'].note
context["trusting"] = TrustTable(
note.trusting.filter(PermissionBackend.filter_queryset(self.request, Trust, "view")).distinct().all())
+ context["trusted_by"] = TrustedTable(
+ note.trusted.filter(PermissionBackend.filter_queryset(self.request, Trust, "view")).distinct().all())
context["can_create"] = PermissionBackend.check_perm(self.request, "note.add_trust", Trust(
trusting=context["object"].note,
trusted=context["object"].note
))
context["widget"] = {
"name": "trusted",
+ "resetable": True,
"attrs": {
- "model_pk": ContentType.objects.get_for_model(Alias).pk,
"class": "autocomplete form-control",
"id": "trusted",
- "resetable": True,
"api_url": "/api/note/alias/?note__polymorphic_ctype__model=noteuser",
"name_field": "name",
"placeholder": ""
@@ -753,6 +753,10 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
club = old_membership.club
user = old_membership.user
+ # Update club membership date
+ if PermissionBackend.check_perm(self.request, "member.change_club_membership_start", club):
+ club.update_membership_dates()
+
form.instance.club = club
# Get form data
diff --git a/apps/note/admin.py b/apps/note/admin.py
index eb0f0f3c..8d081d90 100644
--- a/apps/note/admin.py
+++ b/apps/note/admin.py
@@ -7,7 +7,7 @@ from polymorphic.admin import PolymorphicChildModelAdmin, \
PolymorphicChildModelFilter, PolymorphicParentModelAdmin
from note_kfet.admin import admin_site
-from .models.notes import Alias, Note, NoteClub, NoteSpecial, NoteUser
+from .models.notes import Alias, Note, NoteClub, NoteSpecial, NoteUser, Trust
from .models.transactions import Transaction, TemplateCategory, TransactionTemplate, \
RecurrentTransaction, MembershipTransaction, SpecialTransaction
from .templatetags.pretty_money import pretty_money
@@ -21,6 +21,16 @@ class AliasInlines(admin.TabularInline):
model = Alias
+class TrustInlines(admin.TabularInline):
+ """
+ Define trusts when editing the trusting note
+ """
+ model = Trust
+ fk_name = "trusting"
+ extra = 0
+ readonly_fields = ("trusted",)
+
+
@admin.register(Note, site=admin_site)
class NoteAdmin(PolymorphicParentModelAdmin):
"""
@@ -92,7 +102,7 @@ class NoteUserAdmin(PolymorphicChildModelAdmin):
"""
Child for an user note, see NoteAdmin
"""
- inlines = (AliasInlines,)
+ inlines = (AliasInlines, TrustInlines)
# We can't change user after creation or the balance
readonly_fields = ('user', 'balance')
diff --git a/apps/note/api/serializers.py b/apps/note/api/serializers.py
index 33bf75ba..a374fc33 100644
--- a/apps/note/api/serializers.py
+++ b/apps/note/api/serializers.py
@@ -11,6 +11,7 @@ from member.models import Membership
from note_kfet.middlewares import get_current_request
from permission.backends import PermissionBackend
from rest_framework.utils import model_meta
+from rest_framework.validators import UniqueTogetherValidator
from ..models.notes import Note, NoteClub, NoteSpecial, NoteUser, Alias, Trust
from ..models.transactions import TransactionTemplate, Transaction, MembershipTransaction, TemplateCategory, \
@@ -86,11 +87,9 @@ class TrustSerializer(serializers.ModelSerializer):
class Meta:
model = Trust
fields = '__all__'
-
- def validate(self, attrs):
- instance = Trust(**attrs)
- instance.clean()
- return attrs
+ validators = [UniqueTogetherValidator(
+ queryset=Trust.objects.all(), fields=('trusting', 'trusted'),
+ message=_("This friendship already exists"))]
class AliasSerializer(serializers.ModelSerializer):
diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py
index 3c6b4c7d..8ec7bf0a 100644
--- a/apps/note/models/transactions.py
+++ b/apps/note/models/transactions.py
@@ -325,8 +325,8 @@ class SpecialTransaction(Transaction):
def clean(self):
# SpecialTransaction are only possible with NoteSpecial object
if self.is_credit() == self.is_debit():
- raise(ValidationError(_("A special transaction is only possible between a"
- " Note associated to a payment method and a User or a Club")))
+ raise ValidationError(_("A special transaction is only possible between a"
+ " Note associated to a payment method and a User or a Club"))
@transaction.atomic
def save(self, *args, **kwargs):
diff --git a/apps/note/static/note/js/consos.js b/apps/note/static/note/js/consos.js
index 5999ffc3..9ee543f7 100644
--- a/apps/note/static/note/js/consos.js
+++ b/apps/note/static/note/js/consos.js
@@ -221,7 +221,7 @@ function consume (source, source_alias, dest, quantity, amount, reason, type, ca
.done(function () {
if (!isNaN(source.balance)) {
const newBalance = source.balance - quantity * amount
- if (newBalance <= -5000) {
+ if (newBalance <= -2000) {
addMsg(interpolate(gettext('Warning, the transaction from the note %s succeed, ' +
'but the emitter note %s is very negative.'), [source_alias, source_alias]), 'danger', 30000)
} else if (newBalance < 0) {
@@ -258,3 +258,39 @@ function consume (source, source_alias, dest, quantity, amount, reason, type, ca
})
})
}
+
+var searchbar = document.getElementById("search-input")
+var search_results = document.getElementById("search-results")
+
+var old_pattern = null;
+var firstMatch = null;
+/**
+ * Updates the button search tab
+ * @param force Forces the update even if the pattern didn't change
+ */
+function updateSearch(force = false) {
+ let pattern = searchbar.value
+ if (pattern === "")
+ firstMatch = null;
+ if ((pattern === old_pattern || pattern === "") && !force)
+ return;
+ firstMatch = null;
+ const re = new RegExp(pattern, "i");
+ Array.from(search_results.children).forEach(function(b) {
+ if (re.test(b.innerText)) {
+ b.hidden = false;
+ if (firstMatch === null) {
+ firstMatch = b;
+ }
+ } else
+ b.hidden = true;
+ });
+}
+
+searchbar.addEventListener("input", function (e) {
+ debounce(updateSearch)()
+});
+searchbar.addEventListener("keyup", function (e) {
+ if (firstMatch && e.key === "Enter")
+ firstMatch.click()
+});
diff --git a/apps/note/static/note/js/transfer.js b/apps/note/static/note/js/transfer.js
index 6c1656ef..509d9b48 100644
--- a/apps/note/static/note/js/transfer.js
+++ b/apps/note/static/note/js/transfer.js
@@ -314,7 +314,7 @@ $('#btn_transfer').click(function () {
if (!isNaN(source.note.balance)) {
const newBalance = source.note.balance - source.quantity * dest.quantity * amount
- if (newBalance <= -5000) {
+ if (newBalance <= -2000) {
addMsg(interpolate(gettext('Warning, the transaction of %s from the note %s to the note %s succeed, but the emitter note %s is very negative.'),
[pretty_money(source.quantity * dest.quantity * amount), source.name, dest.name, source.name]), 'danger', 10000)
reset()
diff --git a/apps/note/tables.py b/apps/note/tables.py
index 1e94a39f..243a8da6 100644
--- a/apps/note/tables.py
+++ b/apps/note/tables.py
@@ -159,11 +159,11 @@ class TrustTable(tables.Table):
template_name = 'django_tables2/bootstrap4.html'
show_header = False
- trusted = tables.Column(attrs={'td': {'class': 'text_center'}})
+ trusted = tables.Column(attrs={'td': {'class': 'text-center'}})
delete_col = tables.TemplateColumn(
template_code=DELETE_TEMPLATE,
- extra_context={"delete_trans": _('delete')},
+ extra_context={"delete_trans": _('Delete')},
attrs={
'td': {
'class': lambda record: 'col-sm-1'
@@ -173,6 +173,46 @@ class TrustTable(tables.Table):
verbose_name=_("Delete"),)
+class TrustedTable(tables.Table):
+ class Meta:
+ attrs = {
+ 'class': 'table table condensed table-striped',
+ 'id': 'trusted_table'
+ }
+ Model = Trust
+ fields = ("trusting",)
+ template_name = "django_tables2/bootstrap4.html"
+
+ show_header = False
+ trusting = tables.Column(attrs={
+ 'td': {'class': 'text-center', 'width': '100%'}})
+
+ trust_back = tables.Column(
+ verbose_name=_("Trust back"),
+ accessor="pk",
+ attrs={
+ 'td': {
+ 'class': '',
+ 'id': lambda record: "trust_back_" + str(record.pk),
+ }
+ },
+ )
+
+ def render_trust_back(self, record):
+ user_note = record.trusted
+ trusting_note = record.trusting
+ if Trust.objects.filter(trusted=trusting_note, trusting=user_note):
+ return ""
+ val = ''
+ return mark_safe(val)
+
+
class AliasTable(tables.Table):
class Meta:
attrs = {
diff --git a/apps/note/templates/note/conso_form.html b/apps/note/templates/note/conso_form.html
index d6044b87..25015c90 100644
--- a/apps/note/templates/note/conso_form.html
+++ b/apps/note/templates/note/conso_form.html
@@ -103,6 +103,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
{% endfor %}
+
{% endblock %}
+{% comment "Soge not for membership (only WEI)" %}
{% block extrajavascript %}
{% endblock %}
+{% endcomment %}
diff --git a/apps/registration/tests/test_registration.py b/apps/registration/tests/test_registration.py
index 18cf16db..69ab52d5 100644
--- a/apps/registration/tests/test_registration.py
+++ b/apps/registration/tests/test_registration.py
@@ -48,6 +48,7 @@ class TestSignup(TestCase):
ml_events_registration="en",
ml_sport_registration=True,
ml_art_registration=True,
+ VSS_charter_read=True
))
self.assertRedirects(response, reverse("registration:email_validation_sent"), 302, 200)
self.assertTrue(User.objects.filter(username="toto").exists())
@@ -105,6 +106,7 @@ class TestSignup(TestCase):
ml_events_registration="en",
ml_sport_registration=True,
ml_art_registration=True,
+ VSS_charter_read=True
))
self.assertTrue(response.status_code, 200)
@@ -124,6 +126,7 @@ class TestSignup(TestCase):
ml_events_registration="en",
ml_sport_registration=True,
ml_art_registration=True,
+ VSS_charter_read=True
))
self.assertTrue(response.status_code, 200)
@@ -143,6 +146,27 @@ class TestSignup(TestCase):
ml_events_registration="en",
ml_sport_registration=True,
ml_art_registration=True,
+ VSS_charter_read=True
+ ))
+ self.assertTrue(response.status_code, 200)
+
+ # The VSS charter is not read
+ response = self.client.post(reverse("registration:signup"), dict(
+ first_name="Toto",
+ last_name="TOTO",
+ username="Ihaveanotherusername",
+ email="othertoto@example.com",
+ password1="toto1234",
+ password2="toto1234",
+ phone_number="+33123456789",
+ department="EXT",
+ promotion=Club.objects.get(name="BDE").membership_start.year,
+ address="Earth",
+ paid=False,
+ ml_events_registration="en",
+ ml_sport_registration=True,
+ ml_art_registration=True,
+ VSS_charter_read=False
))
self.assertTrue(response.status_code, 200)
@@ -190,7 +214,7 @@ class TestValidateRegistration(TestCase):
# BDE Membership is mandatory
response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict(
- soge=False,
+ # soge=False,
credit_type=NoteSpecial.objects.get(special_type="Chèque").id,
credit_amount=4200,
last_name="TOTO",
@@ -204,7 +228,7 @@ class TestValidateRegistration(TestCase):
# Same
response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict(
- soge=False,
+ # soge=False,
credit_type="",
credit_amount=0,
last_name="TOTO",
@@ -218,7 +242,7 @@ class TestValidateRegistration(TestCase):
# The BDE membership is not free
response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict(
- soge=False,
+ # soge=False,
credit_type=NoteSpecial.objects.get(special_type="Espèces").id,
credit_amount=0,
last_name="TOTO",
@@ -232,7 +256,7 @@ class TestValidateRegistration(TestCase):
# Last and first names are required for a credit
response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict(
- soge=False,
+ # soge=False,
credit_type=NoteSpecial.objects.get(special_type="Chèque").id,
credit_amount=4000,
last_name="",
@@ -249,7 +273,7 @@ class TestValidateRegistration(TestCase):
self.user.username = "admïntoto"
self.user.save()
response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict(
- soge=False,
+ # soge=False,
credit_type=NoteSpecial.objects.get(special_type="Chèque").id,
credit_amount=500,
last_name="TOTO",
@@ -275,7 +299,7 @@ class TestValidateRegistration(TestCase):
self.user.profile.save()
response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict(
- soge=False,
+ # soge=False,
credit_type=NoteSpecial.objects.get(special_type="Chèque").id,
credit_amount=500,
last_name="TOTO",
@@ -290,6 +314,7 @@ class TestValidateRegistration(TestCase):
self.assertTrue(NoteUser.objects.filter(user=self.user).exists())
self.assertTrue(Membership.objects.filter(club__name="BDE", user=self.user).exists())
self.assertFalse(Membership.objects.filter(club__name="Kfet", user=self.user).exists())
+ self.assertFalse(Membership.objects.filter(club__name__iexact="BDA", user=self.user).exists())
self.assertFalse(SogeCredit.objects.filter(user=self.user).exists())
self.assertEqual(Transaction.objects.filter(
Q(source=self.user.note) | Q(destination=self.user.note)).count(), 2)
@@ -311,7 +336,7 @@ class TestValidateRegistration(TestCase):
self.user.profile.save()
response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict(
- soge=False,
+ # soge=False,
credit_type=NoteSpecial.objects.get(special_type="Espèces").id,
credit_amount=4000,
last_name="TOTO",
@@ -326,6 +351,7 @@ class TestValidateRegistration(TestCase):
self.assertTrue(NoteUser.objects.filter(user=self.user).exists())
self.assertTrue(Membership.objects.filter(club__name="BDE", user=self.user).exists())
self.assertTrue(Membership.objects.filter(club__name="Kfet", user=self.user).exists())
+ self.assertFalse(Membership.objects.filter(club__name__iexact="BDA", user=self.user).exists())
self.assertFalse(SogeCredit.objects.filter(user=self.user).exists())
self.assertEqual(Transaction.objects.filter(
Q(source=self.user.note) | Q(destination=self.user.note)).count(), 3)
@@ -333,42 +359,43 @@ class TestValidateRegistration(TestCase):
response = self.client.get(self.user.profile.get_absolute_url())
self.assertEqual(response.status_code, 200)
- def test_validate_kfet_registration_with_soge(self):
- """
- The user joins the BDE and the Kfet, but the membership is paid by the Société générale.
- """
- response = self.client.get(reverse("registration:future_user_detail", args=(self.user.pk,)))
- self.assertEqual(response.status_code, 200)
-
- response = self.client.get(self.user.profile.get_absolute_url())
- self.assertEqual(response.status_code, 404)
-
- self.user.profile.email_confirmed = True
- self.user.profile.save()
-
- response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict(
- soge=True,
- credit_type=NoteSpecial.objects.get(special_type="Espèces").id,
- credit_amount=4000,
- last_name="TOTO",
- first_name="Toto",
- bank="Société générale",
- join_bde=True,
- join_kfet=True,
- ))
- self.assertRedirects(response, self.user.profile.get_absolute_url(), 302, 200)
- self.user.profile.refresh_from_db()
- self.assertTrue(self.user.profile.registration_valid)
- self.assertTrue(NoteUser.objects.filter(user=self.user).exists())
- self.assertTrue(Membership.objects.filter(club__name="BDE", user=self.user).exists())
- self.assertTrue(Membership.objects.filter(club__name="Kfet", user=self.user).exists())
- self.assertTrue(SogeCredit.objects.filter(user=self.user).exists())
- self.assertEqual(Transaction.objects.filter(
- Q(source=self.user.note) | Q(destination=self.user.note)).count(), 3)
- self.assertFalse(Transaction.objects.filter(valid=True).exists())
-
- response = self.client.get(self.user.profile.get_absolute_url())
- self.assertEqual(response.status_code, 200)
+# def test_validate_kfet_registration_with_soge(self):
+# """
+# The user joins the BDE and the Kfet, but the membership is paid by the Société générale.
+# """
+# response = self.client.get(reverse("registration:future_user_detail", args=(self.user.pk,)))
+# self.assertEqual(response.status_code, 200)
+#
+# response = self.client.get(self.user.profile.get_absolute_url())
+# self.assertEqual(response.status_code, 404)
+#
+# self.user.profile.email_confirmed = True
+# self.user.profile.save()
+#
+# response = self.client.post(reverse("registration:future_user_detail", args=(self.user.pk,)), data=dict(
+# soge=True,
+# credit_type=NoteSpecial.objects.get(special_type="Espèces").id,
+# credit_amount=4000,
+# last_name="TOTO",
+# first_name="Toto",
+# bank="Société générale",
+# join_bde=True,
+# join_kfet=True,
+# ))
+# self.assertRedirects(response, self.user.profile.get_absolute_url(), 302, 200)
+# self.user.profile.refresh_from_db()
+# self.assertTrue(self.user.profile.registration_valid)
+# self.assertTrue(NoteUser.objects.filter(user=self.user).exists())
+# self.assertTrue(Membership.objects.filter(club__name="BDE", user=self.user).exists())
+# self.assertTrue(Membership.objects.filter(club__name="Kfet", user=self.user).exists())
+# self.assertFalse(Membership.objects.filter(club__name__iexact="BDA", user=self.user).exists())
+# self.assertTrue(SogeCredit.objects.filter(user=self.user).exists())
+# self.assertEqual(Transaction.objects.filter(
+# Q(source=self.user.note) | Q(destination=self.user.note)).count(), 3)
+# self.assertFalse(Transaction.objects.filter(valid=True).exists())
+#
+# response = self.client.get(self.user.profile.get_absolute_url())
+# self.assertEqual(response.status_code, 200)
def test_invalidate_registration(self):
"""
diff --git a/apps/registration/views.py b/apps/registration/views.py
index b256f591..eb415bdd 100644
--- a/apps/registration/views.py
+++ b/apps/registration/views.py
@@ -24,7 +24,8 @@ from permission.models import Role
from permission.views import ProtectQuerysetMixin
from treasury.models import SogeCredit
-from .forms import SignUpForm, ValidationForm, DeclareSogeAccountOpenedForm
+# from .forms import SignUpForm, ValidationForm, DeclareSogeAccountOpenedForm
+from .forms import SignUpForm, ValidationForm
from .tables import FutureUserTable
from .tokens import email_validation_token
@@ -42,7 +43,7 @@ class UserCreateView(CreateView):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["profile_form"] = self.second_form(self.request.POST if self.request.POST else None)
- context["soge_form"] = DeclareSogeAccountOpenedForm(self.request.POST if self.request.POST else None)
+# context["soge_form"] = DeclareSogeAccountOpenedForm(self.request.POST if self.request.POST else None)
del context["profile_form"].fields["section"]
del context["profile_form"].fields["report_frequency"]
del context["profile_form"].fields["last_report"]
@@ -75,12 +76,12 @@ class UserCreateView(CreateView):
user.profile.send_email_validation_link()
- soge_form = DeclareSogeAccountOpenedForm(self.request.POST)
- if "soge_account" in soge_form.data and soge_form.data["soge_account"]:
- # If the user declares that a bank account got opened, prepare the soge credit to warn treasurers
- soge_credit = SogeCredit(user=user)
- soge_credit._force_save = True
- soge_credit.save()
+# soge_form = DeclareSogeAccountOpenedForm(self.request.POST)
+# if "soge_account" in soge_form.data and soge_form.data["soge_account"]:
+# # If the user declares that a bank account got opened, prepare the soge credit to warn treasurers
+# soge_credit = SogeCredit(user=user)
+# soge_credit._force_save = True
+# soge_credit.save()
return super().form_valid(form)
@@ -237,9 +238,12 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
fee += bde.membership_fee_paid if user.profile.paid else bde.membership_fee_unpaid
kfet = Club.objects.get(name="Kfet")
fee += kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid
+ if Club.objects.filter(name__iexact="BDA").exists():
+ bda = Club.objects.get(name__iexact="BDA")
+ fee += bda.membership_fee_paid if user.profile.paid else bda.membership_fee_unpaid
ctx["total_fee"] = "{:.02f}".format(fee / 100, )
- ctx["declare_soge_account"] = SogeCredit.objects.filter(user=user).exists()
+# ctx["declare_soge_account"] = SogeCredit.objects.filter(user=user).exists()
return ctx
@@ -262,8 +266,13 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
form.add_error(None, _("An alias with a similar name already exists."))
return self.form_invalid(form)
+ # Check if BDA exist to propose membership at regisration
+ bda_exists = False
+ if Club.objects.filter(name__iexact="BDA").exists():
+ bda_exists = True
+
# Get form data
- soge = form.cleaned_data["soge"]
+# soge = form.cleaned_data["soge"]
credit_type = form.cleaned_data["credit_type"]
credit_amount = form.cleaned_data["credit_amount"]
last_name = form.cleaned_data["last_name"]
@@ -271,11 +280,13 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
bank = form.cleaned_data["bank"]
join_bde = form.cleaned_data["join_bde"]
join_kfet = form.cleaned_data["join_kfet"]
+ if bda_exists:
+ join_bda = form.cleaned_data["join_bda"]
- if soge:
- # If Société Générale pays the inscription, the user automatically joins the two clubs.
- join_bde = True
- join_kfet = True
+# if soge:
+# # If Société Générale pays the inscription, the user automatically joins the two clubs.
+# join_bde = True
+# join_kfet = True
if not join_bde:
# This software belongs to the BDE.
@@ -292,15 +303,21 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
kfet_fee = kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid
# Add extra fee for the full membership
fee += kfet_fee if join_kfet else 0
+ if bda_exists:
+ bda = Club.objects.get(name__iexact="BDA")
+ bda_fee = bda.membership_fee_paid if user.profile.paid else bda.membership_fee_unpaid
+ # Add extra fee for the bda membership
+ fee += bda_fee if join_bda else 0
- # If the bank pays, then we don't credit now. Treasurers will validate the transaction
- # and credit the note later.
- credit_type = None if soge else credit_type
+# # If the bank pays, then we don't credit now. Treasurers will validate the transaction
+# # and credit the note later.
+# credit_type = None if soge else credit_type
# If the user does not select any payment method, then no credit will be performed.
credit_amount = 0 if credit_type is None else credit_amount
- if fee > credit_amount and not soge:
+# if fee > credit_amount and not soge:
+ if fee > credit_amount:
# Check if the user credits enough money
form.add_error('credit_type',
_("The entered amount is not enough for the memberships, should be at least {}")
@@ -320,12 +337,12 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
user.profile.save()
user.refresh_from_db()
- if not soge and SogeCredit.objects.filter(user=user).exists():
- # If the user declared that a bank account was opened but in the validation form the SoGé case was
- # unchecked, delete the associated credit
- soge_credit = SogeCredit.objects.get(user=user)
- soge_credit._force_delete = True
- soge_credit.delete()
+# if not soge and SogeCredit.objects.filter(user=user).exists():
+# # If the user declared that a bank account was opened but in the validation form the SoGé case was
+# # unchecked, delete the associated credit
+# soge_credit = SogeCredit.objects.get(user=user)
+# soge_credit._force_delete = True
+# soge_credit.delete()
if credit_type is not None and credit_amount > 0:
# Credit the note
@@ -334,7 +351,8 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
destination=user.note,
quantity=1,
amount=credit_amount,
- reason="Crédit " + ("Société générale" if soge else credit_type.special_type) + " (Inscription)",
+ reason="Crédit " + credit_type.special_type + " (Inscription)",
+ # reason="Crédit " + ("Société générale" if soge else credit_type.special_type) + " (Inscription)",
last_name=last_name,
first_name=first_name,
bank=bank,
@@ -348,8 +366,8 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
user=user,
fee=bde_fee,
)
- if soge:
- membership._soge = True
+# if soge:
+# membership._soge = True
membership.save()
membership.refresh_from_db()
membership.roles.add(Role.objects.get(name="Adhérent BDE"))
@@ -362,17 +380,29 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
user=user,
fee=kfet_fee,
)
- if soge:
- membership._soge = True
+# if soge:
+# membership._soge = True
membership.save()
membership.refresh_from_db()
membership.roles.add(Role.objects.get(name="Adhérent Kfet"))
membership.save()
- if soge:
- soge_credit = SogeCredit.objects.get(user=user)
- # Update the credit transaction amount
- soge_credit.save()
+ if bda_exists and join_bda:
+ # Create membership for the user to the BDA starting today
+ membership = Membership(
+ club=bda,
+ user=user,
+ fee=bda_fee,
+ )
+ membership.save()
+ membership.refresh_from_db()
+ membership.roles.add(Role.objects.get(name="Membre de club"))
+ membership.save()
+
+# if soge:
+# soge_credit = SogeCredit.objects.get(user=user)
+# # Update the credit transaction amount
+# soge_credit.save()
return ret
diff --git a/apps/treasury/migrations/0005_auto_20230129_2348.py b/apps/treasury/migrations/0005_auto_20230129_2348.py
new file mode 100644
index 00000000..bd8a607a
--- /dev/null
+++ b/apps/treasury/migrations/0005_auto_20230129_2348.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.28 on 2023-01-29 22:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('treasury', '0004_auto_20211005_1544'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='invoice',
+ name='bde',
+ field=models.CharField(choices=[('TotalistSpies', 'Tota[list]Spies'), ('Saperlistpopette', 'Saper[list]popette'), ('Finalist', 'Fina[list]'), ('Listorique', '[List]orique'), ('Satellist', 'Satel[list]'), ('Monopolist', 'Monopo[list]'), ('Kataclist', 'Katac[list]')], default='TotalistSpies', max_length=32, verbose_name='BDE'),
+ ),
+ ]
diff --git a/apps/treasury/migrations/0006_auto_20230414_1651.py b/apps/treasury/migrations/0006_auto_20230414_1651.py
new file mode 100644
index 00000000..98df4316
--- /dev/null
+++ b/apps/treasury/migrations/0006_auto_20230414_1651.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.28 on 2023-04-14 14:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('treasury', '0005_auto_20230129_2348'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='invoice',
+ name='bde',
+ field=models.CharField(choices=[('SecretStorlist', 'SecretStor[list]'), ('TotalistSpies', 'Tota[list]Spies'), ('Saperlistpopette', 'Saper[list]popette'), ('Finalist', 'Fina[list]'), ('Listorique', '[List]orique'), ('Satellist', 'Satel[list]'), ('Monopolist', 'Monopo[list]'), ('Kataclist', 'Katac[list]')], default='SecretStorlist', max_length=32, verbose_name='BDE'),
+ ),
+ ]
diff --git a/apps/treasury/models.py b/apps/treasury/models.py
index 51e2b885..e788e479 100644
--- a/apps/treasury/models.py
+++ b/apps/treasury/models.py
@@ -1,6 +1,5 @@
-# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2023 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
-import datetime
from datetime import date
from django.conf import settings
@@ -12,7 +11,8 @@ from django.db.models import Q
from django.template.loader import render_to_string
from django.utils import timezone
from django.utils.translation import gettext_lazy as _
-from member.models import Club, Membership
+# from member.models import Club, Membership # Club unused because of disabled soge
+from member.models import Membership
from note.models import NoteSpecial, SpecialTransaction, MembershipTransaction, NoteUser
@@ -28,8 +28,10 @@ class Invoice(models.Model):
bde = models.CharField(
max_length=32,
- default='Saperlistpopette',
+ default='SecretStorlist',
choices=(
+ ('SecretStorlist', 'SecretStor[list]'),
+ ('TotalistSpies', 'Tota[list]Spies'),
('Saperlistpopette', 'Saper[list]popette'),
('Finalist', 'Fina[list]'),
('Listorique', '[List]orique'),
@@ -95,7 +97,7 @@ class Invoice(models.Model):
products = self.products.all()
self.place = "Gif-sur-Yvette"
- self.my_name = "BDE ENS Cachan"
+ self.my_name = "BDE ENS Paris Saclay"
self.my_address_street = "4 avenue des Sciences"
self.my_city = "91190 Gif-sur-Yvette"
self.bank_code = 30003
@@ -324,23 +326,23 @@ class SogeCredit(models.Model):
if self.valid or not self.pk:
return
- bde = Club.objects.get(name="BDE")
- kfet = Club.objects.get(name="Kfet")
- bde_qs = Membership.objects.filter(user=self.user, club=bde, date_start__gte=bde.membership_start)
- kfet_qs = Membership.objects.filter(user=self.user, club=kfet, date_start__gte=kfet.membership_start)
+# Soge do not pay BDE and kfet memberships since 2022
+# bde = Club.objects.get(name="BDE")
+# kfet = Club.objects.get(name="Kfet")
+# bde_qs = Membership.objects.filter(user=self.user, club=bde, date_start__gte=bde.membership_start)
+# kfet_qs = Membership.objects.filter(user=self.user, club=kfet, date_start__gte=kfet.membership_start)
-## Soge do not pay BDE and kfet memberships this year (2022-2023)
# if bde_qs.exists():
# m = bde_qs.get()
# if MembershipTransaction.objects.filter(membership=m).exists(): # non-free membership
# if m.transaction not in self.transactions.all():
# self.transactions.add(m.transaction)
#
-# if kfet_qs.exists():
-# m = kfet_qs.get()
-# if MembershipTransaction.objects.filter(membership=m).exists(): # non-free membership
-# if m.transaction not in self.transactions.all():
-# self.transactions.add(m.transaction)
+# if kfet_qs.exists():
+# m = kfet_qs.get()
+# if MembershipTransaction.objects.filter(membership=m).exists(): # non-free membership
+# if m.transaction not in self.transactions.all():
+# self.transactions.add(m.transaction)
if 'wei' in settings.INSTALLED_APPS:
from wei.models import WEIClub
@@ -386,7 +388,6 @@ class SogeCredit(models.Model):
for tr in self.transactions.all():
tr.valid = True
tr._force_save = True
- tr.created_at = timezone.now()
tr.save()
@transaction.atomic
@@ -435,12 +436,11 @@ class SogeCredit(models.Model):
for tr in self.transactions.all():
tr._force_save = True
tr.valid = True
- tr.created_at = timezone.now()
tr.save()
if self.credit_transaction:
# If the soge credit is deleted while the user is not validated yet,
# there is not credit transaction.
- # There is a credit transaction iff the user declares that no bank account
+ # There is a credit transaction if the user declares that no bank account
# was opened after the validation of the account.
self.credit_transaction.valid = False
self.credit_transaction.reason += " (invalide)"
diff --git a/apps/treasury/static/img/SecretStorlist.png b/apps/treasury/static/img/SecretStorlist.png
new file mode 100644
index 00000000..5b7766fd
Binary files /dev/null and b/apps/treasury/static/img/SecretStorlist.png differ
diff --git a/apps/treasury/static/img/SecretStorlist_bg.jpg b/apps/treasury/static/img/SecretStorlist_bg.jpg
new file mode 100644
index 00000000..8c5b0d26
Binary files /dev/null and b/apps/treasury/static/img/SecretStorlist_bg.jpg differ
diff --git a/apps/treasury/static/img/TotalistSpies.png b/apps/treasury/static/img/TotalistSpies.png
new file mode 100644
index 00000000..196b4bc0
Binary files /dev/null and b/apps/treasury/static/img/TotalistSpies.png differ
diff --git a/apps/treasury/static/img/TotalistSpies_bg.jpg b/apps/treasury/static/img/TotalistSpies_bg.jpg
new file mode 100644
index 00000000..829ee2fa
Binary files /dev/null and b/apps/treasury/static/img/TotalistSpies_bg.jpg differ
diff --git a/apps/treasury/templates/treasury/invoice_sample.tex b/apps/treasury/templates/treasury/invoice_sample.tex
index f07f00f5..f34b7ad3 100644
--- a/apps/treasury/templates/treasury/invoice_sample.tex
+++ b/apps/treasury/templates/treasury/invoice_sample.tex
@@ -105,8 +105,8 @@
\renewcommand{\headrulewidth}{0pt}
\cfoot{
- \small{\MonNom ~--~ \MonAdresseRue ~ \MonAdresseVille ~--~ Téléphone : +33(0)6 89 88 56 50\newline
- Site web : bde.ens-cachan.fr ~--~ E-mail : tresorerie.bde@lists.crans.org \newline Numéro SIRET : 399 485 838 00011
+ \small{\MonNom ~--~ \MonAdresseRue ~ \MonAdresseVille ~--~ Téléphone : +33(0)7 78 17 22 34\newline
+ Site web : bde.ens-cachan.fr ~--~ E-mail : tresorerie.bde@lists.crans.org \newline Numéro SIRET : 399 485 838 00029
}
}
diff --git a/apps/treasury/tests/test_treasury.py b/apps/treasury/tests/test_treasury.py
index 798a960f..bc0eddc3 100644
--- a/apps/treasury/tests/test_treasury.py
+++ b/apps/treasury/tests/test_treasury.py
@@ -385,8 +385,7 @@ class TestSogeCredits(TestCase):
response = self.client.post(reverse("treasury:manage_soge_credit", args=(soge_credit.pk,)),
data=dict(delete=True))
- # 403 because no SogeCredit exists anymore, then a PermissionDenied is raised
- self.assertRedirects(response, reverse("treasury:soge_credits"), 302, 403)
+ self.assertRedirects(response, reverse("treasury:soge_credits"), 302, 200)
self.assertFalse(SogeCredit.objects.filter(pk=soge_credit.pk))
self.user.note.refresh_from_db()
self.assertEqual(self.user.note.balance, 0)
diff --git a/apps/treasury/views.py b/apps/treasury/views.py
index aee6ea04..fef684cc 100644
--- a/apps/treasury/views.py
+++ b/apps/treasury/views.py
@@ -101,14 +101,7 @@ class InvoiceListView(LoginRequiredMixin, SingleTableView):
if not request.user.is_authenticated:
return self.handle_no_permission()
- sample_invoice = Invoice(
- id=0,
- object="",
- description="",
- name="",
- address="",
- )
- if not PermissionBackend.check_perm(self.request, "treasury.add_invoice", sample_invoice):
+ if not PermissionBackend.has_model_perm(self.request, Invoice(), "view"):
raise PermissionDenied(_("You are not able to see the treasury interface."))
return super().dispatch(request, *args, **kwargs)
@@ -278,11 +271,7 @@ class RemittanceListView(LoginRequiredMixin, TemplateView):
if not request.user.is_authenticated:
return self.handle_no_permission()
- sample_remittance = Remittance(
- remittance_type_id=1,
- comment="",
- )
- if not PermissionBackend.check_perm(self.request, "treasury.add_remittance", sample_remittance):
+ if not PermissionBackend.has_model_perm(self.request, Remittance(), "view"):
raise PermissionDenied(_("You are not able to see the treasury interface."))
return super().dispatch(request, *args, **kwargs)
@@ -408,7 +397,7 @@ class SogeCreditListView(LoginRequiredMixin, ProtectQuerysetMixin, SingleTableVi
if not request.user.is_authenticated:
return self.handle_no_permission()
- if not super().get_queryset().exists():
+ if not PermissionBackend.has_model_perm(self.request, SogeCredit(), "view"):
raise PermissionDenied(_("You are not able to see the treasury interface."))
return super().dispatch(request, *args, **kwargs)
diff --git a/apps/wei/forms/registration.py b/apps/wei/forms/registration.py
index e934fb50..408071f4 100644
--- a/apps/wei/forms/registration.py
+++ b/apps/wei/forms/registration.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2023 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
from django import forms
@@ -38,7 +38,7 @@ class WEIRegistrationForm(forms.ModelForm):
class Meta:
model = WEIRegistration
- exclude = ('wei', )
+ exclude = ('wei', 'clothing_cut')
widgets = {
"user": Autocomplete(
User,
diff --git a/apps/wei/forms/surveys/__init__.py b/apps/wei/forms/surveys/__init__.py
index 06fcfae5..0b1c583f 100644
--- a/apps/wei/forms/surveys/__init__.py
+++ b/apps/wei/forms/surveys/__init__.py
@@ -2,11 +2,11 @@
# SPDX-License-Identifier: GPL-3.0-or-later
from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm
-from .wei2022 import WEISurvey2022
+from .wei2023 import WEISurvey2023
__all__ = [
'WEISurvey', 'WEISurveyInformation', 'WEISurveyAlgorithm', 'CurrentSurvey',
]
-CurrentSurvey = WEISurvey2022
+CurrentSurvey = WEISurvey2023
diff --git a/apps/wei/forms/surveys/wei2022.py b/apps/wei/forms/surveys/wei2022.py
index cb2b4adb..6a6aecd5 100644
--- a/apps/wei/forms/surveys/wei2022.py
+++ b/apps/wei/forms/surveys/wei2022.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2022 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2023 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
import time
@@ -14,17 +14,17 @@ from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, WEIBusInf
from ...models import WEIMembership
WORDS = [
- 'ABBA', 'After', 'Alcoolique anonyme', 'Ambiance festive', 'Années 2000', 'Apéro', 'Art',
- 'Baby foot billard biere pong', 'BBQ', 'Before', 'Bière pong', 'Bon enfant', 'Calme', 'Canapé',
- 'Chanson paillarde', 'Chanson populaire', 'Chartreuse', 'Cheerleader', 'Chill', 'Choré',
- 'Cinéma', 'Cocktail', 'Comédie musicle', 'Commercial', 'Copaing', 'Danse', 'Dancefloor',
- 'Electro', 'Fanfare', 'Gin tonic', 'Inclusif', 'Jazz', "Jeux d'alcool", 'Jeux de carte',
- 'Jeux de rôle', 'Jeux de société', 'JUL', 'Jus de fruit', 'Kfet', 'Kleptomanie assurée',
- 'LGBTQ+', 'Livre', 'Morning beer', 'Musique', 'NAPS', 'Paillettes', 'Pastis', 'Paté Hénaff',
- 'Peluche', 'Pena baiona', "Peu d'alcool", 'Pilier de bar', 'PMU', 'Poulpe', 'Punch', 'Rap',
- 'Réveil', 'Rock', 'Rugby', 'Sandwich', 'Serge', 'Shot', 'Sociable', 'Spectacle', 'Techno',
- 'Techno house', 'Thérapie Taxi', 'Tradition kchanaises', 'Troisième mi-temps', 'Turn up',
- 'Vodka', 'Vodka pomme', 'Volley', 'Vomi stratégique'
+ 'ABBA', 'After', 'Alcoolique anonyme', 'Ambiance festive', 'Années 2000', 'Apéro', 'Art',
+ 'Baby foot billard biere pong', 'BBQ', 'Before', 'Bière pong', 'Bon enfant', 'Calme', 'Canapé',
+ 'Chanson paillarde', 'Chanson populaire', 'Chartreuse', 'Cheerleader', 'Chill', 'Choré',
+ 'Cinéma', 'Cocktail', 'Comédie musicle', 'Commercial', 'Copaing', 'Danse', 'Dancefloor',
+ 'Electro', 'Fanfare', 'Gin tonic', 'Inclusif', 'Jazz', "Jeux d'alcool", 'Jeux de carte',
+ 'Jeux de rôle', 'Jeux de société', 'JUL', 'Jus de fruit', 'Kfet', 'Kleptomanie assurée',
+ 'LGBTQ+', 'Livre', 'Morning beer', 'Musique', 'NAPS', 'Paillettes', 'Pastis', 'Paté Hénaff',
+ 'Peluche', 'Pena baiona', "Peu d'alcool", 'Pilier de bar', 'PMU', 'Poulpe', 'Punch', 'Rap',
+ 'Réveil', 'Rock', 'Rugby', 'Sandwich', 'Serge', 'Shot', 'Sociable', 'Spectacle', 'Techno',
+ 'Techno house', 'Thérapie Taxi', 'Tradition kchanaises', 'Troisième mi-temps', 'Turn up',
+ 'Vodka', 'Vodka pomme', 'Volley', 'Vomi stratégique'
]
diff --git a/apps/wei/forms/surveys/wei2023.py b/apps/wei/forms/surveys/wei2023.py
new file mode 100644
index 00000000..70bd814e
--- /dev/null
+++ b/apps/wei/forms/surveys/wei2023.py
@@ -0,0 +1,391 @@
+# Copyright (C) 2018-2023 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from functools import lru_cache
+
+from django import forms
+from django.db import transaction
+from django.db.models import Q
+
+from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, WEIBusInformation
+from ...models import WEIMembership
+
+WORDS = {
+ "ambiance": ["Ambiance de bus :", {
+ 1: "Ambiance calme et posée",
+ 2: "Ambiance rigolage entre copaing",
+ 3: "Ambiance danse de camping autour d'une piscine inexistante",
+ 4: "Grosse soirée avec de la musique qui fait bouger",
+ 5: "On retourne le camping et le bus (dans le respect et le savoir vivre)"
+ }],
+ "musique": ["Musique :", {
+ 1: "Musique tranquille",
+ 2: "Musique commerciale",
+ 3: "Chansons paillardes",
+ 4: "Musique de Colonie de vacances",
+ 5: "Grosse techno"
+ }],
+ "boisson": ["Boissons :", {
+ 1: "Boisson soft",
+ 2: "Des cocktails de temps en temps",
+ 3: "Des coktails fancy de pétasse (parce que c'est les meilleurs)",
+ 4: "Bière !",
+ 5: "L'alcool c'est dans les céréales"
+ }],
+ "beauferie": ["Échelle de la beauferie :", {
+ 1: "Je suis toujours classe",
+ 2: "Je rote de temps en temps",
+ 3: "Claquette chaussette, c'est confortable",
+ 4: "L'aviron bayonnais est dans ma plyaylist",
+ 5: "Je suis champion⋅ne de concours de rots et d'éclatage de gobelet sur mon front"
+ }],
+ "sommeil": ["Échelle de ton sommeil pendant le WEI :", {
+ 1: "Dormir, c'est pour les faibles",
+ 2: "5h maximum",
+ 3: "10h",
+ 4: "15h",
+ 5: "Deux bonnes nuits de sommeil, c'est important pour être en forme pour les activités proposées par nos supers GC WEI"
+ }],
+ "vacances": ["Tes vacances de rêve :", {
+ 1: "Dans ma chambre",
+ 2: "Retourner chez popa et moman pour pouvoir enfin arrêter de manger des pasta box",
+ 3: "Être une grosse larve sous le soleil des troopiiiiiiiiques",
+ 4: "Faire un road trip camping sauvage, manger des racines et boire son pipi",
+ 5: "Le crime ne prend pas de vacances"
+ }],
+ "activite": ["T'as une heure de trou pendant ton WEI, que fais-tu ?", {
+ 1: "Je cherche des copaines pour faire un petit jeu de société",
+ 2: "Je cherche un moyen de me dépenser, n'importe quel ballon ferait l'affaire",
+ 3: "Je cherche un endroit où il y a de la musique pour bouger sur le dancefloor",
+ 4: "Petit apéro, petite pétanque avec les collègues autour d'un bon pastaga",
+ 5: "Je cherche une connerie à faire (mais pas trop méchante, pour ne pas embêter mes GC WEI préférés)"
+ }],
+ "hygiene": ["Échelle de ton hygiène :", {
+ 1: "La douche, c'eest tous les jours",
+ 2: "La règle des 2 jours, c'est un droit et un devoir",
+ 3: "Je ne me lave qu'après le sport",
+ 4: "« Ne vous inquiétez pas, je pue pas »",
+ 5: "Y a que les sales qui se lavent"
+ }],
+ "animal": ["Tu décrirais ton animal totem plutôt comme :", {
+ 1: "Un dragon qui raserait des villes entières d'un seul souffle",
+ 2: "Une mouette qui pique des frites aux dunkerquois",
+ 3: "Un poulpe tout meunion",
+ 4: "Un pitbull qui au fond cache un petit cœur en sucre",
+ 5: "Un canard en plastique au bord d'une baignoire qui n'a pas servi depuis 10 ans"
+ }],
+ "fensfoire": ["Quel est ton rapport à la F[ENS]foire ?", {
+ 1: "Je réveille les autres à 6h avec mon instrument",
+ 2: "Je la suis partout",
+ 3: "J'aime bien l'écouter de temps en temps",
+ 4: "Je mets des bouchons d'oreilles pour ne pas l'entendre",
+ 5: "La quoi ?"
+ }],
+ "kokarde": ["Qu'est-ce que le mot Kokarde t'évoque ?", {
+ 1: "Vraiment pas mon truc les soirées…",
+ 2: "Bof, je viens pour manger et je repars aussitôt",
+ 3: "Je kiffe, good vibes",
+ 4: "Perso, je ne m'arrêterai pas de danser sur la piste !",
+ 5: "J'resterai jusqu'à 3h ou rien"
+ }],
+ "copain": ["Qu'est-ce que tu fais avec un⋅e «copain⋅ine» ?", {
+ 1: "Je l'insulte de sale merde",
+ 2: "J'lui fais faire des trucs cons et je l'affiche !",
+ 3: "On parlerait ensemble et on se marrerait",
+ 4: "On aurait des vrais gros délires",
+ 5: "Je meurs pour lui/elle"
+ }],
+ "vie": ["Selon toi, qu'est-ce que la vie ?", {
+ 1: "La vie, cette sale race !",
+ 2: "Un moment paisible avant la mort",
+ 3: "C'est difficile à définir...",
+ 4: "En vrai, c'est cool !",
+ 5: "Une gigantestque tranche de kiff ! Et tous les jours, j'en mange un morceau"
+ }],
+ "jeux": ["Quel est ton rapport avec les jeux de société ?", {
+ 1: "éloigné",
+ 2: "nonchalant",
+ 3: "timide",
+ 4: "assumé",
+ 5: "sexuel"
+ }],
+ "calin": ["Qu'est-ce que tu penses des câlins ?", {
+ 1: "Jamais je n'en fais et jamais je n'en ferai !",
+ 2: "J'en fais mais ça ne me plaît pas",
+ 3: "J'en fais rarement mais c'est toujours cool",
+ 4: "J'en fais tous les jours avec mes ami⋅es !",
+ 5: "Je pourrais en faire à n'importe qui. Pourquoi ne pas créer le club Câl[ENS] ?"
+ }],
+ "vomi": ["Quel est ton rapport au vomi ?", {
+ 1: "C'est compliqué…",
+ 2: "Jamais je ne vomis mais je nettoie quand mes potes vomissent",
+ 3: "Jamais je ne vomis et jamais je ne nettoie celui de quelqu'un d'autre",
+ 4: "Je vomis quelquefois, ça arrive, faites pas cette tête, mais je fins toujours par nettoyer !",
+ 5: "Je vomis à chaque soirée et ce n'est jamais moi qui nettoie"
+ }],
+ "kfet": ["Qu'est ce que la Kfet t'évoque ?", {
+ 1: "La Kfet, quel lieu de dépravé⋅es sérieux…",
+ 2: "C'est un endroit à l'hygiène plus que douteuse…",
+ 3: "Téma les prix des boissons et des snacks, c'est aberrant !",
+ 4: "En vrai, c'est cool, petit billard, petit canapé, chill !",
+ 5: "Banger, j'y reste jusqu'à la fin de mes jours"
+ }],
+ "fatigue": ["Comment combattre la fatigue lors de ton WEI ?", {
+ 1: "Le sport en journée, ça réveille",
+ 2: "Le sucre du coca, ça réveille",
+ 3: "La taurine du Red Bull, ça réveille",
+ 4: "L'alcool dans le sang, ça réveille",
+ 5: "L'écocup sur le front, ça réveille"
+ }],
+ "duree trajet": ["Quelle serait ta durée de trajet préférée ?", {
+ 1: "Trajet instantané, pas le temps de niaiser",
+ 2: "1h, histoire de faire connaissance avec quelques personnes avant de se jeter sur les boissons",
+ 3: "3h, on peut vraiment parler et apprendre à connaître nos voisin⋅es",
+ 4: "6h, histoire d'avoir le temps de faire des conneries dans le bus pour bien se marrer !",
+ 5: "12h, il faut bien trouver un moment pour dormir, ce seront deux gros dodos dans un bus"
+ }],
+ "scolarite": ["Comment tu vois ton cursus à l'ENS ?", {
+ 1: "La tranquillité et le travail",
+ 2: "On va s'amuser tout en bossant",
+ 3: "Ça va profiter et réviser au dernier moment pour les exams…",
+ 4: "Nous festoierons sans songer aux conséquences",
+ 5: "Je ne vois qu'une seule issue : la débauche"
+ }]
+}
+
+
+class WEISurveyForm2023(forms.Form):
+ """
+ Survey form for the year 2023.
+ Members answer 20 questions, from which we calculate the best associated bus.
+ """
+ def set_registration(self, registration):
+ """
+ Filter the bus selector with the buses of the current WEI.
+ """
+ information = WEISurveyInformation2023(registration)
+
+ question = information.questions[information.step]
+ self.fields[question] = forms.ChoiceField(
+ label=WORDS[question][0],
+ widget=forms.RadioSelect(),
+ )
+ answers = [(answer, WORDS[question][1][answer]) for answer in WORDS[question][1]]
+ self.fields[question].choices = answers
+
+
+class WEIBusInformation2023(WEIBusInformation):
+ """
+ For each question, the bus has ordered answers
+ """
+ scores: dict
+
+ def __init__(self, bus):
+ self.scores = {}
+ for question in WORDS:
+ self.scores[question] = []
+ super().__init__(bus)
+
+
+class WEISurveyInformation2023(WEISurveyInformation):
+ """
+ We store the id of the selected bus. We store only the name, but is not used in the selection:
+ that's only for humans that try to read data.
+ """
+
+ step = 0
+ questions = list(WORDS.keys())
+
+ def __init__(self, registration):
+ for question in WORDS:
+ setattr(self, str(question), None)
+ super().__init__(registration)
+
+
+class WEISurvey2023(WEISurvey):
+ """
+ Survey for the year 2023.
+ """
+
+ @classmethod
+ def get_year(cls):
+ return 2023
+
+ @classmethod
+ def get_survey_information_class(cls):
+ return WEISurveyInformation2023
+
+ def get_form_class(self):
+ return WEISurveyForm2023
+
+ def update_form(self, form):
+ """
+ Filter the bus selector with the buses of the WEI.
+ """
+ form.set_registration(self.registration)
+
+ @transaction.atomic
+ def form_valid(self, form):
+ self.information.step += 1
+ for question in WORDS:
+ if question in form.cleaned_data:
+ answer = form.cleaned_data[question]
+ setattr(self.information, question, answer)
+ self.save()
+
+ @classmethod
+ def get_algorithm_class(cls):
+ return WEISurveyAlgorithm2023
+
+ def is_complete(self) -> bool:
+ """
+ The survey is complete once the bus is chosen.
+ """
+ for question in WORDS:
+ if not getattr(self.information, question):
+ return False
+ return True
+
+ @lru_cache()
+ def score(self, bus):
+ if not self.is_complete():
+ raise ValueError("Survey is not ended, can't calculate score")
+
+ bus_info = self.get_algorithm_class().get_bus_information(bus)
+ # Score is the given score by the bus subtracted to the mid-score of the buses.
+ s = 0
+ for question in WORDS:
+ s += bus_info.scores[question][str(getattr(self.information, question))]
+ return s
+
+ @lru_cache()
+ def scores_per_bus(self):
+ return {bus: self.score(bus) for bus in self.get_algorithm_class().get_buses()}
+
+ @lru_cache()
+ def ordered_buses(self):
+ values = list(self.scores_per_bus().items())
+ values.sort(key=lambda item: -item[1])
+ return values
+
+ @classmethod
+ def clear_cache(cls):
+ return super().clear_cache()
+
+
+class WEISurveyAlgorithm2023(WEISurveyAlgorithm):
+ """
+ The algorithm class for the year 2023.
+ We use Gale-Shapley algorithm to attribute 1y students into buses.
+ """
+
+ @classmethod
+ def get_survey_class(cls):
+ return WEISurvey2023
+
+ @classmethod
+ def get_bus_information_class(cls):
+ return WEIBusInformation2023
+
+ def run_algorithm(self, display_tqdm=False):
+ """
+ Gale-Shapley algorithm implementation.
+ We modify it to allow buses to have multiple "weddings".
+ """
+ surveys = list(self.get_survey_class()(r) for r in self.get_registrations()) # All surveys
+ surveys = [s for s in surveys if s.is_complete()] # Don't consider invalid surveys
+ # Don't manage hardcoded people
+ surveys = [s for s in surveys if not hasattr(s.information, 'hardcoded') or not s.information.hardcoded]
+
+ # Reset previous algorithm run
+ for survey in surveys:
+ survey.free()
+ survey.save()
+
+ non_men = [s for s in surveys if s.registration.gender != 'male']
+ men = [s for s in surveys if s.registration.gender == 'male']
+
+ quotas = {}
+ registrations = self.get_registrations()
+ non_men_total = registrations.filter(~Q(gender='male')).count()
+ for bus in self.get_buses():
+ free_seats = bus.size - WEIMembership.objects.filter(bus=bus, registration__first_year=False).count()
+ # Remove hardcoded people
+ free_seats -= WEIMembership.objects.filter(bus=bus, registration__first_year=True,
+ registration__information_json__icontains="hardcoded").count()
+ quotas[bus] = 4 + int(non_men_total / registrations.count() * free_seats)
+
+ tqdm_obj = None
+ if display_tqdm:
+ from tqdm import tqdm
+ tqdm_obj = tqdm(total=len(non_men), desc="Non-hommes")
+
+ # Repartition for non men people first
+ self.make_repartition(non_men, quotas, tqdm_obj=tqdm_obj)
+
+ quotas = {}
+ for bus in self.get_buses():
+ free_seats = bus.size - WEIMembership.objects.filter(bus=bus, registration__first_year=False).count()
+ free_seats -= sum(1 for s in non_men if s.information.selected_bus_pk == bus.pk)
+ # Remove hardcoded people
+ free_seats -= WEIMembership.objects.filter(bus=bus, registration__first_year=True,
+ registration__information_json__icontains="hardcoded").count()
+ quotas[bus] = free_seats
+
+ if display_tqdm:
+ tqdm_obj.close()
+
+ from tqdm import tqdm
+ tqdm_obj = tqdm(total=len(men), desc="Hommes")
+
+ self.make_repartition(men, quotas, tqdm_obj=tqdm_obj)
+
+ if display_tqdm:
+ tqdm_obj.close()
+
+ # Clear cache information after running algorithm
+ WEISurvey2023.clear_cache()
+
+ def make_repartition(self, surveys, quotas=None, tqdm_obj=None):
+ free_surveys = surveys.copy() # Remaining surveys
+ while free_surveys: # Some students are not affected
+ survey = free_surveys[0]
+ buses = survey.ordered_buses() # Preferences of the student
+ for bus, current_score in buses:
+ if self.get_bus_information(bus).has_free_seats(surveys, quotas):
+ # Selected bus has free places. Put student in the bus
+ survey.select_bus(bus)
+ survey.save()
+ free_surveys.remove(survey)
+ break
+ else:
+ # Current bus has not enough places. Remove the least preferred student from the bus if existing
+ least_preferred_survey = None
+ least_score = -1
+ # Find the least student in the bus that has a lower score than the current student
+ for survey2 in surveys:
+ if not survey2.information.valid or survey2.information.get_selected_bus() != bus:
+ continue
+ score2 = survey2.score(bus)
+ if current_score <= score2: # Ignore better students
+ continue
+ if least_preferred_survey is None or score2 < least_score:
+ least_preferred_survey = survey2
+ least_score = score2
+
+ if least_preferred_survey is not None:
+ # Remove the least student from the bus and put the current student in.
+ # If it does not exist, choose the next bus.
+ least_preferred_survey.free()
+ least_preferred_survey.save()
+ free_surveys.append(least_preferred_survey)
+ survey.select_bus(bus)
+ survey.save()
+ free_surveys.remove(survey)
+ break
+ else:
+ raise ValueError(f"User {survey.registration.user} has no free seat")
+
+ if tqdm_obj is not None:
+ tqdm_obj.n = len(surveys) - len(free_surveys)
+ tqdm_obj.refresh()
diff --git a/apps/wei/migrations/0004_auto_20220904_2325.py b/apps/wei/migrations/0004_auto_20220904_2325.py
new file mode 100644
index 00000000..fb41c2bd
--- /dev/null
+++ b/apps/wei/migrations/0004_auto_20220904_2325.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.26 on 2022-09-04 21:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('wei', '0003_bus_size'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='weiclub',
+ name='year',
+ field=models.PositiveIntegerField(default=2022, unique=True, verbose_name='year'),
+ ),
+ ]
diff --git a/apps/wei/migrations/0005_auto_20230128_1850.py b/apps/wei/migrations/0005_auto_20230128_1850.py
new file mode 100644
index 00000000..a8c432aa
--- /dev/null
+++ b/apps/wei/migrations/0005_auto_20230128_1850.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.28 on 2023-01-28 17:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('wei', '0004_auto_20220904_2325'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='weiclub',
+ name='year',
+ field=models.PositiveIntegerField(default=2023, unique=True, verbose_name='year'),
+ ),
+ ]
diff --git a/apps/wei/migrations/0006_unisex_clothing_cut.py b/apps/wei/migrations/0006_unisex_clothing_cut.py
new file mode 100644
index 00000000..c2ed7c97
--- /dev/null
+++ b/apps/wei/migrations/0006_unisex_clothing_cut.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.28 on 2023-07-09 09:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('wei', '0005_auto_20230128_1850'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='weiregistration',
+ name='clothing_cut',
+ field=models.CharField(choices=[('male', 'Male'), ('female', 'Female'), ('unisex', 'Unisex')], default='unisex', max_length=16, verbose_name='clothing cut'),
+ ),
+ ]
diff --git a/apps/wei/migrations/0007_help_text_emergency_contact.py b/apps/wei/migrations/0007_help_text_emergency_contact.py
new file mode 100644
index 00000000..4437db7d
--- /dev/null
+++ b/apps/wei/migrations/0007_help_text_emergency_contact.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.28 on 2023-07-09 12:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('wei', '0006_unisex_clothing_cut'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='weiregistration',
+ name='emergency_contact_name',
+ field=models.CharField(help_text='The emergency contact must not be a WEI participant', max_length=255, verbose_name='emergency contact name'),
+ ),
+ ]
diff --git a/apps/wei/models.py b/apps/wei/models.py
index 6b7272b4..6b05609f 100644
--- a/apps/wei/models.py
+++ b/apps/wei/models.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2021 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2023 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
import json
@@ -209,7 +209,9 @@ class WEIRegistration(models.Model):
choices=(
('male', _("Male")),
('female', _("Female")),
+ ('unisex', _("Unisex")),
),
+ default='unisex',
verbose_name=_("clothing cut"),
)
@@ -235,6 +237,7 @@ class WEIRegistration(models.Model):
emergency_contact_name = models.CharField(
max_length=255,
verbose_name=_("emergency contact name"),
+ help_text=_("The emergency contact must not be a WEI participant")
)
emergency_contact_phone = PhoneNumberField(
diff --git a/apps/wei/templates/wei/weimembership_form.html b/apps/wei/templates/wei/weimembership_form.html
index 7d1059b7..017b0dd7 100644
--- a/apps/wei/templates/wei/weimembership_form.html
+++ b/apps/wei/templates/wei/weimembership_form.html
@@ -56,7 +56,7 @@ SPDX-License-Identifier: GPL-3.0-or-later