From eaaa620b6bf51278049a49fc3d666b4403eca275 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Sun, 19 Jul 2026 10:56:19 +0200 Subject: [PATCH] better script order --- teleforma/exam/views.py | 4 ++-- teleforma/models/notification.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/teleforma/exam/views.py b/teleforma/exam/views.py index b68b88e9..388bf313 100755 --- a/teleforma/exam/views.py +++ b/teleforma/exam/views.py @@ -336,7 +336,7 @@ class ScriptsView(ScriptsListMixinView, ListView): QT = self.get_form_queryset() & Q(period_id=self.kwargs['period_id']) if self.status_filter: QT &= Q(status__in=self.status_filter) - return Script.objects.filter(QT) + return Script.objects.filter(QT).order_by('date_submitted') def get_queryset(self): user = self.request.user @@ -372,7 +372,7 @@ class ScriptsPendingView(ScriptsView): if self.request.GET.get('corrector') is None: user = self.request.user # Exclude status=2 but not author=user - qs = qs.filter(~Q(status=2) | Q(author=user)) + qs = qs.filter(~Q(status=2) | Q(author=user)).order_by('date_submitted') return qs diff --git a/teleforma/models/notification.py b/teleforma/models/notification.py index 10af2d15..b42aa582 100644 --- a/teleforma/models/notification.py +++ b/teleforma/models/notification.py @@ -10,9 +10,11 @@ from channels.layers import get_channel_layer from asgiref.sync import async_to_sync from django.db.models.signals import post_save + def in_one_week(): return datetime.now(timezone.utc) + timedelta(days=7) + def notify(users, message, url, days_before_expiration=None): """ Notify users with message / url @@ -25,6 +27,7 @@ def notify(users, message, url, days_before_expiration=None): notif.expired = datetime.now(timezone.utc) + timedelta(days=days_before_expiration) notif.save() + class Notification(models.Model): """A notification message""" -- 2.47.3