Skip to content

Commit

Permalink
Merge pull request #5208 from dimagi/more-event-tracking
Browse files Browse the repository at this point in the history
More event tracking
  • Loading branch information
NoahCarnahan committed Jan 6, 2015
2 parents 81fc282 + 3478a1f commit 33e5c7f
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 6 deletions.
5 changes: 3 additions & 2 deletions corehq/apps/reports/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ class ScheduledReportForm(forms.Form):
def __init__(self, *args, **kwargs):
self.helper = FormHelper()
self.helper.form_class = 'form-horizontal'
self.helper.add_input(Submit('submit', 'Submit'))
self.helper.form_id = 'id-scheduledReportForm'
self.helper.add_input(Submit('submit_btn', 'Submit'))

super(ScheduledReportForm, self).__init__(*args, **kwargs)

Expand Down Expand Up @@ -73,4 +74,4 @@ def _verify_email(cleaned_data):
and not (cleaned_data['recipient_emails'] or
cleaned_data['send_to_owner'])):
raise forms.ValidationError("You must specify at least one "
"valid recipient")
"valid recipient")
3 changes: 2 additions & 1 deletion corehq/apps/reports/templates/reports/base_template.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@
</ul>
</div>

<button class="btn" data-bind="click: setConfigBeingEdited">
<button class="btn" data-bind="click: setConfigBeingEdited"
onclick="ga_track_event('Scheduled Reports', 'Configure a saved report', '-');">
{% trans "Save" %}...
</button>

Expand Down
10 changes: 10 additions & 0 deletions corehq/apps/reports/templates/reports/edit_scheduled_report.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@
});
scheduled_report_form_helper.init();
</script>
<script type="text/javascript">
$('#id-scheduledReportForm').submit(function() {
ga_track_event('Scheduled Reports', 'Create a scheduled report', '-', {
'hitCallback': function () {
document.getElementById('id-scheduledReportForm').submit();
}
});
return false;
});
</script>
{% endblock %}

{% block reports-css %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ <h3 data-bind="text: modalTitle"></h3>
<div class="btn-group">
<a href="#" class="btn" data-bind="click: $root.unsetConfigBeingEdited">Cancel</a>
</div>
<div class="btn-group">
<div class="btn-group" onclick="ga_track_event('Scheduled Reports', 'Create a saved report', '-');">
<span data-bind="saveButton2: $root.modalSaveButton.state, saveOptions: $root.modalSaveButton.saveOptions"></span>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,17 @@
});
});
</script>

<script type="text/javascript">
$('#close_case').submit(function() {
ga_track_event('Edit Data', 'Close Case', '-', {
'hitCallback': function () {
document.getElementById('close_case').submit();
}
});
return false;
});
</script>
{% endblock %}

{% block page-title %}
Expand All @@ -75,7 +86,7 @@
</form>
{% endif %}
{% if not case.closed %}
<form action="{% url 'close_case' domain case_id %}" method="post" >
<form action="{% url 'close_case' domain case_id %}" method="post" id="close_case">
<button type="submit" class="btn btn-danger disable-on-submit" >{% trans 'Close Case' %}</button>
</form>
{% endif %}
Expand Down
3 changes: 2 additions & 1 deletion corehq/apps/reports/templates/reports/reports_home.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
$(this).text("{% trans 'Saving' %}").prepend('<i class="icon-refresh icon-spin"></i> ').addClass('btn disabled').attr('disabled', 'disabled');
$(this).parents('form').submit();
});
gaTrackLink($('#create_scheduled_report'), 'Scheduled Reports', 'Configure a scheduled report');
});
</script>
{% endblock %}
Expand Down Expand Up @@ -68,7 +69,7 @@

{% if report.show %}
<div class="tab-pane" id="scheduled-reports">
<p><a class="btn btn-success" href="{% url "edit_scheduled_report" domain %}"><i class="icon icon-white icon-plus"></i>
<p><a class="btn btn-success" href="{% url "edit_scheduled_report" domain %}" id="create_scheduled_report"><i class="icon icon-white icon-plus"></i>
{% trans "Create a New Scheduled Report" %}
</a></p>
{% if scheduled_reports %}
Expand Down

0 comments on commit 33e5c7f

Please sign in to comment.