From 07e69061c5ceeb570e129b0de44cc56d585e3c1c Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <yomguy@parisson.com>
Date: Sat, 25 Jul 2015 00:35:16 +0200
Subject: [PATCH] add script counter

---
 teleforma/exam/templates/exam/scores.html |  2 ++
 teleforma/exam/views.py                   | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/teleforma/exam/templates/exam/scores.html b/teleforma/exam/templates/exam/scores.html
index d11a39d2..bb7b1700 100644
--- 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 de320f54..7a597bf7 100644
--- 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
-- 
2.39.5