From b694f6dc8d39578abe089b102a320bc402931a12 Mon Sep 17 00:00:00 2001
From: Hamzux <hamza.touizrat@studebt-cs.fr>
Date: Sun, 10 Apr 2022 16:32:29 +0200
Subject: [PATCH] Revert "Hamza (#52)"
This reverts commit 7d30d0f850840be40f55eb977dbcb36e1688a443.
---
.../migrations/0016_auto_20211225_1242.py | 18 ---------------
visits/admin.py | 22 +++++--------------
visits/migrations/0003_auto_20211225_1242.py | 18 ---------------
visits/models.py | 11 +++-------
visits/notifications.py | 21 ------------------
visits/signals.py | 6 +----
.../templates/visits/confirm_participation.md | 5 -----
.../visits/confirm_participation_wait.md | 22 -------------------
8 files changed, 9 insertions(+), 114 deletions(-)
delete mode 100644 profiles/migrations/0016_auto_20211225_1242.py
delete mode 100644 visits/migrations/0003_auto_20211225_1242.py
delete mode 100644 visits/templates/visits/confirm_participation_wait.md
diff --git a/profiles/migrations/0016_auto_20211225_1242.py b/profiles/migrations/0016_auto_20211225_1242.py
deleted file mode 100644
index 5a74061..0000000
--- a/profiles/migrations/0016_auto_20211225_1242.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2 on 2021-12-25 11:42
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('profiles', '0015_student_updated_date'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='tutor',
- name='promotion',
- field=models.IntegerField(choices=[(2024, '2024'), (2023, '2023'), (2022, '2022'), (2021, '2021'), (2020, '2020')], default=2024),
- ),
- ]
diff --git a/visits/admin.py b/visits/admin.py
index 3e2376a..99427d6 100644
--- a/visits/admin.py
+++ b/visits/admin.py
@@ -63,6 +63,7 @@ class RegistrationsOpenFilter(admin.SimpleListFilter):
class VisitForm(forms.ModelForm):
"""Custom admin form for Visit."""
+
class Meta: # noqa
model = Visit
fields = '__all__'
@@ -106,18 +107,18 @@ class ParticipationInline(admin.TabularInline):
def school(self, participation: Participation):
"""Return a link to the participation's user's school."""
- school = Student.objects.get(user=participation.user).school
+ school = Student.objects.get(user = participation.user).school
return school
school.short_description = "Établissement"
+
def name(self, participation: Participation):
"""Returns the participation's user's name"""
return participation.user.first_name + " " + participation.user.last_name
name.short_description = "Nom"
class Media:
- css = {"all": ("css/hide_admin_original.css",)}
-
+ css = { "all" : ("css/hide_admin_original.css",) }
def accept_selected_participations(modeladmin, request, queryset):
"""Accept selected participations in list view."""
@@ -142,25 +143,12 @@ def reject_selected_participations(modeladmin, request, queryset):
count = queryset.count()
s = pluralize(count)
messages.add_message(request, messages.SUCCESS,
- f'{count} participation{s} rejetée{s} avec succès.') ## rejeté place accepté
+ f'{count} participation{s} acceptée{s} avec succès.')
reject_selected_participations.short_description = (
'Rejeter les participations sélectionnées')
-def wait_selected_participations(modeladmin, request, queryset):
- """Reject selected participations in list view."""
- for obj in queryset:
- obj.accepted = 2 #in wait
- obj.save()
- count = queryset.count()
- s = pluralize(count)
- messages.add_message(request, messages.SUCCESS,
- f'{count} participation{s} en attente{s} avec succès.')
-
-
-wait_selected_participations.short_description = (
- 'Mettre en attentes les participations sélectionnées')
@admin.register(Participation)
class ParticipationAdmin(admin.ModelAdmin):
diff --git a/visits/migrations/0003_auto_20211225_1242.py b/visits/migrations/0003_auto_20211225_1242.py
deleted file mode 100644
index bacb64c..0000000
--- a/visits/migrations/0003_auto_20211225_1242.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 2.2 on 2021-12-25 11:42
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('visits', '0002_visit_context_sheet'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='participation',
- name='accepted',
- field=models.IntegerField(choices=[(0, 'refusé'), (1, 'accepté'), (2, 'en attente')], default=0, help_text='Cocher pour confirmer au tutoré sa participation à la sortie.'),
- ),
- ]
diff --git a/visits/models.py b/visits/models.py
index 65fb58b..7c5a8f8 100644
--- a/visits/models.py
+++ b/visits/models.py
@@ -42,11 +42,7 @@ class Participation(models.Model):
Allows to store whether the user was present to the visit,
and whether their files were validated.
"""
- STATUS_CHOICES = (
- ( 0 , 'refusé' ),
- ( 1 , 'accepté' ),
- ( 2 , 'en attente' ),
- )
+
user = models.ForeignKey('users.User', verbose_name='utilisateur',
related_name='participations',
on_delete=models.CASCADE, null=True)
@@ -57,9 +53,8 @@ class Participation(models.Model):
auto_now_add=True, null=True,
verbose_name='soumis le',
help_text='Date de soumission de la participation')
- accepted = models.IntegerField(
- default=0,
- choices=STATUS_CHOICES,
+ accepted = models.NullBooleanField(
+ 'accepté',
help_text=(
"Cocher pour confirmer au tutoré sa participation à la sortie."))
present = models.NullBooleanField(
diff --git a/visits/notifications.py b/visits/notifications.py
index 13e25da..da91e74 100644
--- a/visits/notifications.py
+++ b/visits/notifications.py
@@ -32,28 +32,7 @@ class ConfirmParticipation(Notification):
template_name = 'visits/confirm_participation.md'
args = ('participation',)
-
- def get_subject(self):
- return f'Participation à la sortie : {self.participation.visit}'
-
- def get_recipients(self):
- return [self.participation.user.email]
-
- @classmethod
- def example(cls):
- user = User(email='john.doe@example.com', first_name='John')
- visit = Visit(title='Visite du Palais de la Découverte', date=now())
- participation = Participation(
- user=user, visit=visit, accepted=True, submitted=now())
- return cls(participation=participation)
-
-
-class ConfirmParticipationWait(Notification):
- """ConfirmParticipation whether a user can participate to a visit."""
- template_name = 'visits/confirm_participation_wait.md'
- args = ('participation',)
-
def get_subject(self):
return f'Participation à la sortie : {self.participation.visit}'
diff --git a/visits/signals.py b/visits/signals.py
index 49653be..3527e3f 100644
--- a/visits/signals.py
+++ b/visits/signals.py
@@ -5,7 +5,6 @@ from django.dispatch import Signal, receiver
from .models import Participation
from .notifications import ConfirmParticipation
-from .notifications import ConfirmParticipationWait
accepted_changed = Signal()
@@ -25,7 +24,4 @@ def notify_participation(sender, instance: Participation, **kwargs):
"""
if instance.accepted is None:
return
- if instance.accepted == 2 :
- ConfirmParticipationWait(participation=instance).send()
- else :
- ConfirmParticipation(participation=instance).send()
+ ConfirmParticipation(participation=instance).send()
diff --git a/visits/templates/visits/confirm_participation.md b/visits/templates/visits/confirm_participation.md
index 60ad2fd..0146635 100644
--- a/visits/templates/visits/confirm_participation.md
+++ b/visits/templates/visits/confirm_participation.md
@@ -7,11 +7,7 @@ Bonjour{% if participation.user.first_name %} {{ participation.user.first_name }
{% block body %}
{% if participation.submitted %}Le {{ participation.submitted|date }}, tu{% else %}Tu{% endif%} as demandé à t'inscrire à la sortie **{{ participation.visit }}** organisée le **{{ participation.visit.date|date }}**.
-
-
{% if participation.accepted %}
-
-
Bonne nouvelle : nous avons validé ta participation à la sortie. ✅
Avant la sortie, tu pourras, en te rendant sur [l'espace sorties]({{ participation.visit.get_site_url }}) :
@@ -20,7 +16,6 @@ Avant la sortie, tu pourras, en te rendant sur [l'espace sorties]({{ participati
- Télécharger la fiche sortie ;
- Télécharger l'autorisation de sortie, à faire remplir par tes parents.
-
{% else %}
Malheureusement, en raison du nombre de places limité, tu ne pourras pas participer à cette sortie. 😔
diff --git a/visits/templates/visits/confirm_participation_wait.md b/visits/templates/visits/confirm_participation_wait.md
deleted file mode 100644
index 6d704cc..0000000
--- a/visits/templates/visits/confirm_participation_wait.md
+++ /dev/null
@@ -1,22 +0,0 @@
-{% extends 'mails/notification.md' %}
-
-{% block greeting %}
-Bonjour{% if participation.user.first_name %} {{ participation.user.first_name }}{% endif %},
-{% endblock %}
-
-{% block body %}
-{% if participation.submitted %}Le {{ participation.submitted|date }}, tu{% else %}Tu{% endif%} as demandé à t'inscrire à la sortie **{{ participation.visit }}** organisée le **{{ participation.visit.date|date }}**.
-
-
-Malheureusement, en raison du nombre de places limité, tu es sur liste d'attente pour participer à cette sortie. 😔
-
-Nous te recontacterons si des places se libèrent suite à des désistements.
-
-{% endblock %}
-
-{% block signature %}
-À très bientôt,
-Les organisateurs
-
-Nous contacter : oser.sortie@gmail.fr
-{% endblock %}
--
GitLab