From 73c068055b8a7adbcfa28a6bcb7532b0c287ec14 Mon Sep 17 00:00:00 2001 From: Alseidon Date: Wed, 9 Dec 2020 21:57:40 +0100 Subject: [PATCH 1/5] =?UTF-8?q?Remise=20=C3=A0=20z=C3=A9ro=20basique=20com?= =?UTF-8?q?ptes=20COF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gestioncof/templates/gestioncof/reset_comptes.html | 5 +++++ gestioncof/urls.py | 3 +++ gestioncof/views.py | 13 +++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 gestioncof/templates/gestioncof/reset_comptes.html diff --git a/gestioncof/templates/gestioncof/reset_comptes.html b/gestioncof/templates/gestioncof/reset_comptes.html new file mode 100644 index 00000000..78d01ae8 --- /dev/null +++ b/gestioncof/templates/gestioncof/reset_comptes.html @@ -0,0 +1,5 @@ +{% extends "base_title.html" %} + +{% block realcontent %} +

Order 66 done

+{% endblock %} \ No newline at end of file diff --git a/gestioncof/urls.py b/gestioncof/urls.py index 14fb101f..a35df9ed 100644 --- a/gestioncof/urls.py +++ b/gestioncof/urls.py @@ -82,6 +82,9 @@ urlpatterns = [ # Misc # ----- path("", views.HomeView.as_view(), name="home"), + + path("reset_comptes/", views.ResetComptes.as_view(), name="reset_comptes"), + path( "user/autocomplete", views.UserAutocompleteView.as_view(), diff --git a/gestioncof/views.py b/gestioncof/views.py index d4b6a5be..7a19875c 100644 --- a/gestioncof/views.py +++ b/gestioncof/views.py @@ -78,6 +78,19 @@ class HomeView(LoginRequiredMixin, TemplateView): context["now"] = timezone.now() return context +class ResetComptes(LoginRequiredMixin, TemplateView): + template_name = "gestioncof/reset_comptes.html" + + def get(self, request): + for profile in CofProfile.objects.all(): + profile.is_cof = False + profile.mailing_cof = False + profile.mailing_bda = False + profile.mailing_bda_revent = False + profile.mailing_unernestaparis = False + profile.save() + return super().get(request) + def login(request): if request.user.is_authenticated: From 319db686558017de9d0373f65b12c7ccd7ed09f2 Mon Sep 17 00:00:00 2001 From: Alseidon Date: Wed, 9 Dec 2020 22:11:21 +0100 Subject: [PATCH 2/5] Ra0 effective --- gestioncof/templates/gestioncof/reset_comptes.html | 6 +++++- gestioncof/views.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gestioncof/templates/gestioncof/reset_comptes.html b/gestioncof/templates/gestioncof/reset_comptes.html index 78d01ae8..370c83f1 100644 --- a/gestioncof/templates/gestioncof/reset_comptes.html +++ b/gestioncof/templates/gestioncof/reset_comptes.html @@ -1,5 +1,9 @@ {% extends "base_title.html" %} {% block realcontent %} -

Order 66 done

+

Remise à zéro des membres COF

+

Voulez-vous vraiment remettre à zéro le statut COF de tous les membres actuels ?

+
+ {% csrf_token %} +
{% endblock %} \ No newline at end of file diff --git a/gestioncof/views.py b/gestioncof/views.py index 7a19875c..ca0833d8 100644 --- a/gestioncof/views.py +++ b/gestioncof/views.py @@ -81,7 +81,7 @@ class HomeView(LoginRequiredMixin, TemplateView): class ResetComptes(LoginRequiredMixin, TemplateView): template_name = "gestioncof/reset_comptes.html" - def get(self, request): + def post(self, request): for profile in CofProfile.objects.all(): profile.is_cof = False profile.mailing_cof = False From ba74779f95e3d4a5ce7e055cd28c5ba0c1ac69e8 Mon Sep 17 00:00:00 2001 From: Alseidon Date: Wed, 9 Dec 2020 22:40:32 +0100 Subject: [PATCH 3/5] =?UTF-8?q?Version=201.0=20remise=20=C3=A0=20z=C3=A9ro?= =?UTF-8?q?=20comptes=20COF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gestioncof/templates/gestioncof/home.html | 1 + .../templates/gestioncof/reset_comptes.html | 4 ++++ gestioncof/views.py | 24 ++++++++++++------- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/gestioncof/templates/gestioncof/home.html b/gestioncof/templates/gestioncof/home.html index e534f687..2ed347ca 100644 --- a/gestioncof/templates/gestioncof/home.html +++ b/gestioncof/templates/gestioncof/home.html @@ -114,6 +114,7 @@ diff --git a/gestioncof/templates/gestioncof/reset_comptes.html b/gestioncof/templates/gestioncof/reset_comptes.html index 370c83f1..97b88998 100644 --- a/gestioncof/templates/gestioncof/reset_comptes.html +++ b/gestioncof/templates/gestioncof/reset_comptes.html @@ -2,8 +2,12 @@ {% block realcontent %}

Remise à zéro des membres COF

+ {% if is_done%} + Order 66 done + {% else%}

Voulez-vous vraiment remettre à zéro le statut COF de tous les membres actuels ?

{% csrf_token %}
+ {% endif %} {% endblock %} \ No newline at end of file diff --git a/gestioncof/views.py b/gestioncof/views.py index ca0833d8..4094a183 100644 --- a/gestioncof/views.py +++ b/gestioncof/views.py @@ -78,18 +78,24 @@ class HomeView(LoginRequiredMixin, TemplateView): context["now"] = timezone.now() return context -class ResetComptes(LoginRequiredMixin, TemplateView): +class ResetComptes(BuroRequiredMixin, TemplateView): template_name = "gestioncof/reset_comptes.html" def post(self, request): - for profile in CofProfile.objects.all(): - profile.is_cof = False - profile.mailing_cof = False - profile.mailing_bda = False - profile.mailing_bda_revent = False - profile.mailing_unernestaparis = False - profile.save() - return super().get(request) + CofProfile.objects.update( + is_cof = False, + mailing_cof=False, + mailing_bda=False, + mailing_bda_revente=False, + mailing_unernestaparis=False) + context = self.get_context_data() + return render(request, self.template_name, context) + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + if self.request.method == 'POST': + context['is_done'] = True + return context def login(request): From c100f2fc8dbe2c2cc48b56cb4086358df8385ca6 Mon Sep 17 00:00:00 2001 From: Alseidon Date: Wed, 9 Dec 2020 23:00:00 +0100 Subject: [PATCH 4/5] =?UTF-8?q?Version=201.1=20remise=20=C3=A0=20z=C3=A9ro?= =?UTF-8?q?=20comptes=20COF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gestioncof/templates/gestioncof/reset_comptes.html | 7 ++++--- gestioncof/views.py | 11 ++++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/gestioncof/templates/gestioncof/reset_comptes.html b/gestioncof/templates/gestioncof/reset_comptes.html index 97b88998..55d54376 100644 --- a/gestioncof/templates/gestioncof/reset_comptes.html +++ b/gestioncof/templates/gestioncof/reset_comptes.html @@ -3,11 +3,12 @@ {% block realcontent %}

Remise à zéro des membres COF

{% if is_done%} - Order 66 done +

{{nb_adherents}} compte{{ nb_adherents|pluralize }} désinscrit{{ nb_adherents|pluralize }} du COF.

{% else%} -

Voulez-vous vraiment remettre à zéro le statut COF de tous les membres actuels ?

+
ATTENTION : Cette action est irréversible.
+

Voulez-vous vraiment remettre à zéro le statut COF de tous les membres actuels ?

- {% csrf_token %} + {% csrf_token %}
{% endif %} {% endblock %} \ No newline at end of file diff --git a/gestioncof/views.py b/gestioncof/views.py index 4094a183..7e3c2cc4 100644 --- a/gestioncof/views.py +++ b/gestioncof/views.py @@ -82,21 +82,18 @@ class ResetComptes(BuroRequiredMixin, TemplateView): template_name = "gestioncof/reset_comptes.html" def post(self, request): + nb_adherents = CofProfile.objects.filter(is_cof=True).count() CofProfile.objects.update( is_cof = False, mailing_cof=False, mailing_bda=False, mailing_bda_revente=False, mailing_unernestaparis=False) - context = self.get_context_data() + context = super().get_context_data() + context['is_done'] = True + context['nb_adherents'] = nb_adherents return render(request, self.template_name, context) - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - if self.request.method == 'POST': - context['is_done'] = True - return context - def login(request): if request.user.is_authenticated: From 44b001bd3c95190b2fca6de2ba04a7d5424c61e7 Mon Sep 17 00:00:00 2001 From: Alseidon Date: Thu, 7 Jan 2021 09:19:56 +0100 Subject: [PATCH 5/5] Satisfy Lord Black --- gestioncof/urls.py | 2 -- gestioncof/views.py | 10 ++++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gestioncof/urls.py b/gestioncof/urls.py index a35df9ed..d0ba75c7 100644 --- a/gestioncof/urls.py +++ b/gestioncof/urls.py @@ -82,9 +82,7 @@ urlpatterns = [ # Misc # ----- path("", views.HomeView.as_view(), name="home"), - path("reset_comptes/", views.ResetComptes.as_view(), name="reset_comptes"), - path( "user/autocomplete", views.UserAutocompleteView.as_view(), diff --git a/gestioncof/views.py b/gestioncof/views.py index 7e3c2cc4..fbe74ec7 100644 --- a/gestioncof/views.py +++ b/gestioncof/views.py @@ -78,20 +78,22 @@ class HomeView(LoginRequiredMixin, TemplateView): context["now"] = timezone.now() return context + class ResetComptes(BuroRequiredMixin, TemplateView): template_name = "gestioncof/reset_comptes.html" def post(self, request): nb_adherents = CofProfile.objects.filter(is_cof=True).count() CofProfile.objects.update( - is_cof = False, + is_cof=False, mailing_cof=False, mailing_bda=False, mailing_bda_revente=False, - mailing_unernestaparis=False) + mailing_unernestaparis=False, + ) context = super().get_context_data() - context['is_done'] = True - context['nb_adherents'] = nb_adherents + context["is_done"] = True + context["nb_adherents"] = nb_adherents return render(request, self.template_name, context)