New eventing

rate/rate.py

@@ -12,26 +12,6 @@ from xblock.core import XBlock
 from xblock.fields import Scope, Integer, String, List, Float
 from xblock.fragment import Fragment
 
-try:
-    from eventtracking import tracker
-except ImportError:
-    class tracker(object):  # pylint: disable=invalid-name
-        """
-        Define tracker if eventtracking cannot be imported. This is a
-        workaround so that the code works in both edx-platform and
-        XBlock workbench (the latter of which does not support event
-        emission). This should be replaced with XBlock's emit(), but
-        at present, emit() is broken.
-        """
-        def __init__(self):
-            """ Do nothing """
-            pass
-
-        @staticmethod
-        def emit(param1, param2):
-            """ In workbench, do nothing for event emission """
-            pass
-
 
 @XBlock.needs('i18n')
 class RateXBlock(XBlock):
@@ -243,6 +223,9 @@ class RateXBlock(XBlock):
         if 'freeform' not in data and 'vote' not in data:
             response = {"success": False,
                         "response": _("Please vote!")}
+            self.runtime.publish(self,
+                                 'edx.ratexblock.nothing_provided',
+                                 {})
         if 'freeform' in data:
             response = {"success": True,
                         "response": _("Thank you for your feedback!")}

rate/static/js/src/rate.js

@@ -24,7 +24,7 @@ function RateXBlock(runtime, element) {
 	}
 	var feedback = {"freeform": freeform, 
 		    "vote": vote};
-	Logger.log("edx.ratexblock.submit", feedback);
+	Logger.log("edx.ratexblock.submitted", feedback);
 	$.ajax({
             type: "POST",
             url: feedback_handler,
@@ -36,12 +36,12 @@ function RateXBlock(runtime, element) {
     $('.rate_radio', element).change(function(eventObject) {
 	var target_id = eventObject.target.id;
 	var vote = parseInt(target_id.split('_')[1]);
-	Logger.log("edx.ratexblock.likert_rate", {"vote":vote});
+	Logger.log("edx.ratexblock.likert_clicked", {"vote":vote});
     });
 
     $('.rate_freeform_area', element).change(function(eventObject) {
 	var freeform = eventObject.currentTarget.value;
-	Logger.log("edx.ratexblock.freeform_feedback", {"freeform":freeform});
+	Logger.log("edx.ratexblock.freeform_changed", {"freeform":freeform});
     });
 
 }