From 493b42c4574b0ce266dca85fd618bb3269b94714 Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Sat, 16 Nov 2024 22:06:28 +0100
Subject: [PATCH] =?UTF-8?q?Ajout=20d'un=20m=C3=A9canisme=20de=20mod=C3=A9r?=
 =?UTF-8?q?ation=20en=20cha=C3=AEne?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/agenda_culturel/forms.py                  |  1 -
 .../agenda_culturel/administration.html       |  6 +-
 .../agenda_culturel/event_form_moderate.html  | 28 +++----
 .../event_next_error_message.html             | 40 ++++++++++
 .../templates/agenda_culturel/recent.html     |  4 +
 .../templates/agenda_culturel/side-nav.html   |  3 +-
 src/agenda_culturel/urls.py                   |  3 +
 src/agenda_culturel/views.py                  | 75 ++++++++++++++++++-
 8 files changed, 138 insertions(+), 22 deletions(-)
 create mode 100644 src/agenda_culturel/templates/agenda_culturel/event_next_error_message.html

diff --git a/src/agenda_culturel/forms.py b/src/agenda_culturel/forms.py
index 033c28a..52f57af 100644
--- a/src/agenda_culturel/forms.py
+++ b/src/agenda_culturel/forms.py
@@ -233,7 +233,6 @@ class EventModerateForm(ModelForm):
         self.cleaned_data['tags'] = list(set(self.cleaned_data['tags']))
 
 
-
 class BatchImportationForm(Form):
     json = CharField(
         label="JSON",
diff --git a/src/agenda_culturel/templates/agenda_culturel/administration.html b/src/agenda_culturel/templates/agenda_culturel/administration.html
index 3899d9a..dbf94dd 100644
--- a/src/agenda_culturel/templates/agenda_culturel/administration.html
+++ b/src/agenda_culturel/templates/agenda_culturel/administration.html
@@ -18,8 +18,12 @@
 <div class="grid two-columns">
     <div id="contenu-principal">
 
-        <article>
+        <article>    
             <header>
+                <div class="slide-buttons">
+                    <a href="{% url 'moderate' %}" role="button">Modérer {% picto_from_name "check-square" %}</a>
+                </div>
+
                 <h2>Activité des derniers jours</h2>
             </header>
             <h3>Résumé des activités</h3>
diff --git a/src/agenda_culturel/templates/agenda_culturel/event_form_moderate.html b/src/agenda_culturel/templates/agenda_culturel/event_form_moderate.html
index b7ca914..af93f99 100644
--- a/src/agenda_culturel/templates/agenda_culturel/event_form_moderate.html
+++ b/src/agenda_culturel/templates/agenda_culturel/event_form_moderate.html
@@ -1,5 +1,7 @@
 {% extends "agenda_culturel/page.html" %}
 {% load static %}
+{% load utils_extra %}
+{% load cat_extra %}
 
 
 {% block title %}{% block og_title %}Modération de l'événement {{ object.title }}{% endblock %}{% endblock %}
@@ -9,22 +11,7 @@
 
 {% block entete_header %}
 <script src="{% static 'choicejs/choices.min.js' %}"></script>
-
-<script src="{% url 'jsi18n' %}"></script>
-<script src="/static/admin/js/vendor/jquery/jquery.js"></script>
-<script src="/static/admin/js/jquery.init.js"></script>
-<script src="/static/admin/js/admin/DateTimeShortcuts.js"></script>
-<script src="{% static 'recurrence/js/recurrence.js' %}"></script>
-<script src="{% static 'recurrence/js/recurrence.js' %}"></script>
-<script src="/static/admin/js/admin/RelatedObjectLookups.js"></script>
-
-
-<script>window.CKEDITOR_BASEPATH = '/static/ckeditor/ckeditor/';</script>
-<script src="/static/admin/js/vendor/jquery/jquery.js"></script>
-<script src="/static/admin/js/jquery.init.js"></script>
-<link href="{% static 'css/django_better_admin_arrayfield.min.css' %}" type="text/css" media="all" rel="stylesheet">
-<script src="{% static 'js/django_better_admin_arrayfield.min.js' %}"></script>
-<script src="{% static 'js/adjust_datetimes.js' %}"></script>
+    {% css_categories %}
 {% endblock %}
 
 
@@ -61,8 +48,13 @@
         </article>
     </div>
 <div class="grid buttons">
-    <a href="{% if request.META.HTTP_REFERER %}{{ request.META.HTTP_REFERER }}{% else %}{{ object.get_absolute_url }}{% endif %}" role="button" class="secondary">Annuler</a>
-    <input type="submit" value="Enregistrer">
+    {% if pred %}
+    <a href="{% url 'moderate_event' pred %}" role="button">🠄 Revenir au précédent</a>
+    {% else %}
+        <a href="{% if request.META.HTTP_REFERER %}{{ request.META.HTTP_REFERER }}{% else %}{{ object.get_absolute_url }}{% endif %}" role="button" class="secondary">Annuler</a>
+    {% endif %}
+    <input type="submit" value="Enregistrer" name="save">
+    <input type="submit" value="Enregistrer et passer au suivant 🠆" name="save_and_next">
 </div>
 </form>
 </article>
diff --git a/src/agenda_culturel/templates/agenda_culturel/event_next_error_message.html b/src/agenda_culturel/templates/agenda_culturel/event_next_error_message.html
new file mode 100644
index 0000000..7555a7c
--- /dev/null
+++ b/src/agenda_culturel/templates/agenda_culturel/event_next_error_message.html
@@ -0,0 +1,40 @@
+{% extends "agenda_culturel/page.html" %}
+
+{% load utils_extra %}
+{% load static %}
+
+{% block title %}{% block og_title %}Erreur pendant la recherche d'événement suivant{% endblock %}{% endblock %}
+
+
+{% block entete_header %}
+    <script src="{% static 'js/modal.js' %}"></script>
+{% endblock %}
+
+{% block fluid %}{% endblock %}
+
+
+{% block content %}
+
+<article>
+    <header>
+        <h1>Erreur pendant la recherche d'événement suivant</h1>
+    </header>
+    {% if object %}
+    <p>Nous n'avons pas été capable de trouver un événement à modérer après 
+        l'événement <a href="{{ object.get_absolute_url }}">{{ object.title }}</a>. Peut-être est-ce le dernier événement
+        avant la fin du monde&nbsp;?
+    </p>
+    {% else %}
+    <p>Nous n'avons pas été capable de trouver l'événement #{{ pk }} sur l'agenda.
+        Il a certainement été supprimé depuis que vous l'avez consulté.
+    </p>
+    {% endif %}
+
+    <footer>
+        <div class="grid buttons">
+            <a href="{% url 'recent' %}" role="button">Retour aux événements récents</a>
+        </div>
+    </footer>
+
+</article>
+{% endblock %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/recent.html b/src/agenda_culturel/templates/agenda_culturel/recent.html
index 1afbd6f..fe0001a 100644
--- a/src/agenda_culturel/templates/agenda_culturel/recent.html
+++ b/src/agenda_culturel/templates/agenda_culturel/recent.html
@@ -18,6 +18,10 @@
 <div class="grid two-columns">
 <article id="contenu-principal">
     <header>
+        <div class="slide-buttons">
+            <a href="{% url 'moderate' %}" role="button">Modérer {% picto_from_name "check-square" %}</a>
+        </div>
+
         <h1>Derniers événements soumis</h1>
 
         <form method="get" class="form django-form recent moderation-events">
diff --git a/src/agenda_culturel/templates/agenda_culturel/side-nav.html b/src/agenda_culturel/templates/agenda_culturel/side-nav.html
index 5aa738e..7ad680a 100644
--- a/src/agenda_culturel/templates/agenda_culturel/side-nav.html
+++ b/src/agenda_culturel/templates/agenda_culturel/side-nav.html
@@ -1,10 +1,11 @@
 {% load event_extra %}
 {% load contactmessages_extra %}
 {% load duplicated_extra %}
+{% load utils_extra %}
 <aside id="sidebar">
     <article>
         <header>
-        <h2>Administrer</h2>
+        <h2>Administration</h2>
         </header>
         <nav>
             <ul>
diff --git a/src/agenda_culturel/urls.py b/src/agenda_culturel/urls.py
index 557849f..5301742 100644
--- a/src/agenda_culturel/urls.py
+++ b/src/agenda_culturel/urls.py
@@ -33,6 +33,9 @@ urlpatterns = [
     ),
     path("event/<int:pk>/edit", EventUpdateView.as_view(), name="edit_event"),
     path("event/<int:pk>/moderate", EventModerateView.as_view(), name="moderate_event"),
+    path("event/<int:pk>/moderate-next", EventModerateView.as_view(), name="moderate_event_next"),
+    path("event/<int:pk>/moderate-next/error", error_next_event, name="error_next_event"),
+    path("moderate", EventModerateView.as_view(), name="moderate"),
     path("event/<int:pk>/clone/edit", EventUpdateView.as_view(), name="clone_edit"),
     path("event/<int:pk>/update-from-source", update_from_source, name="update_from_source"),
     path(
diff --git a/src/agenda_culturel/views.py b/src/agenda_culturel/views.py
index 3362229..de732e3 100644
--- a/src/agenda_culturel/views.py
+++ b/src/agenda_culturel/views.py
@@ -7,6 +7,7 @@ from django.contrib.auth.mixins import (
     PermissionRequiredMixin,
 )
 from django import forms
+from django.http import Http404
 from django.contrib.postgres.search import SearchQuery, SearchHeadline
 from django.utils.safestring import mark_safe
 
@@ -343,12 +344,84 @@ class EventModerateView(
     form_class = EventModerateForm
     success_message = _("The event has been successfully moderated.")
 
-    def form_valid(self, form):
+    def is_moderate_next(self):
+        return "moderate-next" in self.request.path.split('/')
+    
+    def is_starting_moderation(self):
+        return not "pk" in self.kwargs
+
+    def get_next_event(self, start_day, start_time):
+        # select non moderated events
+        qs = Event.objects.filter(moderated_date__isnull=True)
+
+        # select events after the current one
+        if start_time:
+            qs = qs.filter(Q(start_day__gt=start_day)|(Q(start_day=start_day) & (Q(start_time__isnull=True)|Q(start_time__gte=start_time))))
+        else:
+            qs = qs.filter(start_day__gte=start_day)
+
+        # get only possibly representative events
+        qs = qs.filter(
+            Q(other_versions__isnull=True) |
+            Q(other_versions__representative=F('pk')) |
+            Q(other_versions__representative__isnull=True))
+
+        # remove trash events
+        qs = qs.filter(~Q(status=Event.STATUS.TRASH))
+    
+        # sort by datetime
+        qs = qs.order_by("start_day", "start_time")
         
+        return qs.first()
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        if self.is_moderate_next():
+            context['pred'] = self.kwargs["pk"]
+        return context
+
+    def get_object(self, queryset=None):
+        if self.is_starting_moderation():
+            now = datetime.now()
+            return self.get_next_event(now.date(), now.time())
+        else:
+            result = super().get_object(queryset)
+            if self.is_moderate_next():
+                return self.get_next_event(result.start_day, result.start_time)
+            else:
+                return result
+
+    def post(self, request, *args, **kwargs):
+        try:
+            return super().post(request, args, kwargs)
+        except Http404:
+            return HttpResponseRedirect(reverse_lazy("error_next_event", args=[self.object.pk]))
+
+
+    def form_valid(self, form):        
         form.instance.set_no_modification_date_changed()
         form.instance.set_in_moderation_process()
         return super().form_valid(form)
 
+    def get_success_url(self):
+        if 'save_and_next' in self.request.POST:
+            return reverse_lazy("moderate_event_next", args=[self.object.pk])
+        else:
+            return self.object.get_absolute_url()
+
+
+@login_required(login_url="/accounts/login/")
+@permission_required("agenda_culturel.change_event")
+def error_next_event(request, pk):
+    
+    obj = Event.objects.filter(pk=pk).first()
+
+    return render(
+            request,
+            "agenda_culturel/event_next_error_message.html",
+            {"pk": pk, "object": obj},
+        )
+
 
 
 class EventDeleteView(