added post request sent to server for tracking on run and debug

amrdraz · amrdraz · commit 5de7821e72c4 · 2015-10-15T15:20:45.000+02:00
diff --git a/client/scripts/debugger/debugger.js b/client/scripts/debugger/debugger.js
@@ -576,6 +576,7 @@
             resetOutErr();
         }
         debuggingStarted();
+        return getSessionHistory();
     }
 
     function handleDebugError(err) {
diff --git a/client/scripts/debugger/user.js b/client/scripts/debugger/user.js
@@ -148,6 +148,12 @@
             state.severity = 'error';
             editor.updateLinting(CodeMirror.lintResult([state]));
         }
+        PD.sendActivity({
+            action: 'run',
+            meta: {
+                error: hist.error
+            }
+        });
     }
 
     function start_debugger(ev) {
@@ -158,7 +164,13 @@
             storage["py_src"] = src;
         }
 
-        Debugger.start_debugger(src, true);
+        var hist = Debugger.start_debugger(src, true);
+        PD.sendActivity({
+            action: 'debug',
+            meta: {
+                error: hist.error
+            }
+        });
     }
 
     function stop_debugger(ev) {
diff --git a/client/scripts/game/player.js b/client/scripts/game/player.js
@@ -152,6 +152,13 @@
             state.severity = 'error';
             editor.updateLinting(CodeMirror.lintResult([state]));
         }
+        PD.sendActivity({
+            action: 'run',
+            event: 'python-debugger.od-sandbox',
+            meta: {
+                error: hist.error
+            }
+        });
     }
 
     function start_debugger(ev) {
@@ -163,7 +170,15 @@
         if (storage) {
             storage["py_game_src"] = src;
         }
-        Debugger.start_debugger(src, true);
+        var hist = Debugger.start_debugger(src, true);
+
+        PD.sendActivity({
+            action: 'debug',
+            event: 'python-debugger.od-sandbox',
+            meta: {
+                error: hist.error
+            }
+        });
     }
 
     function stop_debugger(ev) {
diff --git a/client/scripts/main.js b/client/scripts/main.js
@@ -0,0 +1,50 @@
+(function(i, s, o, g, r, a, m) {
+    i['GoogleAnalyticsObject'] = r;
+    i[r] = i[r] || function() {
+        (i[r].q = i[r].q || []).push(arguments)
+    }, i[r].l = 1 * new Date();
+    a = s.createElement(o),
+        m = s.getElementsByTagName(o)[0];
+    a.async = 1;
+    a.src = g;
+    m.parentNode.insertBefore(a, m)
+})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
+
+ga('create', 'UA-68861516-1', 'auto');
+ga('send', 'pageview');
+
+var PD = {
+    promprtForId: function promprtForId() {
+        var local = window.localStorage
+        if (!local.getItem('student-id')) {
+            var id = prompt("please enter your guc student id: 37-*****")
+            local.setItem('student-id', id);
+        }
+    },
+    sendActivity: function sendActivity(activity) {
+        var local = window.localStorage
+        if (!local.getItem('student-id')) {
+            var id = prompt("please enter your guc student id: 37-*****")
+            local.setItem('student-id', id);
+        }
+        activity.meta = activity.meta || {};
+        activity.meta['student-id'] = local.getItem('student-id');
+        activity.event = activity.event || 'python-debugger.editor';
+        activity.action = activity.action || 'run';
+
+        $.post('http://www.kodr.in/api/activity', activity).done(function() {
+            console.log('sucess');
+        }).fail(function(xhr) {
+            console.log('could not send', xhr);
+        });
+
+    },
+    logout: function logout() {
+        var local = window.localStorage
+        if (local.getItem('student-id')) {
+            local.removeItem('student-id');
+        }
+    }
+}
+
+PD.promprtForId();
diff --git a/client/templates/layouts/base.swig b/client/templates/layouts/base.swig
@@ -89,20 +89,11 @@
 
     <!-- build:js(client) scripts/main.js -->
     <script src="scripts/debugger/debugger.js" type="text/javascript" charset="utf-8"></script>
+    <script src="scripts/main.js" type="text/javascript" charset="utf-8"></script>
     <!-- endbuild -->
 
     {% block extra_page_script %}
     {% endblock %}
     
-    <script>
-      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-      ga('create', 'UA-68861516-1', 'auto');
-      ga('send', 'pageview');
-
-    </script>
   </body>
 </html>

Original file line number	Diff line number	Diff line change
`@@ -576,6 +576,7 @@`
`576`	`576`	`resetOutErr();`
`577`	`577`	`}`
`578`	`578`	`debuggingStarted();`
	`579`	`+ return getSessionHistory();`
`579`	`580`	`}`
`580`	`581`
`581`	`582`	`function handleDebugError(err) {`
Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,12 @@`
`148`	`148`	`state.severity = 'error';`
`149`	`149`	`editor.updateLinting(CodeMirror.lintResult([state]));`
`150`	`150`	`}`
	`151`	`+ PD.sendActivity({`
	`152`	`+ action: 'run',`
	`153`	`+ meta: {`
	`154`	`+ error: hist.error`
	`155`	`+ }`
	`156`	`+ });`
`151`	`157`	`}`
`152`	`158`
`153`	`159`	`function start_debugger(ev) {`
`@@ -158,7 +164,13 @@`
`158`	`164`	`storage["py_src"] = src;`
`159`	`165`	`}`
`160`	`166`
`161`		`- Debugger.start_debugger(src, true);`
	`167`	`+ var hist = Debugger.start_debugger(src, true);`
	`168`	`+ PD.sendActivity({`
	`169`	`+ action: 'debug',`
	`170`	`+ meta: {`
	`171`	`+ error: hist.error`
	`172`	`+ }`
	`173`	`+ });`
`162`	`174`	`}`
`163`	`175`
`164`	`176`	`function stop_debugger(ev) {`