From 88b1c46e47abf369890b48edd888c59e7435e67c Mon Sep 17 00:00:00 2001 From: Audrey Kao Date: Wed, 27 Feb 2019 15:45:10 -0500 Subject: [PATCH 1/4] Modifying entitlement unenrollment survey --- .../views/entitlement_unenrollment_view.js | 31 ++-- .../multicourse/_entitlement_dashboard.scss | 6 + .../dashboard/_entitlement_reason_survey.html | 140 ++++++++++++++++-- 3 files changed, 153 insertions(+), 24 deletions(-) diff --git a/lms/static/js/learner_dashboard/views/entitlement_unenrollment_view.js b/lms/static/js/learner_dashboard/views/entitlement_unenrollment_view.js index 0638a5136b..2488e9c44f 100644 --- a/lms/static/js/learner_dashboard/views/entitlement_unenrollment_view.js +++ b/lms/static/js/learner_dashboard/views/entitlement_unenrollment_view.js @@ -121,14 +121,10 @@ class EntitlementUnenrollmentView extends Backbone.View { } switchToSlideOne() { - // Randomize survey option order - const survey = document.querySelector('.options'); - for (let i = survey.children.length - 1; i >= 0; i -= 1) { - survey.appendChild(survey.children[Math.trunc(Math.random() * i)]); - } this.$('.entitlement-unenrollment-modal-inner-wrapper header').addClass('hidden'); this.$('.entitlement-unenrollment-modal-submit-wrapper').addClass('hidden'); this.$('.slide1').removeClass('hidden'); + this.$('.entitlement-unenrollment-modal-inner-wrapper').prevObject.addClass('entitlement-unenrollment-modal-long-survey'); // From accessibility_tools.js window.trapFocusForAccessibleModal( @@ -141,19 +137,32 @@ class EntitlementUnenrollmentView extends Backbone.View { } switchToSlideTwo() { - let reason = this.$(".reasons_survey input[name='reason']:checked").attr('val'); - if (reason === 'Other') { - reason = this.$('.other_text').val(); - } - if (reason) { + let price = this.$(".reasons_survey input[name='priceEntitlementUnenrollment']:checked").val(), + dissastisfied = this.$(".reasons_survey input[name='dissastisfiedEntitlementUnenrollment']:checked").val(), + difficult = this.$(".reasons_survey input[name='difficultEntitlementUnenrollment']:checked").val(), + time = this.$(".reasons_survey input[name='timeEntitlementUnenrollment']:checked").val(), + unavailable = this.$(".reasons_survey input[name='unavailableEntitlementUnenrollment']:checked").val(), + email = this.$(".reasons_survey input[name='emailEntitlementUnenrollment']:checked").val(); + + if (price || dissastisfied || difficult || time || unavailable || email) { + let results = { + price: price, + dissastisfied: dissastisfied, + difficult: difficult, + time: time, + unavailable: unavailable, + email: email + }; + window.analytics.track('entitlement_unenrollment_reason.selected', { category: 'user-engagement', - label: reason, + label: results, displayName: 'v1', }); } this.$('.slide1').addClass('hidden'); this.$('.slide2').removeClass('hidden'); + this.$('.entitlement-unenrollment-modal-inner-wrapper').prevObject.removeClass('entitlement-unenrollment-modal-long-survey'); // From accessibility_tools.js window.trapFocusForAccessibleModal( diff --git a/lms/static/sass/multicourse/_entitlement_dashboard.scss b/lms/static/sass/multicourse/_entitlement_dashboard.scss index bc6a89f78c..d67e07425e 100644 --- a/lms/static/sass/multicourse/_entitlement_dashboard.scss +++ b/lms/static/sass/multicourse/_entitlement_dashboard.scss @@ -30,6 +30,9 @@ .entitlement-unenrollment-modal-inner-wrapper { @extend .inner-wrapper; + height: 98%; + overflow-y: scroll; + .entitlement-unenrollment-modal-close-btn { @extend .close-modal; } @@ -67,3 +70,6 @@ } } +.entitlement-unenrollment-modal-long-survey { + height: 70%; +} diff --git a/lms/templates/dashboard/_entitlement_reason_survey.html b/lms/templates/dashboard/_entitlement_reason_survey.html index 0b0c8a5ff8..7749aa62ca 100644 --- a/lms/templates/dashboard/_entitlement_reason_survey.html +++ b/lms/templates/dashboard/_entitlement_reason_survey.html @@ -4,19 +4,133 @@ from django.utils.translation import ugettext as _ %>