]> git.parisson.com Git - teleforma.git/commitdiff
Fix score listing
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Sat, 24 Mar 2018 18:24:26 +0000 (19:24 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Sat, 24 Mar 2018 18:24:26 +0000 (19:24 +0100)
teleforma/exam/views.py

index e8934605be6c3206f368efa9c2345bde8754104d..47c7ce6fb13f043478c9946cd5b68dc7b8290c35 100644 (file)
@@ -241,9 +241,13 @@ class ScriptsScoreAllView(ScriptsTreatedView):
 
     def get_context_data(self, **kwargs):
         context = super(ScriptsScoreAllView, self).get_context_data(**kwargs)
+        user = self.request.user
 
-        if self.request.user.is_staff or self.request.user.professor.all():
-            scripts = Script.objects.filter(period=self.period, date_added__gte=self.period.date_begin).exclude(score=None)
+        if self.request.user.is_staff:
+            QT = Q(status=4, period=period)
+            QT = Q(status=5, period=period) | QT
+            QT = Q(date_added__gte=self.period.date_begin) | QT
+            scripts = Script.objects.filter(QT).exclude(score=None)
         else:
             scripts = self.get_queryset()