Merged in VRFS-5147-user_view_edit_improvements (pull request #17)

changes to user show and edit pages ref: VRFS-5147

* changes to user show and edit pages ref: VRFS-5147

Approved-by: Seth Call

admin/app/admin/jam_ruby_users.rb

@@ -451,35 +451,55 @@ ActiveAdmin.register JamRuby::User, :as => 'Users' do
       end
 
     end
-    panel "Onboarding" do
+
-      attributes_table do
+    panel "School" do
-        row :onboarding_status
+      div do
-        row "Support Consultant" do |user|
+        attributes_table do
-          if user.onboarder
+          row "School" do |user|
-            link_to "#{user.onboarder.name} (#{user.onboarder.onboarding_users.count})", user.onboarder.admin_url
+            span do
-          else
+              if user.school
+                link_to user.school.name, admin_school_path(user.school), target: '_blank'
+              end
+            end
+          end
+          if user.school 
+            row :license_start
+            row :license_end
+            row :is_platform_instructor
           end
         end
-        row "Signup" do
-          user.created_at.to_date
-        end
-        row "Assigned", :onboarder_assigned_at
-        row "Email 1", :onboarding_email_1_sent_at
-        row "Email 2", :onboarding_email_2_sent_at
-        row "Email 3", :onboarding_email_3_sent_at
-        row "Email 4", :onboarding_email_4_sent_at
-        row "Email 5", :onboarding_email_5_sent_at
-        row "Test Session Scheduled Time", :onboarding_test_session_at
-        row "When Test Session Was Requested", :onboarding_test_session_at
-        row "Test Session Outcome", :onboarding_test_session_outcome
-        row "Notes", :onboarding_onboarder_notes
-        row "Lost Reason", :onboarding_lost_reason
-        row "Lost At", :onboarding_lost_at
-        row "Escalated Reason", :onboarding_escalation_reason
-        row "Escalated At", :onboarding_escalated_at
-
       end
     end
+    
+    # panel "Onboarding" do
+    #   attributes_table do
+    #     row :onboarding_status
+    #     row "Support Consultant" do |user|
+    #       if user.onboarder
+    #         link_to "#{user.onboarder.name} (#{user.onboarder.onboarding_users.count})", user.onboarder.admin_url
+    #       else
+    #       end
+    #     end
+    #     row "Signup" do
+    #       user.created_at.to_date
+    #     end
+    #     row "Assigned", :onboarder_assigned_at
+    #     row "Email 1", :onboarding_email_1_sent_at
+    #     row "Email 2", :onboarding_email_2_sent_at
+    #     row "Email 3", :onboarding_email_3_sent_at
+    #     row "Email 4", :onboarding_email_4_sent_at
+    #     row "Email 5", :onboarding_email_5_sent_at
+    #     row "Test Session Scheduled Time", :onboarding_test_session_at
+    #     row "When Test Session Was Requested", :onboarding_test_session_at
+    #     row "Test Session Outcome", :onboarding_test_session_outcome
+    #     row "Notes", :onboarding_onboarder_notes
+    #     row "Lost Reason", :onboarding_lost_reason
+    #     row "Lost At", :onboarding_lost_at
+    #     row "Escalated Reason", :onboarding_escalation_reason
+    #     row "Escalated At", :onboarding_escalated_at
+
+    #   end
+    # end
 =begin
 
     panel "Teacher Setting" do
@@ -618,7 +638,6 @@ ActiveAdmin.register JamRuby::User, :as => 'Users' do
       @user = resource
       @user.email = params[:jam_ruby_user][:email]
       @user.admin = params[:jam_ruby_user][:admin]
-      @user.is_onboarder = params[:jam_ruby_user][:is_onboarder]
       @user.subscribe_email = params[:jam_ruby_user][:subscribe_email]
       @user.musician = params[:jam_ruby_user][:musician]
       @user.first_name = params[:jam_ruby_user][:first_name]

admin/app/views/admin/users/_form.html.slim

@@ -2,7 +2,6 @@
   = f.inputs "Details" do
     = f.input :email, label: 'Email'
     = f.input :admin
-    = f.input :is_onboarder, label: 'Is Support Consultant'
     = f.input :subscribe_email, label: 'Subscribed to Emails?'
     = f.input :is_platform_instructor, label: 'Is Platform Instructor?'
     = f.input :gifted_jamtracks, label: 'JamTrack Credits'
@@ -11,6 +10,8 @@
     = f.input :city
     = f.input :state
     = f.input :musician
+    = f.input :beta
+    = f.input :use_video_conferencing_server
   = f.inputs "Gear Mods" do
     = f.input :show_frame_options, as: :boolean
   = f.inputs "Do Not Shows" do