Skip to content

E
edx-platform
Commit 25ffb356 by Matthew Piatetsky
Options

Update unenrollment survey to only be included for edx.org and rebase with master

parent 98cf69ba
Showing with 156 additions and 111 deletions
lms/static/js/dashboard/legacy.js
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
} }
); );
// Generate the properties object to be passed along with business intelligence events. // Generate the properties object to be passed along with business intelligence events.
function generateProperties(element) { function generateProperties(element) {
var $el = $(element), var $el = $(element),
...@@ -78,6 +79,35 @@ ...@@ -78,6 +79,35 @@
return properties; return properties;
} }
function setDialogAttributes(isPaidCourse, certNameLong,
courseNumber, courseName, enrollmentMode, showRefundOption) {
var diagAttr = {};
if (isPaidCourse) {
if (showRefundOption) {
diagAttr['data-refund-info'] = gettext('You will be refunded the amount you paid.');
} else {
diagAttr['data-refund-info'] = gettext('You will not be refunded the amount you paid.');
}
diagAttr['data-track-info'] = gettext('Are you sure you want to unenroll from the purchased course ' +
'%(courseName)s (%(courseNumber)s)?');
} else if (enrollmentMode !== 'verified') {
diagAttr['data-track-info'] = gettext('Are you sure you want to unenroll from %(courseName)s ' +
'(%(courseNumber)s)?');
} else if (showRefundOption) {
diagAttr['data-track-info'] = gettext('Are you sure you want to unenroll from the verified ' +
'%(certNameLong)s track of %(courseName)s (%(courseNumber)s)?');
diagAttr['data-refund-info'] = gettext('You will be refunded the amount you paid.');
} else {
diagAttr['data-track-info'] = gettext('Are you sure you want to unenroll from the verified ' +
'%(certNameLong)s track of %(courseName)s (%(courseNumber)s)?');
diagAttr['data-refund-info'] = gettext('The refund deadline for this course has passed,' +
'so you will not receive a refund.');
}
return diagAttr;
}
$('#failed-verification-button-dismiss').click(function() { $('#failed-verification-button-dismiss').click(function() {
$.ajax({ $.ajax({
url: urls.verifyToggleBannerFailedOff, url: urls.verifyToggleBannerFailedOff,
...@@ -101,6 +131,65 @@ ...@@ -101,6 +131,65 @@
} }
edx.dashboard.dropdown.toggleCourseActionsDropdownMenu(event); edx.dashboard.dropdown.toggleCourseActionsDropdownMenu(event);
}); });
$('.action-unenroll').click(function(event) {
var isPaidCourse = $(event.target).data('course-is-paid-course') === 'True';
var certNameLong = $(event.target).data('course-cert-name-long');
var enrollmentMode = $(event.target).data('course-enrollment-mode');
var courseNumber = $(event.target).data('course-number');
var courseName = $(event.target).data('course-name');
var courseRefundUrl = $(event.target).data('course-refund-url');
var dialogMessageAttr;
var request = $.ajax({
url: courseRefundUrl,
method: 'GET',
dataType: 'json'
});
request.success(function(data, textStatus, xhr) {
if (xhr.status === 200) {
dialogMessageAttr = setDialogAttributes(isPaidCourse, certNameLong,
courseNumber, courseName, enrollmentMode, data.course_refundable_status);
$('#track-info').empty();
$('#refund-info').empty();
$('#track-info').html(interpolate(dialogMessageAttr['data-track-info'], {
courseNumber: ['<span id="unenroll_course_number">', courseNumber, '</span>'].join(''),
courseName: ['<span id="unenroll_course_name">', courseName, '</span>'].join(''),
certNameLong: ['<span id="unenroll_cert_name">', certNameLong, '</span>'].join('')
}, true));
if ('data-refund-info' in dialogMessageAttr) {
$('#refund-info').text(dialogMessageAttr['data-refund-info']);
}
$('#unenroll_course_id').val($(event.target).data('course-id'));
} else {
$('#unenroll_error').text(
gettext('Unable to determine whether we should give you a refund because' +
' of System Error. Please try again later.')
).stop()
.css('display', 'block');
$('#unenroll_form input[type="submit"]').prop('disabled', true);
}
edx.dashboard.dropdown.toggleCourseActionsDropdownMenu(event);
});
request.fail(function() {
$('#unenroll_error').text(
gettext('Unable to determine whether we should give you a refund because' +
' of System Error. Please try again later.')
).stop()
.css('display', 'block');
$('#unenroll_form input[type="submit"]').prop('disabled', true);
edx.dashboard.dropdown.toggleCourseActionsDropdownMenu(event);
});
$('#unenroll-modal').css('position', 'fixed');
});
$('#email_settings_form').submit(function() { $('#email_settings_form').submit(function() {
$.ajax({ $.ajax({
...@@ -133,5 +222,22 @@ ...@@ -133,5 +222,22 @@
$(this).attr('id', 'email-settings-' + index); $(this).attr('id', 'email-settings-' + index);
}); });
$('.action-unenroll').each(function(index) {
// a bit of a hack, but gets the unique selector for the modal trigger
var trigger = '#' + $(this).attr('id');
accessibleModal(
trigger,
'#unenroll-modal .close-modal',
'#unenroll-modal',
'#dashboard-main'
);
$(this).attr('id', 'unenroll-' + index);
});
$('#unregister_block_course').click(function(event) {
$('#unenroll_course_id').val($(event.target).data('course-id'));
$('#unenroll_course_number').text($(event.target).data('course-number'));
$('#unenroll_course_name').text($(event.target).data('course-name'));
});
}; };
})(jQuery, gettext, Logger, accessible_modal, interpolate); })(jQuery, gettext, Logger, accessible_modal, interpolate);
lms/static/js/learner_dashboard/views/unenroll_view.js
...@@ -16,100 +16,14 @@ ...@@ -16,100 +16,14 @@
return Backbone.View.extend({ return Backbone.View.extend({
el: '.unenroll-modal', el: '.unenroll-modal',
unenrollClick: function(event) { switchToSlideOne: function() {
var isPaidCourse = $(event.target).data('course-is-paid-course') === 'True', var survey, i,
certNameLong = $(event.target).data('course-cert-name-long'), reasonsSurvey = HtmlUtils.HTML($('.reasons_survey'));
enrollmentMode = $(event.target).data('course-enrollment-mode'),
courseNumber = $(event.target).data('course-number'),
courseName = $(event.target).data('course-name'),
courseRefundUrl = $(event.target).data('course-refund-url'),
dialogMessageAttr,
request = $.ajax({
url: courseRefundUrl,
method: 'GET',
dataType: 'json'
});
request.success(function(data, textStatus, xhr) {
if (xhr.status === 200) {
dialogMessageAttr = setDialogAttributes(isPaidCourse, certNameLong,
courseNumber, courseName, enrollmentMode, data.course_refundable_status);
$('#track-info').empty();
$('#refund-info').empty();
$('#track-info').html(interpolate(dialogMessageAttr['data-track-info'], {
courseNumber: ['<span id="unenroll_course_number">', courseNumber, '</span>'].join(''),
courseName: ['<span id="unenroll_course_name">', courseName, '</span>'].join(''),
certNameLong: ['<span id="unenroll_cert_name">', certNameLong, '</span>'].join('')
}, true));
if ('data-refund-info' in dialogMessageAttr) {
$('#refund-info').text(dialogMessageAttr['data-refund-info']);
}
$('#unenroll_course_id').val($(event.target).data('course-id'));
} else {
$('#unenroll_error').text(
gettext('Unable to determine whether we should give you a refund because' +
' of System Error. Please try again later.')
).stop()
.css('display', 'block');
$('#unenroll_form input[type="submit"]').prop('disabled', true);
}
edx.dashboard.dropdown.toggleCourseActionsDropdownMenu(event);
});
request.fail(function() {
$('#unenroll_error').text(
gettext('Unable to determine whether we should give you a refund because' +
' of System Error. Please try again later.')
).stop()
.css('display', 'block');
$('#unenroll_form input[type="submit"]').prop('disabled', true);
edx.dashboard.dropdown.toggleCourseActionsDropdownMenu(event);
});
// Randomize survey option order // Randomize survey option order
survey = document.querySelector('.options'); survey = document.querySelector('.options');
for (i = survey.children.length - 1; i >= 0; i--) { for (i = survey.children.length - 1; i >= 0; i--) {
survey.appendChild(survey.children[Math.random() * i | 0]); survey.appendChild(survey.children[Math.random() * i | 0]);
} }
},
function setDialogAttributes(isPaidCourse, certNameLong,
courseNumber, courseName, enrollmentMode, showRefundOption) {
var diagAttr = {};
if (isPaidCourse) {
if (showRefundOption) {
diagAttr['data-refund-info'] = gettext('You will be refunded the amount you paid.');
} else {
diagAttr['data-refund-info'] = gettext('You will not be refunded the amount you paid.');
}
diagAttr['data-track-info'] = gettext('Are you sure you want to unenroll from the purchased course ' +
'%(courseName)s (%(courseNumber)s)?');
} else if (enrollmentMode !== 'verified') {
diagAttr['data-track-info'] = gettext('Are you sure you want to unenroll from %(courseName)s ' +
'(%(courseNumber)s)?');
} else if (showRefundOption) {
diagAttr['data-track-info'] = gettext('Are you sure you want to unenroll from the verified ' +
'%(certNameLong)s track of %(courseName)s (%(courseNumber)s)?');
diagAttr['data-refund-info'] = gettext('You will be refunded the amount you paid.');
} else {
diagAttr['data-track-info'] = gettext('Are you sure you want to unenroll from the verified ' +
'%(certNameLong)s track of %(courseName)s (%(courseNumber)s)?');
diagAttr['data-refund-info'] = gettext('The refund deadline for this course has passed,' +
'so you will not receive a refund.');
}
return diagAttr;
},
switchToSlideOne: function() {
var reasonsSurvey = HtmlUtils.HTML($('.reasons_survey'));
$('.inner-wrapper header').hide(); $('.inner-wrapper header').hide();
$('#unenroll_form').after(HtmlUtils.ensureHtml(reasonsSurvey).toString()).hide(); $('#unenroll_form').after(HtmlUtils.ensureHtml(reasonsSurvey).toString()).hide();
$('.reasons_survey .slide1').removeClass('hidden'); $('.reasons_survey .slide1').removeClass('hidden');
...@@ -134,8 +48,12 @@ ...@@ -134,8 +48,12 @@
unenrollComplete: function(event, xhr) { unenrollComplete: function(event, xhr) {
if (xhr.status === 200) { if (xhr.status === 200) {
this.switchToSlideOne(); if (!this.isEdx) {
$('.submit_reasons').click(this.switchToSlideTwo.bind(this)); location.href = this.urls.dashboard;
} else {
this.switchToSlideOne();
$('.submit_reasons').click(this.switchToSlideTwo.bind(this));
}
} else if (xhr.status === 403) { } else if (xhr.status === 403) {
location.href = this.urls.signInUser + '?course_id=' + location.href = this.urls.signInUser + '?course_id=' +
encodeURIComponent($('#unenroll_course_id').val()) + '&enrollment_action=unenroll'; encodeURIComponent($('#unenroll_course_id').val()) + '&enrollment_action=unenroll';
...@@ -145,21 +63,14 @@ ...@@ -145,21 +63,14 @@
' of System Error. Please try again later.') ' of System Error. Please try again later.')
).stop() ).stop()
.css('display', 'block'); .css('display', 'block');
} }
}, },
initialize: function(options) { initialize: function(options) {
this.urls = options.urls; this.urls = options.urls;
this.isEdx = options.isEdx;
$('.action-unenroll').click(this.unenrollClick);
$('#unenroll_form').on('ajax:complete', this.unenrollComplete.bind(this)); $('#unenroll_form').on('ajax:complete', this.unenrollComplete.bind(this));
$('#unregister_block_course').click(function(event) {
$('#unenroll_course_id').val($(event.target).data('course-id'));
$('#unenroll_course_number').text($(event.target).data('course-number'));
$('#unenroll_course_name').text($(event.target).data('course-name'));
});
} }
}); });
} }
......
lms/static/js/spec/learner_dashboard/unenroll_view_spec.js
...@@ -10,7 +10,8 @@ define([ ...@@ -10,7 +10,8 @@ define([
urls: { urls: {
dashboard: '/dashboard', dashboard: '/dashboard',
browseCourses: '/courses' browseCourses: '/courses'
} },
isEdx: true
}, },
initView; initView;
......
lms/static/sass/multicourse/_dashboard.scss
...@@ -1499,9 +1499,18 @@ a.fade-cover{ ...@@ -1499,9 +1499,18 @@ a.fade-cover{
} }
} }
#unenroll-modal {
margin-top: -60px;
}
.reasons_survey { .reasons_survey {
padding: 20px; padding: 20px;
.options {
list-style: none;
padding: 0;
}
.option { .option {
margin-bottom: 10px; margin-bottom: 10px;
display: block; display: block;
...@@ -1516,7 +1525,6 @@ a.fade-cover{ ...@@ -1516,7 +1525,6 @@ a.fade-cover{
} }
.other_text { .other_text {
margin-top: 10px;
margin-top: 0; margin-top: 0;
} }
...@@ -1533,7 +1541,12 @@ a.fade-cover{ ...@@ -1533,7 +1541,12 @@ a.fade-cover{
margin-top: 10px; margin-top: 10px;
margin-left: 2.5%; margin-left: 2.5%;
margin-right: 2.5%; margin-right: 2.5%;
color: white; color: $white;
}
.survey_button:visited, .survey_button:hover, .survey_button:focus {
color: $white;
text-decoration: none;
} }
} }
lms/templates/dashboard.html
...@@ -49,7 +49,8 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -49,7 +49,8 @@ from openedx.core.djangolib.markup import HTML, Text
signInUser: "${reverse('signin_user') | n, js_escaped_string}", signInUser: "${reverse('signin_user') | n, js_escaped_string}",
changeEmailSettings: "${reverse('change_email_settings') | n, js_escaped_string}", changeEmailSettings: "${reverse('change_email_settings') | n, js_escaped_string}",
browseCourses: "${marketing_link('COURSES') | n, js_escaped_string}" browseCourses: "${marketing_link('COURSES') | n, js_escaped_string}"
} },
isEdx: false
}); });
</%static:require_module> </%static:require_module>
% if settings.FEATURES.get('ENABLE_DASHBOARD_SEARCH'): % if settings.FEATURES.get('ENABLE_DASHBOARD_SEARCH'):
......
lms/templates/dashboard/_reason_survey.html
...@@ -26,10 +26,12 @@ from django.utils.translation import ugettext as _ ...@@ -26,10 +26,12 @@ from django.utils.translation import ugettext as _
${_('Thank you for sharing your reasons for unenrolling.')}<br> ${_('Thank you for sharing your reasons for unenrolling.')}<br>
${_('You are unenrolled from')} ${course_overview.display_name_with_default}. ${_('You are unenrolled from')} ${course_overview.display_name_with_default}.
<a class="button survey_button return_to_dashboard"> <div>
${_('Return To Dashboard')} <a class="button survey_button return_to_dashboard">
</a> ${_('Return To Dashboard')}
<a class="button survey_button browse_courses"> </a>
${_('Browse Courses')} <a class="button survey_button browse_courses">
</a> ${_('Browse Courses')}
</a>
</div>
</div> </div>
themes/edx.org/lms/templates/dashboard.html
...@@ -43,6 +43,17 @@ from openedx.core.djangoapps.theming import helpers as theming_helpers ...@@ -43,6 +43,17 @@ from openedx.core.djangoapps.theming import helpers as theming_helpers
}); });
}); });
</script> </script>
<%static:require_module module_name="js/learner_dashboard/unenrollment_factory" class_name="UnenrollmentFactory">
UnenrollmentFactory({
urls: {
dashboard: "${reverse('dashboard') | n, js_escaped_string}",
signInUser: "${reverse('signin_user') | n, js_escaped_string}",
changeEmailSettings: "${reverse('change_email_settings') | n, js_escaped_string}",
browseCourses: "${marketing_link('COURSES') | n, js_escaped_string}"
},
isEdx: true
});
</%static:require_module>
% if settings.FEATURES.get('ENABLE_DASHBOARD_SEARCH'): % if settings.FEATURES.get('ENABLE_DASHBOARD_SEARCH'):
<%static:require_module module_name="course_search/js/dashboard_search_factory" class_name="DashboardSearchFactory"> <%static:require_module module_name="course_search/js/dashboard_search_factory" class_name="DashboardSearchFactory">
DashboardSearchFactory(); DashboardSearchFactory();
...@@ -258,7 +269,7 @@ from openedx.core.djangoapps.theming import helpers as theming_helpers ...@@ -258,7 +269,7 @@ from openedx.core.djangoapps.theming import helpers as theming_helpers
</span> </span>
</button> </button>
<header> <header class="unenroll-header">
<h2 id="unenrollment-modal-title"> <h2 id="unenrollment-modal-title">
<span id='track-info'></span> <span id='track-info'></span>
<span id='refund-info'></span> <span id='refund-info'></span>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment