use script.date_added

diff --git a/teleforma/exam/views.py b/teleforma/exam/views.py
index 388bf313d08c2291feaa1a3b6dae088419eb8cca..7a57655a478164d655cc085e550f19a329b94ce3 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).order_by('date_submitted')
+        return Script.objects.filter(QT).order_by('date_added')
 
     def get_queryset(self):
         user = self.request.user
@@ -354,7 +354,7 @@ class ScriptsView(ScriptsListMixinView, ListView):
             base_qs = base_qs.filter(QT)
 
         # if self.get_profile() == STUDENT:
-        base_qs = base_qs.order_by('date_submitted')
+        base_qs = base_qs.order_by('date_added')
         return base_qs
 
     @method_decorator(access_required)
@@ -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)).order_by('date_submitted')
+            qs = qs.filter(~Q(status=2) | Q(author=user)).order_by('date_added')
 
         return qs
 

diff --git a/teleforma/management/commands/teleforma-publish-notify-conferences.py b/teleforma/management/commands/teleforma-publish-notify-conferences.py
index 5a25003ddb87ca64f7e3deeba8bda29efdd651f3..58159764b280bbd1fcb5bda1671d60f361d7ddd8 100644 (file)
--- a/teleforma/management/commands/teleforma-publish-notify-conferences.py
+++ b/teleforma/management/commands/teleforma-publish-notify-conferences.py
@@ -78,6 +78,7 @@ class Command(BaseCommand):
                         period=period,
                         status=2,
                         notified=False,
+                        streaming=False,
                         date_publish__lte=now_plus,
                         date_publish__gte=now_minus,
                         )) + list(ConferencePublication.objects.filter(
@@ -87,7 +88,6 @@ class Command(BaseCommand):
                         date_publish__lte=now_plus,
                         date_publish__gte=now_minus,
                         ))
-        print(publications)
     
         logger.logger.info("Starting conference publication process")
 
@@ -102,6 +102,9 @@ class Command(BaseCommand):
 
             if medias:
                 publication.status = 3
+                publication.save()
+
+                logger.logger.info("Conference published: " + conference.public_id)
 
                 for media in medias:
                     media.is_published = True
@@ -109,9 +112,6 @@ class Command(BaseCommand):
                     if "video/mp4" in media.mime_type:
                         linked_media = media
 
-                publication.save()
-                logger.logger.info("Conference published: " + conference.public_id)
-
                 # media = conference.media.filter(mime_type='video/mp4')[0]
                 url = reverse('teleforma-media-detail', args=[publication.period.id, linked_media.id])
 
@@ -123,6 +123,7 @@ class Command(BaseCommand):
                 else:
                     elm = [conference.course.title,
                         conference.course_type.name, conference.session]
+
                 message = "Nouvelle conférence publiée : " + ' - '.join(elm)
 
                 students = Student.objects.filter(period=publication.period)
@@ -135,10 +136,8 @@ class Command(BaseCommand):
                                         conference.course_type in course['types']:
                                     notify(student.user, message, url)
                                     logger.logger.info("Student notified: " + student.user.username)
-                                    print("notify", student)
                     except:
-                        #logger.logger.info("Student NOT notified: " + str(student.id))
-                        print("can't notify", student)
+                        logger.logger.info("Student NOT notified: " + str(student.id))
                         continue
 
                 for user in User.objects.filter(is_staff=True):