Skip to content

Commit

Permalink
Merge pull request #5205 from dimagi/google-analytics
Browse files Browse the repository at this point in the history
more event tracking
  • Loading branch information
NoahCarnahan committed Jan 6, 2015
2 parents 33e5c7f + a58eced commit e653fb6
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 9 deletions.
26 changes: 25 additions & 1 deletion corehq/apps/export/templates/export/customize_export.html
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,31 @@
self.save = function () {
self.save.state('saving');
$.post(self.urls.save(), self.output()).done(function (data) {
window.location.href = data.redirect;

var redirect = function(){
window.location.href = data.redirect;
};

// If the button had said "Create"
if (!self.custom_export._id || !self.custom_export._id()) {
var event_category = null;
if (self.custom_export.type() == "form") {
event_category = 'Form Exports';
} else if (self.custom_export.type() == "case") {
event_category = 'Case Exports';
}

if (event_category) {
// Record an event
ga_track_event(event_category, 'Custom export creation', "", {
'hitCallback': function () {
redirect();
}
});
return;
}
}
redirect();
}).fail(function (response) {
var data = $.parseJSON(response.responseText);
self.save.state('error');
Expand Down
30 changes: 22 additions & 8 deletions corehq/apps/reports/static/reports/ko/export.manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ var ExportManager = function (o) {
else
$title.attr('style', '');
},
updateModal = function(d) {
updateModal = function(params) {
var autoRefresh = '';
var pollDownloader = function () {
if ($('#ready_'+d.download_id).length == 0) {
$.get(d.download_url, function(data) {
if ($('#ready_'+params.response.download_id).length == 0) {
$.get(params.response.download_url, function(data) {
self.$modal.find(self.exportModalLoadedData).html(data);
}).error(function () {
self.$modal.find(self.exportModalLoading).addClass('hide');
Expand All @@ -54,6 +54,14 @@ var ExportManager = function (o) {
$(self.exportModal).on('hide', function () {
clearInterval(autoRefresh);
});
if (params.xmlns == "http://code.javarosa.org/devicereport"){
gaTrackLink(
$(".download-button", self.exportModal),
"Form Exports",
"Download Mobile Device Log",
"Export Mobile Device Log"
);
}
autoRefresh = setInterval(pollDownloader, 2000);
},
displayModalError = function(error_text) {
Expand Down Expand Up @@ -88,7 +96,7 @@ var ExportManager = function (o) {
}
};

self.downloadExport = function(downloadUrl) {
self.downloadExport = function(params) {
var displayDownloadError = function (response) {
displayModalError('Sorry, something unexpected went wrong and your download ' +
'could not be completed. Please try again and report an issue if the problem ' +
Expand All @@ -97,8 +105,13 @@ var ExportManager = function (o) {
};
$.ajax({
dataType: 'json',
url: downloadUrl,
success: updateModal,
url: params.downloadUrl,
success: function(response){
updateModal({
response: response,
xmlns: params.xmlns
});
},
error: displayDownloadError
});
};
Expand Down Expand Up @@ -191,6 +204,7 @@ var ExportManager = function (o) {
self._requestDownload = function(event, options) {
var $button = $(event.srcElement || event.currentTarget);
var downloadUrl = self.downloadUrl || $button.data('dlocation');
var xmlns = $button.data('xmlns');
resetModal("'" + options.modalTitle + "'", true);
var format = self.format;
var fileName = encodeURIComponent($.trim($button.data('formname')));
Expand All @@ -200,7 +214,7 @@ var ExportManager = function (o) {
downloadUrl = downloadUrl +
"?" + self.exportFilters +
'&async=true' +
'&export_tag=["'+self.domain+'","'+$button.data('xmlns')+'","' + fileName +'"]' +
'&export_tag=["'+self.domain+'","'+xmlns+'","' + fileName +'"]' +
'&format=' + format +
'&filename=' + fileName;

Expand All @@ -210,7 +224,7 @@ var ExportManager = function (o) {
downloadUrl += '&' + k + '=' + v;
}
}
self.downloadExport(downloadUrl);
self.downloadExport({downloadUrl: downloadUrl, xmlns: xmlns});
};

self.requestDownload = function(data, event) {
Expand Down

0 comments on commit e653fb6

Please sign in to comment.