From 5ecacb0103b64729a49ce3d1e032ec098c1c831d Mon Sep 17 00:00:00 2001
From: JM Van Thong <jm@ne35-four-sixty.mit.edu>
Date: Thu, 29 Nov 2012 12:06:57 -0500
Subject: [PATCH] Implemented 3 analytics to the instructor dashboard:
 StudentsEnrolled, StudentsPerHomework, DailyActivityAnalyzer.

---
 lms/djangoapps/instructor/views.py            | 15 ++++++++--
 .../courseware/instructor_dashboard.html      | 29 ++++++++++++++++---
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/lms/djangoapps/instructor/views.py b/lms/djangoapps/instructor/views.py
index 31faf8acb6..666a5d2025 100644
--- a/lms/djangoapps/instructor/views.py
+++ b/lms/djangoapps/instructor/views.py
@@ -271,12 +271,19 @@ def instructor_dashboard(request, course_id):
     # analytics
 
     analytics_json = None
+    students_enrolled_json = None
+    daily_activity_json = None
 
     if idash_mode == 'Analytics':
-        req = requests.get(settings.ANALYTICS_SERVER_URL + "get_daily_activity?sid=2")
-        #analytics_html = req.text
+        req = requests.get(settings.ANALYTICS_SERVER_URL + "get_analytics?aname=StudentsPerHomework&course_id=%s" % course_id)
         analytics_json = req.json
-    
+
+        req = requests.get(settings.ANALYTICS_SERVER_URL + "get_analytics?aname=StudentsEnrolled&course_id=%s" % course_id)
+        students_enrolled_json = req.json
+
+        req = requests.get(settings.ANALYTICS_SERVER_URL + "get_analytics?aname=DailyActivityAnalyzer&from=2012-11-19&to=2012-11-27")
+        daily_activity_json = req.json
+
     #----------------------------------------
     # context for rendering
     context = {'course': course,
@@ -292,6 +299,8 @@ def instructor_dashboard(request, course_id):
                'course_errors': modulestore().get_item_errors(course.location),
                'djangopid' : os.getpid(),
                'analytics_json' : analytics_json,
+               'students_enrolled_json' : students_enrolled_json,
+               'daily_activity_json' : daily_activity_json,
                }
 
     return render_to_response('courseware/instructor_dashboard.html', context)
diff --git a/lms/templates/courseware/instructor_dashboard.html b/lms/templates/courseware/instructor_dashboard.html
index de619a6144..0d12fbc444 100644
--- a/lms/templates/courseware/instructor_dashboard.html
+++ b/lms/templates/courseware/instructor_dashboard.html
@@ -171,13 +171,34 @@ function goto( mode)
 
 ##----------------------------------------------------------------------------- 
 %if modeflag.get('Analytics'):
-   <table>
-     % for r in analytics_json:
+
+   <p>Number of students enrolled: ${students_enrolled_json['data']['nb_students_enrolled']}
+   </p>
+
+   <p>
+     Students who attempted at least one exercise:
+     <table>
+     <tr><td>Module</td><td>Number of students</td></tr>
+     % for k,v in analytics_json['data'].items():
      <tr>
-       <td>${r['day']}</td><td>${r['student_count']}</td>
+     <td>${k}</td> <td>${v}</td>
      </tr>
      % endfor
-   </table>
+     </table>
+   </p>
+
+   <p>
+     Daily activity:
+     <table>
+     <tr><td>Day</td><td>Number of students</td></tr>
+     % for k,v in daily_activity_json['data'].items():
+     <tr>
+     <td>${k}</td> <td>${v}</td>
+     </tr>
+     % endfor
+     </table>
+   </p>
+
 
 %endif