- {user.name}
+ {name}
<% if @lesson_booking.recurring %> diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/student_lesson_booking_declined.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/student_lesson_booking_declined.html.erb index 410621edb..b394a33cc 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/student_lesson_booking_declined.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/student_lesson_booking_declined.html.erb @@ -4,14 +4,27 @@ <% content_for :note do %>
- This teacher has declined your lesson request.
+ <% if @lesson_booking.canceled_by_admin %>
+ This lesson was canceled by a JamKazam administrator.
+ <% else %>
+ This teacher has declined your lesson request.
+ <% end %>
<% if @message.present? %>
-
<%= @teacher.name %> says:
+ <% if @lesson_booking.canceled_by_admin %>
+
System says:
+ <% else %>
+
<%= @teacher.name %> says:
+ <% end %>
<%= @message %>
<% end %>
-
Click the button below to view the teacher's response.
@@ -10,7 +14,11 @@
<%= @session_date %>
<% if @message.present? %>
-
<%= @lesson_session.canceler.name %> says:
+ <% if @lesson_session.canceled_by_admin %>
+
System says:
+ <% else %>
+
<%= @lesson_session.canceler.name %> says:
+ <% end %>
<%= @message %>
<% end %>
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/teacher_lesson_booking_canceled.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/teacher_lesson_booking_canceled.html.erb
index 8de563ccf..a5fd6749a 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/teacher_lesson_booking_canceled.html.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/teacher_lesson_booking_canceled.html.erb
@@ -1,5 +1,9 @@
<% provide(:title, @subject) %>
-<% provide(:photo_url, @lesson_booking.canceler.resolved_photo_url) %>
+<% if @lesson_booking.canceler %>
+ <% provide(:photo_url, @lesson_booking.canceler.resolved_photo_url) %>
+<% else %>
+ <% provide(:photo_url, "#{APP_CONFIG.external_root_url}/assets/shared/avatar_generic.png") %>
+<% end %>
<% content_for :note do %>
@@ -16,7 +20,12 @@
<% end %>
<% if @message.present? %>
-
<%= @lesson_booking.canceler.name %> says:
+ <% if @lesson_booking.canceled_by_admin %>
+
System says:
+ <% else %>
+
<%= @lesson_booking.canceler.name %> says:
+ <% end %>
+
<%= @message %>
<% end %>
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/teacher_lesson_canceled.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/teacher_lesson_canceled.html.erb
index 4a60fe695..a96d48b59 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/teacher_lesson_canceled.html.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/teacher_lesson_canceled.html.erb
@@ -1,5 +1,9 @@
<% provide(:title, @subject) %>
-<% provide(:photo_url, @lesson_session.canceler.resolved_photo_url) %>
+<% if @lesson_booking.canceler %>
+ <% provide(:photo_url, @lesson_session.canceler.resolved_photo_url) %>
+<% else %>
+ <% provide(:photo_url, "#{APP_CONFIG.external_root_url}/assets/shared/avatar_generic.png") %>
+<% end %>
<% content_for :note do %>
@@ -11,7 +15,11 @@
<%= @session_date %>
<% if @message.present? %>
-
<%= @lesson_session.canceler.name %> says:
+ <% if @lesson_session.canceled_by_admin %>
+
System says:
+ <% else %>
+
<%= @lesson_session.canceler.name %> says:
+ <% end %>
<%= @message %>
<% end %>
diff --git a/ruby/lib/jam_ruby/models/jam_track_right.rb b/ruby/lib/jam_ruby/models/jam_track_right.rb
index b9af3eaf8..e02399663 100644
--- a/ruby/lib/jam_ruby/models/jam_track_right.rb
+++ b/ruby/lib/jam_ruby/models/jam_track_right.rb
@@ -7,7 +7,7 @@ module JamRuby
@@log = Logging.logger[JamTrackRight]
attr_accessible :user, :jam_track, :user_id, :jam_track_id, :download_count
- attr_accessible :user_id, :jam_track_id, as: :admin
+ attr_accessible :user_id, :jam_track_id, :can_download, as: :admin
attr_accessible :url_48, :md5_48, :length_48, :url_44, :md5_44, :length_44
belongs_to :user, class_name: "JamRuby::User" # the owner, or purchaser of the jam_track
belongs_to :jam_track, class_name: "JamRuby::JamTrack"
@@ -38,6 +38,8 @@ module JamRuby
key = rsa_key.to_pem()
self.private_key_44 = key
self.private_key_48 = key
+
+ self.version = jam_track.version
end
def after_save
# try to catch major transitions:
diff --git a/ruby/lib/jam_ruby/models/lesson_booking.rb b/ruby/lib/jam_ruby/models/lesson_booking.rb
index 2280ad086..ddd30c2b1 100644
--- a/ruby/lib/jam_ruby/models/lesson_booking.rb
+++ b/ruby/lib/jam_ruby/models/lesson_booking.rb
@@ -741,14 +741,16 @@ module JamRuby
self
end
- def cancel_tracking(canceler, message)
+ def cancel_tracking(canceler, message, canceled_by_admin = false)
canceled_by_student = canceler == student
self.status = STATUS_CANCELED
self.cancel_message = message
- self.canceler = canceler
+ self.canceler = canceler if !canceled_by_admin
self.canceling = true
- if canceled_by_student
+ if canceled_by_admin
+ self.canceled_by_admin = Time.now
+ elsif canceled_by_student
self.student_canceled = true
self.student_canceled_at = Time.now
self.student_canceled_reason = message
@@ -759,16 +761,16 @@ module JamRuby
end
end
- def cancel(canceler, other, message)
+ def cancel(canceler, other, message, canceled_by_admin = false)
- cancel_tracking(canceler, message)
+ cancel_tracking(canceler, message, canceled_by_admin)
self.active = false
success = save
if success
lesson_sessions.upcoming.each do |lesson_session|
lesson_session = LessonSession.find(lesson_session.id) # because .upcoming creates ReadOnly records
- lesson_session.cancel_lesson(canceler, message)
+ lesson_session.cancel_lesson(canceler, message, canceled_by_admin)
if !lesson_session.save
return lesson_session
end
@@ -781,7 +783,12 @@ module JamRuby
UserMailer.teacher_lesson_booking_canceled(self, message).deliver_now
purpose = "Lesson Canceled"
else
- if canceler == student
+ if canceled_by_admin
+ # meh. no two way comm here. just bail
+ #Notification.send_lesson_message('canceled', next_lesson, true)
+ UserMailer.student_lesson_booking_declined(self, message).deliver_now
+ UserMailer.teacher_lesson_booking_canceled(self, message).deliver_now
+ elsif canceler == student
# if it's the first time acceptance student canceling, we call it a 'cancel'
Notification.send_lesson_message('canceled', next_lesson, false)
UserMailer.teacher_lesson_booking_canceled(self, message).deliver_now
@@ -795,7 +802,9 @@ module JamRuby
end
message = '' if message.nil?
- msg = ChatMessage.create(canceler, nil, message, ChatMessage::CHANNEL_LESSON, nil, other, next_lesson, purpose)
+ if !canceled_by_admin
+ msg = ChatMessage.create(canceler, nil, message, ChatMessage::CHANNEL_LESSON, nil, other, next_lesson, purpose)
+ end
else
end
diff --git a/ruby/lib/jam_ruby/models/lesson_session.rb b/ruby/lib/jam_ruby/models/lesson_session.rb
index 2fa288174..3251695d8 100644
--- a/ruby/lib/jam_ruby/models/lesson_session.rb
+++ b/ruby/lib/jam_ruby/models/lesson_session.rb
@@ -79,11 +79,8 @@ module JamRuby
scope :past_cancel_window, -> { joins(:music_session).where('music_sessions.scheduled_start > ?', 24.hours.from_now) }
# show all requested/countered sessions where the student was the last to communicate
scope :slow_responses, -> { joins(:lesson_booking).where('lesson_sessions.status = ? OR lesson_sessions.status = ?', LessonSession::STATUS_REQUESTED, LessonSession::STATUS_COUNTERED)
- .where('lesson_sessions.counterer_id IS NULL OR lesson_sessions.user_id = lesson_sessions.counterer_id')
+ .where("(? - (COALESCE(lesson_sessions.countered_at, lesson_bookings.sent_notices_at))) > INTERVAL '72 hours'", Time.now)
.order('(COALESCE(lesson_sessions.countered_at, lesson_bookings.sent_notices_at)) ASC') }
- scope :least_time_left, -> { joins(:lesson_booking, :music_session).where('lesson_sessions.status = ? OR lesson_sessions.status = ?', LessonSession::STATUS_REQUESTED, LessonSession::STATUS_COUNTERED)
- .where('lesson_sessions.counterer_id IS NULL OR lesson_sessions.user_id = lesson_sessions.counterer_id')
- .order('music_sessions.scheduled_start DESC') }
def create_charge
if payment_if_school_on_school? && !is_test_drive? && !is_monthly_payment?
@@ -222,6 +219,22 @@ module JamRuby
counterer_id.nil? || counterer_id == student_id
end
+ def late_responder
+ if student_last_proposed?
+ teacher
+ else
+ student
+ end
+ end
+
+ def last_proposer
+ if student_last_proposed?
+ student
+ else
+ teacher
+ end
+ end
+
def lesson_is_free?
lesson_booking.booked_price == 0.00
end
@@ -999,15 +1012,17 @@ module JamRuby
response
end
- def cancel_lesson(canceler, message)
+ def cancel_lesson(canceler, message, canceled_by_admin = false)
canceled_by_student = canceler == student
self.status = STATUS_CANCELED
self.cancel_message = message
- self.canceler = canceler
+ self.canceler = canceler if !canceled_by_admin
self.canceling = true
- if canceled_by_student
+ if canceled_by_admin
+
+ elsif canceled_by_student
self.student_canceled = true
self.student_canceled_at = Time.now
self.student_canceled_reason = message
@@ -1059,6 +1074,10 @@ module JamRuby
other = canceled_by_student ? teacher : student
message = params[:message]
message = '' if message.nil?
+ if params[:canceled_by_admin]
+ self.canceled_by_admin = Time.now
+ end
+
if lesson_booking.recurring
update_all = params[:update_all]
@@ -1071,7 +1090,7 @@ module JamRuby
end
if update_all
- response = lesson_booking.cancel(canceler, other, message)
+ response = lesson_booking.cancel(canceler, other, message, params[:canceled_by_admin])
if response.errors.any?
raise ActiveRecord::Rollback
end
@@ -1081,13 +1100,20 @@ module JamRuby
raise ActiveRecord::Rollback
end
else
- cancel_lesson(canceler, message)
+ cancel_lesson(canceler, message, params[:canceled_by_admin])
if !save
response = self
raise ActiveRecord::Rollback
end
- msg = ChatMessage.create(canceler, nil, message, ChatMessage::CHANNEL_LESSON, nil, other, self, "Lesson Canceled")
+ if canceled_by_admin
+ msg = ChatMessage.create(student, nil, message, ChatMessage::CHANNEL_LESSON, nil, teacher, self, "Lesson Canceled")
+ msg = ChatMessage.create(teacher, nil, message, ChatMessage::CHANNEL_LESSON, nil, student, self, "Lesson Canceled")
+ else
+ msg = ChatMessage.create(canceler, nil, message, ChatMessage::CHANNEL_LESSON, nil, other, self, "Lesson Canceled")
+ end
+
+
Notification.send_lesson_message('canceled', self, false)
Notification.send_lesson_message('canceled', self, true)
UserMailer.student_lesson_canceled(self, message).deliver_now
@@ -1108,8 +1134,6 @@ module JamRuby
else
'TBD'
end
-
-
end
def timed_description
if is_test_drive?
@@ -1123,6 +1147,20 @@ module JamRuby
end
end
+ def cancel_by_admin
+ self.cancel({
+ canceler: nil,
+ canceled_by_admin: true,
+ message: 'Canceled by JamKazam administrator',
+ update_all: false
+ })
+ end
+
+ def intervened
+ self.intervened_at = Time.now
+ self.save
+ end
+
def display_type
if is_test_drive?
'TestDrive'
@@ -1137,15 +1175,8 @@ module JamRuby
counterer_id == user_id ? countered_at : sent_notices_at
end
- def days_no_response
- date = last_student_comm_date
- if date.nil?
- '?'
- else
- (Time.now - last_student_comm_date) / (60 * 60 * 24)
- end
-
-
+ def last_response_time
+ [countered_at, lesson_booking.sent_notices_at].find{|x|!x.nil?}
end
def stripe_description(lesson_booking)
diff --git a/ruby/lib/jam_ruby/models/teacher.rb b/ruby/lib/jam_ruby/models/teacher.rb
index 9061dc5a0..09515a4ba 100644
--- a/ruby/lib/jam_ruby/models/teacher.rb
+++ b/ruby/lib/jam_ruby/models/teacher.rb
@@ -64,7 +64,7 @@ module JamRuby
query = User.unscoped.joins(:teacher)
# only show teachers with ready for session set to true
- query = query.where('teachers.ready_for_session_at IS NOT NULL')
+ query = query.where('teachers.ready_for_session_at IS NOT NULL').where('teachers.is_searchable = TRUE')
# always force GuitarCenter users to see only their school's teachers, regardless of what they picked
if user && (user.is_guitar_center_student? || (params[:onlyMySchool] && params[:onlyMySchool] != 'false' && user.school_id))
@@ -222,6 +222,7 @@ module JamRuby
teacher.price_per_month_120_cents = params[:price_per_month_120_cents] if params.key?(:price_per_month_120_cents)
teacher.teaches_test_drive = params[:teaches_test_drive] if params.key?(:teaches_test_drive)
teacher.test_drives_per_week = params[:test_drives_per_week] if params.key?(:test_drives_per_week)
+ teacher.is_searchable = params[:is_searchable] if params.key?(:is_searchable)
teacher.test_drives_per_week = 10 if !params.key?(:test_drives_per_week) # default to 10 in absence of others
if params.key?(:school_id)
teacher.school_id = params[:school_id]
diff --git a/web/app/assets/javascripts/profile.js b/web/app/assets/javascripts/profile.js
index c83fc68e9..7c8b905b3 100644
--- a/web/app/assets/javascripts/profile.js
+++ b/web/app/assets/javascripts/profile.js
@@ -100,6 +100,7 @@
var $btnEdit = $screen.find('.edit-profile-btn');
var $btnTeacherProfileEdit = $screen.find('.edit-teacher-profile-btn');
var $btnTeacherProfileView = $screen.find('.view-teacher-profile-btn');
+ var $toggleTeacherSearchEnabled = $screen.find('.teacher-search-enabled')
var $btnAddFriend = $screen.find('#btn-add-friend');
var $btnFollowUser = $screen.find('#btn-follow-user');
var $btnMessageUser = $screen.find('#btn-message-user');
@@ -232,9 +233,11 @@
$btnTeacherProfileEdit.show();
if (isTeacher()) {
$btnTeacherProfileView.show();
+ $toggleTeacherSearchEnabled.show()
}
else {
$btnTeacherProfileView.hide();
+ $toggleTeacherSearchEnabled.hide()
}
$btnAddFriend.hide();
$btnFollowUser.hide();
@@ -332,6 +335,11 @@
window.ProfileActions.startProfileEdit('experience', true)
return false;
})
+ $toggleTeacherSearchEnabled.find('input').change(function(e) {
+ var $check = $(this)
+ rest.updateTeacher({id: user.teacher.id, is_searchable: $check.is(':checked')})
+ .fail(app.ajaxError);
+ })
}
function playSoundCloudFile(e) {
@@ -520,6 +528,7 @@
renderPerformanceSamples();
renderOnlinePresence();
renderInterests();
+ renderTeacherSearch();
}
}
@@ -565,6 +574,23 @@
}
}
+ function renderTeacherSearch()
+ {
+ if(isTeacher())
+ {
+ if(user.teacher.is_searchable )
+ {
+ $toggleTeacherSearchEnabled.find('input').attr('checked', 'checked')
+ }
+ else
+ {
+ $toggleTeacherSearchEnabled.find('input').removeAttr('checked')
+ }
+
+
+ }
+
+ }
function renderMusicalExperience() {
profileUtils.renderMusicalExperience(user, $screen, isCurrentUser())
}
diff --git a/web/app/assets/javascripts/react-components/LessonBooking.js.jsx.coffee b/web/app/assets/javascripts/react-components/LessonBooking.js.jsx.coffee
index a110ae8e0..0171cf344 100644
--- a/web/app/assets/javascripts/react-components/LessonBooking.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/LessonBooking.js.jsx.coffee
@@ -401,11 +401,14 @@ UserStore = context.UserStore
otherCountered: () ->
@myself().id == @counterer().id
+ adminCanceled: () ->
+ this.state.booking?.canceled_by_admin?
+
studentCanceled: () ->
- @canceler().id == @student().id
+ @canceler()?.id == @student().id
selfCanceled: () ->
- @canceler().id == @myself().id
+ @canceler()?.id == @myself().id
studentMadeDefaultSlot: () ->
@student()?.id == @defaultSlot()?.proposer_id
@@ -513,7 +516,7 @@ UserStore = context.UserStore
else if @isCounter()
@counterer().id == @myself().id
else if @isCanceled()
- @canceler().id == @myself().id
+ @canceler()?.id == @myself().id
else if @isSuspended()
@studentViewing()
else
@@ -544,7 +547,9 @@ UserStore = context.UserStore
messageBlock: (selfWroteMessage, message) ->
- if selfWroteMessage
+ if typeof selfWroteMessage == 'string'
+ whoSaid = selfWroteMessage + ' said:'
+ else if selfWroteMessage
whoSaid = "You said:"
else
whoSaid = "Message from #{this.other().first_name}:"
@@ -660,12 +665,16 @@ UserStore = context.UserStore
if !photo_url?
photo_url = '/assets/shared/avatar_generic.png'
+ if user?
+ name = user.name
+ else
+ name = 'System'
`
A JamKazam administrator canceled this lesson request.
` + else if @studentViewing() if @studentCanceled() action = `You canceled this lesson request.
` else @@ -1062,7 +1073,7 @@ UserStore = context.UserStore if @studentViewing() - if @studentCanceled() + if @adminCanceled() || @studentCanceled() blurb = `We're sorry this scheduling attempt did not working out for you. Please search our community of instructors to find someone else who looks like a good fit for you, and submit a new lesson request
` else blurb = `We're sorry this instructor has declined your request. Please search our community of instructors to find someone else who looks like a good fit for you, and submit a new lesson request
` @@ -1073,11 +1084,16 @@ UserStore = context.UserStore {blurb} SEARCH INSTRUCTORS NOW ` + cancelerUser = null + if this.adminCanceled() + cancelerUser = 'System' + else + cancelerUser = this.selfCanceled() `