From bcdd84c0f53ad0f6e262d8c2d45502f4229e04b3 Mon Sep 17 00:00:00 2001
From: salazard <hamzatouizrat@yahoo.com>
Date: Sun, 21 Aug 2022 22:47:53 +0200
Subject: [PATCH] add acceptation field to sortie view in admin UI
---
profiles/migrations/0017_student_qpv.py | 18 ++++++++++++++++++
users/migrations/0004_user_qpv.py | 18 ++++++++++++++++++
users/migrations/0005_remove_user_qpv.py | 17 +++++++++++++++++
visits/admin.py | 8 +++++---
visits/migrations/0005_auto_20220816_2353.py | 18 ++++++++++++++++++
5 files changed, 76 insertions(+), 3 deletions(-)
create mode 100644 profiles/migrations/0017_student_qpv.py
create mode 100644 users/migrations/0004_user_qpv.py
create mode 100644 users/migrations/0005_remove_user_qpv.py
create mode 100644 visits/migrations/0005_auto_20220816_2353.py
diff --git a/profiles/migrations/0017_student_qpv.py b/profiles/migrations/0017_student_qpv.py
new file mode 100644
index 0000000..b600bc1
--- /dev/null
+++ b/profiles/migrations/0017_student_qpv.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2 on 2022-08-16 22:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('profiles', '0016_auto_20211225_1242'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='student',
+ name='qpv',
+ field=models.BooleanField(blank=True, null=True),
+ ),
+ ]
diff --git a/users/migrations/0004_user_qpv.py b/users/migrations/0004_user_qpv.py
new file mode 100644
index 0000000..7cbd683
--- /dev/null
+++ b/users/migrations/0004_user_qpv.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2 on 2022-08-16 21:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('users', '0003_user_phone_number'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='user',
+ name='qpv',
+ field=models.BooleanField(blank=True, null=True),
+ ),
+ ]
diff --git a/users/migrations/0005_remove_user_qpv.py b/users/migrations/0005_remove_user_qpv.py
new file mode 100644
index 0000000..0343ac9
--- /dev/null
+++ b/users/migrations/0005_remove_user_qpv.py
@@ -0,0 +1,17 @@
+# Generated by Django 2.2 on 2022-08-16 21:59
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('users', '0004_user_qpv'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='user',
+ name='qpv',
+ ),
+ ]
diff --git a/visits/admin.py b/visits/admin.py
index 28072cc..4bd2a6d 100644
--- a/visits/admin.py
+++ b/visits/admin.py
@@ -102,7 +102,7 @@ class ParticipationInline(admin.TabularInline):
actions = ["export_as_csv"]
model = Visit.participants.through
extra = 0
- fields = ('name', 'school', 'user', 'submitted', 'present')
+ fields = ('name', 'school', 'user', 'submitted', 'accepted', 'present')
readonly_fields = ('name', 'school', 'user', 'submitted')
def school(self, participation: Participation):
@@ -143,16 +143,17 @@ 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} rejetée{s} avec succès.') # rejeté place accepté
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.accepted = 2 # in wait
obj.save()
count = queryset.count()
s = pluralize(count)
@@ -163,6 +164,7 @@ def wait_selected_participations(modeladmin, request, queryset):
wait_selected_participations.short_description = (
'Mettre en attentes les participations sélectionnées')
+
def wait_selected_participations(modeladmin, request, queryset):
"""Reject selected participations in list view."""
for obj in queryset:
diff --git a/visits/migrations/0005_auto_20220816_2353.py b/visits/migrations/0005_auto_20220816_2353.py
new file mode 100644
index 0000000..6166078
--- /dev/null
+++ b/visits/migrations/0005_auto_20220816_2353.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2 on 2022-08-16 21:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('visits', '0004_auto_20211225_1242'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='participation',
+ name='accepted',
+ field=models.IntegerField(choices=[(0, 'refusé'), (1, 'accepté'), (2, 'en attente'), (3, 'inconnue')], default=3, help_text='Cocher pour confirmer au tutoré sa participation à la sortie.'),
+ ),
+ ]
--
GitLab