mirror of
				https://gitlab.crans.org/bde/nk20
				synced 2025-11-04 01:12:08 +01:00 
			
		
		
		
	Compare commits
	
		
			55 Commits
		
	
	
		
			survey_wei
			...
			respo_comm
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					26b351a51c | ||
| 
						 | 
					1836677c47 | ||
| 
						 | 
					e7a98c86f0 | ||
| 
						 | 
					eb5044490b | ||
| 
						 | 
					983d7ec052 | ||
| 
						 | 
					dc56deaf85 | ||
| 
						 | 
					694f54e1c4 | ||
| 
						 | 
					0d0fdef363 | ||
| 
						 | 
					821efbf78b | ||
| 
						 | 
					a209e0d366 | ||
| 
						 | 
					ef485e0628 | ||
| 
						 | 
					1481aa0635 | ||
| 
						 | 
					867bf9fd25 | ||
| 
						 | 
					47fda0ea36 | ||
| 
						 | 
					623290827a | ||
| 
						 | 
					a87ce625f3 | ||
| 
						 | 
					3559787fa7 | ||
| 
						 | 
					bd6ed27ae5 | ||
| 
						 | 
					43dc676747 | ||
| 
						 | 
					caaeab6b0b | ||
| 
						 | 
					54ba786884 | ||
| 
						 | 
					80e109114f | ||
| 
						 | 
					787005e60d | ||
| 
						 | 
					414e103686 | ||
| 
						 | 
					942d887c2e | ||
| 
						 | 
					a63c34fe37 | ||
| 
						 | 
					2be6133458 | ||
| 
						 | 
					7975fe47a6 | ||
| 
						 | 
					476fbceeea | ||
| 
						 | 
					8fbaa0bdc8 | ||
| 
						 | 
					a0de63effd | ||
| 
						 | 
					09fb1d227e | ||
| 
						 | 
					2e27d4f05c | ||
| 
						 | 
					5d16dc4e7d | ||
| 
						 | 
					3c34033bf5 | ||
| 
						 | 
					131f508433 | ||
| 
						 | 
					9162319734 | ||
| 
						 | 
					5d2a8e9b79 | ||
| 
						 | 
					33c94d0720 | ||
| 
						 | 
					5040e8e8ea | ||
| 
						 | 
					c5697c4cb4 | ||
| 
						 | 
					e188c5a153 | ||
| 
						 | 
					94e1fdc93a | ||
| 
						 | 
					d1ef367bab | ||
| 
						 | 
					0fbb19c5fd | ||
| 
						 | 
					21cbf2b21a | ||
| 
						 | 
					361de9f8b4 | ||
| 
						 | 
					e2426bd6a6 | ||
| 
						 | 
					7fea619a9f | ||
| 
						 | 
					7b5eefcc0a | ||
| 
						 | 
					e4aa16986f | ||
| 
						 | 
					dd675b3676 | ||
| 
						 | 
					a5df98224f | ||
| 
						 | 
					2cb9ac8735 | ||
| 
						 | 
					35d4849a28 | 
@@ -7,21 +7,6 @@ stages:
 | 
			
		||||
variables:
 | 
			
		||||
  GIT_SUBMODULE_STRATEGY: recursive
 | 
			
		||||
 | 
			
		||||
# Debian Bullseye
 | 
			
		||||
py39-django42:
 | 
			
		||||
  stage: test
 | 
			
		||||
  image: debian:bullseye
 | 
			
		||||
  before_script:
 | 
			
		||||
    - >
 | 
			
		||||
        apt-get update &&
 | 
			
		||||
        apt-get install --no-install-recommends -y
 | 
			
		||||
        python3-django python3-django-crispy-forms
 | 
			
		||||
        python3-django-extensions python3-django-filters python3-django-polymorphic
 | 
			
		||||
        python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
 | 
			
		||||
        python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
 | 
			
		||||
        python3-bs4 python3-setuptools tox texlive-xetex
 | 
			
		||||
  script: tox -e py39-django42
 | 
			
		||||
 | 
			
		||||
# Ubuntu 22.04
 | 
			
		||||
py310-django42:
 | 
			
		||||
  stage: test
 | 
			
		||||
@@ -54,8 +39,6 @@ py311-django42:
 | 
			
		||||
        python3-bs4 python3-setuptools tox texlive-xetex
 | 
			
		||||
  script: tox -e py311-django42
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
linters:
 | 
			
		||||
  stage: quality-assurance
 | 
			
		||||
  image: debian:bookworm
 | 
			
		||||
 
 | 
			
		||||
@@ -265,12 +265,11 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
 | 
			
		||||
        # Keep only users that have a note
 | 
			
		||||
        note_qs = note_qs.filter(note__noteuser__isnull=False)
 | 
			
		||||
 | 
			
		||||
        # Keep only members
 | 
			
		||||
        # Keep only valid members
 | 
			
		||||
        note_qs = note_qs.filter(
 | 
			
		||||
            note__noteuser__user__memberships__club=activity.attendees_club,
 | 
			
		||||
            note__noteuser__user__memberships__date_start__lte=timezone.now(),
 | 
			
		||||
            note__noteuser__user__memberships__date_end__gte=timezone.now(),
 | 
			
		||||
        )
 | 
			
		||||
            note__noteuser__user__memberships__date_end__gte=timezone.now()).exclude(note__inactivity_reason='forced')
 | 
			
		||||
 | 
			
		||||
        # Filter with permission backend
 | 
			
		||||
        note_qs = note_qs.filter(PermissionBackend.filter_queryset(self.request, Alias, "view"))
 | 
			
		||||
@@ -330,7 +329,7 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
 | 
			
		||||
        context["noteuser_ctype"] = ContentType.objects.get_for_model(NoteUser).pk
 | 
			
		||||
        context["notespecial_ctype"] = ContentType.objects.get_for_model(NoteSpecial).pk
 | 
			
		||||
 | 
			
		||||
        activities_open = Activity.objects.filter(open=True).filter(
 | 
			
		||||
        activities_open = Activity.objects.filter(open=True, activity_type__manage_entries=True).filter(
 | 
			
		||||
            PermissionBackend.filter_queryset(self.request, Activity, "view")).distinct().all()
 | 
			
		||||
        context["activities_open"] = [a for a in activities_open
 | 
			
		||||
                                      if PermissionBackend.check_perm(self.request,
 | 
			
		||||
 
 | 
			
		||||
@@ -44,6 +44,7 @@ class ProfileForm(forms.ModelForm):
 | 
			
		||||
    """
 | 
			
		||||
    A form for the extras field provided by the :model:`member.Profile` model.
 | 
			
		||||
    """
 | 
			
		||||
    # Remove widget=forms.HiddenInput() if you want to use report frequency.
 | 
			
		||||
    report_frequency = forms.IntegerField(required=False, initial=0, label=_("Report frequency"))
 | 
			
		||||
 | 
			
		||||
    last_report = forms.DateTimeField(required=False, disabled=True, label=_("Last report date"))
 | 
			
		||||
@@ -76,7 +77,8 @@ class ProfileForm(forms.ModelForm):
 | 
			
		||||
    class Meta:
 | 
			
		||||
        model = Profile
 | 
			
		||||
        fields = '__all__'
 | 
			
		||||
        exclude = ('user', 'email_confirmed', 'registration_valid', )
 | 
			
		||||
        # Remove ml_[asso]_registration from exclude if the concerned association uses nk20 to manage its mailing list.
 | 
			
		||||
        exclude = ('user', 'email_confirmed', 'registration_valid', 'ml_sport_registration', )
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class ImageForm(forms.Form):
 | 
			
		||||
 
 | 
			
		||||
@@ -42,12 +42,12 @@ class UserTable(tables.Table):
 | 
			
		||||
    """
 | 
			
		||||
    alias = tables.Column()
 | 
			
		||||
 | 
			
		||||
    section = tables.Column(accessor='profile__section')
 | 
			
		||||
    section = tables.Column(accessor='profile__section', orderable=False)
 | 
			
		||||
 | 
			
		||||
    # Override the column to let replace the URL
 | 
			
		||||
    email = tables.EmailColumn(linkify=lambda record: "mailto:{}".format(record.email))
 | 
			
		||||
 | 
			
		||||
    balance = tables.Column(accessor='note__balance', verbose_name=_("Balance"))
 | 
			
		||||
    balance = tables.Column(accessor='note__balance', verbose_name=_("Balance"), orderable=False)
 | 
			
		||||
 | 
			
		||||
    def render_email(self, record, value):
 | 
			
		||||
        # Replace the email by a dash if the user can't see the profile detail
 | 
			
		||||
 
 | 
			
		||||
@@ -11,7 +11,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 | 
			
		||||
        {{ title }}
 | 
			
		||||
    </h3>
 | 
			
		||||
    <div class="card-body">
 | 
			
		||||
        <input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note…">
 | 
			
		||||
        <input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note...">
 | 
			
		||||
        <div class="form-check">
 | 
			
		||||
            <label class="form-check-label" for="only_active">
 | 
			
		||||
                <input type="checkbox" class="checkboxinput form-check-input" id="only_active"
 | 
			
		||||
@@ -66,4 +66,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
 | 
			
		||||
        roles_obj.change(reloadTable);
 | 
			
		||||
    });
 | 
			
		||||
</script>
 | 
			
		||||
{% endblock %}
 | 
			
		||||
{% endblock %}
 | 
			
		||||
 
 | 
			
		||||
@@ -26,6 +26,7 @@ from note_kfet.middlewares import _set_current_request
 | 
			
		||||
from permission.backends import PermissionBackend
 | 
			
		||||
from permission.models import Role
 | 
			
		||||
from permission.views import ProtectQuerysetMixin, ProtectedCreateView
 | 
			
		||||
from django import forms
 | 
			
		||||
 | 
			
		||||
from .forms import UserForm, ProfileForm, ImageForm, ClubForm, MembershipForm, \
 | 
			
		||||
    CustomAuthenticationForm, MembershipRolesForm
 | 
			
		||||
@@ -72,11 +73,24 @@ class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
 | 
			
		||||
        form.fields['email'].required = True
 | 
			
		||||
        form.fields['email'].help_text = _("This address must be valid.")
 | 
			
		||||
 | 
			
		||||
        if PermissionBackend.check_perm(self.request, "member.change_profile", context['user_object'].profile):
 | 
			
		||||
            context['profile_form'] = self.profile_form(instance=context['user_object'].profile,
 | 
			
		||||
                                                        data=self.request.POST if self.request.POST else None)
 | 
			
		||||
            if not self.object.profile.report_frequency:
 | 
			
		||||
                del context['profile_form'].fields["last_report"]
 | 
			
		||||
        profile_form = self.profile_form(instance=context['user_object'].profile,
 | 
			
		||||
                                         data=self.request.POST if self.request.POST else None)
 | 
			
		||||
 | 
			
		||||
        if not self.object.profile.report_frequency:
 | 
			
		||||
            del profile_form.fields["last_report"]
 | 
			
		||||
 | 
			
		||||
        fields_to_check = list(profile_form.fields.keys())
 | 
			
		||||
        fields_modifiable = False
 | 
			
		||||
 | 
			
		||||
        # Delete the fields for which the user does not have the permission to modify
 | 
			
		||||
        for field_name in fields_to_check:
 | 
			
		||||
            if not PermissionBackend.check_perm(self.request, f"member.change_profile_{field_name}", context['user_object'].profile):
 | 
			
		||||
                profile_form.fields[field_name].widget = forms.HiddenInput()
 | 
			
		||||
            else:
 | 
			
		||||
                fields_modifiable = True
 | 
			
		||||
 | 
			
		||||
        if fields_modifiable:
 | 
			
		||||
            context['profile_form'] = profile_form
 | 
			
		||||
 | 
			
		||||
        return context
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -260,11 +260,13 @@ class ButtonTable(tables.Table):
 | 
			
		||||
        text=_('edit'),
 | 
			
		||||
        accessor='pk',
 | 
			
		||||
        verbose_name=_("Edit"),
 | 
			
		||||
        orderable=False,
 | 
			
		||||
    )
 | 
			
		||||
 | 
			
		||||
    hideshow = tables.Column(
 | 
			
		||||
        verbose_name=_("Hide/Show"),
 | 
			
		||||
        accessor="pk",
 | 
			
		||||
        orderable=False,
 | 
			
		||||
        attrs={
 | 
			
		||||
            'td': {
 | 
			
		||||
                'class': 'col-sm-1',
 | 
			
		||||
@@ -276,7 +278,8 @@ class ButtonTable(tables.Table):
 | 
			
		||||
    delete_col = tables.TemplateColumn(template_code=DELETE_TEMPLATE,
 | 
			
		||||
                                       extra_context={"delete_trans": _('delete')},
 | 
			
		||||
                                       attrs={'td': {'class': 'col-sm-1'}},
 | 
			
		||||
                                       verbose_name=_("Delete"), )
 | 
			
		||||
                                       verbose_name=_("Delete"),
 | 
			
		||||
                                       orderable=False, )
 | 
			
		||||
 | 
			
		||||
    def render_amount(self, value):
 | 
			
		||||
        return pretty_money(value)
 | 
			
		||||
 
 | 
			
		||||
@@ -31,3 +31,4 @@ class RoleAdmin(admin.ModelAdmin):
 | 
			
		||||
    Admin customisation for Role
 | 
			
		||||
    """
 | 
			
		||||
    list_display = ('name', )
 | 
			
		||||
    filter_horizontal = ('permissions',)
 | 
			
		||||
 
 | 
			
		||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@@ -135,18 +135,18 @@ class Permission(models.Model):
 | 
			
		||||
 | 
			
		||||
    # A json encoded Q object with the following grammar
 | 
			
		||||
    #  query -> [] | {}  (the empty query representing all objects)
 | 
			
		||||
    #  query -> ["AND", query, …]            AND multiple queries
 | 
			
		||||
    #         | ["OR", query, …]             OR multiple queries
 | 
			
		||||
    #  query -> ["AND", query, ...]          AND multiple queries
 | 
			
		||||
    #         | ["OR", query, ...]           OR multiple queries
 | 
			
		||||
    #         | ["NOT", query]               Opposite of query
 | 
			
		||||
    #  query -> {key: value, …}              A list of fields and values of a Q object
 | 
			
		||||
    #  query -> {key: value, ...}            A list of fields and values of a Q object
 | 
			
		||||
    #  key   -> string                       A field name
 | 
			
		||||
    #  value -> int | string | bool | null   Literal values
 | 
			
		||||
    #         | [parameter, …]               A parameter. See compute_param for more details.
 | 
			
		||||
    #         | [parameter, ...]             A parameter. See compute_param for more details.
 | 
			
		||||
    #         | {"F": oper}                  An F object
 | 
			
		||||
    #  oper  -> [string, …]                  A parameter. See compute_param for more details.
 | 
			
		||||
    #         | ["ADD", oper, …]             Sum multiple F objects or literal
 | 
			
		||||
    #  oper  -> [string, ...]                A parameter. See compute_param for more details.
 | 
			
		||||
    #         | ["ADD", oper, ...]           Sum multiple F objects or literal
 | 
			
		||||
    #         | ["SUB", oper, oper]          Substract two F objects or literal
 | 
			
		||||
    #         | ["MUL", oper, …]             Multiply F objects or literals
 | 
			
		||||
    #         | ["MUL", oper, ...]           Multiply F objects or literals
 | 
			
		||||
    #         | int | string | bool | null   Literal values
 | 
			
		||||
    #         | ["F", string]                A field
 | 
			
		||||
    #
 | 
			
		||||
 
 | 
			
		||||
@@ -300,9 +300,13 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
 | 
			
		||||
#            join_bde = True
 | 
			
		||||
#            join_kfet = True
 | 
			
		||||
 | 
			
		||||
        if not join_bde:
 | 
			
		||||
        if not (join_bde or any(b for _, b in join_clubs)):
 | 
			
		||||
            # This software belongs to the BDE.
 | 
			
		||||
            form.add_error('join_bde', _("You must join the BDE."))
 | 
			
		||||
            form.add_error('join_bde', _("You must join a club."))
 | 
			
		||||
            return super().form_invalid(form)
 | 
			
		||||
 | 
			
		||||
        if join_kfet and not join_bde:
 | 
			
		||||
            form.add_error('join_bde', _("You must also join the parent club BDE."))
 | 
			
		||||
            return super().form_invalid(form)
 | 
			
		||||
 | 
			
		||||
        # Calculate required registration fee
 | 
			
		||||
 
 | 
			
		||||
@@ -37,6 +37,7 @@ class InvoiceTable(tables.Table):
 | 
			
		||||
        args=[A('id')],
 | 
			
		||||
        verbose_name=_("delete"),
 | 
			
		||||
        text=_("Delete"),
 | 
			
		||||
        orderable=False,
 | 
			
		||||
        attrs={
 | 
			
		||||
            'th': {
 | 
			
		||||
                'id': 'delete-membership-header'
 | 
			
		||||
@@ -70,6 +71,7 @@ class RemittanceTable(tables.Table):
 | 
			
		||||
                             verbose_name=_("View"),
 | 
			
		||||
                             args=[A("pk")],
 | 
			
		||||
                             text=_("View"),
 | 
			
		||||
                             orderable=False,
 | 
			
		||||
                             attrs={
 | 
			
		||||
                                 'a': {'class': 'btn btn-primary'}
 | 
			
		||||
                             }, )
 | 
			
		||||
@@ -97,6 +99,7 @@ class SpecialTransactionTable(tables.Table):
 | 
			
		||||
                                       verbose_name=_("Remittance"),
 | 
			
		||||
                                       args=[A("specialtransactionproxy__pk")],
 | 
			
		||||
                                       text=_("Add"),
 | 
			
		||||
                                       orderable=False,
 | 
			
		||||
                                       attrs={
 | 
			
		||||
                                           'a': {'class': 'btn btn-primary'}
 | 
			
		||||
                                       }, )
 | 
			
		||||
@@ -105,6 +108,7 @@ class SpecialTransactionTable(tables.Table):
 | 
			
		||||
                                          verbose_name=_("Remittance"),
 | 
			
		||||
                                          args=[A("specialtransactionproxy__pk")],
 | 
			
		||||
                                          text=_("Remove"),
 | 
			
		||||
                                          orderable=False,
 | 
			
		||||
                                          attrs={
 | 
			
		||||
                                              'a': {'class': 'btn btn-primary btn-danger'}
 | 
			
		||||
                                          }, )
 | 
			
		||||
@@ -130,10 +134,12 @@ class SogeCreditTable(tables.Table):
 | 
			
		||||
 | 
			
		||||
    amount = tables.Column(
 | 
			
		||||
        verbose_name=_("Amount"),
 | 
			
		||||
        orderable=False,
 | 
			
		||||
    )
 | 
			
		||||
 | 
			
		||||
    valid = tables.Column(
 | 
			
		||||
        verbose_name=_("Valid"),
 | 
			
		||||
        orderable=False,
 | 
			
		||||
    )
 | 
			
		||||
 | 
			
		||||
    def render_amount(self, value):
 | 
			
		||||
 
 | 
			
		||||
@@ -82,7 +82,7 @@ WORDS = {
 | 
			
		||||
        5: "La quoi ?"
 | 
			
		||||
    }],
 | 
			
		||||
    "kokarde": ["Qu'est-ce que le mot Kokarde t'évoque ?", {
 | 
			
		||||
        1: "Vraiment pas mon truc les soirées…",
 | 
			
		||||
        1: "Vraiment pas mon truc les soirées...",
 | 
			
		||||
        2: "Bof, je viens pour manger et je repars aussitôt",
 | 
			
		||||
        3: "Je kiffe, good vibes",
 | 
			
		||||
        4: "Perso, je ne m'arrêterai pas de danser sur la piste !",
 | 
			
		||||
@@ -117,15 +117,15 @@ WORDS = {
 | 
			
		||||
        5: "Je pourrais en faire à n'importe qui. Pourquoi ne pas créer le club Câl[ENS] ?"
 | 
			
		||||
    }],
 | 
			
		||||
    "vomi": ["Quel est ton rapport au vomi ?", {
 | 
			
		||||
        1: "C'est compliqué…",
 | 
			
		||||
        1: "C'est compliqué...",
 | 
			
		||||
        2: "Jamais je ne vomis mais je nettoie quand mes potes vomissent",
 | 
			
		||||
        3: "Jamais je ne vomis et jamais je ne nettoie celui de quelqu'un d'autre",
 | 
			
		||||
        4: "Je vomis quelquefois, ça arrive, faites pas cette tête, mais je fins toujours par nettoyer !",
 | 
			
		||||
        5: "Je vomis à chaque soirée et ce n'est jamais moi qui nettoie"
 | 
			
		||||
    }],
 | 
			
		||||
    "kfet": ["Qu'est ce que la Kfet t'évoque ?", {
 | 
			
		||||
        1: "La Kfet, quel lieu de dépravé⋅es sérieux…",
 | 
			
		||||
        2: "C'est un endroit à l'hygiène plus que douteuse…",
 | 
			
		||||
        1: "La Kfet, quel lieu de dépravé⋅es sérieux...",
 | 
			
		||||
        2: "C'est un endroit à l'hygiène plus que douteuse...",
 | 
			
		||||
        3: "Téma les prix des boissons et des snacks, c'est aberrant !",
 | 
			
		||||
        4: "En vrai, c'est cool, petit billard, petit canapé, chill !",
 | 
			
		||||
        5: "Banger, j'y reste jusqu'à la fin de mes jours"
 | 
			
		||||
@@ -147,7 +147,7 @@ WORDS = {
 | 
			
		||||
    "scolarite": ["Comment tu vois ton cursus à l'ENS ?", {
 | 
			
		||||
        1: "La tranquillité et le travail",
 | 
			
		||||
        2: "On va s'amuser tout en bossant",
 | 
			
		||||
        3: "Ça va profiter et réviser au dernier moment pour les exams…",
 | 
			
		||||
        3: "Ça va profiter et réviser au dernier moment pour les exams...",
 | 
			
		||||
        4: "Nous festoierons sans songer aux conséquences",
 | 
			
		||||
        5: "Je ne vois qu'une seule issue : la débauche"
 | 
			
		||||
    }]
 | 
			
		||||
 
 | 
			
		||||
@@ -279,7 +279,6 @@ class WEISurveyAlgorithm2024(WEISurveyAlgorithm):
 | 
			
		||||
        # surveys = [s for s in surveys if s.bus_id != None]
 | 
			
		||||
        # surveys = [s for s in surveys if not hasattr(s.information, 'hardcoded') or not s.information.hardcoded]
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        # surveys = [s for s in surveys if s.registration.user_id in free_users]
 | 
			
		||||
 | 
			
		||||
        # hardcoded_first_year_mb = WEIMembership.objects.filter(bus != None,registration__first_year=True)
 | 
			
		||||
@@ -288,15 +287,13 @@ class WEISurveyAlgorithm2024(WEISurveyAlgorithm):
 | 
			
		||||
        hardcoded_first_year_mb = WEIMembership.objects.filter(registration__first_year=True)
 | 
			
		||||
        hardcoded_first_year = {mb.user.id if mb.bus else None: mb.bus.id if mb.bus else None for mb in hardcoded_first_year_mb}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        # Reset previous algorithm run
 | 
			
		||||
        for survey in surveys:
 | 
			
		||||
            survey.free()
 | 
			
		||||
            if survey.registration.user_id in hardcoded_first_year.keys():
 | 
			
		||||
                survey.select_bus(hardcoded_first_year[s.registration.user_id])
 | 
			
		||||
                survey.select_bus(hardcoded_first_year[survey.registration.user_id])
 | 
			
		||||
            survey.save()
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        non_men = [s for s in surveys if s.registration.gender != 'male']
 | 
			
		||||
        men = [s for s in surveys if s.registration.gender == 'male']
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -32,7 +32,7 @@ Applications indispensables
 | 
			
		||||
* `Note <note>`_ :
 | 
			
		||||
   Les notes associées à des utilisateur⋅rices ou des clubs.
 | 
			
		||||
* `Activity <activity>`_ :
 | 
			
		||||
   La gestion des activités (créations, gestion, entrées,…)
 | 
			
		||||
   La gestion des activités (créations, gestion, entrées, ...)
 | 
			
		||||
* `Permission <permission>`_ :
 | 
			
		||||
   Backend de droits, limites les pouvoirs des utilisateur⋅rices
 | 
			
		||||
* `API <../api>`_ :
 | 
			
		||||
@@ -64,9 +64,9 @@ Applications facultatives
 | 
			
		||||
* ``cas-server``
 | 
			
		||||
    Serveur central d'authentification, permet d'utiliser son compte de la NoteKfet2020 pour se connecter à d'autre application ayant intégrer un client.
 | 
			
		||||
* `Scripts <https://gitlab.crans.org/bde/nk20-scripts>`_
 | 
			
		||||
     Ensemble de commande `./manage.py` pour la gestion de la note: import de données, verification d'intégrité, etc…
 | 
			
		||||
     Ensemble de commande `./manage.py` pour la gestion de la note: import de données, verification d'intégrité, etc...
 | 
			
		||||
* `Treasury <treasury>`_ :
 | 
			
		||||
    Interface de gestion pour les trésorièr⋅es, émission de factures, remises de chèque, statistiques ...
 | 
			
		||||
    Interface de gestion pour les trésorièr⋅es, émission de factures, remises de chèque, statistiques...
 | 
			
		||||
* `WEI <wei>`_ :
 | 
			
		||||
    Interface de gestion du WEI.
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -43,7 +43,7 @@ l'utilisateur⋅rice, utiles pour l'adhésion au BDE :
 | 
			
		||||
* ``address`` : ``CharField``, adresse physique de l'utilisateur⋅rice
 | 
			
		||||
* ``paid`` : ``BooleanField``, indique si l'utilisateur⋅rice normalien⋅ne est rémunéré⋅e ou non (utile pour différencier les montants d'adhésion aux clubs)
 | 
			
		||||
* ``phone_number`` : ``CharField``, numéro de téléphone de l'utilisateur⋅rice
 | 
			
		||||
* ``section`` : ``CharField``, section de l'ENS à laquelle appartient l'utilisateur⋅rice (exemple : 1A0,…)
 | 
			
		||||
* ``section`` : ``CharField``, section de l'ENS à laquelle appartient l'utilisateur⋅rice (exemple : 1A0, ...)
 | 
			
		||||
 | 
			
		||||
Clubs
 | 
			
		||||
~~~~~
 | 
			
		||||
@@ -101,7 +101,7 @@ Adhésions
 | 
			
		||||
 | 
			
		||||
La Note Kfet offre la possibilité aux clubs de gérer l'adhésion de leurs membres. En plus de réguler les cotisations
 | 
			
		||||
des adhérent⋅es, des permissions sont octroyées sur la note en fonction des rôles au sein des clubs. Un rôle est une
 | 
			
		||||
fonction occupée au sein d'un club (Trésorièr⋅e de club, président⋅e de club, GC Kfet, Res[pot], respo info,…).
 | 
			
		||||
fonction occupée au sein d'un club (Trésorièr⋅e de club, président⋅e de club, GC Kfet, Res[pot], respo info, ...).
 | 
			
		||||
Une adhésion attribue à un⋅e adhérent⋅e ses rôles. Les rôles fournissent les permissions. Par exemple, læ trésorièr⋅e d'un
 | 
			
		||||
club a le droit de faire des transferts de et vers la note du club, tant que la source reste au-dessus de -50 €.
 | 
			
		||||
Une adhésion est considérée comme valide si la date du jour est comprise (au sens large) entre les dates de début et
 | 
			
		||||
 
 | 
			
		||||
@@ -49,7 +49,7 @@ Une fois l'inscription validée, détail de ce qu'il se passe :
 | 
			
		||||
  lui octroyant un faible nombre de permissions de base, telles que la visualisation de son compte.
 | 
			
		||||
* On adhère la personne au club Kfet si cela est demandé, l'adhésion commence aujourd'hui. Iel dispose d'un unique rôle :
 | 
			
		||||
  « Adhérent⋅e Kfet » , lui octroyant un nombre un peu plus conséquent de permissions basiques, telles que la possibilité de
 | 
			
		||||
  faire des transactions, d'accéder aux activités, au WEI,…
 | 
			
		||||
  faire des transactions, d'accéder aux activités, au WEI, ...
 | 
			
		||||
* Si læ nouvelleau membre a indiqué avoir ouvert un compte à la société générale, alors les transactions sont invalidées,
 | 
			
		||||
  la note n'est pas débitée (commence alors à 0 €).
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -3744,8 +3744,8 @@ msgid "FAQ (FR)"
 | 
			
		||||
msgstr "FAQ (FR)"
 | 
			
		||||
 | 
			
		||||
#: note_kfet/templates/base_search.html:15
 | 
			
		||||
msgid "Search by attribute such as name…"
 | 
			
		||||
msgstr "Suche nach Attributen wie Name…"
 | 
			
		||||
msgid "Search by attribute such as name..."
 | 
			
		||||
msgstr "Suche nach Attributen wie Name..."
 | 
			
		||||
 | 
			
		||||
#: note_kfet/templates/base_search.html:23
 | 
			
		||||
msgid "There is no results."
 | 
			
		||||
 
 | 
			
		||||
@@ -3694,8 +3694,8 @@ msgid "FAQ (FR)"
 | 
			
		||||
msgstr "FAQ (FR)"
 | 
			
		||||
 | 
			
		||||
#: note_kfet/templates/base_search.html:15
 | 
			
		||||
msgid "Search by attribute such as name…"
 | 
			
		||||
msgstr "Buscar con atributo, como el nombre…"
 | 
			
		||||
msgid "Search by attribute such as name..."
 | 
			
		||||
msgstr "Buscar con atributo, como el nombre..."
 | 
			
		||||
 | 
			
		||||
#: note_kfet/templates/base_search.html:23
 | 
			
		||||
msgid "There is no results."
 | 
			
		||||
 
 | 
			
		||||
@@ -795,11 +795,11 @@ msgstr "Masque de permissions"
 | 
			
		||||
 | 
			
		||||
#: apps/member/forms.py:46
 | 
			
		||||
msgid "Report frequency"
 | 
			
		||||
msgstr "Fréquence des rapports (en jours)"
 | 
			
		||||
msgstr "Fréquence des relevés (en jours)"
 | 
			
		||||
 | 
			
		||||
#: apps/member/forms.py:48
 | 
			
		||||
msgid "Last report date"
 | 
			
		||||
msgstr "Date de dernier rapport"
 | 
			
		||||
msgstr "Date de dernier relevé"
 | 
			
		||||
 | 
			
		||||
#: apps/member/forms.py:52
 | 
			
		||||
msgid ""
 | 
			
		||||
@@ -1032,6 +1032,7 @@ msgid ""
 | 
			
		||||
"Register on the mailing list to stay informed of the sport events of the "
 | 
			
		||||
"campus (1 mail/week)"
 | 
			
		||||
msgstr ""
 | 
			
		||||
"S'inscrire sur la liste de diffusion pour rester informé·e des actualités "
 | 
			
		||||
"sportives sur le campus (1 mail par semaine)"
 | 
			
		||||
 | 
			
		||||
#: apps/member/models.py:113
 | 
			
		||||
@@ -1044,11 +1045,11 @@ msgstr ""
 | 
			
		||||
 | 
			
		||||
#: apps/member/models.py:117
 | 
			
		||||
msgid "report frequency (in days)"
 | 
			
		||||
msgstr "fréquence des rapports (en jours)"
 | 
			
		||||
msgstr "fréquence des relevés (en jours)"
 | 
			
		||||
 | 
			
		||||
#: apps/member/models.py:122
 | 
			
		||||
msgid "last report date"
 | 
			
		||||
msgstr "date de dernier rapport"
 | 
			
		||||
msgstr "date de dernier relevé"
 | 
			
		||||
 | 
			
		||||
#: apps/member/models.py:127
 | 
			
		||||
msgid "email confirmed"
 | 
			
		||||
@@ -1930,8 +1931,8 @@ msgstr "Consommer"
 | 
			
		||||
#: apps/note/templates/note/conso_form.html:43
 | 
			
		||||
#: apps/note/templates/note/transaction_form.html:69
 | 
			
		||||
#: apps/note/templates/note/transaction_form.html:96
 | 
			
		||||
msgid "Name or alias…"
 | 
			
		||||
msgstr "Pseudo ou alias…"
 | 
			
		||||
msgid "Name or alias..."
 | 
			
		||||
msgstr "Pseudo ou alias..."
 | 
			
		||||
 | 
			
		||||
#: apps/note/templates/note/conso_form.html:53
 | 
			
		||||
msgid "Select consumptions"
 | 
			
		||||
@@ -2031,8 +2032,8 @@ msgid "Current price"
 | 
			
		||||
msgstr "Prix actuel"
 | 
			
		||||
 | 
			
		||||
#: apps/note/templates/note/transactiontemplate_list.html:13
 | 
			
		||||
msgid "Name of the button…"
 | 
			
		||||
msgstr "Nom du bouton…"
 | 
			
		||||
msgid "Name of the button..."
 | 
			
		||||
msgstr "Nom du bouton..."
 | 
			
		||||
 | 
			
		||||
#: apps/note/templates/note/transactiontemplate_list.html:15
 | 
			
		||||
msgid "New button"
 | 
			
		||||
@@ -3386,8 +3387,8 @@ msgstr ""
 | 
			
		||||
"coût d'adhésion."
 | 
			
		||||
 | 
			
		||||
#: apps/wei/templates/wei/weimembership_list.html:27
 | 
			
		||||
msgid "View unvalidated registrations…"
 | 
			
		||||
msgstr "Voir les inscriptions non validées…"
 | 
			
		||||
msgid "View unvalidated registrations..."
 | 
			
		||||
msgstr "Voir les inscriptions non validées..."
 | 
			
		||||
 | 
			
		||||
#: apps/wei/templates/wei/weiregistration_confirm_delete.html:16
 | 
			
		||||
msgid "This registration is already validated and can't be deleted."
 | 
			
		||||
@@ -3407,8 +3408,8 @@ msgid "There is no pre-registration found with this pattern."
 | 
			
		||||
msgstr "Il n'y a pas de pré-inscription en attente avec cette entrée."
 | 
			
		||||
 | 
			
		||||
#: apps/wei/templates/wei/weiregistration_list.html:27
 | 
			
		||||
msgid "View validated memberships…"
 | 
			
		||||
msgstr "Voir les adhésions validées…"
 | 
			
		||||
msgid "View validated membershipis..."
 | 
			
		||||
msgstr "Voir les adhésions validées..."
 | 
			
		||||
 | 
			
		||||
#: apps/wei/views.py:58
 | 
			
		||||
msgid "Search WEI"
 | 
			
		||||
@@ -3673,8 +3674,8 @@ msgid "FAQ (FR)"
 | 
			
		||||
msgstr "FAQ (FR)"
 | 
			
		||||
 | 
			
		||||
#: note_kfet/templates/base_search.html:15
 | 
			
		||||
msgid "Search by attribute such as name…"
 | 
			
		||||
msgstr "Chercher par un attribut tel que le nom…"
 | 
			
		||||
msgid "Search by attribute such as name..."
 | 
			
		||||
msgstr "Chercher par un attribut tel que le nom..."
 | 
			
		||||
 | 
			
		||||
#: note_kfet/templates/base_search.html:23
 | 
			
		||||
msgid "There is no results."
 | 
			
		||||
 
 | 
			
		||||
@@ -9,6 +9,7 @@ MAILTO=notekfet2020@lists.crans.org
 | 
			
		||||
 *   *     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py send_mail -c 1 -v 0
 | 
			
		||||
 *   *     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py retry_deferred -c 1 -v 0
 | 
			
		||||
 00  0     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py purge_mail_log 7 -v 0
 | 
			
		||||
 00  0     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py purge_mail_log -r failure 30 -v 0
 | 
			
		||||
# Faire une sauvegarde de la base de données
 | 
			
		||||
 00  2     *   *   *     root   cd /var/www/note_kfet && apps/scripts/shell/backup_db
 | 
			
		||||
# Vérifier la cohérence de la base et mailer en cas de problème
 | 
			
		||||
@@ -25,3 +26,5 @@ MAILTO=notekfet2020@lists.crans.org
 | 
			
		||||
 00  9     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py refresh_highlighted_buttons -v 0
 | 
			
		||||
# Vider les tokens Oauth2
 | 
			
		||||
 00  6     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py cleartokens -v 0
 | 
			
		||||
# Envoyer la liste des abonnés à la NL BDA
 | 
			
		||||
 00  8     *   *   0     root   cd /var/www/note_kfet && env/bin/python manage.py extract_ml_registrations -t art -v 0
 | 
			
		||||
@@ -225,6 +225,7 @@ MEDIA_URL = '/media/'
 | 
			
		||||
# Use mailer in production to place emails in a queue before sending them to avoid spam
 | 
			
		||||
EMAIL_BACKEND = 'mailer.backend.DbBackend'
 | 
			
		||||
MAILER_EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 | 
			
		||||
MAILER_EMAIL_MAX_BATCH = 10
 | 
			
		||||
EMAIL_USE_SSL = os.getenv('EMAIL_USE_SSL', False)
 | 
			
		||||
EMAIL_HOST = os.getenv('EMAIL_HOST', 'smtp.example.org')
 | 
			
		||||
EMAIL_PORT = os.getenv('EMAIL_PORT', 25)
 | 
			
		||||
@@ -265,11 +266,9 @@ OAUTH2_PROVIDER = {
 | 
			
		||||
    'SCOPES_BACKEND_CLASS': 'permission.scopes.PermissionScopes',
 | 
			
		||||
    'OAUTH2_VALIDATOR_CLASS': "permission.scopes.PermissionOAuth2Validator",
 | 
			
		||||
    'REFRESH_TOKEN_EXPIRE_SECONDS': timedelta(days=14),
 | 
			
		||||
    'PKCE_REQUIRED': False, # PKCE (fix a breaking change of django-oauth-toolkit 2.0.0)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
# PKCE (fix a breaking change of django-oauth-toolkit 2.0.0)
 | 
			
		||||
PKCE_REQUIRED = False
 | 
			
		||||
 | 
			
		||||
# Take control on how widget templates are sourced
 | 
			
		||||
# See https://docs.djangoproject.com/en/2.2/ref/forms/renderers/#templatessetting
 | 
			
		||||
FORM_RENDERER = 'django.forms.renderers.TemplatesSetting'
 | 
			
		||||
 
 | 
			
		||||
@@ -66,13 +66,13 @@ SPDX-License-Identifier: GPL-3.0-or-later
 | 
			
		||||
                            <a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-coffee"></i> {% trans 'Consumptions' %}</a>
 | 
			
		||||
                        </li>
 | 
			
		||||
                    {% endif %}
 | 
			
		||||
		    {% if request.user.is_authenticated %}
 | 
			
		||||
                    	<li class="nav-item">
 | 
			
		||||
                    {% if request.user.is_authenticated %}
 | 
			
		||||
                        <li class="nav-item">
 | 
			
		||||
                            {% url 'food:food_list' as url %}
 | 
			
		||||
			    <a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-cutlery"></i> {% trans 'Food' %}</a>
 | 
			
		||||
                    	</li>
 | 
			
		||||
		    {% endif %}	
 | 
			
		||||
                    {% if user.is_authenticated and user|is_member:"Kfet" %}
 | 
			
		||||
                            <a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-cutlery"></i> {% trans 'Food' %}</a>
 | 
			
		||||
                        </li>
 | 
			
		||||
                    {% endif %}
 | 
			
		||||
                    {% if user.is_authenticated %}
 | 
			
		||||
                        <li class="nav-item">
 | 
			
		||||
                            {% url 'note:transfer' as url %}
 | 
			
		||||
                            <a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-exchange"></i> {% trans 'Transfer' %}</a>
 | 
			
		||||
@@ -158,7 +158,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 | 
			
		||||
        </div>
 | 
			
		||||
    </nav>
 | 
			
		||||
    <div class="{% block containertype %}container{% endblock %} my-3">
 | 
			
		||||
        <div id="messages">
 | 
			
		||||
	<div id="messages">
 | 
			
		||||
            {% if user.is_authenticated %}
 | 
			
		||||
                {% if not user|is_member:"BDE" %}
 | 
			
		||||
                    <div class="alert alert-danger">
 | 
			
		||||
 
 | 
			
		||||
@@ -12,7 +12,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 | 
			
		||||
    </h3>
 | 
			
		||||
    <div class="card-body">
 | 
			
		||||
        <input id="searchbar" type="text" class="form-control"
 | 
			
		||||
            placeholder="{% trans "Search by attribute such as name…" %}">
 | 
			
		||||
            placeholder="{% trans "Search by attribute such as name..." %}">
 | 
			
		||||
    </div>
 | 
			
		||||
    <div id="dynamic-table">
 | 
			
		||||
        {% if table.data %}
 | 
			
		||||
@@ -75,4 +75,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
 | 
			
		||||
        init_table();
 | 
			
		||||
    });
 | 
			
		||||
</script>
 | 
			
		||||
{% endblock %}
 | 
			
		||||
{% endblock %}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user