better script order

diff --git a/teleforma/exam/views.py b/teleforma/exam/views.py
index b68b88e9d0371097fcfabd11c97278d17972952e..388bf313d08c2291feaa1a3b6dae088419eb8cca 100755 (executable)
--- 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 10af2d154cb15b62f517e8158f19c579ecc53201..b42aa5821198efb108d73fb27b71b08e1451cd18 100644 (file)
--- 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"""