From 086e15c9b6738f830471f746856c7cc775dde9a2 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Tue, 22 Aug 2017 11:40:17 -0400 Subject: [PATCH] Update event naming for course sock. Only show course sock to English readers. --- lms/static/js/courseware/course_home_events.js | 4 ++-- lms/static/js/dashboard/legacy.js | 2 +- .../js/spec/courseware/course_home_events_spec.js | 4 ++-- .../static/course_experience/js/CourseSock.js | 10 +++++----- .../features/course_experience/views/course_sock.py | 7 ++++++- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/lms/static/js/courseware/course_home_events.js b/lms/static/js/courseware/course_home_events.js index 9b9da6ca73..2902292de7 100644 --- a/lms/static/js/courseware/course_home_events.js +++ b/lms/static/js/courseware/course_home_events.js @@ -9,10 +9,10 @@ }); }); $('.date-summary-verified-upgrade-deadline .date-summary-link').on('click', function() { - Logger.log('edx.course.home.upgrade_verified.clicked', {location: 'sidebar'}); + Logger.log('edx.course.enrollment.upgrade.clicked', {location: 'sidebar'}); }); $('.upgrade-banner-button').on('click', function() { - Logger.log('edx.course.home.upgrade_verified.clicked', {location: 'notification'}); + Logger.log('edx.course.enrollment.upgrade.clicked', {location: 'notification'}); }); $('.view-verified-info').on('click', function() { Logger.log('edx.course.home.learn_about_verified.clicked', {location: 'notification'}); diff --git a/lms/static/js/dashboard/legacy.js b/lms/static/js/dashboard/legacy.js index a2c3a4a4db..973e8ad82a 100644 --- a/lms/static/js/dashboard/legacy.js +++ b/lms/static/js/dashboard/legacy.js @@ -120,7 +120,7 @@ var user = $(event.target).closest('.action-upgrade').data('user'), course = $(event.target).closest('.action-upgrade').data('course-id'); - Logger.log('edx.course.enrollment.upgrade.clicked', [user, course], null); + Logger.log('edx.course.enrollment.upgrade.clicked', [user, course], {location: 'learner_dashboard'}); }); $('.action-email-settings').click(function(event) { diff --git a/lms/static/js/spec/courseware/course_home_events_spec.js b/lms/static/js/spec/courseware/course_home_events_spec.js index c7eee6ba13..935da03bfd 100644 --- a/lms/static/js/spec/courseware/course_home_events_spec.js +++ b/lms/static/js/spec/courseware/course_home_events_spec.js @@ -19,13 +19,13 @@ define(['jquery', 'logger', 'js/courseware/course_home_events'], function($, Log it('sends an event when "Upgrade to Verified" is clicked from the sidebar', function() { $('.date-summary-link').click(); - expect(Logger.log).toHaveBeenCalledWith('edx.course.home.upgrade_verified.clicked', {location: 'sidebar'}); + expect(Logger.log).toHaveBeenCalledWith('edx.course.enrollment.upgrade.clicked', {location: 'sidebar'}); }); it('sends an event when "Upgrade Now" is clicked from the upsell notification', function() { $('.upgrade-banner-button').click(); expect(Logger.log).toHaveBeenCalledWith( - 'edx.course.home.upgrade_verified.clicked', {location: 'notification'} + 'edx.course.enrollment.upgrade.clicked', {location: 'notification'} ); }); diff --git a/openedx/features/course_experience/static/course_experience/js/CourseSock.js b/openedx/features/course_experience/static/course_experience/js/CourseSock.js index f654694fe2..c4a321e4c8 100644 --- a/openedx/features/course_experience/static/course_experience/js/CourseSock.js +++ b/openedx/features/course_experience/static/course_experience/js/CourseSock.js @@ -57,9 +57,9 @@ export class CourseSock { // eslint-disable-line import/prefer-default-export // Log open and close events const isOpening = $toggleActionButton.hasClass('active'); - const logMessage = isOpening ? 'User opened the verification sock.' - : 'User closed the verification sock.'; - Logger.log( + const logMessage = isOpening ? 'edx.bi.course.sock.toggle_opened' + : 'edx.bi.course.sock.toggle_closed'; + window.analytics.track( logMessage, { from_page: pageLocation, @@ -69,9 +69,9 @@ export class CourseSock { // eslint-disable-line import/prefer-default-export $upgradeToVerifiedButton.on('click', () => { Logger.log( - 'User clicked the upgrade button in the verification sock.', + 'edx.course.enrollment.upgrade.clicked', { - from_page: pageLocation, + location: 'sock', }, ); }); diff --git a/openedx/features/course_experience/views/course_sock.py b/openedx/features/course_experience/views/course_sock.py index 418c705506..20f88e06ca 100644 --- a/openedx/features/course_experience/views/course_sock.py +++ b/openedx/features/course_experience/views/course_sock.py @@ -2,6 +2,7 @@ Fragment for rendering the course's sock and associated toggle button. """ from django.template.loader import render_to_string +from django.utils.translation import get_language from opaque_keys.edx.keys import CourseKey from web_fragments.fragment import Fragment @@ -37,7 +38,11 @@ class CourseSockFragmentView(EdxFragmentView): verification_deadline = VerifiedUpgradeDeadlineDate(course, request.user) deadline_has_passed = verification_deadline.deadline_has_passed() - show_course_sock = has_verified_mode and not is_already_verified and not deadline_has_passed + # If this proves its worth, we can internationalize and display for more than English speakers. + show_course_sock = ( + has_verified_mode and not is_already_verified and + not deadline_has_passed and get_language() == 'en' + ) # Get the price of the course and format correctly course_price = get_cosmetic_verified_display_price(course)