From 8e2475afdc07f47408c4082bd203dba4f76d93b6 Mon Sep 17 00:00:00 2001
From: Paulo Reis <paulojreis@gmail.com>
Date: Wed, 6 Jul 2016 14:24:50 +0100
Subject: [PATCH] Track hints feedback in both GA and Countly; clean-up.

---
 services/web/app/views/layout.jade                        | 8 +++++---
 .../coffee/ide/pdf/controllers/PdfController.coffee       | 1 +
 services/web/public/coffee/main/event.coffee              | 5 ++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/services/web/app/views/layout.jade b/services/web/app/views/layout.jade
index 3995a3c39f..4b38d67bd8 100644
--- a/services/web/app/views/layout.jade
+++ b/services/web/app/views/layout.jade
@@ -71,21 +71,23 @@ html(itemscope, itemtype='http://schema.org/Product')
 			if (session && session.user)
 				script(type="text/javascript").
 					Countly.q.push(['user_details', {
-						handle: '#{session.user._id}',
 						email: '#{session.user.email}',
+						custom: {
+							handle: '#{session.user._id}',
+						}
 					}]);
 
 			if (justRegistered)
 				script(type="text/javascript").
 					Countly.q.push(['add_event',{
 						key: 'user-registered'
-					});
+					}]);
 
 			if (justLoggedIn)
 				script(type="text/javascript").
 					Countly.q.push(['add_event',{
 						key: 'user-logged-in'
-					});
+					}]);
 		// End countly Analytics
 				
 		script(type="text/javascript").
diff --git a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee
index afd61983c9..6ca950671f 100644
--- a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee
+++ b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee
@@ -20,6 +20,7 @@ define [
 			event_tracking.sendCountly "logs-hints-learn-more"
 
 		trackLogHintsFeedback = (isPositive, hintId) ->
+			event_tracking.send 'log-hints', (if isPositive then 'feedback-positive' else 'feedback-negative'), hintId
 			event_tracking.sendCountly "log-hints-feedback", { isPositive, hintId }
 
 		$scope.trackLogHintsPositiveFeedback = (hintId) -> trackLogHintsFeedback true, hintId
diff --git a/services/web/public/coffee/main/event.coffee b/services/web/public/coffee/main/event.coffee
index c8fee3601c..58e43f3b9f 100644
--- a/services/web/public/coffee/main/event.coffee
+++ b/services/web/public/coffee/main/event.coffee
@@ -9,9 +9,8 @@ define [
 
 			sendCountly: (key, segmentation) ->
 				eventData = { key }
-				eventData.segmentation = segmentation if segmentation?
-
-				Countly.q.push([ "add_event", eventData ]);
+				eventData.segmentation = segmentation if segmentation?				
+				Countly?.q.push([ "add_event", eventData ]);
 		}
 
 	# App.directive "countlyTrack", () ->