add script counter

diff --git a/teleforma/exam/templates/exam/scores.html b/teleforma/exam/templates/exam/scores.html
index d11a39d2acc80634b9e179bf5bab60c007efd7b8..bb7b17001134c7fae012676d61cfff66969630d4 100644 (file)
--- a/teleforma/exam/templates/exam/scores.html
+++ b/teleforma/exam/templates/exam/scores.html
@@ -9,7 +9,9 @@
 <link media="all" href="{{ STATIC_URL }}teleforma/lib/nvd3/build/nv.d3.min.css" rel="stylesheet">
 <script src="{{ STATIC_URL }}teleforma/lib/d3/d3.min.js"></script>
 <script src="{{ STATIC_URL }}teleforma/lib/nvd3/build/nv.d3.min.js"></script>
+
 {% load_chart data.charttype data.chartdata data.chartcontainer data.extra %}
+
 {% endblock extra_javascript %}
 
 

diff --git a/teleforma/exam/views.py b/teleforma/exam/views.py
index de320f54b07d9ed0a216b31de373d62d0ebac0ca..7a597bf76ae8f67d68f9dc858967e297af8e5fd6 100644 (file)
--- a/teleforma/exam/views.py
+++ b/teleforma/exam/views.py
@@ -250,20 +250,24 @@ class ScriptsScoreAllView(ScriptsTreatedView):
             data = []
             for session in sessions:
                 data.append(np.mean([float(script.score) for script in scripts.filter(session=session)]))
-            scores.append({'name': 'Moyenne personnelle', 'data': data})
+            scores.append({'name': 'Moyenne personnelle' + ' (' + str(len(sessions)) + ')', 'data': data})
 
         data = []
+        counter = 0
         for session in sessions:
             scripts = Script.objects.filter(session=session, period=period).exclude(score=None)
+            counter += scripts.count()
             data.append(np.mean([s.score for s in scripts]))
-        scores.append({'name': 'Moyenne generale', 'data': data})
+        scores.append({'name': 'Moyenne generale'  + ' (' + str(counter) + ')', 'data': data})
 
         for script_type in ScriptType.objects.all():
             data = []
+            counter = 0
             for session in sessions:
                 scripts = Script.objects.filter(session=session, period=period, type=script_type).exclude(score=None)
                 data.append(np.mean([s.score for s in scripts]))
-            scores.append({'name': 'Moyenne ' + script_type.name, 'data': data})
+                counter += scripts.count()
+            scores.append({'name': 'Moyenne ' + script_type.name + ' (' + str(counter) + ')', 'data': data})
 
         context['data'] = self.score_data_setup(sessions_x, scores)
         context['course'] = ugettext('all courses')
@@ -298,17 +302,21 @@ class ScriptsScoreCourseView(ScriptsScoreAllView):
             scores.append({'name':'Note personnelle' , 'data': data})
 
         data = []
+        counter = 0
         for session in sessions:
             scripts = Script.objects.filter(session=session, course=course, period=period).exclude(score=None)
+            counter += scripts.count()
             data.append(np.mean([s.score for s in scripts]))
-        scores.append({'name':'Moyenne generale', 'data': data})
+        scores.append({'name':'Moyenne generale' + ' (' + str(counter) + ')', 'data': data})
 
         for script_type in ScriptType.objects.all():
             data = []
+            counter = 0
             for session in sessions:
                 scripts = Script.objects.filter(session=session, type=script_type, course=course, period=period).exclude(score=None)
+                counter += scripts.count()
                 data.append(np.mean([s.score for s in scripts]))
-            scores.append({'name': 'Moyenne ' + script_type.name, 'data': data})
+            scores.append({'name': 'Moyenne ' + script_type.name + ' (' + str(counter) + ')', 'data': data})
 
         context['data'] = self.score_data_setup(sessions_x, scores)
         context['course'] = course.title