.env_example

@@ -16,5 +16,3 @@ EMAIL_HOST=smtp.localhost
 EMAIL_PORT=465
 EMAIL_USER=notekfet@localhost
 EMAIL_PASSWORD=CHANGE_ME
-WIKI_USER=NoteKfet2020
-WIKI_PASSWORD=

.gitignore

@@ -39,7 +39,6 @@ secrets.py
 .env
 map.json
 *.log
-backups/
 media/
 
 # Virtualenv

README.md

@@ -124,8 +124,6 @@ On supposera pour la suite que vous utilisez Debian/Ubuntu sur un serveur tout n
         EMAIL_PORT=465
         EMAIL_USER=notekfet@localhost
         EMAIL_PASSWORD=CHANGE_ME
-        WIKI_USER=NoteKfet2020
-        WIKI_PASSWORD=CHANGE_ME
 
 
     Ensuite on (re)bascule dans l'environement virtuel et on lance les migrations

ansible/roles/2-nk20/tasks/main.yml

@@ -41,9 +41,3 @@
   systemd:
     name: cron
     state: restarted
-
-- name: Update permissions for the cron file
-  file:
-    path: /var/www/note_kfet/note.cron
-    owner: root
-    group: www-data

apps/activity/admin.py

@@ -2,8 +2,8 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django.contrib import admin
-from note_kfet.admin import admin_site
 
+from note_kfet.admin import admin_site
 from .models import Activity, ActivityType, Guest, Entry
 
 

apps/activity/models.py

@@ -1,10 +1,7 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
-
 from datetime import timedelta, datetime
-from threading import Thread
 
-from django.conf import settings
 from django.contrib.auth.models import User
 from django.db import models
 from django.db.models import Q
@@ -57,13 +54,6 @@ class Activity(models.Model):
         verbose_name=_('description'),
     )
 
-    location = models.CharField(
-        verbose_name=_('location'),
-        max_length=255,
-        blank=True,
-        default="",
-    )
-
     activity_type = models.ForeignKey(
         ActivityType,
         on_delete=models.PROTECT,
@@ -109,19 +99,6 @@ class Activity(models.Model):
         verbose_name=_('open'),
     )
 
-    def save(self, *args, **kwargs):
-        """
-        Update the activity wiki page each time the activity is updated (validation, change description, ...)
-        """
-        ret = super().save(*args, **kwargs)
-        if self.pk and "scripts" in settings.INSTALLED_APPS:
-            def refresh_activities():
-                from scripts.management.commands.refresh_activities import Command as RefreshActivitiesCommand
-                RefreshActivitiesCommand.refresh_human_readable_wiki_page("Modification de l'activité " + self.name)
-                RefreshActivitiesCommand.refresh_raw_wiki_page("Modification de l'activité " + self.name)
-            Thread(daemon=True, target=refresh_activities).start()
-        return ret
-
     def __str__(self):
         return self.name
 

apps/logs/signals.py

@@ -23,9 +23,6 @@ EXCLUDED = [
     'cas_server.userattributes',
     'contenttypes.contenttype',
     'logs.changelog',  # Never remove this line
-    'mailer.dontsendentry',
-    'mailer.message',
-    'mailer.messagelog',
     'migrations.migration',
     'note.note'  # We only store the subclasses
     'note.transaction',

apps/member/models.py

@@ -16,6 +16,7 @@ from django.utils.encoding import force_bytes
 from django.utils.http import urlsafe_base64_encode
 from django.utils.translation import gettext_lazy as _
 from phonenumber_field.modelfields import PhoneNumberField
+
 from permission.models import Role
 from registration.tokens import email_validation_token
 from note.models import MembershipTransaction
@@ -154,12 +155,12 @@ class Profile(models.Model):
                                               'uid': urlsafe_base64_encode(force_bytes(self.user.pk)),
                                           })
         html = loader.render_to_string('registration/mails/email_validation_email.html',
-                                       {
+                                          {
-                                           'user': self.user,
+                                              'user': self.user,
-                                           'domain': os.getenv("NOTE_URL", "note.example.com"),
+                                              'domain': os.getenv("NOTE_URL", "note.example.com"),
-                                           'token': email_validation_token.make_token(self.user),
+                                              'token': email_validation_token.make_token(self.user),
-                                           'uid': urlsafe_base64_encode(force_bytes(self.user.pk)),
+                                              'uid': urlsafe_base64_encode(force_bytes(self.user.pk)),
-                                       })
+                                          })
         self.user.email_user(subject, message, html_message=html)
 
 
@@ -328,6 +329,7 @@ class Membership(models.Model):
             club=self.club,
             date_start=max(self.date_end + datetime.timedelta(days=1), self.club.membership_start),
         )
+        from django.forms import model_to_dict
         if hasattr(self, '_force_renew_parent') and self._force_renew_parent:
             new_membership._force_renew_parent = True
         if hasattr(self, '_soge') and self._soge:
@@ -443,8 +445,8 @@ class Membership(models.Model):
             )
             transaction._force_save = True
             if hasattr(self, '_soge') and "treasury" in settings.INSTALLED_APPS\
-                    and (self.club.name == "BDE" or self.club.name == "Kfet"
+                    and (self.club.name == "BDE" or self.club.name == "Kfet" or
-                         or ("wei" in settings.INSTALLED_APPS and hasattr(self.club, "weiclub") and self.club.weiclub)):
+                         ("wei" in settings.INSTALLED_APPS and hasattr(self.club, "weiclub") and self.club.weiclub)):
                 # If the soge pays, then the transaction is unvalidated in a first time, then submitted for control
                 # to treasurers.
                 transaction.valid = False

apps/member/tables.py

@@ -38,8 +38,6 @@ class UserTable(tables.Table):
     """
     List all users.
     """
-    alias = tables.Column()
-
     section = tables.Column(accessor='profile.section')
 
     balance = tables.Column(accessor='note.balance', verbose_name=_("Balance"))
@@ -52,7 +50,7 @@ class UserTable(tables.Table):
             'class': 'table table-condensed table-striped table-hover'
         }
         template_name = 'django_tables2/bootstrap4.html'
-        fields = ('last_name', 'first_name', 'username', 'alias', 'email')
+        fields = ('last_name', 'first_name', 'username', 'email')
         model = User
         row_attrs = {
             'class': 'table-row',

apps/member/views.py

@@ -10,7 +10,7 @@ from django.contrib.auth import logout
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.models import User
 from django.contrib.auth.views import LoginView
-from django.db.models import Q, F
+from django.db.models import Q
 from django.shortcuts import redirect
 from django.urls import reverse_lazy
 from django.utils import timezone
@@ -172,9 +172,7 @@ class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
         """
         Filter the user list with the given pattern.
         """
-        qs = super().get_queryset().distinct("pk").annotate(alias=F("note__alias__name"))\
+        qs = super().get_queryset().distinct().filter(profile__registration_valid=True)
-            .annotate(normalized_alias=F("note__alias__normalized_name"))\
-            .filter(profile__registration_valid=True)
         if "search" in self.request.GET:
             pattern = self.request.GET["search"]
 
@@ -186,8 +184,8 @@ class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
                 | Q(last_name__iregex=pattern)
                 | Q(profile__section__iregex=pattern)
                 | Q(username__iregex="^" + pattern)
-                | Q(alias__iregex="^" + pattern)
+                | Q(note__alias__name__iregex="^" + pattern)
-                | Q(normalized_alias__iregex=Alias.normalize("^" + pattern))
+                | Q(note__alias__normalized_name__iregex=Alias.normalize("^" + pattern))
             )
         else:
             qs = qs.none()
@@ -457,7 +455,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
             while c.parent_club is not None:
                 c = c.parent_club
                 clubs_renewal.append(c)
-                additional_fee_renewal += c.membership_fee_paid
+                additional_fee_renewal += c.membership_fee_paid if user.profile.paid else c.membership_fee_unpaid
             context["clubs_renewal"] = clubs_renewal
             context["additional_fee_renewal"] = additional_fee_renewal
 
@@ -498,7 +496,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
             form.fields['user'].disabled = True
             form.fields['date_start'].initial = old_membership.date_end + timedelta(days=1)
             form.fields['credit_amount'].initial = (club.membership_fee_paid if user.profile.paid
-                                                    else club.membership_fee_unpaid) + additional_fee_renewal
+                else club.membership_fee_unpaid) + additional_fee_renewal
             form.fields['last_name'].initial = user.last_name
             form.fields['first_name'].initial = user.first_name
 

apps/note/api/serializers.py

@@ -1,8 +1,10 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
-
+from django.utils import timezone
 from rest_framework import serializers
+from rest_framework.serializers import ListSerializer
 from rest_polymorphic.serializers import PolymorphicSerializer
+
 from member.api.serializers import MembershipSerializer
 from member.models import Membership
 from note_kfet.middlewares import get_current_authenticated_user

apps/note/api/views.py

@@ -9,7 +9,7 @@ from rest_framework import viewsets
 from rest_framework.response import Response
 from rest_framework import status
 from api.viewsets import ReadProtectedModelViewSet, ReadOnlyProtectedModelViewSet
-from note_kfet.middlewares import get_current_session
+from note_kfet.middlewares import  get_current_session
 from permission.backends import PermissionBackend
 
 from .serializers import NotePolymorphicSerializer, AliasSerializer, ConsumerSerializer,\

apps/note/models/transactions.py

@@ -7,7 +7,7 @@ from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from polymorphic.models import PolymorphicModel
 
-from .notes import Note, NoteClub, NoteSpecial
+from .notes import Note, NoteClub, NoteSpecial, NoteUser
 from ..templatetags.pretty_money import pretty_money
 
 """
@@ -222,7 +222,8 @@ class Transaction(PolymorphicModel):
                 self.destination_alias = str(self.destination)
 
             if self.source.pk == self.destination.pk:
-                # When source == destination, no money is transferred and no transaction is created
+                # When source == destination, no money is transferred
+                super().save(*args, **kwargs)
                 return
 
             self.log("Saving")

apps/note/views.py

@@ -10,6 +10,7 @@ from django.utils.translation import gettext_lazy as _
 from django.views.generic import CreateView, UpdateView, DetailView
 from django_tables2 import SingleTableView
 from django.urls import reverse_lazy
+
 from activity.models import Entry
 from note_kfet.inputs import AmountInput
 from permission.backends import PermissionBackend

apps/permission/models.py

@@ -5,6 +5,7 @@ import functools
 import json
 import operator
 from copy import copy
+from time import sleep
 
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError

apps/permission/tables.py

@@ -4,6 +4,7 @@
 import django_tables2 as tables
 from django.urls import reverse_lazy
 from django.utils.html import format_html
+
 from member.models import Membership
 from note_kfet.middlewares import get_current_authenticated_user
 from permission.backends import PermissionBackend

apps/scripts

@@ -1 +1 @@
-Subproject commit 3806feb67fcb1fe822cfdedddbbc4ca7eeef3829
+Subproject commit 47dc4dd9e6742c3fd0f0d4ea654b1e9a0a39f4f7

apps/wei/forms/registration.py

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

apps/wei/models.py

@@ -9,6 +9,7 @@ from django.contrib.auth.models import User
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 from phonenumber_field.modelfields import PhoneNumberField
+
 from member.models import Club, Membership
 from note.models import MembershipTransaction
 from permission.models import Role

apps/wei/tables.py

@@ -7,9 +7,9 @@ from django.utils import timezone
 from django.utils.html import format_html
 from django.utils.translation import gettext_lazy as _
 from django_tables2 import A
+
 from note_kfet.middlewares import get_current_authenticated_user
 from permission.backends import PermissionBackend
-
 from .models import WEIClub, WEIRegistration, Bus, BusTeam, WEIMembership
 
 

apps/wei/views.py

@@ -28,6 +28,7 @@ from note.models import Transaction, NoteClub, Alias, SpecialTransaction, NoteSp
 from note.tables import HistoryTable
 from note_kfet.settings import BASE_DIR
 from permission.backends import PermissionBackend
+from permission.models import Role
 from permission.views import ProtectQuerysetMixin
 
 from .forms.registration import WEIChooseBusForm

note.cron

@@ -6,17 +6,14 @@
  *   *     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py send_mail >> /var/www/note_kfet/cron_mail.log
  *   *     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py retry_deferred >> /var/www/note_kfet/cron_mail_deferred.log
  00  0     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py purge_mail_log 7 >> /var/www/note_kfet/cron_mail_purge.log
-# 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
  00  4     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py check_consistency --sum-all --check-all --mail
+# TODO
 # Mettre à jour le wiki (modification sans (dé)validation, activités passées)
-#30  5     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py refresh_activities --raw --comment refresh
+#30  5     *   *   *     root   /home/note/note-kfet-2015-serveur/serveur/Wiki.py --human --raw
 # Spammer les gens en négatif
  00  5     *   *   2     root   cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --spam
 # Envoyer le rapport mensuel aux trésoriers et respos info
  00  8     6   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --report
 # Envoyer les rapports aux gens
  55  6     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py send_reports
-# Envoyer les rapports aux gens
- 00  9     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py refresh_highlighted_buttons

requirements/base.txt

@@ -1,4 +1,3 @@
-beautifulsoup4==4.9.1
 certifi==2019.6.16
 chardet==3.0.4
 defusedxml==0.6.0
@@ -13,7 +12,6 @@ django-polymorphic==2.0.3
 django-tables2==2.1.0
 docutils==0.14
 idna==2.8
-lxml==4.5.2
 oauthlib==3.1.0
 phonenumbers==8.12.7
 Pillow==7.1.2

static/js/consos.js

@@ -218,7 +218,7 @@ function consume(source, source_alias, dest, quantity, amount, reason, type, cat
                     addMsg("Attention, La transaction depuis la note " + source_alias + " a été réalisée avec " +
                         "succès, mais la note émettrice " + source_alias + " est en négatif.",
                         "warning", 30000);
-                if (source.note.membership && source.note.membership.date_end < new Date().toISOString())
+                if (source.note.membership && source.note.membership.date_end > new Date().toISOString())
                     addMsg("Attention : la note émettrice " + source.name + " n'est plus adhérente.",
                         "danger", 30000);
             }

static/js/transfer.js

@@ -246,13 +246,6 @@ $("#btn_transfer").click(function() {
         // We copy the arrays to ensure that transactions are well-processed even if the form is reset
         [...sources_notes_display].forEach(function (source) {
             [...dests_notes_display].forEach(function (dest) {
-                if (source.note.id === dest.note.id) {
-                    addMsg("Attention : la transaction de " + pretty_money(amount) + " de la note " + source.name
-                        + " vers la note " + dest.name + " n'a pas été faite car il s'agit de la même note au départ" +
-                        " et à l'arrivée.","warning", 10000);
-                    return;
-                }
-
                 $.post("/api/note/transaction/transaction/",
                     {
                         "csrfmiddlewaretoken": CSRF_TOKEN,
@@ -267,10 +260,10 @@ $("#btn_transfer").click(function() {
                         "destination": dest.note.id,
                         "destination_alias": dest.name
                     }).done(function () {
-                        if (source.note.membership && source.note.membership.date_end < new Date().toISOString())
+                        if (source.note.membership && source.note.membership.date_end > new Date().toISOString())
                             addMsg("Attention : la note émettrice " + source.name + " n'est plus adhérente.",
                                 "danger", 30000);
-                        if (dest.note.membership && dest.note.membership.date_end < new Date().toISOString())
+                        if (dest.note.membership && dest.note.membership.date_end > new Date().toISOString())
                             addMsg("Attention : la note destination " + dest.name + " n'est plus adhérente.",
                                 "danger", 30000);
 
@@ -380,7 +373,7 @@ $("#btn_transfer").click(function() {
                 "bank": $("#bank").val()
             }).done(function () {
                 addMsg("Le crédit/retrait a bien été effectué !", "success", 10000);
-                if (user_note.membership && user_note.membership.date_end < new Date().toISOString())
+                if (user_note.membership && user_note.membership.date_end > new Date().toISOString())
                     addMsg("Attention : la note " + alias +  " n'est plus adhérente.", "danger", 10000);
                 reset();
             }).fail(function (err) {

uwsgi_note.ini

@@ -22,7 +22,5 @@ socket          = /var/www/note_kfet/note_kfet.sock
 chmod-socket    = 664
 # clear environment on exit
 vacuum          = true
-# Touch reload
+#Touch reload
-touch-reload    = /var/www/note_kfet/note_kfet/settings/__init__.py
+touch-reload = /var/www/note_kfet/note_kfet/settings/__init__.py
-# Enable threads
-enable-threads  = true