diff --git a/admin/app/admin/onboarding.rb b/admin/app/admin/onboarding.rb index 33eb7420e..8e4358691 100644 --- a/admin/app/admin/onboarding.rb +++ b/admin/app/admin/onboarding.rb @@ -96,6 +96,9 @@ ActiveAdmin.register JamRuby::User, :as => 'OnboarderManagement' do if user.is_waiting_onboarding || user.is_onboarding link_to("mark onboarded", mark_onboarded_admin_onboarder_management_path(user.id), { 'data-confirm': "Mark onboarded?"}) end + if user.is_waiting_onboarding || user.is_onboarding + link_to("mark lost", mark_lost_admin_onboarder_management_path(user.id), { 'data-confirm': "Mark lost (reason = Other)?"}) + end end end column "Onboarder Notes", :onboarding_onboarder_notes @@ -127,4 +130,9 @@ ActiveAdmin.register JamRuby::User, :as => 'OnboarderManagement' do redirect_to :back end + member_action :mark_lost, :method => :get do + resource.mark_lost + redirect_to :back + end + end \ No newline at end of file diff --git a/ruby/lib/jam_ruby/models/user.rb b/ruby/lib/jam_ruby/models/user.rb index 535eaae81..4130caa43 100644 --- a/ruby/lib/jam_ruby/models/user.rb +++ b/ruby/lib/jam_ruby/models/user.rb @@ -353,7 +353,7 @@ module JamRuby end def is_onboarding - ONBOARDING_STATUS_ASSIGNED || ONBOARDING_STATUS_ESCALATED || ONBOARDING_STATUS_EMAILED || ONBOARDING_STATUS_LOST + ONBOARDING_STATUS_ASSIGNED || ONBOARDING_STATUS_ESCALATED || ONBOARDING_STATUS_EMAILED end def user_progression_fields @@ -2543,6 +2543,12 @@ module JamRuby self.save! end + def mark_lost(lost_reason = LOST_REASON_OTHER) + self.onboarding_lost_at = Time.now + self.onboarding_lost_reason = lost_reason + self.save! + end + def has_booked_with_student?(student, since_at = nil) LessonBooking.engaged_bookings(student, self, since_at).count > 0 end