mirror of
https://gitlab.crans.org/bde/nk20
synced 2025-07-23 17:26:46 +02:00
Compare commits
3 Commits
wei
...
4692adde3d
Author | SHA1 | Date | |
---|---|---|---|
4692adde3d | |||
dde1baa25c | |||
7a7ee47e0b |
1
.gitignore
vendored
1
.gitignore
vendored
@ -48,7 +48,6 @@ backups/
|
|||||||
env/
|
env/
|
||||||
venv/
|
venv/
|
||||||
db.sqlite3
|
db.sqlite3
|
||||||
shell.nix
|
|
||||||
|
|
||||||
# ansibles customs host
|
# ansibles customs host
|
||||||
ansible/host_vars/*.yaml
|
ansible/host_vars/*.yaml
|
||||||
|
@ -6,7 +6,7 @@ from django.conf import settings
|
|||||||
from django.db.models.signals import post_save
|
from django.db.models.signals import post_save
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
from .signals import save_user_profile, update_wei_registration_fee_on_membership_creation, update_wei_registration_fee_on_club_change
|
from .signals import save_user_profile
|
||||||
|
|
||||||
|
|
||||||
class MemberConfig(AppConfig):
|
class MemberConfig(AppConfig):
|
||||||
@ -17,16 +17,7 @@ class MemberConfig(AppConfig):
|
|||||||
"""
|
"""
|
||||||
Define app internal signals to interact with other apps
|
Define app internal signals to interact with other apps
|
||||||
"""
|
"""
|
||||||
from .models import Membership, Club
|
|
||||||
post_save.connect(
|
post_save.connect(
|
||||||
save_user_profile,
|
save_user_profile,
|
||||||
sender=settings.AUTH_USER_MODEL,
|
sender=settings.AUTH_USER_MODEL,
|
||||||
)
|
)
|
||||||
post_save.connect(
|
|
||||||
update_wei_registration_fee_on_membership_creation,
|
|
||||||
sender=Membership
|
|
||||||
)
|
|
||||||
post_save.connect(
|
|
||||||
update_wei_registration_fee_on_club_change,
|
|
||||||
sender=Club
|
|
||||||
)
|
|
||||||
|
@ -438,6 +438,8 @@ class Membership(models.Model):
|
|||||||
)
|
)
|
||||||
if hasattr(self, '_force_renew_parent') and self._force_renew_parent:
|
if hasattr(self, '_force_renew_parent') and self._force_renew_parent:
|
||||||
new_membership._force_renew_parent = True
|
new_membership._force_renew_parent = True
|
||||||
|
if hasattr(self, '_soge') and self._soge:
|
||||||
|
new_membership._soge = True
|
||||||
if hasattr(self, '_force_save') and self._force_save:
|
if hasattr(self, '_force_save') and self._force_save:
|
||||||
new_membership._force_save = True
|
new_membership._force_save = True
|
||||||
new_membership.save()
|
new_membership.save()
|
||||||
@ -456,6 +458,8 @@ class Membership(models.Model):
|
|||||||
# Renew the previous membership of the parent club
|
# Renew the previous membership of the parent club
|
||||||
parent_membership = parent_membership.first()
|
parent_membership = parent_membership.first()
|
||||||
parent_membership._force_renew_parent = True
|
parent_membership._force_renew_parent = True
|
||||||
|
if hasattr(self, '_soge'):
|
||||||
|
parent_membership._soge = True
|
||||||
if hasattr(self, '_force_save'):
|
if hasattr(self, '_force_save'):
|
||||||
parent_membership._force_save = True
|
parent_membership._force_save = True
|
||||||
parent_membership.renew()
|
parent_membership.renew()
|
||||||
@ -467,6 +471,8 @@ class Membership(models.Model):
|
|||||||
date_start=self.date_start,
|
date_start=self.date_start,
|
||||||
)
|
)
|
||||||
parent_membership._force_renew_parent = True
|
parent_membership._force_renew_parent = True
|
||||||
|
if hasattr(self, '_soge'):
|
||||||
|
parent_membership._soge = True
|
||||||
if hasattr(self, '_force_save'):
|
if hasattr(self, '_force_save'):
|
||||||
parent_membership._force_save = True
|
parent_membership._force_save = True
|
||||||
parent_membership.save()
|
parent_membership.save()
|
||||||
|
@ -13,25 +13,3 @@ def save_user_profile(instance, created, raw, **_kwargs):
|
|||||||
instance.profile.email_confirmed = True
|
instance.profile.email_confirmed = True
|
||||||
instance.profile.registration_valid = True
|
instance.profile.registration_valid = True
|
||||||
instance.profile.save()
|
instance.profile.save()
|
||||||
|
|
||||||
|
|
||||||
def update_wei_registration_fee_on_membership_creation(sender, instance, created, **kwargs):
|
|
||||||
if created:
|
|
||||||
from wei.models import WEIRegistration
|
|
||||||
if instance.club.id == 1 or instance.club.id == 2:
|
|
||||||
registrations = WEIRegistration.objects.filter(
|
|
||||||
user=instance.user,
|
|
||||||
wei__year=instance.date_start.year,
|
|
||||||
)
|
|
||||||
for r in registrations:
|
|
||||||
r.save()
|
|
||||||
|
|
||||||
|
|
||||||
def update_wei_registration_fee_on_club_change(sender, instance, **kwargs):
|
|
||||||
from wei.models import WEIRegistration
|
|
||||||
if instance.id == 1 or instance.id == 2:
|
|
||||||
registrations = WEIRegistration.objects.filter(
|
|
||||||
wei__year=instance.membership_start.year,
|
|
||||||
)
|
|
||||||
for r in registrations:
|
|
||||||
r.save()
|
|
||||||
|
@ -4347,23 +4347,7 @@
|
|||||||
"mask": 3,
|
"mask": 3,
|
||||||
"field": "",
|
"field": "",
|
||||||
"permanent": false,
|
"permanent": false,
|
||||||
"description": "Faire adhérer BDE ou Kfet"
|
"description": "Ajouter un membre au BDE ou à la Kfet"
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"model": "permission.permission",
|
|
||||||
"pk": 293,
|
|
||||||
"fields": {
|
|
||||||
"model": [
|
|
||||||
"wei",
|
|
||||||
"weimembership"
|
|
||||||
],
|
|
||||||
"query": "[\"AND\", {\"bus\": [\"membership\", \"weimembership\", \"bus\"]}, {\"club\": [\"club\"], \"club__weiclub__membership_end__gte\": [\"today\"]}]",
|
|
||||||
"type": "change",
|
|
||||||
"mask": 2,
|
|
||||||
"field": "team",
|
|
||||||
"permanent": false,
|
|
||||||
"description": "Modifier l'équipe d'une adhésion WEI à son bus"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -4780,6 +4764,7 @@
|
|||||||
"name": "Chef\u22c5fe de bus",
|
"name": "Chef\u22c5fe de bus",
|
||||||
"permissions": [
|
"permissions": [
|
||||||
22,
|
22,
|
||||||
|
84,
|
||||||
115,
|
115,
|
||||||
117,
|
117,
|
||||||
118,
|
118,
|
||||||
@ -4793,8 +4778,7 @@
|
|||||||
287,
|
287,
|
||||||
289,
|
289,
|
||||||
290,
|
290,
|
||||||
291,
|
291
|
||||||
293
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -4806,6 +4790,7 @@
|
|||||||
"name": "Chef\u22c5fe d'\u00e9quipe",
|
"name": "Chef\u22c5fe d'\u00e9quipe",
|
||||||
"permissions": [
|
"permissions": [
|
||||||
22,
|
22,
|
||||||
|
84,
|
||||||
116,
|
116,
|
||||||
123,
|
123,
|
||||||
124,
|
124,
|
||||||
@ -4820,7 +4805,20 @@
|
|||||||
"for_club": null,
|
"for_club": null,
|
||||||
"name": "\u00c9lectron libre",
|
"name": "\u00c9lectron libre",
|
||||||
"permissions": [
|
"permissions": [
|
||||||
22
|
22,
|
||||||
|
84
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.role",
|
||||||
|
"pk": 16,
|
||||||
|
"fields": {
|
||||||
|
"for_club": null,
|
||||||
|
"name": "\u00c9lectron libre (avec perm)",
|
||||||
|
"permissions": [
|
||||||
|
22,
|
||||||
|
84
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -4971,6 +4969,7 @@
|
|||||||
"name": "Référent⋅e Bus",
|
"name": "Référent⋅e Bus",
|
||||||
"permissions": [
|
"permissions": [
|
||||||
22,
|
22,
|
||||||
|
84,
|
||||||
115,
|
115,
|
||||||
117,
|
117,
|
||||||
118,
|
118,
|
||||||
@ -4984,8 +4983,7 @@
|
|||||||
287,
|
287,
|
||||||
289,
|
289,
|
||||||
290,
|
290,
|
||||||
291,
|
291
|
||||||
293
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -5095,6 +5093,11 @@
|
|||||||
"pk": 15,
|
"pk": 15,
|
||||||
"fields": {}
|
"fields": {}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"model": "wei.weirole",
|
||||||
|
"pk": 16,
|
||||||
|
"fields": {}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"model": "wei.weirole",
|
"model": "wei.weirole",
|
||||||
"pk": 17,
|
"pk": 17,
|
||||||
|
@ -353,7 +353,7 @@ class SogeCredit(models.Model):
|
|||||||
def amount(self):
|
def amount(self):
|
||||||
if self.valid:
|
if self.valid:
|
||||||
return self.credit_transaction.total
|
return self.credit_transaction.total
|
||||||
amount = sum(max(transaction.total - 2000, 0) for transaction in self.transactions.all())
|
amount = sum(transaction.total for transaction in self.transactions.all())
|
||||||
if 'wei' in settings.INSTALLED_APPS:
|
if 'wei' in settings.INSTALLED_APPS:
|
||||||
from wei.models import WEIMembership
|
from wei.models import WEIMembership
|
||||||
if not WEIMembership.objects\
|
if not WEIMembership.objects\
|
||||||
@ -441,7 +441,7 @@ class SogeCredit(models.Model):
|
|||||||
With Great Power Comes Great Responsibility...
|
With Great Power Comes Great Responsibility...
|
||||||
"""
|
"""
|
||||||
|
|
||||||
total_fee = sum(max(transaction.total - 2000, 0) for transaction in self.transactions.all() if not transaction.valid)
|
total_fee = sum(transaction.total for transaction in self.transactions.all() if not transaction.valid)
|
||||||
if self.user.note.balance < total_fee:
|
if self.user.note.balance < total_fee:
|
||||||
raise ValidationError(_("This user doesn't have enough money to pay the memberships with its note. "
|
raise ValidationError(_("This user doesn't have enough money to pay the memberships with its note. "
|
||||||
"Please ask her/him to credit the note before invalidating this credit."))
|
"Please ask her/him to credit the note before invalidating this credit."))
|
||||||
|
@ -77,7 +77,7 @@ class WEIRegistrationViewSet(ReadProtectedModelViewSet):
|
|||||||
filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
|
filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
|
||||||
filterset_fields = ['user', 'user__username', 'user__first_name', 'user__last_name', 'user__email',
|
filterset_fields = ['user', 'user__username', 'user__first_name', 'user__last_name', 'user__email',
|
||||||
'user__note__alias__name', 'user__note__alias__normalized_name', 'wei', 'wei__name',
|
'user__note__alias__name', 'user__note__alias__normalized_name', 'wei', 'wei__name',
|
||||||
'wei__email', 'wei__year', 'soge_credit', 'deposit_check', 'birth_date', 'gender',
|
'wei__email', 'wei__year', 'soge_credit', 'caution_check', 'birth_date', 'gender',
|
||||||
'clothing_cut', 'clothing_size', 'first_year', 'emergency_contact_name',
|
'clothing_cut', 'clothing_size', 'first_year', 'emergency_contact_name',
|
||||||
'emergency_contact_phone', ]
|
'emergency_contact_phone', ]
|
||||||
search_fields = ['$user__username', '$user__first_name', '$user__last_name', '$user__email',
|
search_fields = ['$user__username', '$user__first_name', '$user__last_name', '$user__email',
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
|
# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
from .registration import WEIForm, WEIRegistrationForm, WEIMembership1AForm, \
|
from .registration import WEIForm, WEIRegistrationForm, WEIRegistration1AForm, WEIRegistration2AForm, WEIMembership1AForm, \
|
||||||
WEIMembershipForm, BusForm, BusTeamForm
|
WEIMembershipForm, BusForm, BusTeamForm
|
||||||
from .surveys import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, CurrentSurvey
|
from .surveys import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, CurrentSurvey
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
'WEIForm', 'WEIRegistrationForm', 'WEIMembership1AForm', 'WEIMembershipForm', 'BusForm', 'BusTeamForm',
|
'WEIForm', 'WEIRegistrationForm', 'WEIRegistration1AForm', 'WEIRegistration2AForm', 'WEIMembership1AForm', 'WEIMembershipForm', 'BusForm', 'BusTeamForm',
|
||||||
'WEISurvey', 'WEISurveyInformation', 'WEISurveyAlgorithm', 'CurrentSurvey',
|
'WEISurvey', 'WEISurveyInformation', 'WEISurveyAlgorithm', 'CurrentSurvey',
|
||||||
]
|
]
|
||||||
|
@ -24,8 +24,7 @@ class WEIForm(forms.ModelForm):
|
|||||||
"membership_end": DatePickerInput(),
|
"membership_end": DatePickerInput(),
|
||||||
"date_start": DatePickerInput(),
|
"date_start": DatePickerInput(),
|
||||||
"date_end": DatePickerInput(),
|
"date_end": DatePickerInput(),
|
||||||
"deposit_amount": AmountInput(),
|
"caution_amount": AmountInput(),
|
||||||
"fee_soge_credit": AmountInput(),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -44,7 +43,7 @@ class WEIRegistrationForm(forms.ModelForm):
|
|||||||
fields = [
|
fields = [
|
||||||
'user', 'soge_credit', 'birth_date', 'gender', 'clothing_size',
|
'user', 'soge_credit', 'birth_date', 'gender', 'clothing_size',
|
||||||
'health_issues', 'emergency_contact_name', 'emergency_contact_phone',
|
'health_issues', 'emergency_contact_name', 'emergency_contact_phone',
|
||||||
'first_year', 'information_json', 'deposit_check', 'deposit_type'
|
'first_year', 'information_json', 'caution_check'
|
||||||
]
|
]
|
||||||
widgets = {
|
widgets = {
|
||||||
"user": Autocomplete(
|
"user": Autocomplete(
|
||||||
@ -59,13 +58,26 @@ class WEIRegistrationForm(forms.ModelForm):
|
|||||||
'minDate': '1900-01-01',
|
'minDate': '1900-01-01',
|
||||||
'maxDate': '2100-01-01'
|
'maxDate': '2100-01-01'
|
||||||
}),
|
}),
|
||||||
"deposit_check": forms.BooleanField(
|
"caution_check": forms.BooleanField(
|
||||||
required=False,
|
required=False,
|
||||||
),
|
),
|
||||||
"deposit_type": forms.RadioSelect(),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class WEIRegistration2AForm(WEIRegistrationForm):
|
||||||
|
class Meta(WEIRegistrationForm.Meta):
|
||||||
|
fields = WEIRegistrationForm.Meta.fields + ['caution_type']
|
||||||
|
widgets = WEIRegistrationForm.Meta.widgets.copy()
|
||||||
|
widgets.update({
|
||||||
|
"caution_type": forms.RadioSelect(),
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
class WEIRegistration1AForm(WEIRegistrationForm):
|
||||||
|
class Meta(WEIRegistrationForm.Meta):
|
||||||
|
fields = WEIRegistrationForm.Meta.fields
|
||||||
|
|
||||||
|
|
||||||
class WEIChooseBusForm(forms.Form):
|
class WEIChooseBusForm(forms.Form):
|
||||||
bus = forms.ModelMultipleChoiceField(
|
bus = forms.ModelMultipleChoiceField(
|
||||||
queryset=Bus.objects,
|
queryset=Bus.objects,
|
||||||
@ -87,7 +99,7 @@ class WEIChooseBusForm(forms.Form):
|
|||||||
queryset=WEIRole.objects.filter(~Q(name="1A") & ~Q(name="GC WEI")),
|
queryset=WEIRole.objects.filter(~Q(name="1A") & ~Q(name="GC WEI")),
|
||||||
label=_("WEI Roles"),
|
label=_("WEI Roles"),
|
||||||
help_text=_("Select the roles that you are interested in."),
|
help_text=_("Select the roles that you are interested in."),
|
||||||
initial=WEIRole.objects.filter(Q(name="Adhérent⋅e WEI") | Q(name="\u00c9lectron libre")).all(),
|
initial=WEIRole.objects.filter(name="Adhérent⋅e WEI").all(),
|
||||||
widget=CheckboxSelectMultiple(),
|
widget=CheckboxSelectMultiple(),
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -161,7 +173,7 @@ class WEIMembership1AForm(WEIMembershipForm):
|
|||||||
"""
|
"""
|
||||||
Used to confirm registrations of first year members without choosing a bus now.
|
Used to confirm registrations of first year members without choosing a bus now.
|
||||||
"""
|
"""
|
||||||
deposit_check = None
|
caution_check = None
|
||||||
roles = None
|
roles = None
|
||||||
|
|
||||||
def clean(self):
|
def clean(self):
|
||||||
|
@ -14,139 +14,16 @@ from django.utils.translation import gettext_lazy as _
|
|||||||
from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, WEIBusInformation
|
from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, WEIBusInformation
|
||||||
from ...models import WEIMembership, Bus
|
from ...models import WEIMembership, Bus
|
||||||
|
|
||||||
WORDS = {
|
WORDS = [
|
||||||
'list': [
|
'13 organisé', '3ième mi temps', 'Années 2000', 'Apéro', 'BBQ', 'BP', 'Beauf', 'Binge drinking', 'Bon enfant',
|
||||||
'13 organisé', '3ième mi temps', 'Années 2000', 'Apéro', 'BBQ', 'BP', 'Beauf', 'Binge drinking', 'Bon enfant',
|
'Cartouche', 'Catacombes', 'Chansons paillardes', 'Chansons populaires', 'Chanteur', 'Chartreuse', 'Chill',
|
||||||
'Cartouche', 'Catacombes', 'Chansons paillardes', 'Chansons populaires', 'Chanteur', 'Chartreuse', 'Chill',
|
'Core', 'DJ', 'Dancefloor', 'Danse', 'David Guetta', 'Disco', 'Eau de vie', 'Électro', 'Escalade', 'Familial',
|
||||||
'Core', 'DJ', 'Dancefloor', 'Danse', 'David Guetta', 'Disco', 'Eau de vie', 'Électro', 'Escalade', 'Familial',
|
'Fanfare', 'Fracassage', 'Féria', 'Hard rock', 'Hoeggarden', 'House', 'Huit-six', 'IPA', 'Inclusif', 'Inferno',
|
||||||
'Fanfare', 'Fracassage', 'Féria', 'Hard rock', 'Hoeggarden', 'House', 'Huit-six', 'IPA', 'Inclusif', 'Inferno',
|
'Introverti', 'Jager bomb', 'Jazz', 'Jeux d\'alcool', 'Jeux de rôles', 'Jeux vidéo', 'Jul', 'Jus de fruit',
|
||||||
'Introverti', 'Jager bomb', 'Jazz', 'Jeux d\'alcool', 'Jeux de rôles', 'Jeux vidéo', 'Jul', 'Jus de fruit',
|
'Karaoké', 'LGBTQI+', 'Lady Gaga', 'Loup garou', 'Morning beer', 'Métal', 'Nuit blanche', 'Ovalie', 'Psychedelic',
|
||||||
'Karaoké', 'LGBTQI+', 'Lady Gaga', 'Loup garou', 'Morning beer', 'Métal', 'Nuit blanche', 'Ovalie', 'Psychedelic',
|
'Pétanque', 'Rave', 'Reggae', 'Rhum', 'Ricard', 'Rock', 'Rosé', 'Rétro', 'Séducteur', 'Techno', 'Thérapie taxi',
|
||||||
'Pétanque', 'Rave', 'Reggae', 'Rhum', 'Ricard', 'Rock', 'Rosé', 'Rétro', 'Séducteur', 'Techno', 'Thérapie taxi',
|
'Théâtre', 'Trap', 'Turn up', 'Underground', 'Volley', 'Wati B', 'Zinédine Zidane',
|
||||||
'Théâtre', 'Trap', 'Turn up', 'Underground', 'Volley', 'Wati B', 'Zinédine Zidane',
|
]
|
||||||
],
|
|
||||||
'questions': {
|
|
||||||
'Question 1': [
|
|
||||||
'Description 1',
|
|
||||||
{
|
|
||||||
3: 'Réponse 1 Madagas[car]',
|
|
||||||
43: 'Réponse 1 Y2[KAR]',
|
|
||||||
2: 'Réponse 1 Tcherno[bus]',
|
|
||||||
45: 'Réponse 1 [Kar]tier',
|
|
||||||
1: 'Réponse 1 [Car]cassonne',
|
|
||||||
47: 'Réponse 1 O[car]ina',
|
|
||||||
48: 'Réponse 1 Show[bus]',
|
|
||||||
49: 'Réponse 1 [Car]ioca'
|
|
||||||
}
|
|
||||||
],
|
|
||||||
'Question 2': [
|
|
||||||
'Description 2',
|
|
||||||
{
|
|
||||||
3: 'Réponse 2 Madagas[car]',
|
|
||||||
43: 'Réponse 2 Y2[KAR]',
|
|
||||||
2: 'Réponse 2 Tcherno[bus]',
|
|
||||||
45: 'Réponse 2 [Kar]tier',
|
|
||||||
1: 'Réponse 2 [Car]cassonne',
|
|
||||||
47: 'Réponse 2 O[car]ina',
|
|
||||||
48: 'Réponse 2 Show[bus]',
|
|
||||||
49: 'Réponse 2 [Car]ioca'
|
|
||||||
}
|
|
||||||
],
|
|
||||||
'Question 3': [
|
|
||||||
'Description 3',
|
|
||||||
{
|
|
||||||
3: 'Réponse 3 Madagas[car]',
|
|
||||||
43: 'Réponse 3 Y2[KAR]',
|
|
||||||
2: 'Réponse 3 Tcherno[bus]',
|
|
||||||
45: 'Réponse 3 [Kar]tier',
|
|
||||||
1: 'Réponse 3 [Car]cassonne',
|
|
||||||
47: 'Réponse 3 O[car]ina',
|
|
||||||
48: 'Réponse 3 Show[bus]',
|
|
||||||
49: 'Réponse 3 [Car]ioca'
|
|
||||||
}
|
|
||||||
],
|
|
||||||
'Question 4': [
|
|
||||||
'Description 4',
|
|
||||||
{
|
|
||||||
3: 'Réponse 4 Madagas[car]',
|
|
||||||
43: 'Réponse 4 Y2[KAR]',
|
|
||||||
2: 'Réponse 4 Tcherno[bus]',
|
|
||||||
45: 'Réponse 4 [Kar]tier',
|
|
||||||
1: 'Réponse 4 [Car]cassonne',
|
|
||||||
47: 'Réponse 4 O[car]ina',
|
|
||||||
48: 'Réponse 4 Show[bus]',
|
|
||||||
49: 'Réponse 4 [Car]ioca'
|
|
||||||
}
|
|
||||||
],
|
|
||||||
'Question 5': [
|
|
||||||
'Description 5',
|
|
||||||
{
|
|
||||||
3: 'Réponse 5 Madagas[car]',
|
|
||||||
43: 'Réponse 5 Y2[KAR]',
|
|
||||||
2: 'Réponse 5 Tcherno[bus]',
|
|
||||||
45: 'Réponse 5 [Kar]tier',
|
|
||||||
1: 'Réponse 5 [Car]cassonne',
|
|
||||||
47: 'Réponse 5 O[car]ina',
|
|
||||||
48: 'Réponse 5 Show[bus]',
|
|
||||||
49: 'Réponse 5 [Car]ioca'
|
|
||||||
}
|
|
||||||
],
|
|
||||||
'Question 6': [
|
|
||||||
'Description 6',
|
|
||||||
{
|
|
||||||
3: 'Réponse 6 Madagas[car]',
|
|
||||||
43: 'Réponse 6 Y2[KAR]',
|
|
||||||
2: 'Réponse 6 Tcherno[bus]',
|
|
||||||
45: 'Réponse 6 [Kar]tier',
|
|
||||||
1: 'Réponse 6 [Car]cassonne',
|
|
||||||
47: 'Réponse 6 O[car]ina',
|
|
||||||
48: 'Réponse 6 Show[bus]',
|
|
||||||
49: 'Réponse 6 [Car]ioca'
|
|
||||||
}
|
|
||||||
],
|
|
||||||
'Question 7': [
|
|
||||||
'Description 7',
|
|
||||||
{
|
|
||||||
3: 'Réponse 7 Madagas[car]',
|
|
||||||
43: 'Réponse 7 Y2[KAR]',
|
|
||||||
2: 'Réponse 7 Tcherno[bus]',
|
|
||||||
45: 'Réponse 7 [Kar]tier',
|
|
||||||
1: 'Réponse 7 [Car]cassonne',
|
|
||||||
47: 'Réponse 7 O[car]ina',
|
|
||||||
48: 'Réponse 7 Show[bus]',
|
|
||||||
49: 'Réponse 7 [Car]ioca'
|
|
||||||
}
|
|
||||||
],
|
|
||||||
'Question 8': [
|
|
||||||
'Description 8',
|
|
||||||
{
|
|
||||||
3: 'Réponse 8 Madagas[car]',
|
|
||||||
43: 'Réponse 8 Y2[KAR]',
|
|
||||||
2: 'Réponse 8 Tcherno[bus]',
|
|
||||||
45: 'Réponse 8 [Kar]tier',
|
|
||||||
1: 'Réponse 8 [Car]cassonne',
|
|
||||||
47: 'Réponse 8 O[car]ina',
|
|
||||||
48: 'Réponse 8 Show[bus]',
|
|
||||||
49: 'Réponse 8 [Car]ioca'
|
|
||||||
}
|
|
||||||
],
|
|
||||||
'Question 9': [
|
|
||||||
'Description 9',
|
|
||||||
{
|
|
||||||
3: 'Réponse 9 Madagas[car]',
|
|
||||||
43: 'Réponse 9 Y2[KAR]',
|
|
||||||
2: 'Réponse 9 Tcherno[bus]',
|
|
||||||
45: 'Réponse 9 [Kar]tier',
|
|
||||||
1: 'Réponse 9 [Car]cassonne',
|
|
||||||
47: 'Réponse 9 O[car]ina',
|
|
||||||
48: 'Réponse 9 Show[bus]',
|
|
||||||
49: 'Réponse 9 [Car]ioca'
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
NB_WORDS = 5
|
|
||||||
|
|
||||||
|
|
||||||
class WEISurveyForm2025(forms.Form):
|
class WEISurveyForm2025(forms.Form):
|
||||||
@ -155,6 +32,11 @@ class WEISurveyForm2025(forms.Form):
|
|||||||
Members choose 20 words, from which we calculate the best associated bus.
|
Members choose 20 words, from which we calculate the best associated bus.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
word = forms.ChoiceField(
|
||||||
|
label=_("Choose a word:"),
|
||||||
|
widget=forms.RadioSelect(),
|
||||||
|
)
|
||||||
|
|
||||||
def set_registration(self, registration):
|
def set_registration(self, registration):
|
||||||
"""
|
"""
|
||||||
Filter the bus selector with the buses of the current WEI.
|
Filter the bus selector with the buses of the current WEI.
|
||||||
@ -166,56 +48,34 @@ class WEISurveyForm2025(forms.Form):
|
|||||||
registration._force_save = True
|
registration._force_save = True
|
||||||
registration.save()
|
registration.save()
|
||||||
|
|
||||||
rng = Random((information.step + 1) * information.seed)
|
if self.data:
|
||||||
|
self.fields["word"].choices = [(w, w) for w in WORDS]
|
||||||
if information.step == 0:
|
|
||||||
self.fields["words"] = forms.MultipleChoiceField(
|
|
||||||
label=_(f"Choose {NB_WORDS} words:"),
|
|
||||||
choices=[(w, w) for w in WORDS['list']],
|
|
||||||
widget=forms.CheckboxSelectMultiple(),
|
|
||||||
required=True,
|
|
||||||
)
|
|
||||||
if self.is_valid():
|
if self.is_valid():
|
||||||
return
|
return
|
||||||
|
|
||||||
buses = WEISurveyAlgorithm2025.get_buses()
|
rng = Random((information.step + 1) * information.seed)
|
||||||
informations = {bus: WEIBusInformation2025(bus) for bus in buses}
|
|
||||||
scores = sum((list(informations[bus].scores.values()) for bus in buses), [])
|
|
||||||
if scores:
|
|
||||||
average_score = sum(scores) / len(scores)
|
|
||||||
else:
|
|
||||||
average_score = 0
|
|
||||||
|
|
||||||
preferred_words = {
|
buses = WEISurveyAlgorithm2025.get_buses()
|
||||||
bus: [word for word in WORDS['list'] if informations[bus].scores[word] >= average_score]
|
informations = {bus: WEIBusInformation2025(bus) for bus in buses}
|
||||||
for bus in buses
|
scores = sum((list(informations[bus].scores.values()) for bus in buses), [])
|
||||||
}
|
if scores:
|
||||||
|
average_score = sum(scores) / len(scores)
|
||||||
all_preferred_words = set()
|
|
||||||
for bus_words in preferred_words.values():
|
|
||||||
all_preferred_words.update(bus_words)
|
|
||||||
all_preferred_words = list(all_preferred_words)
|
|
||||||
rng.shuffle(all_preferred_words)
|
|
||||||
self.fields["words"].choices = [(w, w) for w in all_preferred_words]
|
|
||||||
else:
|
else:
|
||||||
questions = list(WORDS['questions'].items())
|
average_score = 0
|
||||||
idx = information.step - 1
|
|
||||||
if idx < len(questions):
|
|
||||||
q, (desc, answers) = questions[idx]
|
|
||||||
choices = [(k, v) for k, v in answers.items()]
|
|
||||||
rng.shuffle(choices)
|
|
||||||
self.fields[q] = forms.ChoiceField(
|
|
||||||
label=desc,
|
|
||||||
choices=choices,
|
|
||||||
widget=forms.RadioSelect,
|
|
||||||
required=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
def clean_words(self):
|
preferred_words = {bus: [word for word in WORDS
|
||||||
data = self.cleaned_data['words']
|
if informations[bus].scores[word] >= average_score]
|
||||||
if len(data) != NB_WORDS:
|
for bus in buses}
|
||||||
raise forms.ValidationError(_(f"Please choose exactly {NB_WORDS} words"))
|
|
||||||
return data
|
# Correction : proposer plusieurs mots différents à chaque étape
|
||||||
|
n_choices = 4 # Nombre de mots à proposer à chaque étape
|
||||||
|
all_preferred_words = set()
|
||||||
|
for bus_words in preferred_words.values():
|
||||||
|
all_preferred_words.update(bus_words)
|
||||||
|
all_preferred_words = list(all_preferred_words)
|
||||||
|
rng.shuffle(all_preferred_words)
|
||||||
|
words = all_preferred_words[:n_choices]
|
||||||
|
self.fields["word"].choices = [(w, w) for w in words]
|
||||||
|
|
||||||
|
|
||||||
class WEIBusInformation2025(WEIBusInformation):
|
class WEIBusInformation2025(WEIBusInformation):
|
||||||
@ -226,7 +86,7 @@ class WEIBusInformation2025(WEIBusInformation):
|
|||||||
|
|
||||||
def __init__(self, bus):
|
def __init__(self, bus):
|
||||||
self.scores = {}
|
self.scores = {}
|
||||||
for word in WORDS['list']:
|
for word in WORDS:
|
||||||
self.scores[word] = 0
|
self.scores[word] = 0
|
||||||
super().__init__(bus)
|
super().__init__(bus)
|
||||||
|
|
||||||
@ -248,7 +108,7 @@ class BusInformationForm2025(forms.ModelForm):
|
|||||||
except (json.JSONDecodeError, TypeError, AttributeError):
|
except (json.JSONDecodeError, TypeError, AttributeError):
|
||||||
initial_scores = {}
|
initial_scores = {}
|
||||||
if words is None:
|
if words is None:
|
||||||
words = WORDS['list']
|
words = WORDS
|
||||||
self.words = words
|
self.words = words
|
||||||
|
|
||||||
choices = [(i, str(i)) for i in range(6)] # [(0, '0'), (1, '1'), ..., (5, '5')]
|
choices = [(i, str(i)) for i in range(6)] # [(0, '0'), (1, '1'), ..., (5, '5')]
|
||||||
@ -285,26 +145,10 @@ class WEISurveyInformation2025(WEISurveyInformation):
|
|||||||
step = 0
|
step = 0
|
||||||
|
|
||||||
def __init__(self, registration):
|
def __init__(self, registration):
|
||||||
for i in range(1, 5):
|
for i in range(1, 21):
|
||||||
setattr(self, "word" + str(i), None)
|
setattr(self, "word" + str(i), None)
|
||||||
for q in WORDS['questions']:
|
|
||||||
setattr(self, q, None)
|
|
||||||
super().__init__(registration)
|
super().__init__(registration)
|
||||||
|
|
||||||
def reset(self, registration):
|
|
||||||
"""
|
|
||||||
Réinitialise complètement le questionnaire : step, seed, mots choisis et réponses aux questions.
|
|
||||||
"""
|
|
||||||
self.step = 0
|
|
||||||
self.seed = 0
|
|
||||||
for i in range(1, 5):
|
|
||||||
setattr(self, f"word{i}", None)
|
|
||||||
for q in WORDS['questions']:
|
|
||||||
setattr(self, q, None)
|
|
||||||
self.save(registration)
|
|
||||||
registration._force_save = True
|
|
||||||
registration.save()
|
|
||||||
|
|
||||||
|
|
||||||
class WEISurvey2025(WEISurvey):
|
class WEISurvey2025(WEISurvey):
|
||||||
"""
|
"""
|
||||||
@ -330,20 +174,10 @@ class WEISurvey2025(WEISurvey):
|
|||||||
|
|
||||||
@transaction.atomic
|
@transaction.atomic
|
||||||
def form_valid(self, form):
|
def form_valid(self, form):
|
||||||
if self.information.step == 0:
|
word = form.cleaned_data["word"]
|
||||||
words = form.cleaned_data['words']
|
self.information.step += 1
|
||||||
for i, word in enumerate(words, 1):
|
setattr(self.information, "word" + str(self.information.step), word)
|
||||||
setattr(self.information, "word" + str(i), word)
|
self.save()
|
||||||
self.information.step += 1
|
|
||||||
self.save()
|
|
||||||
else:
|
|
||||||
questions = list(WORDS['questions'].keys())
|
|
||||||
idx = self.information.step - 1
|
|
||||||
if idx < len(questions):
|
|
||||||
q = questions[idx]
|
|
||||||
setattr(self.information, q, form.cleaned_data[q])
|
|
||||||
self.information.step += 1
|
|
||||||
self.save()
|
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def get_algorithm_class(cls):
|
def get_algorithm_class(cls):
|
||||||
@ -353,7 +187,7 @@ class WEISurvey2025(WEISurvey):
|
|||||||
"""
|
"""
|
||||||
The survey is complete once the bus is chosen.
|
The survey is complete once the bus is chosen.
|
||||||
"""
|
"""
|
||||||
return self.information.step > len(WORDS['questions'])
|
return self.information.step == 20
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
@lru_cache()
|
@lru_cache()
|
||||||
@ -372,8 +206,7 @@ class WEISurvey2025(WEISurvey):
|
|||||||
bus_info = self.get_algorithm_class().get_bus_information(bus)
|
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.
|
# Score is the given score by the bus subtracted to the mid-score of the buses.
|
||||||
s = sum(bus_info.scores[getattr(self.information, 'word' + str(i))]
|
s = sum(bus_info.scores[getattr(self.information, 'word' + str(i))]
|
||||||
- self.word_mean(getattr(self.information, 'word' + str(i))) for i in range(1, 1 + NB_WORDS)) / NB_WORDS
|
- self.word_mean(getattr(self.information, 'word' + str(i))) for i in range(1, 21)) / 20
|
||||||
s += sum(1 for q in WORDS['questions'] if getattr(self.information, q) == str(bus.pk))
|
|
||||||
return s
|
return s
|
||||||
|
|
||||||
@lru_cache()
|
@lru_cache()
|
||||||
@ -410,13 +243,6 @@ class WEISurveyAlgorithm2025(WEISurveyAlgorithm):
|
|||||||
def get_bus_information_form(cls):
|
def get_bus_information_form(cls):
|
||||||
return BusInformationForm2025
|
return BusInformationForm2025
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def get_buses(cls):
|
|
||||||
|
|
||||||
if not hasattr(cls, '_buses'):
|
|
||||||
cls._buses = Bus.objects.filter(wei__year=cls.get_survey_class().get_year(), size__gt=0).all().exclude(name='Staff')
|
|
||||||
return cls._buses
|
|
||||||
|
|
||||||
def run_algorithm(self, display_tqdm=False):
|
def run_algorithm(self, display_tqdm=False):
|
||||||
"""
|
"""
|
||||||
Gale-Shapley algorithm implementation.
|
Gale-Shapley algorithm implementation.
|
||||||
|
@ -1,18 +0,0 @@
|
|||||||
# Generated by Django 4.2.23 on 2025-07-15 14:05
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('wei', '0013_weiclub_caution_amount_weiregistration_caution_type'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='weiclub',
|
|
||||||
name='fee_soge_credit',
|
|
||||||
field=models.PositiveIntegerField(default=2000, verbose_name='fee soge credit'),
|
|
||||||
),
|
|
||||||
]
|
|
@ -1,40 +0,0 @@
|
|||||||
# Generated by Django 4.2.23 on 2025-07-15 16:03
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('wei', '0014_weiclub_fee_soge_credit'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.RemoveField(
|
|
||||||
model_name='weiclub',
|
|
||||||
name='caution_amount',
|
|
||||||
),
|
|
||||||
migrations.RemoveField(
|
|
||||||
model_name='weiregistration',
|
|
||||||
name='caution_check',
|
|
||||||
),
|
|
||||||
migrations.RemoveField(
|
|
||||||
model_name='weiregistration',
|
|
||||||
name='caution_type',
|
|
||||||
),
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='weiclub',
|
|
||||||
name='deposit_amount',
|
|
||||||
field=models.PositiveIntegerField(default=0, verbose_name='deposit amount'),
|
|
||||||
),
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='weiregistration',
|
|
||||||
name='deposit_check',
|
|
||||||
field=models.BooleanField(default=False, verbose_name='Deposit check given'),
|
|
||||||
),
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='weiregistration',
|
|
||||||
name='deposit_type',
|
|
||||||
field=models.CharField(choices=[('check', 'Check'), ('note', 'Note transaction')], default='check', max_length=16, verbose_name='deposit type'),
|
|
||||||
),
|
|
||||||
]
|
|
@ -1,23 +0,0 @@
|
|||||||
# Generated by Django 5.2.4 on 2025-07-19 12:17
|
|
||||||
|
|
||||||
from django.db import migrations, models
|
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
|
||||||
|
|
||||||
dependencies = [
|
|
||||||
('wei', '0015_remove_weiclub_caution_amount_and_more'),
|
|
||||||
]
|
|
||||||
|
|
||||||
operations = [
|
|
||||||
migrations.AddField(
|
|
||||||
model_name='weiregistration',
|
|
||||||
name='fee',
|
|
||||||
field=models.PositiveIntegerField(blank=True, default=0, verbose_name='fee'),
|
|
||||||
),
|
|
||||||
migrations.AlterField(
|
|
||||||
model_name='weiclub',
|
|
||||||
name='fee_soge_credit',
|
|
||||||
field=models.PositiveIntegerField(default=2000, verbose_name='membership fee (soge credit)'),
|
|
||||||
),
|
|
||||||
]
|
|
@ -33,16 +33,11 @@ class WEIClub(Club):
|
|||||||
verbose_name=_("date end"),
|
verbose_name=_("date end"),
|
||||||
)
|
)
|
||||||
|
|
||||||
deposit_amount = models.PositiveIntegerField(
|
caution_amount = models.PositiveIntegerField(
|
||||||
verbose_name=_("deposit amount"),
|
verbose_name=_("caution amount"),
|
||||||
default=0,
|
default=0,
|
||||||
)
|
)
|
||||||
|
|
||||||
fee_soge_credit = models.PositiveIntegerField(
|
|
||||||
verbose_name=_("membership fee (soge credit)"),
|
|
||||||
default=2000,
|
|
||||||
)
|
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name = _("WEI")
|
verbose_name = _("WEI")
|
||||||
verbose_name_plural = _("WEI")
|
verbose_name_plural = _("WEI")
|
||||||
@ -202,19 +197,19 @@ class WEIRegistration(models.Model):
|
|||||||
verbose_name=_("Credit from Société générale"),
|
verbose_name=_("Credit from Société générale"),
|
||||||
)
|
)
|
||||||
|
|
||||||
deposit_check = models.BooleanField(
|
caution_check = models.BooleanField(
|
||||||
default=False,
|
default=False,
|
||||||
verbose_name=_("Deposit check given")
|
verbose_name=_("Caution check given")
|
||||||
)
|
)
|
||||||
|
|
||||||
deposit_type = models.CharField(
|
caution_type = models.CharField(
|
||||||
max_length=16,
|
max_length=16,
|
||||||
choices=(
|
choices=(
|
||||||
('check', _("Check")),
|
('check', _("Check")),
|
||||||
('note', _("Note transaction")),
|
('note', _("Note transaction")),
|
||||||
),
|
),
|
||||||
default='check',
|
default='check',
|
||||||
verbose_name=_("deposit type"),
|
verbose_name=_("caution type"),
|
||||||
)
|
)
|
||||||
|
|
||||||
birth_date = models.DateField(
|
birth_date = models.DateField(
|
||||||
@ -285,12 +280,6 @@ class WEIRegistration(models.Model):
|
|||||||
"encoded in JSON"),
|
"encoded in JSON"),
|
||||||
)
|
)
|
||||||
|
|
||||||
fee = models.PositiveIntegerField(
|
|
||||||
default=0,
|
|
||||||
verbose_name=_('fee'),
|
|
||||||
blank=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
unique_together = ('user', 'wei',)
|
unique_together = ('user', 'wei',)
|
||||||
verbose_name = _("WEI User")
|
verbose_name = _("WEI User")
|
||||||
@ -315,25 +304,7 @@ class WEIRegistration(models.Model):
|
|||||||
self.information_json = json.dumps(information, indent=2)
|
self.information_json = json.dumps(information, indent=2)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def is_validated(self):
|
def fee(self):
|
||||||
try:
|
|
||||||
return self.membership is not None
|
|
||||||
except AttributeError:
|
|
||||||
return False
|
|
||||||
|
|
||||||
@property
|
|
||||||
def validation_status(self):
|
|
||||||
"""
|
|
||||||
Define an order to have easier access to validatable registrations
|
|
||||||
"""
|
|
||||||
if self.fee + (self.wei.deposit_amount if self.deposit_type == 'note' else 0) > self.user.note.balance:
|
|
||||||
return 2
|
|
||||||
elif self.first_year:
|
|
||||||
return 1
|
|
||||||
else:
|
|
||||||
return 0
|
|
||||||
|
|
||||||
def calculate_fee(self):
|
|
||||||
bde = Club.objects.get(pk=1)
|
bde = Club.objects.get(pk=1)
|
||||||
kfet = Club.objects.get(pk=2)
|
kfet = Club.objects.get(pk=2)
|
||||||
|
|
||||||
@ -348,8 +319,7 @@ class WEIRegistration(models.Model):
|
|||||||
date_start__gte=bde.membership_start,
|
date_start__gte=bde.membership_start,
|
||||||
).exists()
|
).exists()
|
||||||
|
|
||||||
fee = self.wei.fee_soge_credit if self.soge_credit \
|
fee = self.wei.membership_fee_paid if self.user.profile.paid \
|
||||||
else self.wei.membership_fee_paid if self.user.profile.paid \
|
|
||||||
else self.wei.membership_fee_unpaid
|
else self.wei.membership_fee_unpaid
|
||||||
if not kfet_member:
|
if not kfet_member:
|
||||||
fee += kfet.membership_fee_paid if self.user.profile.paid \
|
fee += kfet.membership_fee_paid if self.user.profile.paid \
|
||||||
@ -360,9 +330,12 @@ class WEIRegistration(models.Model):
|
|||||||
|
|
||||||
return fee
|
return fee
|
||||||
|
|
||||||
def save(self, *args, **kwargs):
|
@property
|
||||||
self.fee = self.calculate_fee()
|
def is_validated(self):
|
||||||
super().save(*args, **kwargs)
|
try:
|
||||||
|
return self.membership is not None
|
||||||
|
except AttributeError:
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
class WEIMembership(Membership):
|
class WEIMembership(Membership):
|
||||||
|
@ -58,8 +58,8 @@ class WEIRegistrationTable(tables.Table):
|
|||||||
|
|
||||||
validate = tables.Column(
|
validate = tables.Column(
|
||||||
verbose_name=_("Validate"),
|
verbose_name=_("Validate"),
|
||||||
orderable=True,
|
orderable=False,
|
||||||
accessor='validate_status',
|
accessor=A('pk'),
|
||||||
attrs={
|
attrs={
|
||||||
'th': {
|
'th': {
|
||||||
'id': 'validate-membership-header'
|
'id': 'validate-membership-header'
|
||||||
@ -71,7 +71,7 @@ class WEIRegistrationTable(tables.Table):
|
|||||||
'wei:wei_delete_registration',
|
'wei:wei_delete_registration',
|
||||||
args=[A('pk')],
|
args=[A('pk')],
|
||||||
orderable=False,
|
orderable=False,
|
||||||
verbose_name=_("Delete"),
|
verbose_name=_("delete"),
|
||||||
text=_("Delete"),
|
text=_("Delete"),
|
||||||
attrs={
|
attrs={
|
||||||
'th': {
|
'th': {
|
||||||
@ -98,13 +98,12 @@ class WEIRegistrationTable(tables.Table):
|
|||||||
if not hasperm:
|
if not hasperm:
|
||||||
return format_html("<span class='no-perm'></span>")
|
return format_html("<span class='no-perm'></span>")
|
||||||
|
|
||||||
url = reverse_lazy('wei:validate_registration', args=(record.pk,))
|
url = reverse_lazy('wei:wei_update_registration', args=(record.pk,)) + '?validate=true'
|
||||||
text = _('Validate')
|
text = _('Validate')
|
||||||
status = record.validation_status
|
if record.fee > record.user.note.balance and not record.soge_credit:
|
||||||
if status == 2:
|
|
||||||
btn_class = 'btn-secondary'
|
btn_class = 'btn-secondary'
|
||||||
tooltip = _("The user does not have enough money.")
|
tooltip = _("The user does not have enough money.")
|
||||||
elif status == 1:
|
elif record.first_year:
|
||||||
btn_class = 'btn-info'
|
btn_class = 'btn-info'
|
||||||
tooltip = _("The user is in first year. You may validate the credit, the algorithm will run later.")
|
tooltip = _("The user is in first year. You may validate the credit, the algorithm will run later.")
|
||||||
else:
|
else:
|
||||||
@ -122,10 +121,9 @@ class WEIRegistrationTable(tables.Table):
|
|||||||
attrs = {
|
attrs = {
|
||||||
'class': 'table table-condensed table-striped table-hover'
|
'class': 'table table-condensed table-striped table-hover'
|
||||||
}
|
}
|
||||||
order_by = ('validate', 'user',)
|
|
||||||
model = WEIRegistration
|
model = WEIRegistration
|
||||||
template_name = 'django_tables2/bootstrap4.html'
|
template_name = 'django_tables2/bootstrap4.html'
|
||||||
fields = ('user', 'user__first_name', 'user__last_name', 'first_year', 'deposit_check',
|
fields = ('user', 'user__first_name', 'user__last_name', 'first_year', 'caution_check',
|
||||||
'edit', 'validate', 'delete',)
|
'edit', 'validate', 'delete',)
|
||||||
row_attrs = {
|
row_attrs = {
|
||||||
'class': 'table-row',
|
'class': 'table-row',
|
||||||
@ -136,8 +134,8 @@ class WEIRegistrationTable(tables.Table):
|
|||||||
|
|
||||||
class WEIMembershipTable(tables.Table):
|
class WEIMembershipTable(tables.Table):
|
||||||
user = tables.LinkColumn(
|
user = tables.LinkColumn(
|
||||||
'wei:wei_update_membership',
|
'wei:wei_update_registration',
|
||||||
args=[A('pk')],
|
args=[A('registration__pk')],
|
||||||
)
|
)
|
||||||
|
|
||||||
year = tables.Column(
|
year = tables.Column(
|
||||||
@ -165,7 +163,7 @@ class WEIMembershipTable(tables.Table):
|
|||||||
model = WEIMembership
|
model = WEIMembership
|
||||||
template_name = 'django_tables2/bootstrap4.html'
|
template_name = 'django_tables2/bootstrap4.html'
|
||||||
fields = ('user', 'user__last_name', 'user__first_name', 'registration__gender', 'user__profile__department',
|
fields = ('user', 'user__last_name', 'user__first_name', 'registration__gender', 'user__profile__department',
|
||||||
'year', 'bus', 'team', 'registration__deposit_check', )
|
'year', 'bus', 'team', 'registration__caution_check', )
|
||||||
row_attrs = {
|
row_attrs = {
|
||||||
'class': 'table-row',
|
'class': 'table-row',
|
||||||
'id': lambda record: "row-" + str(record.pk),
|
'id': lambda record: "row-" + str(record.pk),
|
||||||
|
@ -49,9 +49,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if club.deposit_amount > 0 %}
|
{% if club.caution_amount > 0 %}
|
||||||
<dt class="col-xl-6">{% trans 'deposit amount'|capfirst %}</dt>
|
<dt class="col-xl-6">{% trans 'Caution amount'|capfirst %}</dt>
|
||||||
<dd class="col-xl-6">{{ club.deposit_amount|pretty_money }}</dd>
|
<dd class="col-xl-6">{{ club.caution_amount|pretty_money }}</dd>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if "note.view_note"|has_perm:club.note %}
|
{% if "note.view_note"|has_perm:club.note %}
|
||||||
|
@ -39,11 +39,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||||||
data-turbolinks="false">
|
data-turbolinks="false">
|
||||||
{% trans "Update my registration" %}
|
{% trans "Update my registration" %}
|
||||||
</a>
|
</a>
|
||||||
{% if not not_first_year %}
|
|
||||||
<a class="btn btn-warning" href="{% url "wei:wei_survey" pk=my_registration.pk %}?reset=true" data-turbolinks="false">
|
|
||||||
{% trans "Restart survey" %}
|
|
||||||
</a>
|
|
||||||
{% endif %}
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
@ -72,6 +67,20 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
{% if history_list.data %}
|
||||||
|
<div class="card bg-white mb-3">
|
||||||
|
<div class="card-header position-relative" id="historyListHeading">
|
||||||
|
<a class="stretched-link font-weight-bold text-decoration-none" {% if "note.view_note"|has_perm:club.note %}
|
||||||
|
href="{% url 'note:transactions' pk=club.note.pk %}" {% endif %}>
|
||||||
|
<i class="fa fa-euro"></i> {% trans "Transaction history" %}
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
<div id="history_list">
|
||||||
|
{% render_table history_list %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
{% if pre_registrations.data %}
|
{% if pre_registrations.data %}
|
||||||
<div class="card bg-white mb-3">
|
<div class="card bg-white mb-3">
|
||||||
<div class="card-header position-relative" id="historyListHeading">
|
<div class="card-header position-relative" id="historyListHeading">
|
||||||
@ -90,19 +99,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||||||
<a href="{% url 'wei:wei_1A_list' pk=object.pk %}" class="btn btn-block btn-info">{% trans "Attribute buses" %}</a>
|
<a href="{% url 'wei:wei_1A_list' pk=object.pk %}" class="btn btn-block btn-info">{% trans "Attribute buses" %}</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if history_list.data %}
|
|
||||||
<div class="card bg-white mt-3">
|
|
||||||
<div class="card-header position-relative" id="historyListHeading">
|
|
||||||
<a class="stretched-link font-weight-bold text-decoration-none" {% if "note.view_note"|has_perm:club.note %}
|
|
||||||
href="{% url 'note:transactions' pk=club.note.pk %}" {% endif %}>
|
|
||||||
<i class="fa fa-euro"></i> {% trans "Transaction history" %}
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
<div id="history_list">
|
|
||||||
{% render_table history_list %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
@ -95,8 +95,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||||||
<dd class="col-xl-6"><em>{% trans "The algorithm didn't run." %}</em></dd>
|
<dd class="col-xl-6"><em>{% trans "The algorithm didn't run." %}</em></dd>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<dt class="col-xl-6">{% trans 'Deposit check given'|capfirst %}</dt>
|
<dt class="col-xl-6">{% trans 'caution check given'|capfirst %}</dt>
|
||||||
<dd class="col-xl-6">{{ registration.deposit_check|yesno }}</dd>
|
<dd class="col-xl-6">{{ registration.caution_check|yesno }}</dd>
|
||||||
|
|
||||||
{% with information=registration.information %}
|
{% with information=registration.information %}
|
||||||
<dt class="col-xl-6">{% trans 'preferred bus'|capfirst %}</dt>
|
<dt class="col-xl-6">{% trans 'preferred bus'|capfirst %}</dt>
|
||||||
@ -137,37 +137,41 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||||||
{% if registration.soge_credit %}
|
{% if registration.soge_credit %}
|
||||||
<div class="alert alert-warning">
|
<div class="alert alert-warning">
|
||||||
{% blocktrans trimmed %}
|
{% blocktrans trimmed %}
|
||||||
The WEI will partially be paid by Société générale. The membership will be created even if the bank didn't pay the BDE yet.
|
The WEI will be paid by Société générale. The membership will be created even if the bank didn't pay the BDE yet.
|
||||||
The membership transaction will be created but will be invalid. You will have to validate it once the bank
|
The membership transaction will be created but will be invalid. You will have to validate it once the bank
|
||||||
validated the creation of the account, or to change the payment method.
|
validated the creation of the account, or to change the payment method.
|
||||||
{% endblocktrans %}
|
{% endblocktrans %}
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% else %}
|
||||||
<div class="alert {% if registration.user.note.balance < fee %}alert-danger{% else %}alert-success{% endif %}">
|
<div class="alert {% if registration.user.note.balance < fee %}alert-danger{% else %}alert-success{% endif %}">
|
||||||
<h5>{% trans "Required payments:" %}</h5>
|
<h5>{% trans "Required payments:" %}</h5>
|
||||||
<ul>
|
<ul>
|
||||||
<li>{% blocktrans trimmed with amount=fee|pretty_money %}
|
<li>{% blocktrans trimmed with amount=fee|pretty_money %}
|
||||||
Membership fees: {{ amount }}
|
Membership fees: {{ amount }}
|
||||||
{% endblocktrans %}</li>
|
|
||||||
{% if registration.deposit_type == 'note' %}
|
|
||||||
<li>{% blocktrans trimmed with amount=club.deposit_amount|pretty_money %}
|
|
||||||
Deposit (by Note transaction): {{ amount }}
|
|
||||||
{% endblocktrans %}</li>
|
{% endblocktrans %}</li>
|
||||||
{% else %}
|
{% if registration.caution_type == 'note' %}
|
||||||
<li>{% blocktrans trimmed with amount=club.deposit_amount|pretty_money %}
|
<li>{% blocktrans trimmed with amount=club.caution_amount|pretty_money %}
|
||||||
Deposit (by check): {{ amount }}
|
Deposit (by Note transaction): {{ amount }}
|
||||||
{% endblocktrans %}</li>
|
{% endblocktrans %}</li>
|
||||||
{% endif %}
|
<li><strong>{% blocktrans trimmed with total=total_needed|pretty_money %}
|
||||||
<li><strong>{% blocktrans trimmed with total=total_needed|pretty_money %}
|
Total needed: {{ total }}
|
||||||
Total needed: {{ total }}
|
{% endblocktrans %}</strong></li>
|
||||||
{% endblocktrans %}</strong></li>
|
{% else %}
|
||||||
</ul>
|
<li>{% blocktrans trimmed with amount=club.caution_amount|pretty_money %}
|
||||||
<p>{% blocktrans trimmed with balance=registration.user.note.balance|pretty_money %}
|
Deposit (by check): {{ amount }}
|
||||||
Current balance: {{ balance }}
|
{% endblocktrans %}</li>
|
||||||
{% endblocktrans %}</p>
|
<li><strong>{% blocktrans trimmed with total=fee|pretty_money %}
|
||||||
|
Total needed: {{ total }}
|
||||||
|
{% endblocktrans %}</strong></li>
|
||||||
|
{% endif %}
|
||||||
|
</ul>
|
||||||
|
<p>{% blocktrans trimmed with balance=registration.user.note.balance|pretty_money %}
|
||||||
|
Current balance: {{ balance }}
|
||||||
|
{% endblocktrans %}</p>
|
||||||
</div>
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
{% if not registration.deposit_check and not registration.first_year and registration.caution_type == 'check' %}
|
{% if not registration.caution_check and not registration.first_year and registration.caution_type == 'check' %}
|
||||||
<div class="alert alert-danger">
|
<div class="alert alert-danger">
|
||||||
{% trans "The user didn't give her/his caution check." %}
|
{% trans "The user didn't give her/his caution check." %}
|
||||||
</div>
|
</div>
|
||||||
@ -213,6 +217,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||||||
$("input[name='bus']:checked").each(function (ignored) {
|
$("input[name='bus']:checked").each(function (ignored) {
|
||||||
buses.push($(this).parent().text().trim());
|
buses.push($(this).parent().text().trim());
|
||||||
});
|
});
|
||||||
|
console.log(buses);
|
||||||
$("input[name='team']").each(function () {
|
$("input[name='team']").each(function () {
|
||||||
let label = $(this).parent();
|
let label = $(this).parent();
|
||||||
$(this).parent().addClass('d-none');
|
$(this).parent().addClass('d-none');
|
||||||
|
@ -1,46 +0,0 @@
|
|||||||
{% extends "base.html" %}
|
|
||||||
{% comment %}
|
|
||||||
Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
|
|
||||||
SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
{% endcomment %}
|
|
||||||
{% load i18n crispy_forms_tags %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="card bg-white mb-3">
|
|
||||||
<h3 class="card-header text-center">
|
|
||||||
{{ title }}
|
|
||||||
</h3>
|
|
||||||
<div class="card-body" id="form">
|
|
||||||
<form method="post">
|
|
||||||
{% csrf_token %}
|
|
||||||
{{ form | crispy }}
|
|
||||||
<button class="btn btn-primary" type="submit">{% trans "Submit"%}</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block extrajavascript %}
|
|
||||||
<script>
|
|
||||||
$(document).ready(function () {
|
|
||||||
function refreshTeams() {
|
|
||||||
let buses = [];
|
|
||||||
$("input[name='bus']:checked").each(function (ignored) {
|
|
||||||
buses.push($(this).parent().text().trim());
|
|
||||||
});
|
|
||||||
$("input[name='team']").each(function () {
|
|
||||||
let label = $(this).parent();
|
|
||||||
$(this).parent().addClass('d-none');
|
|
||||||
buses.forEach(function (bus) {
|
|
||||||
if (label.text().includes(bus))
|
|
||||||
label.removeClass('d-none');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
$("input[name='bus']").change(refreshTeams);
|
|
||||||
|
|
||||||
refreshTeams();
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
{% endblock %}
|
|
@ -6,7 +6,7 @@ import random
|
|||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
|
|
||||||
from ..forms.surveys.wei2025 import WEIBusInformation2025, WEISurvey2025, WORDS, NB_WORDS, WEISurveyInformation2025
|
from ..forms.surveys.wei2025 import WEIBusInformation2025, WEISurvey2025, WORDS, WEISurveyInformation2025
|
||||||
from ..models import Bus, WEIClub, WEIRegistration
|
from ..models import Bus, WEIClub, WEIRegistration
|
||||||
|
|
||||||
|
|
||||||
@ -34,8 +34,8 @@ class TestWEIAlgorithm(TestCase):
|
|||||||
bus = Bus.objects.create(wei=self.wei, name=f"Bus {i}", size=10)
|
bus = Bus.objects.create(wei=self.wei, name=f"Bus {i}", size=10)
|
||||||
self.buses.append(bus)
|
self.buses.append(bus)
|
||||||
information = WEIBusInformation2025(bus)
|
information = WEIBusInformation2025(bus)
|
||||||
for word in WORDS['list']:
|
for word in WORDS:
|
||||||
information.scores[word] = random.randint(0, 6)
|
information.scores[word] = random.randint(0, 101)
|
||||||
information.save()
|
information.save()
|
||||||
bus.save()
|
bus.save()
|
||||||
|
|
||||||
@ -54,7 +54,7 @@ class TestWEIAlgorithm(TestCase):
|
|||||||
)
|
)
|
||||||
information = WEISurveyInformation2025(registration)
|
information = WEISurveyInformation2025(registration)
|
||||||
for j in range(1, 21):
|
for j in range(1, 21):
|
||||||
setattr(information, f'word{j}', random.choice(WORDS['list']))
|
setattr(information, f'word{j}', random.choice(WORDS))
|
||||||
information.step = 20
|
information.step = 20
|
||||||
information.save(registration)
|
information.save(registration)
|
||||||
registration.save()
|
registration.save()
|
||||||
@ -83,11 +83,9 @@ class TestWEIAlgorithm(TestCase):
|
|||||||
birth_date='2000-01-01',
|
birth_date='2000-01-01',
|
||||||
)
|
)
|
||||||
information = WEISurveyInformation2025(registration)
|
information = WEISurveyInformation2025(registration)
|
||||||
for j in range(1, 1 + NB_WORDS):
|
for j in range(1, 21):
|
||||||
setattr(information, f'word{j}', random.choice(WORDS['list']))
|
setattr(information, f'word{j}', random.choice(WORDS))
|
||||||
for q in WORDS['questions']:
|
information.step = 20
|
||||||
setattr(information, q, random.choice(list(WORDS['questions'][q][1].keys())))
|
|
||||||
information.step = len(WORDS['questions']) + 1
|
|
||||||
information.save(registration)
|
information.save(registration)
|
||||||
registration.save()
|
registration.save()
|
||||||
|
|
||||||
@ -108,6 +106,6 @@ class TestWEIAlgorithm(TestCase):
|
|||||||
max_score = buses[0][1]
|
max_score = buses[0][1]
|
||||||
penalty += (max_score - score) ** 2
|
penalty += (max_score - score) ** 2
|
||||||
|
|
||||||
self.assertLessEqual(max_score - score, 1) # Always less than 25 % of tolerance
|
self.assertLessEqual(max_score - score, 25) # Always less than 25 % of tolerance
|
||||||
|
|
||||||
self.assertLessEqual(penalty / 100, 25) # Tolerance of 5 %
|
self.assertLessEqual(penalty / 100, 25) # Tolerance of 5 %
|
||||||
|
@ -101,7 +101,7 @@ class TestWEIRegistration(TestCase):
|
|||||||
user_id=self.user.id,
|
user_id=self.user.id,
|
||||||
wei_id=self.wei.id,
|
wei_id=self.wei.id,
|
||||||
soge_credit=True,
|
soge_credit=True,
|
||||||
deposit_check=True,
|
caution_check=True,
|
||||||
birth_date=date(2000, 1, 1),
|
birth_date=date(2000, 1, 1),
|
||||||
gender="nonbinary",
|
gender="nonbinary",
|
||||||
clothing_cut="male",
|
clothing_cut="male",
|
||||||
@ -121,13 +121,12 @@ class TestWEIRegistration(TestCase):
|
|||||||
email="gc.wei@example.com",
|
email="gc.wei@example.com",
|
||||||
membership_fee_paid=12500,
|
membership_fee_paid=12500,
|
||||||
membership_fee_unpaid=5500,
|
membership_fee_unpaid=5500,
|
||||||
fee_soge_credit=2000,
|
|
||||||
membership_start=str(self.year + 1) + "-08-01",
|
membership_start=str(self.year + 1) + "-08-01",
|
||||||
membership_end=str(self.year + 1) + "-09-30",
|
membership_end=str(self.year + 1) + "-09-30",
|
||||||
year=self.year + 1,
|
year=self.year + 1,
|
||||||
date_start=str(self.year + 1) + "-09-01",
|
date_start=str(self.year + 1) + "-09-01",
|
||||||
date_end=str(self.year + 1) + "-09-03",
|
date_end=str(self.year + 1) + "-09-03",
|
||||||
deposit_amount=12000,
|
caution_amount=12000,
|
||||||
))
|
))
|
||||||
qs = WEIClub.objects.filter(name="Create WEI Test", year=self.year + 1)
|
qs = WEIClub.objects.filter(name="Create WEI Test", year=self.year + 1)
|
||||||
self.assertTrue(qs.exists())
|
self.assertTrue(qs.exists())
|
||||||
@ -158,12 +157,11 @@ class TestWEIRegistration(TestCase):
|
|||||||
email="wei-updated@example.com",
|
email="wei-updated@example.com",
|
||||||
membership_fee_paid=0,
|
membership_fee_paid=0,
|
||||||
membership_fee_unpaid=0,
|
membership_fee_unpaid=0,
|
||||||
fee_soge_credit=0,
|
|
||||||
membership_start="2000-08-01",
|
membership_start="2000-08-01",
|
||||||
membership_end="2000-09-30",
|
membership_end="2000-09-30",
|
||||||
date_start="2000-09-01",
|
date_start="2000-09-01",
|
||||||
date_end="2000-09-03",
|
date_end="2000-09-03",
|
||||||
deposit_amount=12000,
|
caution_amount=12000,
|
||||||
))
|
))
|
||||||
qs = WEIClub.objects.filter(name="Update WEI Test", id=self.wei.id)
|
qs = WEIClub.objects.filter(name="Update WEI Test", id=self.wei.id)
|
||||||
self.assertRedirects(response, reverse("wei:wei_detail", kwargs=dict(pk=self.wei.pk)), 302, 200)
|
self.assertRedirects(response, reverse("wei:wei_detail", kwargs=dict(pk=self.wei.pk)), 302, 200)
|
||||||
@ -322,7 +320,7 @@ class TestWEIRegistration(TestCase):
|
|||||||
bus=[],
|
bus=[],
|
||||||
team=[],
|
team=[],
|
||||||
roles=[],
|
roles=[],
|
||||||
deposit_type='check'
|
caution_type='check'
|
||||||
))
|
))
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, 200)
|
||||||
self.assertFalse(response.context["membership_form"].is_valid())
|
self.assertFalse(response.context["membership_form"].is_valid())
|
||||||
@ -340,7 +338,7 @@ class TestWEIRegistration(TestCase):
|
|||||||
bus=[self.bus.id],
|
bus=[self.bus.id],
|
||||||
team=[self.team.id],
|
team=[self.team.id],
|
||||||
roles=[role.id for role in WEIRole.objects.filter(~Q(name="1A") & ~Q(name="GC WEI")).all()],
|
roles=[role.id for role in WEIRole.objects.filter(~Q(name="1A") & ~Q(name="GC WEI")).all()],
|
||||||
deposit_type='check'
|
caution_type='check'
|
||||||
))
|
))
|
||||||
qs = WEIRegistration.objects.filter(user_id=user.id)
|
qs = WEIRegistration.objects.filter(user_id=user.id)
|
||||||
self.assertTrue(qs.exists())
|
self.assertTrue(qs.exists())
|
||||||
@ -360,7 +358,7 @@ class TestWEIRegistration(TestCase):
|
|||||||
bus=[self.bus.id],
|
bus=[self.bus.id],
|
||||||
team=[self.team.id],
|
team=[self.team.id],
|
||||||
roles=[role.id for role in WEIRole.objects.filter(~Q(name="1A")).all()],
|
roles=[role.id for role in WEIRole.objects.filter(~Q(name="1A")).all()],
|
||||||
deposit_type='check'
|
caution_type='check'
|
||||||
))
|
))
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, 200)
|
||||||
self.assertTrue("This user is already registered to this WEI." in str(response.context["form"].errors))
|
self.assertTrue("This user is already registered to this WEI." in str(response.context["form"].errors))
|
||||||
@ -513,7 +511,7 @@ class TestWEIRegistration(TestCase):
|
|||||||
team=[self.team.id],
|
team=[self.team.id],
|
||||||
roles=[role.id for role in WEIRole.objects.filter(name="Adhérent⋅e WEI").all()],
|
roles=[role.id for role in WEIRole.objects.filter(name="Adhérent⋅e WEI").all()],
|
||||||
information_json=self.registration.information_json,
|
information_json=self.registration.information_json,
|
||||||
deposit_type='check'
|
caution_type='check'
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
qs = WEIRegistration.objects.filter(user_id=self.user.id, soge_credit=False, clothing_size="M")
|
qs = WEIRegistration.objects.filter(user_id=self.user.id, soge_credit=False, clothing_size="M")
|
||||||
@ -568,7 +566,7 @@ class TestWEIRegistration(TestCase):
|
|||||||
team=[self.team.id],
|
team=[self.team.id],
|
||||||
roles=[role.id for role in WEIRole.objects.filter(name="Adhérent⋅e WEI").all()],
|
roles=[role.id for role in WEIRole.objects.filter(name="Adhérent⋅e WEI").all()],
|
||||||
information_json=self.registration.information_json,
|
information_json=self.registration.information_json,
|
||||||
deposit_type='check'
|
caution_type='check'
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
qs = WEIRegistration.objects.filter(user_id=self.user.id, clothing_size="L")
|
qs = WEIRegistration.objects.filter(user_id=self.user.id, clothing_size="L")
|
||||||
@ -592,7 +590,7 @@ class TestWEIRegistration(TestCase):
|
|||||||
team=[],
|
team=[],
|
||||||
roles=[],
|
roles=[],
|
||||||
information_json=self.registration.information_json,
|
information_json=self.registration.information_json,
|
||||||
deposit_type='check'
|
caution_type='check'
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
self.assertFalse(response.context["membership_form"].is_valid())
|
self.assertFalse(response.context["membership_form"].is_valid())
|
||||||
@ -642,7 +640,7 @@ class TestWEIRegistration(TestCase):
|
|||||||
last_name="admin",
|
last_name="admin",
|
||||||
first_name="admin",
|
first_name="admin",
|
||||||
bank="Société générale",
|
bank="Société générale",
|
||||||
deposit_check=True,
|
caution_check=True,
|
||||||
))
|
))
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, 200)
|
||||||
self.assertFalse(response.context["form"].is_valid())
|
self.assertFalse(response.context["form"].is_valid())
|
||||||
@ -657,7 +655,7 @@ class TestWEIRegistration(TestCase):
|
|||||||
last_name="admin",
|
last_name="admin",
|
||||||
first_name="admin",
|
first_name="admin",
|
||||||
bank="Société générale",
|
bank="Société générale",
|
||||||
deposit_check=True,
|
caution_check=True,
|
||||||
))
|
))
|
||||||
self.assertRedirects(response, reverse("wei:wei_registrations", kwargs=dict(pk=self.registration.wei.pk)), 302, 200)
|
self.assertRedirects(response, reverse("wei:wei_registrations", kwargs=dict(pk=self.registration.wei.pk)), 302, 200)
|
||||||
|
|
||||||
@ -680,7 +678,11 @@ class TestWEIRegistration(TestCase):
|
|||||||
self.assertTrue(soge_credit.exists())
|
self.assertTrue(soge_credit.exists())
|
||||||
soge_credit = soge_credit.get()
|
soge_credit = soge_credit.get()
|
||||||
self.assertTrue(membership.transaction in soge_credit.transactions.all())
|
self.assertTrue(membership.transaction in soge_credit.transactions.all())
|
||||||
|
self.assertTrue(kfet_membership.transaction in soge_credit.transactions.all())
|
||||||
|
self.assertTrue(bde_membership.transaction in soge_credit.transactions.all())
|
||||||
self.assertFalse(membership.transaction.valid)
|
self.assertFalse(membership.transaction.valid)
|
||||||
|
self.assertFalse(kfet_membership.transaction.valid)
|
||||||
|
self.assertFalse(bde_membership.transaction.valid)
|
||||||
|
|
||||||
# Check that if the WEI is started, we can't update a wei
|
# Check that if the WEI is started, we can't update a wei
|
||||||
self.wei.date_start = date(2000, 1, 1)
|
self.wei.date_start = date(2000, 1, 1)
|
||||||
@ -813,7 +815,7 @@ class TestWeiAPI(TestAPI):
|
|||||||
user_id=self.user.id,
|
user_id=self.user.id,
|
||||||
wei_id=self.wei.id,
|
wei_id=self.wei.id,
|
||||||
soge_credit=True,
|
soge_credit=True,
|
||||||
deposit_check=True,
|
caution_check=True,
|
||||||
birth_date=date(2000, 1, 1),
|
birth_date=date(2000, 1, 1),
|
||||||
gender="nonbinary",
|
gender="nonbinary",
|
||||||
clothing_cut="male",
|
clothing_cut="male",
|
||||||
|
@ -7,7 +7,7 @@ from .views import CurrentWEIDetailView, WEI1AListView, WEIListView, WEICreateVi
|
|||||||
WEIRegistrationsView, WEIMembershipsView, MemberListRenderView, BusInformationUpdateView, \
|
WEIRegistrationsView, WEIMembershipsView, MemberListRenderView, BusInformationUpdateView, \
|
||||||
BusCreateView, BusManageView, BusUpdateView, BusTeamCreateView, BusTeamManageView, BusTeamUpdateView, \
|
BusCreateView, BusManageView, BusUpdateView, BusTeamCreateView, BusTeamManageView, BusTeamUpdateView, \
|
||||||
WEIAttributeBus1AView, WEIAttributeBus1ANextView, WEIRegister1AView, WEIRegister2AView, WEIUpdateRegistrationView, \
|
WEIAttributeBus1AView, WEIAttributeBus1ANextView, WEIRegister1AView, WEIRegister2AView, WEIUpdateRegistrationView, \
|
||||||
WEIDeleteRegistrationView, WEIValidateRegistrationView, WEISurveyView, WEISurveyEndView, WEIClosedView, WEIUpdateMembershipView
|
WEIDeleteRegistrationView, WEIValidateRegistrationView, WEISurveyView, WEISurveyEndView, WEIClosedView
|
||||||
|
|
||||||
app_name = 'wei'
|
app_name = 'wei'
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
@ -43,6 +43,4 @@ urlpatterns = [
|
|||||||
path('bus-1A/<int:pk>/', WEIAttributeBus1AView.as_view(), name="wei_bus_1A"),
|
path('bus-1A/<int:pk>/', WEIAttributeBus1AView.as_view(), name="wei_bus_1A"),
|
||||||
path('bus-1A/next/<int:pk>/', WEIAttributeBus1ANextView.as_view(), name="wei_bus_1A_next"),
|
path('bus-1A/next/<int:pk>/', WEIAttributeBus1ANextView.as_view(), name="wei_bus_1A_next"),
|
||||||
path('update-bus-info/<int:pk>/', BusInformationUpdateView.as_view(), name="update_bus_info"),
|
path('update-bus-info/<int:pk>/', BusInformationUpdateView.as_view(), name="update_bus_info"),
|
||||||
|
|
||||||
path('edit_membership/<int:pk>/', WEIUpdateMembershipView.as_view(), name="wei_update_membership"),
|
|
||||||
]
|
]
|
||||||
|
@ -13,7 +13,7 @@ from django.contrib.auth.mixins import LoginRequiredMixin
|
|||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.core.exceptions import PermissionDenied
|
from django.core.exceptions import PermissionDenied
|
||||||
from django.db import transaction
|
from django.db import transaction
|
||||||
from django.db.models import Q, Count, Case, When, Value, IntegerField, F
|
from django.db.models import Q, Count
|
||||||
from django.db.models.functions.text import Lower
|
from django.db.models.functions.text import Lower
|
||||||
from django import forms
|
from django import forms
|
||||||
from django.http import HttpResponse, Http404
|
from django.http import HttpResponse, Http404
|
||||||
@ -27,7 +27,7 @@ from django.views.generic.edit import BaseFormView, DeleteView
|
|||||||
from django_tables2 import SingleTableView, MultiTableMixin
|
from django_tables2 import SingleTableView, MultiTableMixin
|
||||||
from api.viewsets import is_regex
|
from api.viewsets import is_regex
|
||||||
from member.models import Membership, Club
|
from member.models import Membership, Club
|
||||||
from note.models import Transaction, NoteClub, Alias, SpecialTransaction
|
from note.models import Transaction, NoteClub, Alias, SpecialTransaction, NoteSpecial
|
||||||
from note.tables import HistoryTable
|
from note.tables import HistoryTable
|
||||||
from note_kfet.settings import BASE_DIR
|
from note_kfet.settings import BASE_DIR
|
||||||
from permission.backends import PermissionBackend
|
from permission.backends import PermissionBackend
|
||||||
@ -35,7 +35,7 @@ from permission.views import ProtectQuerysetMixin, ProtectedCreateView
|
|||||||
|
|
||||||
from .forms.registration import WEIChooseBusForm
|
from .forms.registration import WEIChooseBusForm
|
||||||
from .models import WEIClub, WEIRegistration, WEIMembership, Bus, BusTeam, WEIRole
|
from .models import WEIClub, WEIRegistration, WEIMembership, Bus, BusTeam, WEIRole
|
||||||
from .forms import WEIForm, WEIRegistrationForm, BusForm, BusTeamForm, WEIMembership1AForm, \
|
from .forms import WEIForm, WEIRegistrationForm, WEIRegistration1AForm, WEIRegistration2AForm, BusForm, BusTeamForm, WEIMembership1AForm, \
|
||||||
WEIMembershipForm, CurrentSurvey
|
WEIMembershipForm, CurrentSurvey
|
||||||
from .tables import BusRepartitionTable, BusTable, BusTeamTable, WEITable, WEIRegistrationTable, \
|
from .tables import BusRepartitionTable, BusTable, BusTeamTable, WEITable, WEIRegistrationTable, \
|
||||||
WEIRegistration1ATable, WEIMembershipTable
|
WEIRegistration1ATable, WEIMembershipTable
|
||||||
@ -133,23 +133,6 @@ class WEIDetailView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, D
|
|||||||
membership=None,
|
membership=None,
|
||||||
wei=club
|
wei=club
|
||||||
)
|
)
|
||||||
# Annotate the query to be able to sort registrations on validate status
|
|
||||||
pre_registrations = pre_registrations.annotate(
|
|
||||||
deposit=Case(
|
|
||||||
When(deposit_type='note', then=F('wei__deposit_amount')),
|
|
||||||
default=Value(0),
|
|
||||||
output_field=IntegerField()
|
|
||||||
)
|
|
||||||
).annotate(
|
|
||||||
total_fee=F('fee') + F('deposit')
|
|
||||||
).annotate(
|
|
||||||
validate_status=Case(
|
|
||||||
When(total_fee__gt=F('user__note__balance'), then=Value(2)),
|
|
||||||
When(first_year=True, then=Value(1)),
|
|
||||||
default=Value(0),
|
|
||||||
output_field=IntegerField(),
|
|
||||||
)
|
|
||||||
)
|
|
||||||
buses = Bus.objects.filter(PermissionBackend.filter_queryset(self.request, Bus, "view")) \
|
buses = Bus.objects.filter(PermissionBackend.filter_queryset(self.request, Bus, "view")) \
|
||||||
.filter(wei=self.object).annotate(count=Count("memberships")).order_by("name")
|
.filter(wei=self.object).annotate(count=Count("memberships")).order_by("name")
|
||||||
return [club_transactions, club_member, pre_registrations, buses, ]
|
return [club_transactions, club_member, pre_registrations, buses, ]
|
||||||
@ -277,23 +260,6 @@ class WEIRegistrationsView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTable
|
|||||||
|
|
||||||
def get_queryset(self, **kwargs):
|
def get_queryset(self, **kwargs):
|
||||||
qs = super().get_queryset(**kwargs).filter(wei=self.club, membership=None).distinct()
|
qs = super().get_queryset(**kwargs).filter(wei=self.club, membership=None).distinct()
|
||||||
# Annotate the query to be able to sort registrations on validate status
|
|
||||||
qs = qs.annotate(
|
|
||||||
deposit=Case(
|
|
||||||
When(deposit_type='note', then=F('wei__deposit_amount')),
|
|
||||||
default=Value(0),
|
|
||||||
output_field=IntegerField()
|
|
||||||
)
|
|
||||||
).annotate(
|
|
||||||
total_fee=F('fee') + F('deposit')
|
|
||||||
).annotate(
|
|
||||||
validate_status=Case(
|
|
||||||
When(total_fee__gt=F('user__note__balance'), then=Value(2)),
|
|
||||||
When(first_year=True, then=Value(1)),
|
|
||||||
default=Value(0),
|
|
||||||
output_field=IntegerField(),
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
pattern = self.request.GET.get("search", "")
|
pattern = self.request.GET.get("search", "")
|
||||||
|
|
||||||
@ -544,7 +510,7 @@ class WEIRegister1AView(ProtectQuerysetMixin, ProtectedCreateView):
|
|||||||
Register a new user to the WEI
|
Register a new user to the WEI
|
||||||
"""
|
"""
|
||||||
model = WEIRegistration
|
model = WEIRegistration
|
||||||
form_class = WEIRegistrationForm
|
form_class = WEIRegistration1AForm
|
||||||
extra_context = {"title": _("Register first year student to the WEI")}
|
extra_context = {"title": _("Register first year student to the WEI")}
|
||||||
|
|
||||||
def get_sample_object(self):
|
def get_sample_object(self):
|
||||||
@ -594,15 +560,13 @@ class WEIRegister1AView(ProtectQuerysetMixin, ProtectedCreateView):
|
|||||||
# Cacher les champs pendant l'inscription initiale
|
# Cacher les champs pendant l'inscription initiale
|
||||||
if "first_year" in form.fields:
|
if "first_year" in form.fields:
|
||||||
del form.fields["first_year"]
|
del form.fields["first_year"]
|
||||||
if "deposit_check" in form.fields:
|
if "caution_check" in form.fields:
|
||||||
del form.fields["deposit_check"]
|
del form.fields["caution_check"]
|
||||||
if "information_json" in form.fields:
|
if "information_json" in form.fields:
|
||||||
del form.fields["information_json"]
|
del form.fields["information_json"]
|
||||||
if "deposit_type" in form.fields:
|
if "caution_type" in form.fields:
|
||||||
del form.fields["deposit_type"]
|
del form.fields["caution_type"]
|
||||||
|
|
||||||
if "soge_credit" in form.fields:
|
|
||||||
form.fields["soge_credit"].help_text = _('Check if you will open a Société Générale account')
|
|
||||||
return form
|
return form
|
||||||
|
|
||||||
@transaction.atomic
|
@transaction.atomic
|
||||||
@ -640,7 +604,7 @@ class WEIRegister2AView(ProtectQuerysetMixin, ProtectedCreateView):
|
|||||||
Register an old user to the WEI
|
Register an old user to the WEI
|
||||||
"""
|
"""
|
||||||
model = WEIRegistration
|
model = WEIRegistration
|
||||||
form_class = WEIRegistrationForm
|
form_class = WEIRegistration2AForm
|
||||||
extra_context = {"title": _("Register old student to the WEI")}
|
extra_context = {"title": _("Register old student to the WEI")}
|
||||||
|
|
||||||
def get_sample_object(self):
|
def get_sample_object(self):
|
||||||
@ -694,9 +658,6 @@ class WEIRegister2AView(ProtectQuerysetMixin, ProtectedCreateView):
|
|||||||
def get_form(self, form_class=None):
|
def get_form(self, form_class=None):
|
||||||
form = super().get_form(form_class)
|
form = super().get_form(form_class)
|
||||||
form.fields["user"].initial = self.request.user
|
form.fields["user"].initial = self.request.user
|
||||||
if "soge_credit" in form.fields:
|
|
||||||
form.fields["soge_credit"].help_text = _('Check if you will open a Société Générale account')
|
|
||||||
|
|
||||||
if "myself" in self.request.path and self.request.user.profile.soge:
|
if "myself" in self.request.path and self.request.user.profile.soge:
|
||||||
form.fields["soge_credit"].disabled = True
|
form.fields["soge_credit"].disabled = True
|
||||||
form.fields["soge_credit"].help_text = _("You already opened an account in the Société générale.")
|
form.fields["soge_credit"].help_text = _("You already opened an account in the Société générale.")
|
||||||
@ -704,16 +665,16 @@ class WEIRegister2AView(ProtectQuerysetMixin, ProtectedCreateView):
|
|||||||
# Cacher les champs pendant l'inscription initiale
|
# Cacher les champs pendant l'inscription initiale
|
||||||
if "first_year" in form.fields:
|
if "first_year" in form.fields:
|
||||||
del form.fields["first_year"]
|
del form.fields["first_year"]
|
||||||
if "deposit_check" in form.fields:
|
if "caution_check" in form.fields:
|
||||||
del form.fields["deposit_check"]
|
del form.fields["caution_check"]
|
||||||
if "information_json" in form.fields:
|
if "information_json" in form.fields:
|
||||||
del form.fields["information_json"]
|
del form.fields["information_json"]
|
||||||
|
|
||||||
# S'assurer que le champ deposit_type est obligatoire
|
# S'assurer que le champ caution_type est obligatoire
|
||||||
if "deposit_type" in form.fields:
|
if "caution_type" in form.fields:
|
||||||
form.fields["deposit_type"].required = True
|
form.fields["caution_type"].required = True
|
||||||
form.fields["deposit_type"].help_text = _("Choose how you want to pay the deposit")
|
form.fields["caution_type"].help_text = _("Choose how you want to pay the deposit")
|
||||||
form.fields["deposit_type"].widget = forms.RadioSelect(choices=form.fields["deposit_type"].choices)
|
form.fields["caution_type"].widget = forms.RadioSelect(choices=form.fields["caution_type"].choices)
|
||||||
|
|
||||||
return form
|
return form
|
||||||
|
|
||||||
@ -742,7 +703,7 @@ class WEIRegister2AView(ProtectQuerysetMixin, ProtectedCreateView):
|
|||||||
form.instance.information = information
|
form.instance.information = information
|
||||||
|
|
||||||
# Sauvegarder le type de caution
|
# Sauvegarder le type de caution
|
||||||
form.instance.deposit_type = form.cleaned_data["deposit_type"]
|
form.instance.caution_type = form.cleaned_data["caution_type"]
|
||||||
form.instance.save()
|
form.instance.save()
|
||||||
|
|
||||||
if 'treasury' in settings.INSTALLED_APPS:
|
if 'treasury' in settings.INSTALLED_APPS:
|
||||||
@ -773,11 +734,14 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
|
|||||||
if today >= wei.date_start or today < wei.membership_start:
|
if today >= wei.date_start or today < wei.membership_start:
|
||||||
return redirect(reverse_lazy('wei:wei_closed', args=(wei.pk,)))
|
return redirect(reverse_lazy('wei:wei_closed', args=(wei.pk,)))
|
||||||
# Store the validate parameter in the view's state
|
# Store the validate parameter in the view's state
|
||||||
|
self.should_validate = request.GET.get('validate', False)
|
||||||
return super().dispatch(request, *args, **kwargs)
|
return super().dispatch(request, *args, **kwargs)
|
||||||
|
|
||||||
def get_context_data(self, **kwargs):
|
def get_context_data(self, **kwargs):
|
||||||
context = super().get_context_data(**kwargs)
|
context = super().get_context_data(**kwargs)
|
||||||
context["club"] = self.object.wei
|
context["club"] = self.object.wei
|
||||||
|
# Pass the validate parameter to the template
|
||||||
|
context["should_validate"] = self.should_validate
|
||||||
|
|
||||||
if self.object.is_validated:
|
if self.object.is_validated:
|
||||||
membership_form = self.get_membership_form(instance=self.object.membership,
|
membership_form = self.get_membership_form(instance=self.object.membership,
|
||||||
@ -809,16 +773,17 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
|
|||||||
form = super().get_form(form_class)
|
form = super().get_form(form_class)
|
||||||
form.fields["user"].disabled = True
|
form.fields["user"].disabled = True
|
||||||
# The auto-json-format may cause issues with the default field remove
|
# The auto-json-format may cause issues with the default field remove
|
||||||
if "information_json" in form.fields:
|
if not PermissionBackend.check_perm(self.request, 'wei.change_weiregistration_information_json', self.object):
|
||||||
del form.fields["information_json"]
|
del form.fields["information_json"]
|
||||||
# Masquer le champ deposit_check pour tout le monde dans le formulaire de modification
|
# Masquer le champ caution_check pour tout le monde dans le formulaire de modification
|
||||||
if "deposit_check" in form.fields:
|
if "caution_check" in form.fields:
|
||||||
del form.fields["deposit_check"]
|
del form.fields["caution_check"]
|
||||||
|
|
||||||
# S'assurer que le champ deposit_type est obligatoire pour les 2A+
|
# S'assurer que le champ caution_type est obligatoire pour les 2A+
|
||||||
if not self.object.first_year and "deposit_type" in form.fields:
|
if not self.object.first_year and "caution_type" in form.fields:
|
||||||
form.fields["deposit_type"].required = True
|
form.fields["caution_type"].required = True
|
||||||
form.fields["deposit_type"].help_text = _("Choose how you want to pay the deposit")
|
form.fields["caution_type"].help_text = _("Choose how you want to pay the deposit")
|
||||||
|
form.fields["caution_type"].widget = forms.RadioSelect(choices=form.fields["caution_type"].choices)
|
||||||
|
|
||||||
return form
|
return form
|
||||||
|
|
||||||
@ -880,8 +845,8 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
|
|||||||
form.instance.information = information
|
form.instance.information = information
|
||||||
|
|
||||||
# Sauvegarder le type de caution pour les 2A+
|
# Sauvegarder le type de caution pour les 2A+
|
||||||
if "deposit_type" in form.cleaned_data:
|
if "caution_type" in form.cleaned_data:
|
||||||
form.instance.deposit_type = form.cleaned_data["deposit_type"]
|
form.instance.caution_type = form.cleaned_data["caution_type"]
|
||||||
form.instance.save()
|
form.instance.save()
|
||||||
|
|
||||||
return super().form_valid(form)
|
return super().form_valid(form)
|
||||||
@ -892,6 +857,9 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
|
|||||||
survey = CurrentSurvey(self.object)
|
survey = CurrentSurvey(self.object)
|
||||||
if not survey.is_complete():
|
if not survey.is_complete():
|
||||||
return reverse_lazy("wei:wei_survey", kwargs={"pk": self.object.pk})
|
return reverse_lazy("wei:wei_survey", kwargs={"pk": self.object.pk})
|
||||||
|
# On redirige vers la validation uniquement si c'est explicitement demandé (et stocké dans la vue)
|
||||||
|
if self.should_validate and self.request.user.has_perm("wei.add_weimembership"):
|
||||||
|
return reverse_lazy("wei:validate_registration", kwargs={"pk": self.object.pk})
|
||||||
return reverse_lazy("wei:wei_detail", kwargs={"pk": self.object.wei.pk})
|
return reverse_lazy("wei:wei_detail", kwargs={"pk": self.object.wei.pk})
|
||||||
|
|
||||||
|
|
||||||
@ -984,15 +952,15 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
|
|||||||
|
|
||||||
# Calculer le montant total nécessaire (frais + caution si transaction)
|
# Calculer le montant total nécessaire (frais + caution si transaction)
|
||||||
total_needed = fee
|
total_needed = fee
|
||||||
if registration.deposit_type == 'note':
|
if registration.caution_type == 'note':
|
||||||
total_needed += registration.wei.deposit_amount
|
total_needed += registration.wei.caution_amount
|
||||||
context["total_needed"] = total_needed
|
context["total_needed"] = total_needed
|
||||||
|
|
||||||
form = context["form"]
|
form = context["form"]
|
||||||
if registration.soge_credit:
|
if registration.soge_credit:
|
||||||
form.fields["credit_amount"].initial = fee
|
form.fields["credit_amount"].initial = registration.fee
|
||||||
else:
|
else:
|
||||||
form.fields["credit_amount"].initial = max(0, fee - registration.user.note.balance)
|
form.fields["credit_amount"].initial = max(0, registration.fee - registration.user.note.balance)
|
||||||
|
|
||||||
return context
|
return context
|
||||||
|
|
||||||
@ -1015,25 +983,34 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
|
|||||||
form.fields["last_name"].initial = registration.user.last_name
|
form.fields["last_name"].initial = registration.user.last_name
|
||||||
form.fields["first_name"].initial = registration.user.first_name
|
form.fields["first_name"].initial = registration.user.first_name
|
||||||
|
|
||||||
# Ajouter le champ deposit_check uniquement pour les non-première année et le rendre obligatoire
|
# Ajouter le champ caution_check uniquement pour les non-première année et le rendre obligatoire
|
||||||
if not registration.first_year:
|
if not registration.first_year:
|
||||||
if registration.deposit_type == 'check':
|
if registration.caution_type == 'check':
|
||||||
form.fields["deposit_check"] = forms.BooleanField(
|
form.fields["caution_check"] = forms.BooleanField(
|
||||||
required=True,
|
required=True,
|
||||||
initial=registration.deposit_check,
|
initial=registration.caution_check,
|
||||||
label=_("Deposit check given"),
|
label=_("Caution check given"),
|
||||||
help_text=_("Please make sure the check is given before validating the registration")
|
help_text=_("Please make sure the check is given before validating the registration")
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
form.fields["deposit_check"] = forms.BooleanField(
|
form.fields["caution_check"] = forms.BooleanField(
|
||||||
required=True,
|
required=True,
|
||||||
initial=False,
|
initial=False,
|
||||||
label=_("Create deposit transaction"),
|
label=_("Create deposit transaction"),
|
||||||
help_text=_("A transaction of %(amount).2f€ will be created from the user's Note account") % {
|
help_text=_("A transaction of %(amount).2f€ will be created from the user's Note account") % {
|
||||||
'amount': registration.wei.deposit_amount / 100
|
'amount': registration.wei.caution_amount / 100
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if registration.soge_credit:
|
||||||
|
form.fields["credit_type"].disabled = True
|
||||||
|
form.fields["credit_type"].initial = NoteSpecial.objects.get(special_type="Virement bancaire")
|
||||||
|
form.fields["credit_amount"].disabled = True
|
||||||
|
form.fields["last_name"].disabled = True
|
||||||
|
form.fields["first_name"].disabled = True
|
||||||
|
form.fields["bank"].disabled = True
|
||||||
|
form.fields["bank"].initial = "Société générale"
|
||||||
|
|
||||||
if 'bus' in form.fields:
|
if 'bus' in form.fields:
|
||||||
# For 2A+ and hardcoded 1A
|
# For 2A+ and hardcoded 1A
|
||||||
form.fields["bus"].widget.attrs["api_url"] = "/api/wei/bus/?wei=" + str(registration.wei.pk)
|
form.fields["bus"].widget.attrs["api_url"] = "/api/wei/bus/?wei=" + str(registration.wei.pk)
|
||||||
@ -1066,8 +1043,8 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
|
|||||||
club = registration.wei
|
club = registration.wei
|
||||||
user = registration.user
|
user = registration.user
|
||||||
|
|
||||||
if "deposit_check" in form.data:
|
if "caution_check" in form.data:
|
||||||
registration.deposit_check = form.data["deposit_check"] == "on"
|
registration.caution_check = form.data["caution_check"] == "on"
|
||||||
registration.save()
|
registration.save()
|
||||||
membership = form.instance
|
membership = form.instance
|
||||||
membership.user = user
|
membership.user = user
|
||||||
@ -1078,8 +1055,6 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
|
|||||||
membership._force_renew_parent = True
|
membership._force_renew_parent = True
|
||||||
|
|
||||||
fee = club.membership_fee_paid if user.profile.paid else club.membership_fee_unpaid
|
fee = club.membership_fee_paid if user.profile.paid else club.membership_fee_unpaid
|
||||||
if registration.soge_credit:
|
|
||||||
fee = registration.wei.fee_soge_credit
|
|
||||||
|
|
||||||
kfet = club.parent_club
|
kfet = club.parent_club
|
||||||
bde = kfet.parent_club
|
bde = kfet.parent_club
|
||||||
@ -1106,16 +1081,16 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
|
|||||||
first_name = form.cleaned_data["first_name"]
|
first_name = form.cleaned_data["first_name"]
|
||||||
bank = form.cleaned_data["bank"]
|
bank = form.cleaned_data["bank"]
|
||||||
|
|
||||||
if credit_type is None:
|
if credit_type is None or registration.soge_credit:
|
||||||
credit_amount = 0
|
credit_amount = 0
|
||||||
|
|
||||||
# Calculer le montant total nécessaire (frais + caution si transaction)
|
# Calculer le montant total nécessaire (frais + caution si transaction)
|
||||||
total_needed = fee
|
total_needed = fee
|
||||||
if registration.deposit_type == 'note':
|
if registration.caution_type == 'note':
|
||||||
total_needed += club.deposit_amount
|
total_needed += club.caution_amount
|
||||||
|
|
||||||
# Vérifier que l'utilisateur a assez d'argent pour tout payer
|
# Vérifier que l'utilisateur a assez d'argent pour tout payer
|
||||||
if user.note.balance + credit_amount < total_needed:
|
if not registration.soge_credit and user.note.balance + credit_amount < total_needed:
|
||||||
form.add_error('credit_type',
|
form.add_error('credit_type',
|
||||||
_("This user doesn't have enough money to join this club and pay the deposit. "
|
_("This user doesn't have enough money to join this club and pay the deposit. "
|
||||||
"Current balance: %(balance)d€, credit: %(credit)d€, needed: %(needed)d€") % {
|
"Current balance: %(balance)d€, credit: %(credit)d€, needed: %(needed)d€") % {
|
||||||
@ -1163,14 +1138,14 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
|
|||||||
membership.roles.add(WEIRole.objects.get(name="Adhérent⋅e WEI"))
|
membership.roles.add(WEIRole.objects.get(name="Adhérent⋅e WEI"))
|
||||||
|
|
||||||
# Créer la transaction de caution si nécessaire
|
# Créer la transaction de caution si nécessaire
|
||||||
if registration.deposit_type == 'note':
|
if registration.caution_type == 'note':
|
||||||
from note.models import Transaction
|
from note.models import Transaction
|
||||||
Transaction.objects.create(
|
Transaction.objects.create(
|
||||||
source=user.note,
|
source=user.note,
|
||||||
destination=club.note,
|
destination=club.note,
|
||||||
quantity=1,
|
quantity=1,
|
||||||
amount=club.deposit_amount,
|
amount=club.caution_amount,
|
||||||
reason=_("Deposit %(name)s") % {'name': club.name},
|
reason=_("Caution %(name)s") % {'name': club.name},
|
||||||
valid=True,
|
valid=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -1181,49 +1156,6 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
|
|||||||
return reverse_lazy("wei:wei_registrations", kwargs={"pk": self.object.club.pk})
|
return reverse_lazy("wei:wei_registrations", kwargs={"pk": self.object.club.pk})
|
||||||
|
|
||||||
|
|
||||||
class WEIUpdateMembershipView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
|
|
||||||
"""
|
|
||||||
Update a membership for the WEI
|
|
||||||
"""
|
|
||||||
model = WEIMembership
|
|
||||||
context_object_name = "membership"
|
|
||||||
template_name = "wei/weimembership_update.html"
|
|
||||||
extra_context = {"title": _("Update WEI Membership")}
|
|
||||||
|
|
||||||
def dispatch(self, request, *args, **kwargs):
|
|
||||||
wei = self.get_object().registration.wei
|
|
||||||
today = date.today()
|
|
||||||
# We can't update a registration once the WEI is started and before the membership start date
|
|
||||||
if today >= wei.date_start or today < wei.membership_start:
|
|
||||||
return redirect(reverse_lazy('wei:wei_closed', args=(wei.pk,)))
|
|
||||||
# Store the validate parameter in the view's state
|
|
||||||
return super().dispatch(request, *args, **kwargs)
|
|
||||||
|
|
||||||
def get_form(self):
|
|
||||||
form = WEIMembershipForm(
|
|
||||||
self.request.POST or None,
|
|
||||||
self.request.FILES or None,
|
|
||||||
instance=self.object,
|
|
||||||
wei=self.object.registration.wei,
|
|
||||||
)
|
|
||||||
|
|
||||||
form.fields["roles"].initial = self.object.roles.all()
|
|
||||||
form.fields["bus"].initial = self.object.bus
|
|
||||||
form.fields["team"].initial = self.object.team
|
|
||||||
|
|
||||||
del form.fields["credit_type"]
|
|
||||||
del form.fields["credit_amount"]
|
|
||||||
del form.fields["first_name"]
|
|
||||||
del form.fields["last_name"]
|
|
||||||
del form.fields["bank"]
|
|
||||||
|
|
||||||
return form
|
|
||||||
|
|
||||||
def get_success_url(self):
|
|
||||||
print("get_success_url")
|
|
||||||
return reverse_lazy("wei:wei_detail", kwargs={"pk": self.object.registration.wei.pk})
|
|
||||||
|
|
||||||
|
|
||||||
class WEISurveyView(LoginRequiredMixin, BaseFormView, DetailView):
|
class WEISurveyView(LoginRequiredMixin, BaseFormView, DetailView):
|
||||||
"""
|
"""
|
||||||
Display the survey for the WEI for first year members.
|
Display the survey for the WEI for first year members.
|
||||||
@ -1246,10 +1178,6 @@ class WEISurveyView(LoginRequiredMixin, BaseFormView, DetailView):
|
|||||||
|
|
||||||
if not self.survey:
|
if not self.survey:
|
||||||
self.survey = CurrentSurvey(obj)
|
self.survey = CurrentSurvey(obj)
|
||||||
|
|
||||||
if request.GET.get("reset") == "true":
|
|
||||||
info = self.survey.information
|
|
||||||
info.reset(obj)
|
|
||||||
# If the survey is complete, then display the end page.
|
# If the survey is complete, then display the end page.
|
||||||
if self.survey.is_complete():
|
if self.survey.is_complete():
|
||||||
return redirect(reverse_lazy('wei:wei_survey_end', args=(self.survey.registration.pk,)))
|
return redirect(reverse_lazy('wei:wei_survey_end', args=(self.survey.registration.pk,)))
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -7,7 +7,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: \n"
|
"Project-Id-Version: \n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2025-07-15 18:18+0200\n"
|
"POT-Creation-Date: 2025-06-20 14:02+0200\n"
|
||||||
"PO-Revision-Date: 2022-04-11 23:12+0200\n"
|
"PO-Revision-Date: 2022-04-11 23:12+0200\n"
|
||||||
"Last-Translator: bleizi <bleizi@crans.org>\n"
|
"Last-Translator: bleizi <bleizi@crans.org>\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
@ -65,7 +65,7 @@ msgstr "Usted no puede invitar más de 3 persona a esta actividad."
|
|||||||
#: apps/note/models/transactions.py:46 apps/note/models/transactions.py:299
|
#: apps/note/models/transactions.py:46 apps/note/models/transactions.py:299
|
||||||
#: apps/permission/models.py:329
|
#: apps/permission/models.py:329
|
||||||
#: apps/registration/templates/registration/future_profile_detail.html:16
|
#: apps/registration/templates/registration/future_profile_detail.html:16
|
||||||
#: apps/wei/models.py:77 apps/wei/models.py:150 apps/wei/tables.py:282
|
#: apps/wei/models.py:72 apps/wei/models.py:145 apps/wei/tables.py:282
|
||||||
#: apps/wei/templates/wei/base.html:26
|
#: apps/wei/templates/wei/base.html:26
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:14 apps/wrapped/models.py:16
|
#: apps/wei/templates/wei/weimembership_form.html:14 apps/wrapped/models.py:16
|
||||||
msgid "name"
|
msgid "name"
|
||||||
@ -100,7 +100,7 @@ msgstr "tipos de actividad"
|
|||||||
#: apps/activity/models.py:68
|
#: apps/activity/models.py:68
|
||||||
#: apps/activity/templates/activity/includes/activity_info.html:19
|
#: apps/activity/templates/activity/includes/activity_info.html:19
|
||||||
#: apps/note/models/transactions.py:82 apps/permission/models.py:109
|
#: apps/note/models/transactions.py:82 apps/permission/models.py:109
|
||||||
#: apps/permission/models.py:188 apps/wei/models.py:97 apps/wei/models.py:161
|
#: apps/permission/models.py:188 apps/wei/models.py:92 apps/wei/models.py:156
|
||||||
msgid "description"
|
msgid "description"
|
||||||
msgstr "descripción"
|
msgstr "descripción"
|
||||||
|
|
||||||
@ -121,7 +121,7 @@ msgstr "tipo"
|
|||||||
|
|
||||||
#: apps/activity/models.py:91 apps/logs/models.py:22 apps/member/models.py:325
|
#: apps/activity/models.py:91 apps/logs/models.py:22 apps/member/models.py:325
|
||||||
#: apps/note/models/notes.py:148 apps/treasury/models.py:294
|
#: apps/note/models/notes.py:148 apps/treasury/models.py:294
|
||||||
#: apps/wei/models.py:190 apps/wei/templates/wei/attribute_bus_1A.html:13
|
#: apps/wei/models.py:185 apps/wei/templates/wei/attribute_bus_1A.html:13
|
||||||
#: apps/wei/templates/wei/survey.html:15
|
#: apps/wei/templates/wei/survey.html:15
|
||||||
msgid "user"
|
msgid "user"
|
||||||
msgstr "usuario"
|
msgstr "usuario"
|
||||||
@ -1297,7 +1297,7 @@ msgid "add to registration form"
|
|||||||
msgstr "Validar la afiliación"
|
msgstr "Validar la afiliación"
|
||||||
|
|
||||||
#: apps/member/models.py:268 apps/member/models.py:331
|
#: apps/member/models.py:268 apps/member/models.py:331
|
||||||
#: apps/note/models/notes.py:176 apps/wei/models.py:91
|
#: apps/note/models/notes.py:176 apps/wei/models.py:86
|
||||||
msgid "club"
|
msgid "club"
|
||||||
msgstr "club"
|
msgstr "club"
|
||||||
|
|
||||||
@ -2017,8 +2017,8 @@ msgstr ""
|
|||||||
"pago y un usuario o un club"
|
"pago y un usuario o un club"
|
||||||
|
|
||||||
#: apps/note/models/transactions.py:357 apps/note/models/transactions.py:360
|
#: apps/note/models/transactions.py:357 apps/note/models/transactions.py:360
|
||||||
#: apps/note/models/transactions.py:363 apps/wei/views.py:1103
|
#: apps/note/models/transactions.py:363 apps/wei/views.py:1097
|
||||||
#: apps/wei/views.py:1107
|
#: apps/wei/views.py:1101
|
||||||
msgid "This field is required."
|
msgid "This field is required."
|
||||||
msgstr "Este campo es obligatorio."
|
msgstr "Este campo es obligatorio."
|
||||||
|
|
||||||
@ -2515,7 +2515,7 @@ msgstr "El usuario declara que ya abrió una cuenta a la Société Générale."
|
|||||||
|
|
||||||
#: apps/registration/templates/registration/future_profile_detail.html:73
|
#: apps/registration/templates/registration/future_profile_detail.html:73
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:127
|
#: apps/wei/templates/wei/weimembership_form.html:127
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:192
|
#: apps/wei/templates/wei/weimembership_form.html:196
|
||||||
msgid "Validate registration"
|
msgid "Validate registration"
|
||||||
msgstr "Validar la afiliación"
|
msgstr "Validar la afiliación"
|
||||||
|
|
||||||
@ -3043,8 +3043,8 @@ msgstr "Lista de los créditos de la Société Générale"
|
|||||||
msgid "Manage credits from the Société générale"
|
msgid "Manage credits from the Société générale"
|
||||||
msgstr "Gestionar los créditos de la Société Générale"
|
msgstr "Gestionar los créditos de la Société Générale"
|
||||||
|
|
||||||
#: apps/wei/apps.py:10 apps/wei/models.py:47 apps/wei/models.py:48
|
#: apps/wei/apps.py:10 apps/wei/models.py:42 apps/wei/models.py:43
|
||||||
#: apps/wei/models.py:72 apps/wei/models.py:197
|
#: apps/wei/models.py:67 apps/wei/models.py:192
|
||||||
#: note_kfet/templates/base.html:108
|
#: note_kfet/templates/base.html:108
|
||||||
msgid "WEI"
|
msgid "WEI"
|
||||||
msgstr "WEI"
|
msgstr "WEI"
|
||||||
@ -3054,8 +3054,8 @@ msgid "The selected user is not validated. Please validate its account first"
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"El usuario seleccionado no ha sido validado. Validar esta cuenta primero"
|
"El usuario seleccionado no ha sido validado. Validar esta cuenta primero"
|
||||||
|
|
||||||
#: apps/wei/forms/registration.py:84 apps/wei/models.py:145
|
#: apps/wei/forms/registration.py:84 apps/wei/models.py:140
|
||||||
#: apps/wei/models.py:354
|
#: apps/wei/models.py:348
|
||||||
msgid "bus"
|
msgid "bus"
|
||||||
msgstr "bus"
|
msgstr "bus"
|
||||||
|
|
||||||
@ -3081,7 +3081,7 @@ msgstr ""
|
|||||||
"electrón libre)"
|
"electrón libre)"
|
||||||
|
|
||||||
#: apps/wei/forms/registration.py:100 apps/wei/forms/registration.py:110
|
#: apps/wei/forms/registration.py:100 apps/wei/forms/registration.py:110
|
||||||
#: apps/wei/models.py:179
|
#: apps/wei/models.py:174
|
||||||
msgid "WEI Roles"
|
msgid "WEI Roles"
|
||||||
msgstr "Papeles en el WEI"
|
msgstr "Papeles en el WEI"
|
||||||
|
|
||||||
@ -3089,19 +3089,14 @@ msgstr "Papeles en el WEI"
|
|||||||
msgid "Select the roles that you are interested in."
|
msgid "Select the roles that you are interested in."
|
||||||
msgstr "Elegir los papeles que le interesa."
|
msgstr "Elegir los papeles que le interesa."
|
||||||
|
|
||||||
#: apps/wei/forms/registration.py:160
|
#: apps/wei/forms/registration.py:147
|
||||||
msgid "This team doesn't belong to the given bus."
|
msgid "This team doesn't belong to the given bus."
|
||||||
msgstr "Este equipo no pertenece al bus dado."
|
msgstr "Este equipo no pertenece al bus dado."
|
||||||
|
|
||||||
#: apps/wei/forms/surveys/wei2021.py:35 apps/wei/forms/surveys/wei2022.py:38
|
#: apps/wei/forms/surveys/wei2021.py:35 apps/wei/forms/surveys/wei2022.py:38
|
||||||
#: apps/wei/forms/surveys/wei2025.py:36
|
|
||||||
msgid "Choose a word:"
|
msgid "Choose a word:"
|
||||||
msgstr "Elegir una palabra :"
|
msgstr "Elegir una palabra :"
|
||||||
|
|
||||||
#: apps/wei/forms/surveys/wei2025.py:123
|
|
||||||
msgid "Rate between 0 and 5."
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: apps/wei/models.py:25 apps/wei/templates/wei/base.html:36
|
#: apps/wei/models.py:25 apps/wei/templates/wei/base.html:36
|
||||||
msgid "year"
|
msgid "year"
|
||||||
msgstr "año"
|
msgstr "año"
|
||||||
@ -3118,147 +3113,138 @@ msgstr "fecha de fin"
|
|||||||
|
|
||||||
#: apps/wei/models.py:37
|
#: apps/wei/models.py:37
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
#| msgid "Credit amount"
|
#| msgid "total amount"
|
||||||
msgid "deposit amount"
|
msgid "caution amount"
|
||||||
msgstr "Valor del crédito"
|
msgstr "monto total"
|
||||||
|
|
||||||
#: apps/wei/models.py:42
|
#: apps/wei/models.py:76 apps/wei/tables.py:305
|
||||||
#, fuzzy
|
|
||||||
#| msgid "No credit"
|
|
||||||
msgid "membership fee (soge credit)"
|
|
||||||
msgstr "No crédito"
|
|
||||||
|
|
||||||
#: apps/wei/models.py:81 apps/wei/tables.py:305
|
|
||||||
msgid "seat count in the bus"
|
msgid "seat count in the bus"
|
||||||
msgstr "cantidad de asientos en el bus"
|
msgstr "cantidad de asientos en el bus"
|
||||||
|
|
||||||
#: apps/wei/models.py:102
|
#: apps/wei/models.py:97
|
||||||
msgid "survey information"
|
msgid "survey information"
|
||||||
msgstr "informaciones sobre el cuestionario"
|
msgstr "informaciones sobre el cuestionario"
|
||||||
|
|
||||||
#: apps/wei/models.py:103
|
#: apps/wei/models.py:98
|
||||||
msgid "Information about the survey for new members, encoded in JSON"
|
msgid "Information about the survey for new members, encoded in JSON"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Informaciones sobre el cuestionario para los nuevos miembros, registrado en "
|
"Informaciones sobre el cuestionario para los nuevos miembros, registrado en "
|
||||||
"JSON"
|
"JSON"
|
||||||
|
|
||||||
#: apps/wei/models.py:107
|
#: apps/wei/models.py:102
|
||||||
msgid "Bus"
|
msgid "Bus"
|
||||||
msgstr "Bus"
|
msgstr "Bus"
|
||||||
|
|
||||||
#: apps/wei/models.py:108 apps/wei/templates/wei/weiclub_detail.html:51
|
#: apps/wei/models.py:103 apps/wei/templates/wei/weiclub_detail.html:51
|
||||||
msgid "Buses"
|
msgid "Buses"
|
||||||
msgstr "Bus"
|
msgstr "Bus"
|
||||||
|
|
||||||
#: apps/wei/models.py:154
|
#: apps/wei/models.py:149
|
||||||
msgid "color"
|
msgid "color"
|
||||||
msgstr "color"
|
msgstr "color"
|
||||||
|
|
||||||
#: apps/wei/models.py:155
|
#: apps/wei/models.py:150
|
||||||
msgid "The color of the T-Shirt, stored with its number equivalent"
|
msgid "The color of the T-Shirt, stored with its number equivalent"
|
||||||
msgstr "El color de la camiseta, registrado con su número equivalente"
|
msgstr "El color de la camiseta, registrado con su número equivalente"
|
||||||
|
|
||||||
#: apps/wei/models.py:166
|
#: apps/wei/models.py:161
|
||||||
msgid "Bus team"
|
msgid "Bus team"
|
||||||
msgstr "Equipo de bus"
|
msgstr "Equipo de bus"
|
||||||
|
|
||||||
#: apps/wei/models.py:167
|
#: apps/wei/models.py:162
|
||||||
msgid "Bus teams"
|
msgid "Bus teams"
|
||||||
msgstr "Equipos de bus"
|
msgstr "Equipos de bus"
|
||||||
|
|
||||||
#: apps/wei/models.py:178
|
#: apps/wei/models.py:173
|
||||||
msgid "WEI Role"
|
msgid "WEI Role"
|
||||||
msgstr "Papeles en el WEI"
|
msgstr "Papeles en el WEI"
|
||||||
|
|
||||||
#: apps/wei/models.py:202
|
#: apps/wei/models.py:197
|
||||||
msgid "Credit from Société générale"
|
msgid "Credit from Société générale"
|
||||||
msgstr "Crédito de la Société Générale"
|
msgstr "Crédito de la Société Générale"
|
||||||
|
|
||||||
#: apps/wei/models.py:207 apps/wei/templates/wei/weimembership_form.html:98
|
#: apps/wei/models.py:202 apps/wei/views.py:984
|
||||||
#: apps/wei/views.py:997
|
msgid "Caution check given"
|
||||||
#, fuzzy
|
|
||||||
#| msgid "Caution check given"
|
|
||||||
msgid "Deposit check given"
|
|
||||||
msgstr "Cheque de garantía dado"
|
msgstr "Cheque de garantía dado"
|
||||||
|
|
||||||
#: apps/wei/models.py:213
|
#: apps/wei/models.py:208
|
||||||
msgid "Check"
|
msgid "Check"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: apps/wei/models.py:214
|
#: apps/wei/models.py:209
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
#| msgid "transactions"
|
#| msgid "transactions"
|
||||||
msgid "Note transaction"
|
msgid "Note transaction"
|
||||||
msgstr "Transacción"
|
msgstr "Transacción"
|
||||||
|
|
||||||
#: apps/wei/models.py:217
|
#: apps/wei/models.py:212
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
#| msgid "Credit type"
|
#| msgid "created at"
|
||||||
msgid "deposit type"
|
msgid "caution type"
|
||||||
msgstr "Tipo de crédito"
|
msgstr "tipo de fianza"
|
||||||
|
|
||||||
#: apps/wei/models.py:221 apps/wei/templates/wei/weimembership_form.html:64
|
#: apps/wei/models.py:216 apps/wei/templates/wei/weimembership_form.html:64
|
||||||
msgid "birth date"
|
msgid "birth date"
|
||||||
msgstr "fecha de nacimiento"
|
msgstr "fecha de nacimiento"
|
||||||
|
|
||||||
#: apps/wei/models.py:227 apps/wei/models.py:237
|
#: apps/wei/models.py:222 apps/wei/models.py:232
|
||||||
msgid "Male"
|
msgid "Male"
|
||||||
msgstr "Hombre"
|
msgstr "Hombre"
|
||||||
|
|
||||||
#: apps/wei/models.py:228 apps/wei/models.py:238
|
#: apps/wei/models.py:223 apps/wei/models.py:233
|
||||||
msgid "Female"
|
msgid "Female"
|
||||||
msgstr "Mujer"
|
msgstr "Mujer"
|
||||||
|
|
||||||
#: apps/wei/models.py:229
|
#: apps/wei/models.py:224
|
||||||
msgid "Non binary"
|
msgid "Non binary"
|
||||||
msgstr "No binari@"
|
msgstr "No binari@"
|
||||||
|
|
||||||
#: apps/wei/models.py:231 apps/wei/templates/wei/attribute_bus_1A.html:22
|
#: apps/wei/models.py:226 apps/wei/templates/wei/attribute_bus_1A.html:22
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:55
|
#: apps/wei/templates/wei/weimembership_form.html:55
|
||||||
msgid "gender"
|
msgid "gender"
|
||||||
msgstr "género"
|
msgstr "género"
|
||||||
|
|
||||||
#: apps/wei/models.py:239
|
#: apps/wei/models.py:234
|
||||||
msgid "Unisex"
|
msgid "Unisex"
|
||||||
msgstr "Unisex"
|
msgstr "Unisex"
|
||||||
|
|
||||||
#: apps/wei/models.py:242 apps/wei/templates/wei/weimembership_form.html:58
|
#: apps/wei/models.py:237 apps/wei/templates/wei/weimembership_form.html:58
|
||||||
msgid "clothing cut"
|
msgid "clothing cut"
|
||||||
msgstr "forma de ropa"
|
msgstr "forma de ropa"
|
||||||
|
|
||||||
#: apps/wei/models.py:255 apps/wei/templates/wei/weimembership_form.html:61
|
#: apps/wei/models.py:250 apps/wei/templates/wei/weimembership_form.html:61
|
||||||
msgid "clothing size"
|
msgid "clothing size"
|
||||||
msgstr "medida de ropa"
|
msgstr "medida de ropa"
|
||||||
|
|
||||||
#: apps/wei/models.py:261
|
#: apps/wei/models.py:256
|
||||||
msgid "health issues"
|
msgid "health issues"
|
||||||
msgstr "problemas de salud"
|
msgstr "problemas de salud"
|
||||||
|
|
||||||
#: apps/wei/models.py:266 apps/wei/templates/wei/weimembership_form.html:70
|
#: apps/wei/models.py:261 apps/wei/templates/wei/weimembership_form.html:70
|
||||||
msgid "emergency contact name"
|
msgid "emergency contact name"
|
||||||
msgstr "nombre del contacto de emergencia"
|
msgstr "nombre del contacto de emergencia"
|
||||||
|
|
||||||
#: apps/wei/models.py:267
|
#: apps/wei/models.py:262
|
||||||
msgid "The emergency contact must not be a WEI participant"
|
msgid "The emergency contact must not be a WEI participant"
|
||||||
msgstr "El contacto de emergencia no debe ser un participante de WEI"
|
msgstr "El contacto de emergencia no debe ser un participante de WEI"
|
||||||
|
|
||||||
#: apps/wei/models.py:272 apps/wei/templates/wei/weimembership_form.html:73
|
#: apps/wei/models.py:267 apps/wei/templates/wei/weimembership_form.html:73
|
||||||
msgid "emergency contact phone"
|
msgid "emergency contact phone"
|
||||||
msgstr "teléfono del contacto de emergencia"
|
msgstr "teléfono del contacto de emergencia"
|
||||||
|
|
||||||
#: apps/wei/models.py:277 apps/wei/templates/wei/weimembership_form.html:52
|
#: apps/wei/models.py:272 apps/wei/templates/wei/weimembership_form.html:52
|
||||||
msgid "first year"
|
msgid "first year"
|
||||||
msgstr "primer año"
|
msgstr "primer año"
|
||||||
|
|
||||||
#: apps/wei/models.py:278
|
#: apps/wei/models.py:273
|
||||||
msgid "Tells if the user is new in the school."
|
msgid "Tells if the user is new in the school."
|
||||||
msgstr "Indica si el usuario es nuevo en la escuela."
|
msgstr "Indica si el usuario es nuevo en la escuela."
|
||||||
|
|
||||||
#: apps/wei/models.py:283
|
#: apps/wei/models.py:278
|
||||||
msgid "registration information"
|
msgid "registration information"
|
||||||
msgstr "informaciones sobre la afiliación"
|
msgstr "informaciones sobre la afiliación"
|
||||||
|
|
||||||
#: apps/wei/models.py:284
|
#: apps/wei/models.py:279
|
||||||
msgid ""
|
msgid ""
|
||||||
"Information about the registration (buses for old members, survey for the "
|
"Information about the registration (buses for old members, survey for the "
|
||||||
"new members), encoded in JSON"
|
"new members), encoded in JSON"
|
||||||
@ -3266,27 +3252,27 @@ msgstr ""
|
|||||||
"Informaciones sobre la afiliacion (bus para miembros ancianos, cuestionario "
|
"Informaciones sobre la afiliacion (bus para miembros ancianos, cuestionario "
|
||||||
"para los nuevos miembros), registrado en JSON"
|
"para los nuevos miembros), registrado en JSON"
|
||||||
|
|
||||||
#: apps/wei/models.py:290
|
#: apps/wei/models.py:285
|
||||||
msgid "WEI User"
|
msgid "WEI User"
|
||||||
msgstr "Participante WEI"
|
msgstr "Participante WEI"
|
||||||
|
|
||||||
#: apps/wei/models.py:291
|
#: apps/wei/models.py:286
|
||||||
msgid "WEI Users"
|
msgid "WEI Users"
|
||||||
msgstr "Participantes WEI"
|
msgstr "Participantes WEI"
|
||||||
|
|
||||||
#: apps/wei/models.py:364
|
#: apps/wei/models.py:358
|
||||||
msgid "team"
|
msgid "team"
|
||||||
msgstr "equipo"
|
msgstr "equipo"
|
||||||
|
|
||||||
#: apps/wei/models.py:374
|
#: apps/wei/models.py:368
|
||||||
msgid "WEI registration"
|
msgid "WEI registration"
|
||||||
msgstr "Apuntación al WEI"
|
msgstr "Apuntación al WEI"
|
||||||
|
|
||||||
#: apps/wei/models.py:378
|
#: apps/wei/models.py:372
|
||||||
msgid "WEI membership"
|
msgid "WEI membership"
|
||||||
msgstr "Afiliación al WEI"
|
msgstr "Afiliación al WEI"
|
||||||
|
|
||||||
#: apps/wei/models.py:379
|
#: apps/wei/models.py:373
|
||||||
msgid "WEI memberships"
|
msgid "WEI memberships"
|
||||||
msgstr "Afiliaciones al WEI"
|
msgstr "Afiliaciones al WEI"
|
||||||
|
|
||||||
@ -3314,7 +3300,7 @@ msgstr "Año"
|
|||||||
msgid "preferred bus"
|
msgid "preferred bus"
|
||||||
msgstr "bus preferido"
|
msgstr "bus preferido"
|
||||||
|
|
||||||
#: apps/wei/tables.py:210 apps/wei/templates/wei/bus_detail.html:38
|
#: apps/wei/tables.py:210 apps/wei/templates/wei/bus_detail.html:36
|
||||||
#: apps/wei/templates/wei/busteam_detail.html:52
|
#: apps/wei/templates/wei/busteam_detail.html:52
|
||||||
msgid "Teams"
|
msgid "Teams"
|
||||||
msgstr "Equipos"
|
msgstr "Equipos"
|
||||||
@ -3386,9 +3372,9 @@ msgstr "Pago de entrada del WEI (estudiantes no pagados)"
|
|||||||
|
|
||||||
#: apps/wei/templates/wei/base.html:53
|
#: apps/wei/templates/wei/base.html:53
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
#| msgid "Credit amount"
|
#| msgid "total amount"
|
||||||
msgid "Deposit amount"
|
msgid "Caution amount"
|
||||||
msgstr "Valor del crédito"
|
msgstr "monto total"
|
||||||
|
|
||||||
#: apps/wei/templates/wei/base.html:74
|
#: apps/wei/templates/wei/base.html:74
|
||||||
msgid "WEI list"
|
msgid "WEI list"
|
||||||
@ -3398,7 +3384,7 @@ msgstr "Lista de los WEI"
|
|||||||
msgid "Register 1A"
|
msgid "Register 1A"
|
||||||
msgstr "Apuntar un 1A"
|
msgstr "Apuntar un 1A"
|
||||||
|
|
||||||
#: apps/wei/templates/wei/base.html:83 apps/wei/views.py:646
|
#: apps/wei/templates/wei/base.html:83 apps/wei/views.py:644
|
||||||
msgid "Register 2A+"
|
msgid "Register 2A+"
|
||||||
msgstr "Apuntar un 2A+"
|
msgstr "Apuntar un 2A+"
|
||||||
|
|
||||||
@ -3415,21 +3401,15 @@ msgid "View club"
|
|||||||
msgstr "Ver club"
|
msgstr "Ver club"
|
||||||
|
|
||||||
#: apps/wei/templates/wei/bus_detail.html:26
|
#: apps/wei/templates/wei/bus_detail.html:26
|
||||||
#, fuzzy
|
|
||||||
#| msgid "survey information"
|
|
||||||
msgid "Edit information"
|
|
||||||
msgstr "informaciones sobre el cuestionario"
|
|
||||||
|
|
||||||
#: apps/wei/templates/wei/bus_detail.html:28
|
|
||||||
#: apps/wei/templates/wei/busteam_detail.html:24
|
#: apps/wei/templates/wei/busteam_detail.html:24
|
||||||
msgid "Add team"
|
msgid "Add team"
|
||||||
msgstr "Añadir un equipo"
|
msgstr "Añadir un equipo"
|
||||||
|
|
||||||
#: apps/wei/templates/wei/bus_detail.html:51
|
#: apps/wei/templates/wei/bus_detail.html:49
|
||||||
msgid "Members"
|
msgid "Members"
|
||||||
msgstr "Miembros"
|
msgstr "Miembros"
|
||||||
|
|
||||||
#: apps/wei/templates/wei/bus_detail.html:60
|
#: apps/wei/templates/wei/bus_detail.html:58
|
||||||
#: apps/wei/templates/wei/busteam_detail.html:62
|
#: apps/wei/templates/wei/busteam_detail.html:62
|
||||||
#: apps/wei/templates/wei/weimembership_list.html:31
|
#: apps/wei/templates/wei/weimembership_list.html:31
|
||||||
msgid "View as PDF"
|
msgid "View as PDF"
|
||||||
@ -3437,8 +3417,8 @@ msgstr "Descargar un PDF"
|
|||||||
|
|
||||||
#: apps/wei/templates/wei/survey.html:11
|
#: apps/wei/templates/wei/survey.html:11
|
||||||
#: apps/wei/templates/wei/survey_closed.html:11
|
#: apps/wei/templates/wei/survey_closed.html:11
|
||||||
#: apps/wei/templates/wei/survey_end.html:11 apps/wei/views.py:1165
|
#: apps/wei/templates/wei/survey_end.html:11 apps/wei/views.py:1159
|
||||||
#: apps/wei/views.py:1220 apps/wei/views.py:1267
|
#: apps/wei/views.py:1214 apps/wei/views.py:1261
|
||||||
msgid "Survey WEI"
|
msgid "Survey WEI"
|
||||||
msgstr "Cuestionario WEI"
|
msgstr "Cuestionario WEI"
|
||||||
|
|
||||||
@ -3514,6 +3494,10 @@ msgstr "Informaciones crudas del cuestionario"
|
|||||||
msgid "The algorithm didn't run."
|
msgid "The algorithm didn't run."
|
||||||
msgstr "El algoritmo no funcionó."
|
msgstr "El algoritmo no funcionó."
|
||||||
|
|
||||||
|
#: apps/wei/templates/wei/weimembership_form.html:98
|
||||||
|
msgid "caution check given"
|
||||||
|
msgstr "cheque de garantía dado"
|
||||||
|
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:105
|
#: apps/wei/templates/wei/weimembership_form.html:105
|
||||||
msgid "preferred team"
|
msgid "preferred team"
|
||||||
msgstr "equipo preferido"
|
msgstr "equipo preferido"
|
||||||
@ -3548,18 +3532,11 @@ msgid "with the following roles:"
|
|||||||
msgstr "con los papeles :"
|
msgstr "con los papeles :"
|
||||||
|
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:139
|
#: apps/wei/templates/wei/weimembership_form.html:139
|
||||||
#, fuzzy
|
|
||||||
#| msgid ""
|
|
||||||
#| "The WEI will be paid by Société générale. The membership will be created "
|
|
||||||
#| "even if the bank didn't pay the BDE yet. The membership transaction will "
|
|
||||||
#| "be created but will be invalid. You will have to validate it once the "
|
|
||||||
#| "bank validated the creation of the account, or to change the payment "
|
|
||||||
#| "method."
|
|
||||||
msgid ""
|
msgid ""
|
||||||
"The WEI will partially be paid by Société générale. The membership will be "
|
"The WEI will be paid by Société générale. The membership will be created "
|
||||||
"created even if the bank didn't pay the BDE yet. The membership transaction "
|
"even if the bank didn't pay the BDE yet. The membership transaction will be "
|
||||||
"will be created but will be invalid. You will have to validate it once the "
|
"created but will be invalid. You will have to validate it once the bank "
|
||||||
"bank validated the creation of the account, or to change the payment method."
|
"validated the creation of the account, or to change the payment method."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"El WEI será pagado por la Société Générale. La afiliación será creada aunque "
|
"El WEI será pagado por la Société Générale. La afiliación será creada aunque "
|
||||||
"el banco no pago el BDE ya. La transacción de afiliación será creada pero "
|
"el banco no pago el BDE ya. La transacción de afiliación será creada pero "
|
||||||
@ -3581,26 +3558,27 @@ msgstr "Pagos de afiliación (estudiantes pagados)"
|
|||||||
msgid "Deposit (by Note transaction): %(amount)s"
|
msgid "Deposit (by Note transaction): %(amount)s"
|
||||||
msgstr "Fianza (transacción) : %(amount)s"
|
msgstr "Fianza (transacción) : %(amount)s"
|
||||||
|
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:157
|
#: apps/wei/templates/wei/weimembership_form.html:156
|
||||||
#, python-format
|
#: apps/wei/templates/wei/weimembership_form.html:163
|
||||||
msgid "Deposit (by check): %(amount)s"
|
|
||||||
msgstr "Fianza (cheque) : %(amount)s"
|
|
||||||
|
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:161
|
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Total needed: %(total)s"
|
msgid "Total needed: %(total)s"
|
||||||
msgstr "Total necesario : %(total)s"
|
msgstr "Total necesario : %(total)s"
|
||||||
|
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:165
|
#: apps/wei/templates/wei/weimembership_form.html:160
|
||||||
|
#, python-format
|
||||||
|
msgid "Deposit (by check): %(amount)s"
|
||||||
|
msgstr "Fianza (cheque) : %(amount)s"
|
||||||
|
|
||||||
|
#: apps/wei/templates/wei/weimembership_form.html:168
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Current balance: %(balance)s"
|
msgid "Current balance: %(balance)s"
|
||||||
msgstr "Saldo actual : %(balance)s"
|
msgstr "Saldo actual : %(balance)s"
|
||||||
|
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:172
|
#: apps/wei/templates/wei/weimembership_form.html:176
|
||||||
msgid "The user didn't give her/his caution check."
|
msgid "The user didn't give her/his caution check."
|
||||||
msgstr "El usuario no dio su cheque de garantía."
|
msgstr "El usuario no dio su cheque de garantía."
|
||||||
|
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:180
|
#: apps/wei/templates/wei/weimembership_form.html:184
|
||||||
msgid ""
|
msgid ""
|
||||||
"This user is not a member of the Kfet club for the coming year. The "
|
"This user is not a member of the Kfet club for the coming year. The "
|
||||||
"membership will be processed automatically, the WEI registration includes "
|
"membership will be processed automatically, the WEI registration includes "
|
||||||
@ -3690,109 +3668,110 @@ msgstr "Gestionar el equipo"
|
|||||||
msgid "Register first year student to the WEI"
|
msgid "Register first year student to the WEI"
|
||||||
msgstr "Registrar un 1A al WEI"
|
msgstr "Registrar un 1A al WEI"
|
||||||
|
|
||||||
#: apps/wei/views.py:571 apps/wei/views.py:664
|
#: apps/wei/views.py:580 apps/wei/views.py:689
|
||||||
#, fuzzy
|
|
||||||
#| msgid "Check this case if the Société Générale paid the inscription."
|
|
||||||
msgid "Check if you will open a Société Générale account"
|
|
||||||
msgstr "Marcar esta casilla si Société Générale pagó la registración."
|
|
||||||
|
|
||||||
#: apps/wei/views.py:582 apps/wei/views.py:694
|
|
||||||
msgid "This user is already registered to this WEI."
|
msgid "This user is already registered to this WEI."
|
||||||
msgstr "Este usuario ya afilió a este WEI."
|
msgstr "Este usuario ya afilió a este WEI."
|
||||||
|
|
||||||
#: apps/wei/views.py:587
|
#: apps/wei/views.py:585
|
||||||
msgid ""
|
msgid ""
|
||||||
"This user can't be in her/his first year since he/she has already "
|
"This user can't be in her/his first year since he/she has already "
|
||||||
"participated to a WEI."
|
"participated to a WEI."
|
||||||
msgstr "Este usuario no puede ser un 1A porque ya participó en un WEI."
|
msgstr "Este usuario no puede ser un 1A porque ya participó en un WEI."
|
||||||
|
|
||||||
#: apps/wei/views.py:610
|
#: apps/wei/views.py:608
|
||||||
msgid "Register old student to the WEI"
|
msgid "Register old student to the WEI"
|
||||||
msgstr "Registrar un 2A+ al WEI"
|
msgstr "Registrar un 2A+ al WEI"
|
||||||
|
|
||||||
#: apps/wei/views.py:668 apps/wei/views.py:773
|
#: apps/wei/views.py:663 apps/wei/views.py:768
|
||||||
msgid "You already opened an account in the Société générale."
|
msgid "You already opened an account in the Société générale."
|
||||||
msgstr "Usted ya abrió una cuenta a la Société Générale."
|
msgstr "Usted ya abrió una cuenta a la Société Générale."
|
||||||
|
|
||||||
#: apps/wei/views.py:681 apps/wei/views.py:790
|
#: apps/wei/views.py:676 apps/wei/views.py:785
|
||||||
msgid "Choose how you want to pay the deposit"
|
msgid "Choose how you want to pay the deposit"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: apps/wei/views.py:733
|
#: apps/wei/views.py:728
|
||||||
msgid "Update WEI Registration"
|
msgid "Update WEI Registration"
|
||||||
msgstr "Modificar la inscripción WEI"
|
msgstr "Modificar la inscripción WEI"
|
||||||
|
|
||||||
#: apps/wei/views.py:816
|
#: apps/wei/views.py:810
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
#| msgid "The BDE membership is included in the WEI registration."
|
#| msgid "The BDE membership is included in the WEI registration."
|
||||||
msgid "No membership found for this registration"
|
msgid "No membership found for this registration"
|
||||||
msgstr "La afiliación al BDE esta incluida en la afiliación WEI."
|
msgstr "La afiliación al BDE esta incluida en la afiliación WEI."
|
||||||
|
|
||||||
#: apps/wei/views.py:825
|
#: apps/wei/views.py:819
|
||||||
|
#| msgid ""
|
||||||
|
#| "You don't have the permission to add an instance of model {app_label}."
|
||||||
|
#| "{model_name}."
|
||||||
msgid "You don't have the permission to update memberships"
|
msgid "You don't have the permission to update memberships"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Usted no tiene permiso a añadir una instancia al modelo {app_label}."
|
"Usted no tiene permiso a añadir una instancia al modelo {app_label}."
|
||||||
"{model_name}."
|
"{model_name}."
|
||||||
|
|
||||||
#: apps/wei/views.py:831
|
#: apps/wei/views.py:825
|
||||||
#, python-format
|
#, python-format
|
||||||
|
#| msgid ""
|
||||||
|
#| "You don't have the permission to delete this instance of model "
|
||||||
|
#| "{app_label}.{model_name}."
|
||||||
msgid "You don't have the permission to update the field %(field)s"
|
msgid "You don't have the permission to update the field %(field)s"
|
||||||
msgstr "Usted no tiene permiso a modificar el campo %(field)s"
|
msgstr "Usted no tiene permiso a modificar el campo %(field)s"
|
||||||
|
|
||||||
#: apps/wei/views.py:876
|
#: apps/wei/views.py:870
|
||||||
msgid "Delete WEI registration"
|
msgid "Delete WEI registration"
|
||||||
msgstr "Suprimir la inscripción WEI"
|
msgstr "Suprimir la inscripción WEI"
|
||||||
|
|
||||||
#: apps/wei/views.py:887
|
#: apps/wei/views.py:881
|
||||||
msgid "You don't have the right to delete this WEI registration."
|
msgid "You don't have the right to delete this WEI registration."
|
||||||
msgstr "Usted no tiene derecho a suprimir esta inscripción WEI."
|
msgstr "Usted no tiene derecho a suprimir esta inscripción WEI."
|
||||||
|
|
||||||
#: apps/wei/views.py:905
|
#: apps/wei/views.py:899
|
||||||
msgid "Validate WEI registration"
|
msgid "Validate WEI registration"
|
||||||
msgstr "Validar la inscripción WEI"
|
msgstr "Validar la inscripción WEI"
|
||||||
|
|
||||||
#: apps/wei/views.py:998
|
#: apps/wei/views.py:985
|
||||||
msgid "Please make sure the check is given before validating the registration"
|
msgid "Please make sure the check is given before validating the registration"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Por favor asegúrese de que el cheque se entrega antes de validar el registro"
|
"Por favor asegúrese de que el cheque se entrega antes de validar el registro"
|
||||||
|
|
||||||
#: apps/wei/views.py:1004
|
#: apps/wei/views.py:991
|
||||||
|
#| msgid "credit transaction"
|
||||||
msgid "Create deposit transaction"
|
msgid "Create deposit transaction"
|
||||||
msgstr "Crear transacción de crédito"
|
msgstr "Crear transacción de crédito"
|
||||||
|
|
||||||
#: apps/wei/views.py:1005
|
#: apps/wei/views.py:992
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"A transaction of %(amount).2f€ will be created from the user's Note account"
|
"A transaction of %(amount).2f€ will be created from the user's Note account"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: apps/wei/views.py:1093
|
#: apps/wei/views.py:1087
|
||||||
#, fuzzy, python-format
|
#, python-format
|
||||||
#| msgid ""
|
#| msgid ""
|
||||||
#| "This user doesn't have enough money. Current balance: %(balance)d€, "
|
#| "This user don't have enough money to join this club, and can't have a "
|
||||||
#| "credit: %(credit)d€, needed: %(needed)d€"
|
#| "negative balance."
|
||||||
msgid ""
|
msgid ""
|
||||||
"This user doesn't have enough money to join this club and pay the deposit. "
|
"This user doesn't have enough money. "
|
||||||
"Current balance: %(balance)d€, credit: %(credit)d€, needed: %(needed)d€"
|
"Current balance: %(balance)d€, credit: %(credit)d€, needed: %(needed)d€"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Este usuario no tiene suficiente dinero. Saldo actual : %(balance)d€, "
|
"Este usuario no tiene suficiente dinero. "
|
||||||
"crédito: %(credit)d€, requerido: %(needed)d€"
|
"Saldo actual : %(balance)d€, crédito: %(credit)d€, requerido: %(needed)d€"
|
||||||
|
|
||||||
#: apps/wei/views.py:1146
|
#: apps/wei/views.py:1140
|
||||||
#, fuzzy, python-format
|
#, python-format
|
||||||
#| msgid "Caution %(name)s"
|
#| msgid "created at"
|
||||||
msgid "Deposit %(name)s"
|
msgid "Caution %(name)s"
|
||||||
msgstr "Fianza %(name)s"
|
msgstr "Fianza %(name)s"
|
||||||
|
|
||||||
#: apps/wei/views.py:1360
|
#: apps/wei/views.py:1354
|
||||||
msgid "Attribute buses to first year members"
|
msgid "Attribute buses to first year members"
|
||||||
msgstr "Repartir los primer años en los buses"
|
msgstr "Repartir los primer años en los buses"
|
||||||
|
|
||||||
#: apps/wei/views.py:1386
|
#: apps/wei/views.py:1379
|
||||||
msgid "Attribute bus"
|
msgid "Attribute bus"
|
||||||
msgstr "Repartir en un bus"
|
msgstr "Repartir en un bus"
|
||||||
|
|
||||||
#: apps/wei/views.py:1426
|
#: apps/wei/views.py:1419
|
||||||
msgid ""
|
msgid ""
|
||||||
"No first year student without a bus found. Either all of them have a bus, or "
|
"No first year student without a bus found. Either all of them have a bus, or "
|
||||||
"none has filled the survey yet."
|
"none has filled the survey yet."
|
||||||
@ -4358,24 +4337,6 @@ msgstr ""
|
|||||||
"pagar su afiliación. Tambien tiene que validar su correo electronico con el "
|
"pagar su afiliación. Tambien tiene que validar su correo electronico con el "
|
||||||
"enlace que recibió."
|
"enlace que recibió."
|
||||||
|
|
||||||
#, fuzzy
|
|
||||||
#~| msgid "total amount"
|
|
||||||
#~ msgid "caution amount"
|
|
||||||
#~ msgstr "monto total"
|
|
||||||
|
|
||||||
#, fuzzy
|
|
||||||
#~| msgid "created at"
|
|
||||||
#~ msgid "caution type"
|
|
||||||
#~ msgstr "tipo de fianza"
|
|
||||||
|
|
||||||
#, fuzzy
|
|
||||||
#~| msgid "total amount"
|
|
||||||
#~ msgid "Caution amount"
|
|
||||||
#~ msgstr "monto total"
|
|
||||||
|
|
||||||
#~ msgid "caution check given"
|
|
||||||
#~ msgstr "cheque de garantía dado"
|
|
||||||
|
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
#~| msgid "Invitation"
|
#~| msgid "Invitation"
|
||||||
#~ msgid "Syndication"
|
#~ msgid "Syndication"
|
||||||
|
@ -7,7 +7,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: \n"
|
"Project-Id-Version: \n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2025-07-15 18:17+0200\n"
|
"POT-Creation-Date: 2025-07-11 16:10+0200\n"
|
||||||
"PO-Revision-Date: 2022-04-11 22:05+0200\n"
|
"PO-Revision-Date: 2022-04-11 22:05+0200\n"
|
||||||
"Last-Translator: bleizi <bleizi@crans.org>\n"
|
"Last-Translator: bleizi <bleizi@crans.org>\n"
|
||||||
"Language-Team: French <http://translate.ynerant.fr/projects/nk20/nk20/fr/>\n"
|
"Language-Team: French <http://translate.ynerant.fr/projects/nk20/nk20/fr/>\n"
|
||||||
@ -66,7 +66,7 @@ msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité."
|
|||||||
#: apps/note/models/transactions.py:46 apps/note/models/transactions.py:299
|
#: apps/note/models/transactions.py:46 apps/note/models/transactions.py:299
|
||||||
#: apps/permission/models.py:329
|
#: apps/permission/models.py:329
|
||||||
#: apps/registration/templates/registration/future_profile_detail.html:16
|
#: apps/registration/templates/registration/future_profile_detail.html:16
|
||||||
#: apps/wei/models.py:77 apps/wei/models.py:150 apps/wei/tables.py:282
|
#: apps/wei/models.py:72 apps/wei/models.py:145 apps/wei/tables.py:282
|
||||||
#: apps/wei/templates/wei/base.html:26
|
#: apps/wei/templates/wei/base.html:26
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:14 apps/wrapped/models.py:16
|
#: apps/wei/templates/wei/weimembership_form.html:14 apps/wrapped/models.py:16
|
||||||
msgid "name"
|
msgid "name"
|
||||||
@ -101,7 +101,7 @@ msgstr "types d'activité"
|
|||||||
#: apps/activity/models.py:68
|
#: apps/activity/models.py:68
|
||||||
#: apps/activity/templates/activity/includes/activity_info.html:19
|
#: apps/activity/templates/activity/includes/activity_info.html:19
|
||||||
#: apps/note/models/transactions.py:82 apps/permission/models.py:109
|
#: apps/note/models/transactions.py:82 apps/permission/models.py:109
|
||||||
#: apps/permission/models.py:188 apps/wei/models.py:97 apps/wei/models.py:161
|
#: apps/permission/models.py:188 apps/wei/models.py:92 apps/wei/models.py:156
|
||||||
msgid "description"
|
msgid "description"
|
||||||
msgstr "description"
|
msgstr "description"
|
||||||
|
|
||||||
@ -122,7 +122,7 @@ msgstr "type"
|
|||||||
|
|
||||||
#: apps/activity/models.py:91 apps/logs/models.py:22 apps/member/models.py:325
|
#: apps/activity/models.py:91 apps/logs/models.py:22 apps/member/models.py:325
|
||||||
#: apps/note/models/notes.py:148 apps/treasury/models.py:294
|
#: apps/note/models/notes.py:148 apps/treasury/models.py:294
|
||||||
#: apps/wei/models.py:190 apps/wei/templates/wei/attribute_bus_1A.html:13
|
#: apps/wei/models.py:185 apps/wei/templates/wei/attribute_bus_1A.html:13
|
||||||
#: apps/wei/templates/wei/survey.html:15
|
#: apps/wei/templates/wei/survey.html:15
|
||||||
msgid "user"
|
msgid "user"
|
||||||
msgstr "utilisateur⋅rice"
|
msgstr "utilisateur⋅rice"
|
||||||
@ -1254,7 +1254,7 @@ msgid "add to registration form"
|
|||||||
msgstr "ajouter au formulaire d'inscription"
|
msgstr "ajouter au formulaire d'inscription"
|
||||||
|
|
||||||
#: apps/member/models.py:268 apps/member/models.py:331
|
#: apps/member/models.py:268 apps/member/models.py:331
|
||||||
#: apps/note/models/notes.py:176 apps/wei/models.py:91
|
#: apps/note/models/notes.py:176 apps/wei/models.py:86
|
||||||
msgid "club"
|
msgid "club"
|
||||||
msgstr "club"
|
msgstr "club"
|
||||||
|
|
||||||
@ -1976,8 +1976,8 @@ msgstr ""
|
|||||||
"mode de paiement et un⋅e utilisateur⋅rice ou un club"
|
"mode de paiement et un⋅e utilisateur⋅rice ou un club"
|
||||||
|
|
||||||
#: apps/note/models/transactions.py:357 apps/note/models/transactions.py:360
|
#: apps/note/models/transactions.py:357 apps/note/models/transactions.py:360
|
||||||
#: apps/note/models/transactions.py:363 apps/wei/views.py:1103
|
#: apps/note/models/transactions.py:363 apps/wei/views.py:1105
|
||||||
#: apps/wei/views.py:1107
|
#: apps/wei/views.py:1109
|
||||||
msgid "This field is required."
|
msgid "This field is required."
|
||||||
msgstr "Ce champ est requis."
|
msgstr "Ce champ est requis."
|
||||||
|
|
||||||
@ -2484,7 +2484,7 @@ msgstr ""
|
|||||||
|
|
||||||
#: apps/registration/templates/registration/future_profile_detail.html:73
|
#: apps/registration/templates/registration/future_profile_detail.html:73
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:127
|
#: apps/wei/templates/wei/weimembership_form.html:127
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:192
|
#: apps/wei/templates/wei/weimembership_form.html:196
|
||||||
msgid "Validate registration"
|
msgid "Validate registration"
|
||||||
msgstr "Valider l'inscription"
|
msgstr "Valider l'inscription"
|
||||||
|
|
||||||
@ -3010,9 +3010,9 @@ msgstr "Liste des crédits de la Société générale"
|
|||||||
msgid "Manage credits from the Société générale"
|
msgid "Manage credits from the Société générale"
|
||||||
msgstr "Gérer les crédits de la Société générale"
|
msgstr "Gérer les crédits de la Société générale"
|
||||||
|
|
||||||
#: apps/wei/apps.py:10 apps/wei/models.py:47 apps/wei/models.py:48
|
#: apps/wei/apps.py:10 apps/wei/models.py:42 apps/wei/models.py:43
|
||||||
#: apps/wei/models.py:72 apps/wei/models.py:197
|
#: apps/wei/models.py:67 apps/wei/models.py:192
|
||||||
#: note_kfet/templates/base.html:108
|
#: note_kfet/templates/base.html:109
|
||||||
msgid "WEI"
|
msgid "WEI"
|
||||||
msgstr "WEI"
|
msgstr "WEI"
|
||||||
|
|
||||||
@ -3022,8 +3022,8 @@ msgstr ""
|
|||||||
"L'utilisateur·rice sélectionné·e n'est pas validé·e. Merci de d'abord "
|
"L'utilisateur·rice sélectionné·e n'est pas validé·e. Merci de d'abord "
|
||||||
"valider son compte"
|
"valider son compte"
|
||||||
|
|
||||||
#: apps/wei/forms/registration.py:84 apps/wei/models.py:145
|
#: apps/wei/forms/registration.py:84 apps/wei/models.py:140
|
||||||
#: apps/wei/models.py:354
|
#: apps/wei/models.py:348
|
||||||
msgid "bus"
|
msgid "bus"
|
||||||
msgstr "bus"
|
msgstr "bus"
|
||||||
|
|
||||||
@ -3049,7 +3049,7 @@ msgstr ""
|
|||||||
"bus ou électron libre)"
|
"bus ou électron libre)"
|
||||||
|
|
||||||
#: apps/wei/forms/registration.py:100 apps/wei/forms/registration.py:110
|
#: apps/wei/forms/registration.py:100 apps/wei/forms/registration.py:110
|
||||||
#: apps/wei/models.py:179
|
#: apps/wei/models.py:174
|
||||||
msgid "WEI Roles"
|
msgid "WEI Roles"
|
||||||
msgstr "Rôles au WEI"
|
msgstr "Rôles au WEI"
|
||||||
|
|
||||||
@ -3085,142 +3085,137 @@ msgid "date end"
|
|||||||
msgstr "fin"
|
msgstr "fin"
|
||||||
|
|
||||||
#: apps/wei/models.py:37
|
#: apps/wei/models.py:37
|
||||||
msgid "deposit amount"
|
#, fuzzy
|
||||||
msgstr "montant de la caution"
|
#| msgid "total amount"
|
||||||
|
msgid "caution amount"
|
||||||
|
msgstr "montant total"
|
||||||
|
|
||||||
#: apps/wei/models.py:42
|
#: apps/wei/models.py:76 apps/wei/tables.py:305
|
||||||
msgid "membership fee (soge credit)"
|
|
||||||
msgstr "Cotisation pour adhérer (crédit sogé)"
|
|
||||||
|
|
||||||
#: apps/wei/models.py:81 apps/wei/tables.py:305
|
|
||||||
msgid "seat count in the bus"
|
msgid "seat count in the bus"
|
||||||
msgstr "nombre de sièges dans le bus"
|
msgstr "nombre de sièges dans le bus"
|
||||||
|
|
||||||
#: apps/wei/models.py:102
|
#: apps/wei/models.py:97
|
||||||
msgid "survey information"
|
msgid "survey information"
|
||||||
msgstr "informations sur le questionnaire"
|
msgstr "informations sur le questionnaire"
|
||||||
|
|
||||||
#: apps/wei/models.py:103
|
#: apps/wei/models.py:98
|
||||||
msgid "Information about the survey for new members, encoded in JSON"
|
msgid "Information about the survey for new members, encoded in JSON"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Informations sur le sondage pour les nouveaux membres, encodées en JSON"
|
"Informations sur le sondage pour les nouveaux membres, encodées en JSON"
|
||||||
|
|
||||||
#: apps/wei/models.py:107
|
#: apps/wei/models.py:102
|
||||||
msgid "Bus"
|
msgid "Bus"
|
||||||
msgstr "Bus"
|
msgstr "Bus"
|
||||||
|
|
||||||
#: apps/wei/models.py:108 apps/wei/templates/wei/weiclub_detail.html:51
|
#: apps/wei/models.py:103 apps/wei/templates/wei/weiclub_detail.html:51
|
||||||
msgid "Buses"
|
msgid "Buses"
|
||||||
msgstr "Bus"
|
msgstr "Bus"
|
||||||
|
|
||||||
#: apps/wei/models.py:154
|
#: apps/wei/models.py:149
|
||||||
msgid "color"
|
msgid "color"
|
||||||
msgstr "couleur"
|
msgstr "couleur"
|
||||||
|
|
||||||
#: apps/wei/models.py:155
|
#: apps/wei/models.py:150
|
||||||
msgid "The color of the T-Shirt, stored with its number equivalent"
|
msgid "The color of the T-Shirt, stored with its number equivalent"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"La couleur du T-Shirt, stocké sous la forme de son équivalent numérique"
|
"La couleur du T-Shirt, stocké sous la forme de son équivalent numérique"
|
||||||
|
|
||||||
#: apps/wei/models.py:166
|
#: apps/wei/models.py:161
|
||||||
msgid "Bus team"
|
msgid "Bus team"
|
||||||
msgstr "Équipe de bus"
|
msgstr "Équipe de bus"
|
||||||
|
|
||||||
#: apps/wei/models.py:167
|
#: apps/wei/models.py:162
|
||||||
msgid "Bus teams"
|
msgid "Bus teams"
|
||||||
msgstr "Équipes de bus"
|
msgstr "Équipes de bus"
|
||||||
|
|
||||||
#: apps/wei/models.py:178
|
#: apps/wei/models.py:173
|
||||||
msgid "WEI Role"
|
msgid "WEI Role"
|
||||||
msgstr "Rôle au WEI"
|
msgstr "Rôle au WEI"
|
||||||
|
|
||||||
#: apps/wei/models.py:202
|
#: apps/wei/models.py:197
|
||||||
msgid "Credit from Société générale"
|
msgid "Credit from Société générale"
|
||||||
msgstr "Crédit de la Société générale"
|
msgstr "Crédit de la Société générale"
|
||||||
|
|
||||||
#: apps/wei/models.py:207 apps/wei/templates/wei/weimembership_form.html:98
|
#: apps/wei/models.py:202 apps/wei/views.py:992
|
||||||
#: apps/wei/views.py:997
|
msgid "Caution check given"
|
||||||
msgid "Deposit check given"
|
|
||||||
msgstr "Chèque de caution donné"
|
msgstr "Chèque de caution donné"
|
||||||
|
|
||||||
#: apps/wei/models.py:213
|
#: apps/wei/models.py:208
|
||||||
msgid "Check"
|
msgid "Check"
|
||||||
msgstr "Chèque"
|
msgstr ""
|
||||||
|
|
||||||
#: apps/wei/models.py:214
|
#: apps/wei/models.py:209
|
||||||
msgid "Note transaction"
|
msgid "Note transaction"
|
||||||
msgstr "Transaction Note"
|
msgstr "Transaction Note"
|
||||||
|
|
||||||
#: apps/wei/models.py:217
|
#: apps/wei/models.py:212
|
||||||
#, fuzzy
|
msgid "caution type"
|
||||||
#| msgid "Credit type"
|
msgstr "date de création"
|
||||||
msgid "deposit type"
|
|
||||||
msgstr "Type de rechargement"
|
|
||||||
|
|
||||||
#: apps/wei/models.py:221 apps/wei/templates/wei/weimembership_form.html:64
|
#: apps/wei/models.py:216 apps/wei/templates/wei/weimembership_form.html:64
|
||||||
msgid "birth date"
|
msgid "birth date"
|
||||||
msgstr "date de naissance"
|
msgstr "date de naissance"
|
||||||
|
|
||||||
#: apps/wei/models.py:227 apps/wei/models.py:237
|
#: apps/wei/models.py:222 apps/wei/models.py:232
|
||||||
msgid "Male"
|
msgid "Male"
|
||||||
msgstr "Homme"
|
msgstr "Homme"
|
||||||
|
|
||||||
#: apps/wei/models.py:228 apps/wei/models.py:238
|
#: apps/wei/models.py:223 apps/wei/models.py:233
|
||||||
msgid "Female"
|
msgid "Female"
|
||||||
msgstr "Femme"
|
msgstr "Femme"
|
||||||
|
|
||||||
#: apps/wei/models.py:229
|
#: apps/wei/models.py:224
|
||||||
msgid "Non binary"
|
msgid "Non binary"
|
||||||
msgstr "Non-binaire"
|
msgstr "Non-binaire"
|
||||||
|
|
||||||
#: apps/wei/models.py:231 apps/wei/templates/wei/attribute_bus_1A.html:22
|
#: apps/wei/models.py:226 apps/wei/templates/wei/attribute_bus_1A.html:22
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:55
|
#: apps/wei/templates/wei/weimembership_form.html:55
|
||||||
msgid "gender"
|
msgid "gender"
|
||||||
msgstr "genre"
|
msgstr "genre"
|
||||||
|
|
||||||
#: apps/wei/models.py:239
|
#: apps/wei/models.py:234
|
||||||
msgid "Unisex"
|
msgid "Unisex"
|
||||||
msgstr "Unisexe"
|
msgstr "Unisexe"
|
||||||
|
|
||||||
#: apps/wei/models.py:242 apps/wei/templates/wei/weimembership_form.html:58
|
#: apps/wei/models.py:237 apps/wei/templates/wei/weimembership_form.html:58
|
||||||
msgid "clothing cut"
|
msgid "clothing cut"
|
||||||
msgstr "coupe de vêtement"
|
msgstr "coupe de vêtement"
|
||||||
|
|
||||||
#: apps/wei/models.py:255 apps/wei/templates/wei/weimembership_form.html:61
|
#: apps/wei/models.py:250 apps/wei/templates/wei/weimembership_form.html:61
|
||||||
msgid "clothing size"
|
msgid "clothing size"
|
||||||
msgstr "taille de vêtement"
|
msgstr "taille de vêtement"
|
||||||
|
|
||||||
#: apps/wei/models.py:261
|
#: apps/wei/models.py:256
|
||||||
msgid "health issues"
|
msgid "health issues"
|
||||||
msgstr "problèmes de santé"
|
msgstr "problèmes de santé"
|
||||||
|
|
||||||
#: apps/wei/models.py:266 apps/wei/templates/wei/weimembership_form.html:70
|
#: apps/wei/models.py:261 apps/wei/templates/wei/weimembership_form.html:70
|
||||||
msgid "emergency contact name"
|
msgid "emergency contact name"
|
||||||
msgstr "nom du contact en cas d'urgence"
|
msgstr "nom du contact en cas d'urgence"
|
||||||
|
|
||||||
#: apps/wei/models.py:267
|
#: apps/wei/models.py:262
|
||||||
msgid "The emergency contact must not be a WEI participant"
|
msgid "The emergency contact must not be a WEI participant"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Le contact en cas d'urgence ne doit pas être une personne qui participe au "
|
"Le contact en cas d'urgence ne doit pas être une personne qui participe au "
|
||||||
"WEI"
|
"WEI"
|
||||||
|
|
||||||
#: apps/wei/models.py:272 apps/wei/templates/wei/weimembership_form.html:73
|
#: apps/wei/models.py:267 apps/wei/templates/wei/weimembership_form.html:73
|
||||||
msgid "emergency contact phone"
|
msgid "emergency contact phone"
|
||||||
msgstr "téléphone du contact en cas d'urgence"
|
msgstr "téléphone du contact en cas d'urgence"
|
||||||
|
|
||||||
#: apps/wei/models.py:277 apps/wei/templates/wei/weimembership_form.html:52
|
#: apps/wei/models.py:272 apps/wei/templates/wei/weimembership_form.html:52
|
||||||
msgid "first year"
|
msgid "first year"
|
||||||
msgstr "première année"
|
msgstr "première année"
|
||||||
|
|
||||||
#: apps/wei/models.py:278
|
#: apps/wei/models.py:273
|
||||||
msgid "Tells if the user is new in the school."
|
msgid "Tells if the user is new in the school."
|
||||||
msgstr "Indique si l'utilisateur⋅rice est nouvelleeau dans l'école."
|
msgstr "Indique si l'utilisateur⋅rice est nouvelleeau dans l'école."
|
||||||
|
|
||||||
#: apps/wei/models.py:283
|
#: apps/wei/models.py:278
|
||||||
msgid "registration information"
|
msgid "registration information"
|
||||||
msgstr "informations sur l'inscription"
|
msgstr "informations sur l'inscription"
|
||||||
|
|
||||||
#: apps/wei/models.py:284
|
#: apps/wei/models.py:279
|
||||||
msgid ""
|
msgid ""
|
||||||
"Information about the registration (buses for old members, survey for the "
|
"Information about the registration (buses for old members, survey for the "
|
||||||
"new members), encoded in JSON"
|
"new members), encoded in JSON"
|
||||||
@ -3228,27 +3223,27 @@ msgstr ""
|
|||||||
"Informations sur l'inscription (bus pour les 2A+, questionnaire pour les "
|
"Informations sur l'inscription (bus pour les 2A+, questionnaire pour les "
|
||||||
"1A), encodées en JSON"
|
"1A), encodées en JSON"
|
||||||
|
|
||||||
#: apps/wei/models.py:290
|
#: apps/wei/models.py:285
|
||||||
msgid "WEI User"
|
msgid "WEI User"
|
||||||
msgstr "Participant·e au WEI"
|
msgstr "Participant·e au WEI"
|
||||||
|
|
||||||
#: apps/wei/models.py:291
|
#: apps/wei/models.py:286
|
||||||
msgid "WEI Users"
|
msgid "WEI Users"
|
||||||
msgstr "Participant·e·s au WEI"
|
msgstr "Participant·e·s au WEI"
|
||||||
|
|
||||||
#: apps/wei/models.py:364
|
#: apps/wei/models.py:358
|
||||||
msgid "team"
|
msgid "team"
|
||||||
msgstr "équipe"
|
msgstr "équipe"
|
||||||
|
|
||||||
#: apps/wei/models.py:374
|
#: apps/wei/models.py:368
|
||||||
msgid "WEI registration"
|
msgid "WEI registration"
|
||||||
msgstr "Inscription au WEI"
|
msgstr "Inscription au WEI"
|
||||||
|
|
||||||
#: apps/wei/models.py:378
|
#: apps/wei/models.py:372
|
||||||
msgid "WEI membership"
|
msgid "WEI membership"
|
||||||
msgstr "Adhésion au WEI"
|
msgstr "Adhésion au WEI"
|
||||||
|
|
||||||
#: apps/wei/models.py:379
|
#: apps/wei/models.py:373
|
||||||
msgid "WEI memberships"
|
msgid "WEI memberships"
|
||||||
msgstr "Adhésions au WEI"
|
msgstr "Adhésions au WEI"
|
||||||
|
|
||||||
@ -3343,8 +3338,10 @@ msgid "WEI fee (unpaid students)"
|
|||||||
msgstr "Prix du WEI (étudiant⋅es)"
|
msgstr "Prix du WEI (étudiant⋅es)"
|
||||||
|
|
||||||
#: apps/wei/templates/wei/base.html:53
|
#: apps/wei/templates/wei/base.html:53
|
||||||
msgid "Deposit amount"
|
#, fuzzy
|
||||||
msgstr "Caution"
|
#| msgid "total amount"
|
||||||
|
msgid "Caution amount"
|
||||||
|
msgstr "montant total"
|
||||||
|
|
||||||
#: apps/wei/templates/wei/base.html:74
|
#: apps/wei/templates/wei/base.html:74
|
||||||
msgid "WEI list"
|
msgid "WEI list"
|
||||||
@ -3354,7 +3351,7 @@ msgstr "Liste des WEI"
|
|||||||
msgid "Register 1A"
|
msgid "Register 1A"
|
||||||
msgstr "Inscrire un⋅e 1A"
|
msgstr "Inscrire un⋅e 1A"
|
||||||
|
|
||||||
#: apps/wei/templates/wei/base.html:83 apps/wei/views.py:646
|
#: apps/wei/templates/wei/base.html:83 apps/wei/views.py:644
|
||||||
msgid "Register 2A+"
|
msgid "Register 2A+"
|
||||||
msgstr "Inscrire un⋅e 2A+"
|
msgstr "Inscrire un⋅e 2A+"
|
||||||
|
|
||||||
@ -3391,8 +3388,8 @@ msgstr "Télécharger au format PDF"
|
|||||||
|
|
||||||
#: apps/wei/templates/wei/survey.html:11
|
#: apps/wei/templates/wei/survey.html:11
|
||||||
#: apps/wei/templates/wei/survey_closed.html:11
|
#: apps/wei/templates/wei/survey_closed.html:11
|
||||||
#: apps/wei/templates/wei/survey_end.html:11 apps/wei/views.py:1165
|
#: apps/wei/templates/wei/survey_end.html:11 apps/wei/views.py:1167
|
||||||
#: apps/wei/views.py:1220 apps/wei/views.py:1267
|
#: apps/wei/views.py:1222 apps/wei/views.py:1269
|
||||||
msgid "Survey WEI"
|
msgid "Survey WEI"
|
||||||
msgstr "Questionnaire WEI"
|
msgstr "Questionnaire WEI"
|
||||||
|
|
||||||
@ -3469,6 +3466,10 @@ msgstr "Informations brutes du sondage"
|
|||||||
msgid "The algorithm didn't run."
|
msgid "The algorithm didn't run."
|
||||||
msgstr "L'algorithme n'a pas été exécuté."
|
msgstr "L'algorithme n'a pas été exécuté."
|
||||||
|
|
||||||
|
#: apps/wei/templates/wei/weimembership_form.html:98
|
||||||
|
msgid "caution check given"
|
||||||
|
msgstr "chèque de caution donné"
|
||||||
|
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:105
|
#: apps/wei/templates/wei/weimembership_form.html:105
|
||||||
msgid "preferred team"
|
msgid "preferred team"
|
||||||
msgstr "équipe préférée"
|
msgstr "équipe préférée"
|
||||||
@ -3504,53 +3505,52 @@ msgstr "avec les rôles suivants :"
|
|||||||
|
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:139
|
#: apps/wei/templates/wei/weimembership_form.html:139
|
||||||
msgid ""
|
msgid ""
|
||||||
"The WEI will partially be paid by Société générale. The membership will be "
|
"The WEI will be paid by Société générale. The membership will be created "
|
||||||
"created even if the bank didn't pay the BDE yet. The membership transaction "
|
"even if the bank didn't pay the BDE yet. The membership transaction will be "
|
||||||
"will be created but will be invalid. You will have to validate it once the "
|
"created but will be invalid. You will have to validate it once the bank "
|
||||||
"bank validated the creation of the account, or to change the payment method."
|
"validated the creation of the account, or to change the payment method."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Le WEI va être partiellement payé par la Société générale. L'adhésion sera "
|
"Le WEI va être payé par la Société générale. L'adhésion sera créée même si "
|
||||||
"créée même si la banque n'a pas encore payé le BDE. La transaction "
|
"la banque n'a pas encore payé le BDE. La transaction d'adhésion sera créée "
|
||||||
"d'adhésion sera créée mais invalide. Vous devrez la valider une fois que la "
|
"mais invalide. Vous devrez la valider une fois que la banque aura validé la "
|
||||||
"banque aura validé la création du compte, ou bien changer de moyen de "
|
"création du compte, ou bien changer de moyen de paiement."
|
||||||
"paiement."
|
|
||||||
|
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:147
|
#: apps/wei/templates/wei/weimembership_form.html:147
|
||||||
msgid "Required payments:"
|
msgid "Required payments:"
|
||||||
msgstr "Paiements requis"
|
msgstr "Paiements requis"
|
||||||
|
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:149
|
#: apps/wei/templates/wei/weimembership_form.html:149
|
||||||
#, python-format
|
#, fuzzy, python-format
|
||||||
|
#| msgid "membership fee (paid students)"
|
||||||
msgid "Membership fees: %(amount)s"
|
msgid "Membership fees: %(amount)s"
|
||||||
msgstr "Frais d'inscription : %(amount)s"
|
msgstr "cotisation pour adhérer (normalien·ne élève)"
|
||||||
|
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:153
|
#: apps/wei/templates/wei/weimembership_form.html:153
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Deposit (by Note transaction): %(amount)s"
|
msgid "Deposit (by Note transaction): %(amount)s"
|
||||||
msgstr "Caution (par transaction) : %(amount)s"
|
msgstr "Caution (par transaction) : %(amount)s"
|
||||||
|
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:157
|
#: apps/wei/templates/wei/weimembership_form.html:156
|
||||||
#, python-format
|
#: apps/wei/templates/wei/weimembership_form.html:163
|
||||||
msgid "Deposit (by check): %(amount)s"
|
|
||||||
msgstr "Caution (par chèque) : %(amount)s"
|
|
||||||
|
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:161
|
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Total needed: %(total)s"
|
msgid "Total needed: %(total)s"
|
||||||
msgstr "Total nécessaire : %(total)s"
|
msgstr "Total nécessaire : %(total)s"
|
||||||
|
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:165
|
#: apps/wei/templates/wei/weimembership_form.html:160
|
||||||
|
#, python-format
|
||||||
|
msgid "Deposit (by check): %(amount)s"
|
||||||
|
msgstr "Caution (par chèque) : %(amount)s"
|
||||||
|
|
||||||
|
#: apps/wei/templates/wei/weimembership_form.html:168
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "Current balance: %(balance)s"
|
msgid "Current balance: %(balance)s"
|
||||||
msgstr "Solde actuel : %(balance)s"
|
msgstr "Solde actuel : %(balance)s"
|
||||||
|
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:172
|
#: apps/wei/templates/wei/weimembership_form.html:176
|
||||||
#, fuzzy
|
|
||||||
#| msgid "The user didn't give her/his deposit check."
|
|
||||||
msgid "The user didn't give her/his caution check."
|
msgid "The user didn't give her/his caution check."
|
||||||
msgstr "L'utilisateur⋅rice n'a pas donné son chèque de caution."
|
msgstr "L'utilisateur⋅rice n'a pas donné son chèque de caution."
|
||||||
|
|
||||||
#: apps/wei/templates/wei/weimembership_form.html:180
|
#: apps/wei/templates/wei/weimembership_form.html:184
|
||||||
msgid ""
|
msgid ""
|
||||||
"This user is not a member of the Kfet club for the coming year. The "
|
"This user is not a member of the Kfet club for the coming year. The "
|
||||||
"membership will be processed automatically, the WEI registration includes "
|
"membership will be processed automatically, the WEI registration includes "
|
||||||
@ -3641,15 +3641,11 @@ msgstr "Gérer l'équipe WEI"
|
|||||||
msgid "Register first year student to the WEI"
|
msgid "Register first year student to the WEI"
|
||||||
msgstr "Inscrire un⋅e 1A au WEI"
|
msgstr "Inscrire un⋅e 1A au WEI"
|
||||||
|
|
||||||
#: apps/wei/views.py:571 apps/wei/views.py:664
|
#: apps/wei/views.py:580 apps/wei/views.py:689
|
||||||
msgid "Check if you will open a Société Générale account"
|
|
||||||
msgstr "Cochez cette case si vous ouvrez un compte à la Société Générale."
|
|
||||||
|
|
||||||
#: apps/wei/views.py:582 apps/wei/views.py:694
|
|
||||||
msgid "This user is already registered to this WEI."
|
msgid "This user is already registered to this WEI."
|
||||||
msgstr "Cette personne est déjà inscrite au WEI."
|
msgstr "Cette personne est déjà inscrite au WEI."
|
||||||
|
|
||||||
#: apps/wei/views.py:587
|
#: apps/wei/views.py:585
|
||||||
msgid ""
|
msgid ""
|
||||||
"This user can't be in her/his first year since he/she has already "
|
"This user can't be in her/his first year since he/she has already "
|
||||||
"participated to a WEI."
|
"participated to a WEI."
|
||||||
@ -3657,94 +3653,95 @@ msgstr ""
|
|||||||
"Cet⋅te utilisateur⋅rice ne peut pas être en première année puisqu'iel a déjà "
|
"Cet⋅te utilisateur⋅rice ne peut pas être en première année puisqu'iel a déjà "
|
||||||
"participé à un WEI."
|
"participé à un WEI."
|
||||||
|
|
||||||
#: apps/wei/views.py:610
|
#: apps/wei/views.py:608
|
||||||
msgid "Register old student to the WEI"
|
msgid "Register old student to the WEI"
|
||||||
msgstr "Inscrire un⋅e 2A+ au WEI"
|
msgstr "Inscrire un⋅e 2A+ au WEI"
|
||||||
|
|
||||||
#: apps/wei/views.py:668 apps/wei/views.py:773
|
#: apps/wei/views.py:663 apps/wei/views.py:768
|
||||||
msgid "You already opened an account in the Société générale."
|
msgid "You already opened an account in the Société générale."
|
||||||
msgstr "Vous avez déjà ouvert un compte auprès de la société générale."
|
msgstr "Vous avez déjà ouvert un compte auprès de la société générale."
|
||||||
|
|
||||||
#: apps/wei/views.py:681 apps/wei/views.py:790
|
#: apps/wei/views.py:676 apps/wei/views.py:785
|
||||||
msgid "Choose how you want to pay the deposit"
|
msgid "Choose how you want to pay the deposit"
|
||||||
msgstr "Choisissez comment payer la caution"
|
msgstr ""
|
||||||
|
|
||||||
#: apps/wei/views.py:733
|
#: apps/wei/views.py:728
|
||||||
msgid "Update WEI Registration"
|
msgid "Update WEI Registration"
|
||||||
msgstr "Modifier l'inscription WEI"
|
msgstr "Modifier l'inscription WEI"
|
||||||
|
|
||||||
#: apps/wei/views.py:816
|
#: apps/wei/views.py:811
|
||||||
msgid "No membership found for this registration"
|
msgid "No membership found for this registration"
|
||||||
msgstr "Pas d'adhésion trouvée pour cette inscription"
|
msgstr "Pas d'adhésion trouvée pour cette inscription"
|
||||||
|
|
||||||
#: apps/wei/views.py:825
|
#: apps/wei/views.py:820
|
||||||
msgid "You don't have the permission to update memberships"
|
msgid "You don't have the permission to update memberships"
|
||||||
msgstr "Vous n'avez pas la permission de modifier une inscription"
|
msgstr ""
|
||||||
|
"Vous n'avez pas la permission d'ajouter une instance du modèle {app_label}."
|
||||||
|
"{model_name}."
|
||||||
|
|
||||||
#: apps/wei/views.py:831
|
#: apps/wei/views.py:826
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid "You don't have the permission to update the field %(field)s"
|
msgid "You don't have the permission to update the field %(field)s"
|
||||||
msgstr "Vous n'avez pas la permission de modifier le champ %(field)s"
|
msgstr "Vous n'avez pas la permission de modifier le champ %(field)s"
|
||||||
|
|
||||||
#: apps/wei/views.py:876
|
#: apps/wei/views.py:871
|
||||||
msgid "Delete WEI registration"
|
msgid "Delete WEI registration"
|
||||||
msgstr "Supprimer l'inscription WEI"
|
msgstr "Supprimer l'inscription WEI"
|
||||||
|
|
||||||
#: apps/wei/views.py:887
|
#: apps/wei/views.py:882
|
||||||
msgid "You don't have the right to delete this WEI registration."
|
msgid "You don't have the right to delete this WEI registration."
|
||||||
msgstr "Vous n'avez pas la permission de supprimer cette inscription au WEI."
|
msgstr "Vous n'avez pas la permission de supprimer cette inscription au WEI."
|
||||||
|
|
||||||
#: apps/wei/views.py:905
|
#: apps/wei/views.py:900
|
||||||
msgid "Validate WEI registration"
|
msgid "Validate WEI registration"
|
||||||
msgstr "Valider l'inscription WEI"
|
msgstr "Valider l'inscription WEI"
|
||||||
|
|
||||||
#: apps/wei/views.py:998
|
#: apps/wei/views.py:993
|
||||||
msgid "Please make sure the check is given before validating the registration"
|
msgid "Please make sure the check is given before validating the registration"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Merci de vous assurer que le chèque a bien été donné avant de valider "
|
"Merci de vous assurer que le chèque a bien été donné avant de valider "
|
||||||
"l'adhésion"
|
"l'adhésion"
|
||||||
|
|
||||||
#: apps/wei/views.py:1004
|
#: apps/wei/views.py:999
|
||||||
msgid "Create deposit transaction"
|
msgid "Create deposit transaction"
|
||||||
msgstr "Créer une transaction de caution"
|
msgstr "Créer une transaction de caution"
|
||||||
|
|
||||||
#: apps/wei/views.py:1005
|
#: apps/wei/views.py:1000
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"A transaction of %(amount).2f€ will be created from the user's Note account"
|
"A transaction of %(amount).2f€ will be created from the user's Note account"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Un transaction de %(amount).2f€ va être créée depuis la note de l'utilisateur"
|
"Un transaction de %(amount).2f€ va être créée depuis la note de l'utilisateur"
|
||||||
|
|
||||||
#: apps/wei/views.py:1093
|
#: apps/wei/views.py:1095
|
||||||
#, python-format
|
#, python-format
|
||||||
msgid ""
|
msgid ""
|
||||||
"This user doesn't have enough money to join this club and pay the deposit. "
|
"This user doesn't have enough money to join this club and pay the deposit. "
|
||||||
"Current balance: %(balance)d€, credit: %(credit)d€, needed: %(needed)d€"
|
"Current balance: %(balance)d€, credit: %(credit)d€, needed: %(needed)d€"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Cet⋅te utilisateur⋅rice n'a pas assez d'argent pour rejoindre ce club et "
|
"Cet⋅te utilisateur⋅rice n'a pas assez d'argent pour rejoindre ce club et "
|
||||||
"payer la caution. Solde actuel : %(balance)d€, crédit : %(credit)d€, "
|
"payer la cautionSolde actuel : %(balance)d€, crédit : %(credit)d€, requis : "
|
||||||
"requis : %(needed)d€"
|
"%(needed)d€"
|
||||||
|
|
||||||
#: apps/wei/views.py:1146
|
#: apps/wei/views.py:1148
|
||||||
#, python-format
|
#, fuzzy, python-format
|
||||||
msgid "Deposit %(name)s"
|
#| msgid "total amount"
|
||||||
msgstr "Caution %(name)s"
|
msgid "Caution %(name)s"
|
||||||
|
msgstr "montant total"
|
||||||
|
|
||||||
#: apps/wei/views.py:1360
|
#: apps/wei/views.py:1362
|
||||||
msgid "Attribute buses to first year members"
|
msgid "Attribute buses to first year members"
|
||||||
msgstr "Répartir les 1A dans les bus"
|
msgstr "Répartir les 1A dans les bus"
|
||||||
|
|
||||||
#: apps/wei/views.py:1386
|
#: apps/wei/views.py:1388
|
||||||
msgid "Attribute bus"
|
msgid "Attribute bus"
|
||||||
msgstr "Attribuer un bus"
|
msgstr "Attribuer un bus"
|
||||||
|
|
||||||
#: apps/wei/views.py:1426
|
#: apps/wei/views.py:1428
|
||||||
msgid ""
|
msgid ""
|
||||||
"No first year student without a bus found. Either all of them have a bus, or "
|
"No first year student without a bus found. Either all of them have a bus, or "
|
||||||
"none has filled the survey yet."
|
"none has filled the survey yet."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Aucun 1A sans bus trouvé. Soit ils ont tous été attribués, soitaucun n'a "
|
|
||||||
"encore rempli le sondage."
|
|
||||||
|
|
||||||
#: apps/wrapped/apps.py:10
|
#: apps/wrapped/apps.py:10
|
||||||
msgid "wrapped"
|
msgid "wrapped"
|
||||||
@ -4358,21 +4355,86 @@ msgstr ""
|
|||||||
"d'adhésion. Vous devez également valider votre adresse email en suivant le "
|
"d'adhésion. Vous devez également valider votre adresse email en suivant le "
|
||||||
"lien que vous avez reçu."
|
"lien que vous avez reçu."
|
||||||
|
|
||||||
#~ msgid "caution amount"
|
#, fuzzy
|
||||||
#~ msgstr "montant de la caution"
|
#~| msgid "QR-code"
|
||||||
|
#~ msgid "Go to QR-code"
|
||||||
|
#~ msgstr "QR-code"
|
||||||
|
|
||||||
#~ msgid "caution type"
|
#, python-brace-format
|
||||||
#~ msgstr "type de caution"
|
#~ msgid "QR-code number {qr_code_number}"
|
||||||
|
#~ msgstr "Numéro du QR-code {qr_code_number}"
|
||||||
|
|
||||||
#~ msgid "Caution amount"
|
#~ msgid "was eaten"
|
||||||
#~ msgstr "Montant de la caution"
|
#~ msgstr "a été mangé"
|
||||||
|
|
||||||
#~ msgid "caution check given"
|
#~ msgid "is active"
|
||||||
#~ msgstr "chèque de caution donné"
|
#~ msgstr "est en cours"
|
||||||
|
|
||||||
#, python-format
|
#~ msgid "foods"
|
||||||
#~ msgid "Caution %(name)s"
|
#~ msgstr "bouffes"
|
||||||
#~ msgstr "Caution %(name)s"
|
|
||||||
|
#~ msgid "Arrival date"
|
||||||
|
#~ msgstr "Date d'arrivée"
|
||||||
|
|
||||||
|
#~ msgid "Active"
|
||||||
|
#~ msgstr "Actif"
|
||||||
|
|
||||||
|
#~ msgid "Eaten"
|
||||||
|
#~ msgstr "Mangé"
|
||||||
|
|
||||||
|
#~ msgid "number"
|
||||||
|
#~ msgstr "numéro"
|
||||||
|
|
||||||
|
#~ msgid "View details"
|
||||||
|
#~ msgstr "Voir plus"
|
||||||
|
|
||||||
|
#~ msgid "Ready"
|
||||||
|
#~ msgstr "Prêt"
|
||||||
|
|
||||||
|
#~ msgid "Creation date"
|
||||||
|
#~ msgstr "Date de création"
|
||||||
|
|
||||||
|
#~ msgid "Ingredients"
|
||||||
|
#~ msgstr "Ingrédients"
|
||||||
|
|
||||||
|
#~ msgid "Open"
|
||||||
|
#~ msgstr "Open"
|
||||||
|
|
||||||
|
#~ msgid "All meals"
|
||||||
|
#~ msgstr "Tout les plats"
|
||||||
|
|
||||||
|
#~ msgid "There is no meal."
|
||||||
|
#~ msgstr "Il n'y a pas de plat"
|
||||||
|
|
||||||
|
#~ msgid "The product is already prepared"
|
||||||
|
#~ msgstr "Le produit est déjà prêt"
|
||||||
|
|
||||||
|
#~ msgid "Add a new basic food with QRCode"
|
||||||
|
#~ msgstr "Ajouter un nouvel ingrédient avec un QR-code"
|
||||||
|
|
||||||
|
#~ msgid "QRCode"
|
||||||
|
#~ msgstr "QR-code"
|
||||||
|
|
||||||
|
#~ msgid "Add a new meal"
|
||||||
|
#~ msgstr "Ajouter un nouveau plat"
|
||||||
|
|
||||||
|
#~ msgid "Update a meal"
|
||||||
|
#~ msgstr "Modifier le plat"
|
||||||
|
|
||||||
|
#, fuzzy
|
||||||
|
#~| msgid "invalidate"
|
||||||
|
#~ msgid "Enter a valid color."
|
||||||
|
#~ msgstr "dévalider"
|
||||||
|
|
||||||
|
#, fuzzy
|
||||||
|
#~| msgid "invalidate"
|
||||||
|
#~ msgid "Enter a valid value."
|
||||||
|
#~ msgstr "dévalider"
|
||||||
|
|
||||||
|
#, fuzzy
|
||||||
|
#~| msgid "Invitation"
|
||||||
|
#~ msgid "Syndication"
|
||||||
|
#~ msgstr "Invitation"
|
||||||
|
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
#~| msgid "There is no results."
|
#~| msgid "There is no results."
|
||||||
@ -4755,6 +4817,9 @@ msgstr ""
|
|||||||
#~ msgid "Application requires the following permissions"
|
#~ msgid "Application requires the following permissions"
|
||||||
#~ msgstr "L'application requiert les permissions suivantes :"
|
#~ msgstr "L'application requiert les permissions suivantes :"
|
||||||
|
|
||||||
|
#~ msgid "Deposit amount"
|
||||||
|
#~ msgstr "Caution"
|
||||||
|
|
||||||
#~ msgid "The BDE membership is included in the WEI registration."
|
#~ msgid "The BDE membership is included in the WEI registration."
|
||||||
#~ msgstr "L'adhésion au BDE est offerte avec l'inscription au WEI."
|
#~ msgstr "L'adhésion au BDE est offerte avec l'inscription au WEI."
|
||||||
|
|
||||||
|
34
shell-static.nix
Executable file
34
shell-static.nix
Executable file
@ -0,0 +1,34 @@
|
|||||||
|
# This is a workaround meant for use with the nix package manager. If you don't know what it is or don't use it, please ignore this file.
|
||||||
|
#
|
||||||
|
# The nk20 javascript static location are hardcoded for imperative system.
|
||||||
|
# This make ./manage.py collectstatic hard to use with nixos.
|
||||||
|
#
|
||||||
|
# A workaround is to enter a FHSUserEnv with the static placed under /share/javascript/<static>.
|
||||||
|
# This emulate a debian like system and enable collecting static normally with ./manage.py collectstatics.
|
||||||
|
# The regular shell.nix should be enough for other configurations.
|
||||||
|
#
|
||||||
|
# Warning, you are still supposed to use pip package with a venv !
|
||||||
|
{ pkgs ? import <nixpkgs> {} }:
|
||||||
|
(pkgs.buildFHSUserEnv {
|
||||||
|
name = "pipzone";
|
||||||
|
targetPkgs = pkgs: (with pkgs;
|
||||||
|
let
|
||||||
|
fhs-static = stdenv.mkDerivation {
|
||||||
|
name = "fhs-static";
|
||||||
|
buildCommand = ''
|
||||||
|
mkdir -p $out/share/javascript/bootstrap4
|
||||||
|
mkdir -p $out/share/javascript/jquery
|
||||||
|
ln -s ${python39Packages.xstatic-bootstrap}/lib/python3.9/site-packages/xstatic/pkg/bootstrap/data/* $out/share/javascript/bootstrap4
|
||||||
|
ln -s ${python39Packages.xstatic-jquery}/lib/python3.9/site-packages/xstatic/pkg/jquery/data/* $out/share/javascript/jquery
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
in [
|
||||||
|
fhs-static
|
||||||
|
python39
|
||||||
|
gettext
|
||||||
|
python39Packages.pip
|
||||||
|
python39Packages.virtualenv
|
||||||
|
python39Packages.setuptools
|
||||||
|
]);
|
||||||
|
runScript = "bash";
|
||||||
|
}).env
|
23
shell.nix
Executable file
23
shell.nix
Executable file
@ -0,0 +1,23 @@
|
|||||||
|
# This is meant for use with the nix package manager. If you don't know what it is or don't use it, please ignore this file.
|
||||||
|
#
|
||||||
|
# This shell.nix contains all dependencies require to create a venv and pip install -r requirements.txt.
|
||||||
|
#
|
||||||
|
# Please check shell-static.nix for running ./manage.py collectstatics.
|
||||||
|
{ pkgs ? import <nixpkgs> {} }:
|
||||||
|
pkgs.mkShell {
|
||||||
|
buildInputs = with pkgs; [
|
||||||
|
python39
|
||||||
|
python39Packages.pip
|
||||||
|
python39Packages.setuptools
|
||||||
|
gettext
|
||||||
|
|
||||||
|
];
|
||||||
|
shellHook = ''
|
||||||
|
# Tells pip to put packages into $PIP_PREFIX instead of the usual locations.
|
||||||
|
# See https://pip.pypa.io/en/stable/user_guide/#environment-variables.
|
||||||
|
export PIP_PREFIX=$(pwd)/_build/pip_packages
|
||||||
|
export PYTHONPATH="$PIP_PREFIX/${pkgs.python39.sitePackages}:$PYTHONPATH"
|
||||||
|
export PATH="$PIP_PREFIX/bin:$PATH"
|
||||||
|
unset SOURCE_DATE_EPOCH
|
||||||
|
'';
|
||||||
|
}
|
Reference in New Issue
Block a user