Skip to content

Commit

Permalink
Add user full name and teacher info to AdministerUserModal
Browse files Browse the repository at this point in the history
  • Loading branch information
sderickson committed Nov 8, 2017
1 parent de8ef69 commit 32f68f7
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
6 changes: 5 additions & 1 deletion app/templates/admin/administer-user-modal.jade
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,12 @@ block modal-header-content
if view.user.isTeacher()
button#deteacher-btn.btn.btn-burgundy Deteacher

h4 Name: #{view.user.get('name')}
h4 Name: #{view.user.get('name')} (#{view.user.get('firstName') || ''} #{view.user.get('lastName')})
h4 Email: #{view.user.get('emailLower') || view.user.get('email')}
if view.user.isTeacher() && view.trialRequest
- var props = view.trialRequest.get('properties') || {}
h4 School: #{props.nces_school || props.organization}
h4 District: #{props.nces_district || props.district}
br
div
a(href="#licenses") Grant Student Licenses
Expand Down
6 changes: 5 additions & 1 deletion app/views/admin/AdministerUserModal.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ StripeCoupons = require 'collections/StripeCoupons'
forms = require 'core/forms'
Prepaids = require 'collections/Prepaids'
Classrooms = require 'collections/Classrooms'
TrialRequests = require 'collections/TrialRequests'

module.exports = class AdministerUserModal extends ModalView
id: 'administer-user-modal'
Expand Down Expand Up @@ -35,7 +36,9 @@ module.exports = class AdministerUserModal extends ModalView
@supermodel.trackRequest prepaid.creator.fetchCreatorOfPrepaid(prepaid)
@classrooms = new Classrooms()
@supermodel.trackRequest @classrooms.fetchByOwner(@userHandle)

@trialRequests = new TrialRequests()
@supermodel.trackRequest @trialRequests.fetchByApplicant(@userHandle)

onLoaded: ->
# TODO: Figure out a better way to expose this info, perhaps User methods?
stripe = @user.get('stripe') or {}
Expand All @@ -44,6 +47,7 @@ module.exports = class AdministerUserModal extends ModalView
@freeUntilDate = if @freeUntil then stripe.free else new Date().toISOString()[...10]
@currentCouponID = stripe.couponID
@none = not (@free or @freeUntil or @coupon)
@trialRequest = @trialRequests.first()
super()

onClickSaveChanges: ->
Expand Down

0 comments on commit 32f68f7

Please sign in to comment.