From 1c9e58be18fbd7cfd9c7ab69541b287a2b884573 Mon Sep 17 00:00:00 2001 From: Andrew Jakubowicz Date: Wed, 25 Jul 2018 15:49:03 -0700 Subject: [PATCH 1/2] Fix expired text in EditStudentModal --- .../teachers/edit-student-modal.jade | 23 +++++++++++-------- app/views/teachers/EditStudentModal.coffee | 6 ++--- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/app/templates/teachers/edit-student-modal.jade b/app/templates/teachers/edit-student-modal.jade index 6e25385a0b9..774071e532d 100644 --- a/app/templates/teachers/edit-student-modal.jade +++ b/app/templates/teachers/edit-student-modal.jade @@ -7,13 +7,26 @@ block modal-header-content block modal-body-content + - var status = view.user.prepaidStatus() + - var prepaidType = view.user.prepaidType() + .text-center .license-details strong(data-i18n="teacher.license_status") span.spr : - if view.user.prepaidStatus() !== 'enrolled' + if status == "not-enrolled" .small-details span(data-i18n="teacher.status_not_enrolled") + else + .small-details + if prepaidType === 'course' + span.spr(data-i18n="teacher.full_license") + else if prepaidType === 'starter_license' + span.spr(data-i18n="teacher.starter_license") + span ( + span(class= status === 'expired' ? 'text-danger' : '')= view.studentStatusString() + span ) + if status !== 'enrolled' .small-details if view.prepaids.totalAvailable() == 0 button.enroll-student-btn.btn.btn-navy.disabled(data-i18n="teacher.apply_license") @@ -22,14 +35,6 @@ block modal-body-content else button.enroll-student-btn.btn.btn-navy(data-i18n="teacher.apply_license") else - .small-details - if view.user.prepaidType() === 'course' - span.spr(data-i18n="teacher.full_license") - else if view.user.prepaidType() === 'starter_license' - span.spr(data-i18n="teacher.starter_license") - span ( - span= view.studentStatusString(view.user) - span ) .small-details button.revoke-student-btn.btn.btn-burgundy-alt(data-i18n="teacher.revoke_license") diff --git a/app/views/teachers/EditStudentModal.coffee b/app/views/teachers/EditStudentModal.coffee index ea4e52db448..03f30193259 100644 --- a/app/views/teachers/EditStudentModal.coffee +++ b/app/views/teachers/EditStudentModal.coffee @@ -56,9 +56,9 @@ module.exports = class EditStudentModal extends ModalView noty text: msg, layout: 'center', type: 'error', killer: true, timeout: 3000 }) - studentStatusString: (student) -> - status = student.prepaidStatus() - expires = student.get('coursePrepaid')?.endDate + studentStatusString: -> + status = @user.prepaidStatus() + expires = @user.get('coursePrepaid')?.endDate date = if expires? then moment(expires).utc().format('ll') else '' utils.formatStudentLicenseStatusDate(status, date) From b5eecd90f4cc1089f52802ccad47f68b5e52c1f8 Mon Sep 17 00:00:00 2001 From: Andrew Jakubowicz Date: Thu, 26 Jul 2018 12:11:33 -0700 Subject: [PATCH 2/2] Fix applying license on expired student --- app/views/teachers/EditStudentModal.coffee | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/views/teachers/EditStudentModal.coffee b/app/views/teachers/EditStudentModal.coffee index 03f30193259..8f4af4dd153 100644 --- a/app/views/teachers/EditStudentModal.coffee +++ b/app/views/teachers/EditStudentModal.coffee @@ -36,6 +36,10 @@ module.exports = class EditStudentModal extends ModalView @state.set({ errorMessage: error.message }) # TODO: Show an error. (password too short) + onLoaded: -> + @prepaids.reset(@prepaids.filter((prepaid) -> prepaid.status() is "available")) + super() + onClickSendRecoveryEmail: -> email = @user.get('email') auth.sendRecoveryEmail(email).then =>