Improved analytics names. displayedin attribute indicates element type in which…

Improved analytics names. displayedin attribute indicates element type in which google doc was embedded

google_drive/google_calendar.py

@@ -96,7 +96,7 @@ class GoogleCalendarBlock(XBlock):
     @XBlock.json_handler
     def calendar_loaded(self, calendar_data, suffix=''):
 
-        self.runtime.publish(self, 'calendar.loaded', calendar_data)
+        self.runtime.publish(self, 'edx.googlecomponent.calendar.displayed', calendar_data)
 
         return {
             'result': 'success',

google_drive/google_docs.py

@@ -87,12 +87,8 @@ class GoogleDocumentBlock(XBlock):
 
     @XBlock.json_handler
     def document_loaded(self, data, suffix=''):
-        try:
-            event_name = data.pop('eventName')
-        except KeyError as e:
-            return {'result': 'error', 'message': 'Missing eventName in JSON data'}
 
-        self.runtime.publish(self, event_name, data)
+        self.runtime.publish(self, "edx.googlecomponent.document.displayed", data)
 
         return {
             'result': 'success',

google_drive/public/js/google_calendar.js

@@ -6,7 +6,7 @@ function GoogleCalendarBlock(runtime, element) {
         $.ajax({
             type: "POST",
             url: runtime.handlerUrl(element, 'calendar_loaded'),
-            data: JSON.stringify({url: iframe_url})
+            data: JSON.stringify({url: iframe_url, displayedin: 'iframe'})
         });
     });
 }

google_drive/public/js/google_docs.js

@@ -12,15 +12,18 @@ function GoogleDocumentBlock(runtime, element) {
         }
     }
 
-    function SignalDocumentLoaded(event_name){
+    function SignalDocumentLoaded(presented_within){
         var document_url = $(this).attr('src');
         $.ajax({
             type: "POST",
             url: runtime.handlerUrl(element, 'document_loaded'),
-            data: JSON.stringify({url: document_url, eventName: event_name})
+            data: JSON.stringify({
+                url: document_url,
+                displayedin: presented_within
+             })
         });
     }
-    $('iframe', element).load(SignalDocumentLoaded('googledoc.iframe.loaded'));
-    $('img', element).load(SignalDocumentLoaded('googledoc.image.loaded'));
+    $('iframe', element).load(SignalDocumentLoaded('iframe'));
+    $('img', element).load(SignalDocumentLoaded('img'));
 
 }