From 028dac54919b9a8687b80f320ca4b502e7c888b3 Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Tue, 17 Jan 2012 21:28:23 -0500
Subject: [PATCH 1/5] Info tab

---
 urls.py       | 1 +
 util/views.py | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/urls.py b/urls.py
index 2bf3403437..6d5cfeb561 100644
--- a/urls.py
+++ b/urls.py
@@ -12,6 +12,7 @@ urlpatterns = ('',
     url(r'^event$', 'track.views.user_track'),
     url(r'^t/(?P<template>[^/]*)$', 'static_template_view.views.index'),
     url(r'^logout$', 'auth.views.logout_user'),
+    url(r'^info$', 'util.views.info'),
     url(r'^login$', 'auth.views.login_user'),
     url(r'^login/(?P<error>[^/]*)$', 'auth.views.login_user'),
     url(r'^create_account$', 'auth.views.create_account'),
diff --git a/util/views.py b/util/views.py
index f61edf040e..738bd93de7 100644
--- a/util/views.py
+++ b/util/views.py
@@ -48,3 +48,6 @@ def send_feedback(request):
               fail_silently = False
               )
     return HttpResponse(json.dumps({'success':True}))
+
+def info(request):
+    return render_to_response("info.html", {})

From a25b2478491fabbbb63436a41dd9c0a6c930dd7a Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Wed, 18 Jan 2012 13:13:27 -0500
Subject: [PATCH 2/5] Fixed bridger's bug in adding to settings.py instead of
 his local

---
 settings.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/settings.py b/settings.py
index 7693d9de7f..2e2c52f35f 100644
--- a/settings.py
+++ b/settings.py
@@ -12,9 +12,6 @@ SITE_NAME = "localhost:8000"
 DEFAULT_FROM_EMAIL = 'registration@mitx.mit.edu'
 DEFAULT_FEEDBACK_EMAIL = 'feedback@mitx.mit.edu'
 
-# For testing the login system
-GENERATE_RANDOM_USER_CREDENTIALS = True
-
 WIKI_REQUIRE_LOGIN_EDIT = True
 WIKI_REQUIRE_LOGIN_VIEW = True
 

From b0bbfc1b81c02b7ebf06e258546c983f241699da Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Wed, 18 Jan 2012 13:14:16 -0500
Subject: [PATCH 3/5] Fixed my own error in above

---
 settings.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/settings.py b/settings.py
index 2e2c52f35f..5c4eda8543 100644
--- a/settings.py
+++ b/settings.py
@@ -12,6 +12,8 @@ SITE_NAME = "localhost:8000"
 DEFAULT_FROM_EMAIL = 'registration@mitx.mit.edu'
 DEFAULT_FEEDBACK_EMAIL = 'feedback@mitx.mit.edu'
 
+GENERATE_RANDOM_USER_CREDENTIALS = False
+
 WIKI_REQUIRE_LOGIN_EDIT = True
 WIKI_REQUIRE_LOGIN_VIEW = True
 

From 4e75a04ffacfee9cb056aacfedca86964b399b9c Mon Sep 17 00:00:00 2001
From: Piotr Mitros <pmitros@mit.edu>
Date: Wed, 18 Jan 2012 14:17:06 -0500
Subject: [PATCH 4/5] Problem tracking appears to work

---
 courseware/capa_module.py   | 62 +++++++++++++++++++++++++++----------
 courseware/html_module.py   |  4 +--
 courseware/module_render.py | 12 +++++--
 courseware/video_module.py  |  4 +--
 courseware/x_module.py      |  6 +++-
 5 files changed, 65 insertions(+), 23 deletions(-)

diff --git a/courseware/capa_module.py b/courseware/capa_module.py
index 1286b63b8d..e13ee453fe 100644
--- a/courseware/capa_module.py
+++ b/courseware/capa_module.py
@@ -108,8 +108,8 @@ class LoncapaModule(XModule):
             
         return html
 
-    def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None):
-        XModule.__init__(self, xml, item_id, ajax_url, track_url, state)
+    def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None, track_function=None):
+        XModule.__init__(self, xml, item_id, ajax_url, track_url, state, track_function)
 
         self.attempts = 0
         self.max_attempts = None
@@ -222,22 +222,32 @@ class LoncapaModule(XModule):
     def check_problem(self, get):
         ''' Checks whether answers to a problem are correct, and
             returns a map of correct/incorrect answers'''
+        event_info = dict()
+        event_info['state'] = self.lcp.get_state()
+        event_info['filename'] = self.filename
+
+        answers=dict()
+        # input_resistor_1 ==> resistor_1
+        for key in get:
+            answers['_'.join(key.split('_')[1:])]=get[key]
+
+        event_info['answers']=answers
+
         # Too late. Cannot submit
         if self.closed():
+            event_info['failure']='closed'
+            self.tracker('save_problem_check_fail', event_info)
             print "cp"
             raise Http404
             
         # Problem submitted. Student should reset before checking
         # again.
         if self.lcp.done and self.rerandomize:
+            event_info['failure']='unreset'
+            self.tracker('save_problem_check_fail', event_info)
             print "cpdr"
             raise Http404
 
-        answers=dict()
-        # input_resistor_1 ==> resistor_1
-        for key in get:
-            answers['_'.join(key.split('_')[1:])]=get[key]
-
         try:
             old_state = self.lcp.get_state()
             lcp_id = self.lcp.problem_id
@@ -262,35 +272,56 @@ class LoncapaModule(XModule):
         js=json.dumps({'correct_map' : correct_map,
                        'success' : success})
 
+        event_info['correct_map']=correct_map
+        event_info['success']=success
+
+        self.tracker('save_problem_check', event_info)
+
         return js
 
     def save_problem(self, get):
+        event_info = dict()
+        event_info['state'] = self.lcp.get_state()
+        event_info['filename'] = self.filename
+
+        answers=dict()
+        for key in get:
+            answers['_'.join(key.split('_')[1:])]=get[key]
+        event_info['answers'] = answers
+
         # Too late. Cannot submit
         if self.closed():
-            print "sp"
+            event_info['failure']='closed'
+            self.tracker('save_problem_fail', event_info)
             return "Problem is closed"
             
         # Problem submitted. Student should reset before saving
         # again.
         if self.lcp.done and self.rerandomize:
-            print "spdr"
+            event_info['failure']='done'
+            self.tracker('save_problem_fail', event_info)
             return "Problem needs to be reset prior to save."
 
-        answers=dict()
-        for key in get:
-            answers['_'.join(key.split('_')[1:])]=get[key]
-        
         self.lcp.student_answers=answers
 
+        self.tracker('save_problem_fail', event_info)
         return json.dumps({'success':True})
 
     def reset_problem(self, get):
         ''' Changes problem state to unfinished -- removes student answers, 
             and causes problem to rerender itself. '''
+        event_info = dict()
+        event_info['old_state']=self.lcp.get_state()
+        event_info['filename']=self.filename
+
         if self.closed():
+            event_info['failure']='closed'
+            self.tracker('reset_problem_fail', event_info)
             return "Problem is closed"
             
         if not self.lcp.done:
+            event_info['failure']='not_done'
+            self.tracker('reset_problem_fail', event_info)
             return "Refresh the page and make an attempt before resetting."
 
         self.lcp.done=False
@@ -307,8 +338,7 @@ class LoncapaModule(XModule):
         filename=settings.DATA_DIR+"problems/"+self.filename+".xml"
         self.lcp=LoncapaProblem(filename, self.item_id, self.lcp.get_state())
 
-        event_info = self.lcp.get_state()
-        event_info.update({'filename':filename})
-        #server_track(request, 'reset_problem', event_info)
+        event_info['new_state']=self.lcp.get_state()
+        self.tracker('reset_problem', event_info)
 
         return json.dumps(self.get_problem_html(encapsulate=False))
diff --git a/courseware/html_module.py b/courseware/html_module.py
index ceadb2fd8b..853a322236 100644
--- a/courseware/html_module.py
+++ b/courseware/html_module.py
@@ -25,8 +25,8 @@ class HtmlModule(XModule):
             textlist=[i for i in textlist if type(i)==str]
             return "".join(textlist)
 
-    def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None):
-        XModule.__init__(self, xml, item_id, ajax_url, track_url, state)
+    def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None, track_function=None):
+        XModule.__init__(self, xml, item_id, ajax_url, track_url, state, track_function)
         xmltree=etree.fromstring(xml)
         self.filename = None
         filename_l=xmltree.xpath("/html/@filename")
diff --git a/courseware/module_render.py b/courseware/module_render.py
index 97ca31c0c1..58574df190 100644
--- a/courseware/module_render.py
+++ b/courseware/module_render.py
@@ -10,6 +10,7 @@ from auth.models import UserProfile
 from django.shortcuts import redirect
 
 import StringIO
+import track.views
 
 from django.http import Http404
 
@@ -35,6 +36,11 @@ modx_modules={'problem':capa_module.LoncapaModule,
               'html':html_module.HtmlModule,
               'schematic':schematic_module.SchematicModule}
 
+def make_track_function(request):
+    def f(event_type, event):
+        return track.views.server_track(request, event_type, event, page='x_module')
+    return f
+
 def modx_dispatch(request, module=None, dispatch=None, id=None):
     ''' Generic view for extensions. '''
     # Grab the student information for the module from the database
@@ -60,7 +66,8 @@ def modx_dispatch(request, module=None, dispatch=None, id=None):
     instance=modx_modules[module](xml, 
                                   s.module_id, 
                                   ajax_url=ajax_url, 
-                                  state=s.state)
+                                  state=s.state, 
+                                  track_function = make_track_function(request))
     # Let the module handle the AJAX
     ajax_return=instance.handle_ajax(dispatch, request.POST)
     # Save the state back to the database
@@ -153,7 +160,8 @@ def render_x_module(request, xml_module):
     instance=module_class(xml_module.toxml(), 
                           module_id, 
                           ajax_url=ajax_url,
-                          state=state)
+                          state=state, 
+                          track_function = make_track_function(request))
     
     # If instance wasn't already in the database, create it
     if len(s) == 0:
diff --git a/courseware/video_module.py b/courseware/video_module.py
index e94edb428b..0fdb54f119 100644
--- a/courseware/video_module.py
+++ b/courseware/video_module.py
@@ -46,8 +46,8 @@ class VideoModule(XModule):
     def get_destroy_js(self):
         return "videoDestroy();"
 
-    def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None):
-        XModule.__init__(self, xml, item_id, ajax_url, track_url, state)
+    def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None, track_function=None):
+        XModule.__init__(self, xml, item_id, ajax_url, track_url, state, track_function)
         print state
         if state!=None and "time" not in json.loads(state):
             self.video_time = 0
diff --git a/courseware/x_module.py b/courseware/x_module.py
index c9ece2816f..2b79519d20 100644
--- a/courseware/x_module.py
+++ b/courseware/x_module.py
@@ -1,3 +1,6 @@
+def dummy_track(event_type, event):
+    pass
+
 class XModule(object):
     ''' Implements a generic learning module. 
         Initialized on access with __init__, first time with state=None, and
@@ -36,10 +39,11 @@ class XModule(object):
             get is a dictionary-like object ''' 
         return ""
 
-    def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None):
+    def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None, track_function=None):
         ''' In most cases, you must pass state or xml'''
         self.xml=xml
         self.item_id=item_id
         self.ajax_url=ajax_url
         self.track_url=track_url
         self.state=state
+        self.tracker=track_function

From 9619bf20ea52ace34fb7365626bba1bea25c9dcb Mon Sep 17 00:00:00 2001
From: David Ormsbee <dormsbee@mitx.mit.edu>
Date: Wed, 18 Jan 2012 15:00:46 -0500
Subject: [PATCH 5/5] moved logging level to INFO, replaced tabs with spaces in
 settings.py

---
 settings.py | 200 ++++++++++++++++++++++++++--------------------------
 1 file changed, 100 insertions(+), 100 deletions(-)

diff --git a/settings.py b/settings.py
index 5c4eda8543..1ecf5f7ad7 100644
--- a/settings.py
+++ b/settings.py
@@ -1,9 +1,9 @@
 if 'COURSEWARE_ENABLED' not in locals():
-   COURSEWARE_ENABLED = True
+    COURSEWARE_ENABLED = True
 if 'ASKBOT_ENABLED' not in locals():
-   ASKBOT_ENABLED = True
+    ASKBOT_ENABLED = True
 if not COURSEWARE_ENABLED:
-   ASKBOT_ENABLED = False
+    ASKBOT_ENABLED = False
 
 # Defaults to be overridden
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
@@ -25,7 +25,7 @@ DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
-   ('Piotr Mitros', 'pmitros@csail.mit.edu'),
+    ('Piotr Mitros', 'pmitros@csail.mit.edu'),
 )
 
 MANAGERS = ADMINS
@@ -74,14 +74,14 @@ TEMPLATE_LOADERS = (
 )
 
 MIDDLEWARE_CLASSES = (
-   'django.middleware.common.CommonMiddleware',
-   'django.contrib.sessions.middleware.SessionMiddleware',
-   'django.middleware.csrf.CsrfViewMiddleware',
-   'django.contrib.auth.middleware.AuthenticationMiddleware',
-   'django.contrib.messages.middleware.MessageMiddleware',
-   'track.middleware.TrackMiddleware',
-   'djangomako.middleware.MakoMiddleware',
-   #'debug_toolbar.middleware.DebugToolbarMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'track.middleware.TrackMiddleware',
+    'djangomako.middleware.MakoMiddleware',
+    #'debug_toolbar.middleware.DebugToolbarMiddleware',
 )
 
 ROOT_URLCONF = 'mitx.urls'
@@ -125,7 +125,7 @@ LOGGING = {
     'loggers': {
         'django.request': {
             'handlers': ['mail_admins'],
-            'level': 'ERROR',
+            'level': 'INFO',
             'propagate': True,
         },
     }
@@ -141,104 +141,104 @@ MAXLOG = 500
 execfile("../settings.py")
 
 if PERFSTATS :
-   MIDDLEWARE_CLASSES = ( 'perfstats.middleware.ProfileMiddleware',) + MIDDLEWARE_CLASSES
+    MIDDLEWARE_CLASSES = ( 'perfstats.middleware.ProfileMiddleware',) + MIDDLEWARE_CLASSES
 
 if 'TRACK_DIR' not in locals():
-   TRACK_DIR = BASE_DIR+'/track_dir/'
+    TRACK_DIR = BASE_DIR+'/track_dir/'
 if 'ASKBOT_EXTRA_SKINS_DIR' not in locals():
-   ASKBOT_EXTRA_SKINS_DIR = BASE_DIR+'/askbot/skins'
+    ASKBOT_EXTRA_SKINS_DIR = BASE_DIR+'/askbot/skins'
 if 'ASKBOT_DIR' not in locals():
-   ASKBOT_DIR = BASE_DIR
+    ASKBOT_DIR = BASE_DIR
 if 'STATIC_ROOT' not in locals():
-   STATIC_ROOT = BASE_DIR+'/staticroot/'
+    STATIC_ROOT = BASE_DIR+'/staticroot/'
 if 'DATA_DIR' not in locals():
-   DATA_DIR = BASE_DIR+'/data/'
+    DATA_DIR = BASE_DIR+'/data/'
 if 'TEXTBOOK_DIR' not in locals():
-   TEXTBOOK_DIR = BASE_DIR+'/textbook/'
+    TEXTBOOK_DIR = BASE_DIR+'/textbook/'
 
 if 'TEMPLATE_DIRS' not in locals():
-   TEMPLATE_DIRS = (
-      BASE_DIR+'/templates/',
-      DATA_DIR+'/templates',
-      TEXTBOOK_DIR,
-   )
+    TEMPLATE_DIRS = (
+        BASE_DIR+'/templates/',
+        DATA_DIR+'/templates',
+        TEXTBOOK_DIR,
+    )
 
 if 'STATICFILES_DIRS' not in locals():
-   STATICFILES_DIRS = (
-      BASE_DIR+'/3rdParty/static',
-      BASE_DIR+'/static'
-   )
+    STATICFILES_DIRS = (
+        BASE_DIR+'/3rdParty/static',
+        BASE_DIR+'/static'
+    )
 
 if ASKBOT_ENABLED:
-   import sys
-   sys.path.append(ASKBOT_DIR)
-   import os
-   import askbot
-   import site
-   site.addsitedir(os.path.join(os.path.dirname(askbot.__file__), 'deps'))
-   TEMPLATE_LOADERS = TEMPLATE_LOADERS + ('askbot.skins.loaders.filesystem_load_template_source',)
+    import sys
+    sys.path.append(ASKBOT_DIR)
+    import os
+    import askbot
+    import site
+    site.addsitedir(os.path.join(os.path.dirname(askbot.__file__), 'deps'))
+    TEMPLATE_LOADERS = TEMPLATE_LOADERS + ('askbot.skins.loaders.filesystem_load_template_source',)
 
-   MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
-	   'askbot.middleware.anon_user.ConnectToSessionMessagesMiddleware',
-	   'askbot.middleware.pagesize.QuestionsPageSizeMiddleware',
-	   'askbot.middleware.cancel.CancelActionMiddleware',
-	   'django.middleware.transaction.TransactionMiddleware',
-	   'askbot.middleware.view_log.ViewLogMiddleware',
-	   'askbot.middleware.spaceless.SpacelessMiddleware',
-	   'askbot.middleware.forum_mode.ForumModeMiddleware',
-	   )
-
-   FILE_UPLOAD_TEMP_DIR = os.path.join(
-	   os.path.dirname(__file__),
-	   'tmp'
-	   ).replace('\\','/')
-   FILE_UPLOAD_HANDLERS = (
-	   'django.core.files.uploadhandler.MemoryFileUploadHandler',
-	   'django.core.files.uploadhandler.TemporaryFileUploadHandler',
-	   )
-   ASKBOT_ALLOWED_UPLOAD_FILE_TYPES = ('.jpg', '.jpeg', '.gif', '.bmp', '.png', '.tiff')
-   ASKBOT_MAX_UPLOAD_FILE_SIZE = 1024 * 1024 #result in bytes
-   ASKBOT_FILE_UPLOAD_DIR = os.path.join(os.path.dirname(__file__), 'askbot', 'upfiles')
-   DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
-   
-   PROJECT_ROOT = os.path.dirname(__file__)
-   
-   TEMPLATE_CONTEXT_PROCESSORS = (
-	   'django.core.context_processors.request',
-	   'askbot.context.application_settings',
-	   #'django.core.context_processors.i18n',
-	   'askbot.user_messages.context_processors.user_messages',#must be before auth
-	   'django.core.context_processors.auth', #this is required for admin
-	   'django.core.context_processors.csrf', #necessary for csrf protection
-	   )
-   
-   INSTALLED_APPS = INSTALLED_APPS + (
-	   'django.contrib.sitemaps',
-	   'django.contrib.admin',
-	   'south',
-	   'askbot.deps.livesettings',
-	   'askbot',
-	   #'keyedcache', # TODO: Main askbot tree has this installed, but we get intermittent errors if we include it. 
-	   'robots',
-	   'django_countries',
-	   'djcelery',
-	   'djkombu',
-	   'followit',
-	   )
-   
-   CACHE_MIDDLEWARE_ANONYMOUS_ONLY = True
-   ASKBOT_URL = 'discussion/'
-   LOGIN_REDIRECT_URL = '/'
-   LOGIN_URL = '/'
-   
-   ASKBOT_UPLOADED_FILES_URL = '%s%s' % (ASKBOT_URL, 'upfiles/')
-   ALLOW_UNICODE_SLUGS = False
-   ASKBOT_USE_STACKEXCHANGE_URLS = False #mimic url scheme of stackexchange
-   ASKBOT_CSS_DEVEL = True
-   
-   #Celery Settings
-   BROKER_TRANSPORT = "djkombu.transport.DatabaseTransport"
-   CELERY_ALWAYS_EAGER = True
-   
-   import djcelery
-   djcelery.setup_loader()
+    MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
+      'askbot.middleware.anon_user.ConnectToSessionMessagesMiddleware',
+      'askbot.middleware.pagesize.QuestionsPageSizeMiddleware',
+      'askbot.middleware.cancel.CancelActionMiddleware',
+      'django.middleware.transaction.TransactionMiddleware',
+      'askbot.middleware.view_log.ViewLogMiddleware',
+      'askbot.middleware.spaceless.SpacelessMiddleware',
+      'askbot.middleware.forum_mode.ForumModeMiddleware',
+      )
+ 
+    FILE_UPLOAD_TEMP_DIR = os.path.join(
+      os.path.dirname(__file__),
+      'tmp'
+      ).replace('\\','/')
+    FILE_UPLOAD_HANDLERS = (
+      'django.core.files.uploadhandler.MemoryFileUploadHandler',
+      'django.core.files.uploadhandler.TemporaryFileUploadHandler',
+      )
+    ASKBOT_ALLOWED_UPLOAD_FILE_TYPES = ('.jpg', '.jpeg', '.gif', '.bmp', '.png', '.tiff')
+    ASKBOT_MAX_UPLOAD_FILE_SIZE = 1024 * 1024 #result in bytes
+    MEDIA_ROOT = os.path.join(os.path.dirname(__file__), 'askbot', 'upfiles')
+    DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
+    
+    PROJECT_ROOT = os.path.dirname(__file__)
+    
+    TEMPLATE_CONTEXT_PROCESSORS = (
+      'django.core.context_processors.request',
+      'askbot.context.application_settings',
+      #'django.core.context_processors.i18n',
+      'askbot.user_messages.context_processors.user_messages',#must be before auth
+      'django.core.context_processors.auth', #this is required for admin
+      'django.core.context_processors.csrf', #necessary for csrf protection
+      )
+    
+    INSTALLED_APPS = INSTALLED_APPS + (
+      'django.contrib.sitemaps',
+      'django.contrib.admin',
+      'south',
+      'askbot.deps.livesettings',
+      'askbot',
+      #'keyedcache', # TODO: Main askbot tree has this installed, but we get intermittent errors if we include it. 
+      'robots',
+      'django_countries',
+      'djcelery',
+      'djkombu',
+      'followit',
+      )
+    
+    CACHE_MIDDLEWARE_ANONYMOUS_ONLY = True
+    ASKBOT_URL = 'discussion/'
+    LOGIN_REDIRECT_URL = '/'
+    LOGIN_URL = '/'
+    
+    MEDIA_URL = '/%s%s' % (ASKBOT_URL, 'upfiles/')
+    ALLOW_UNICODE_SLUGS = False
+    ASKBOT_USE_STACKEXCHANGE_URLS = False #mimic url scheme of stackexchange
+    ASKBOT_CSS_DEVEL = True
+    
+    #Celery Settings
+    BROKER_TRANSPORT = "djkombu.transport.DatabaseTransport"
+    CELERY_ALWAYS_EAGER = True
+    
+    import djcelery
+    djcelery.setup_loader()