From 0528f09e2791b10b7cc27bda1daf259f5fa4f1bd Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Tue, 24 May 2016 14:25:50 -0500
Subject: [PATCH] VRFS-4123 put disconnected msg above broadcast

---
 db/manifest                                       |  3 ++-
 db/up/track_user_on_lesson.sql                    |  3 +++
 ruby/lib/jam_ruby/models/lesson_session.rb        |  7 ++++++-
 ruby/lib/jam_ruby/models/music_session.rb         |  4 ++--
 ruby/lib/jam_ruby/models/teacher_distribution.rb  | 15 ++++++++++-----
 .../AccountPaymentHistoryScreen.js.jsx.coffee     |  3 +++
 .../react-components/StripeConnect.js.jsx.coffee  |  2 +-
 .../react-components/mixins/ICheckMixin.js.coffee |  1 -
 .../assets/stylesheets/client/jamServer.css.scss  |  1 +
 web/app/views/api_teacher_distributions/show.rabl |  2 +-
 10 files changed, 29 insertions(+), 12 deletions(-)
 create mode 100644 db/up/track_user_on_lesson.sql

diff --git a/db/manifest b/db/manifest
index a0b94d2d5..3afb06265 100755
--- a/db/manifest
+++ b/db/manifest
@@ -352,4 +352,5 @@ lesson_booking_schools_2.sql
 phantom_accounts.sql
 lesson_booking_success.sql
 user_origin.sql
-remove_stripe_acct_id.sql
\ No newline at end of file
+remove_stripe_acct_id.sql
+track_user_on_lesson.sql
\ No newline at end of file
diff --git a/db/up/track_user_on_lesson.sql b/db/up/track_user_on_lesson.sql
new file mode 100644
index 000000000..a18a19a86
--- /dev/null
+++ b/db/up/track_user_on_lesson.sql
@@ -0,0 +1,3 @@
+ALTER TABLE lesson_sessions ADD COLUMN user_id VARCHAR(64) REFERENCES users(id);
+UPDATE lesson_sessions SET user_id = (select user_id from music_sessions where lesson_sessions.id = music_sessions.lesson_session_id) where user_id is NULL;
+ALTER TABLE lesson_sessions ALTER COLUMN user_id SET NOT NULL;
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/models/lesson_session.rb b/ruby/lib/jam_ruby/models/lesson_session.rb
index 6a08b52e4..4addbc205 100644
--- a/ruby/lib/jam_ruby/models/lesson_session.rb
+++ b/ruby/lib/jam_ruby/models/lesson_session.rb
@@ -400,7 +400,12 @@ module JamRuby
     end
 
     def scheduled_start
-      music_session.scheduled_start
+      if music_session
+        music_session.scheduled_start
+      else
+        raise "lesson session #{id} has no music session in scheduled_start"
+      end
+
     end
 
     def send_counter(countered_lesson, countered_slot)
diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb
index cea40f0be..5c99ecf0f 100644
--- a/ruby/lib/jam_ruby/models/music_session.rb
+++ b/ruby/lib/jam_ruby/models/music_session.rb
@@ -1013,7 +1013,7 @@ SQL
     def self.purgeable_sessions
       sessions = []
       sql =<<SQL
-  (started_at IS NULL AND 
+  (started_at IS NULL AND
     (created_at <= NOW() - interval '#{UNSTARTED_INTERVAL_DAYS_PURGE} days' OR
      scheduled_start <= NOW() - interval '#{UNSTARTED_INTERVAL_DAYS_PURGE} days')) 
 OR 
@@ -1023,7 +1023,7 @@ OR
   (recurring_mode = '#{RECURRING_WEEKLY}' AND
     scheduled_start <= NOW() - interval '#{UNSTARTED_INTERVAL_DAYS_PURGE_RECUR} days') 
 SQL
-      self.where("started_at IS NULL").where(sql).find_each do |ms|
+      self.where("lesson_session_id is NULL").where("started_at IS NULL").where(sql).find_each do |ms|
         block_given? ? yield(ms) : sessions << ms
       end
       sessions
diff --git a/ruby/lib/jam_ruby/models/teacher_distribution.rb b/ruby/lib/jam_ruby/models/teacher_distribution.rb
index 316061e7d..79dd8159c 100644
--- a/ruby/lib/jam_ruby/models/teacher_distribution.rb
+++ b/ruby/lib/jam_ruby/models/teacher_distribution.rb
@@ -38,7 +38,7 @@ module JamRuby
       elsif is_normal?
         !lesson_session.billing_should_retry
       else
-        ! lesson_package_purchase.billing_should_retry
+        !lesson_package_purchase.billing_should_retry
       end
     end
 
@@ -139,11 +139,16 @@ module JamRuby
     end
 
     def description
-      if lesson_session
-        lesson_session.timed_description
-      else
-        lesson_package_purchase.timed_description
+      begin
+        if lesson_session
+          lesson_session.timed_description
+        else
+          lesson_package_purchase.timed_description
+        end
+      rescue
+        "temp fix"
       end
+
     end
   end
 end
\ No newline at end of file
diff --git a/web/app/assets/javascripts/react-components/AccountPaymentHistoryScreen.js.jsx.coffee b/web/app/assets/javascripts/react-components/AccountPaymentHistoryScreen.js.jsx.coffee
index 0fdb13d44..1729087f9 100644
--- a/web/app/assets/javascripts/react-components/AccountPaymentHistoryScreen.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/AccountPaymentHistoryScreen.js.jsx.coffee
@@ -40,6 +40,9 @@ profileUtils = context.JK.ProfileUtils
     else
       shouldShowName = @state.shouldShowName
 
+    if userState?.user?.teacher?
+      @setState({selected: 'payments to you'})
+
     @setState({user: userState?.user, shouldShowName: shouldShowName})
 
 
diff --git a/web/app/assets/javascripts/react-components/StripeConnect.js.jsx.coffee b/web/app/assets/javascripts/react-components/StripeConnect.js.jsx.coffee
index 2060193f9..0a24142bb 100644
--- a/web/app/assets/javascripts/react-components/StripeConnect.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/StripeConnect.js.jsx.coffee
@@ -32,7 +32,7 @@ UserStore = context.UserStore
       if this.props.purpose == 'jamclass-home'
         return `<div>
           <p>Your Stripe account is properly set up and connected to enable transfer of student payments. To view lesson payment history, click the button below.</p>
-          <a className="button-orange view-payments" href="/client?payments-to-you#/accounts/payment-history">VIEW PAYMENTS</a>
+          <a className="button-orange view-payments" href="/client#/account/payment-history">VIEW PAYMENTS</a>
         </div>`
       else
         return `<div>You have successfully connected your Stripe account for payments. If you need to make any changes to your Stripe account, please go to the <a href="https://dashboard.stripe.com/" target="_blank">Stripe website</a> and sign in using your Stripe credentials there to make any changes needed.</div>`
diff --git a/web/app/assets/javascripts/react-components/mixins/ICheckMixin.js.coffee b/web/app/assets/javascripts/react-components/mixins/ICheckMixin.js.coffee
index cc312cb39..0bf3cda13 100644
--- a/web/app/assets/javascripts/react-components/mixins/ICheckMixin.js.coffee
+++ b/web/app/assets/javascripts/react-components/mixins/ICheckMixin.js.coffee
@@ -24,7 +24,6 @@ teacherActions = window.JK.Actions.Teacher
 
       @iCheckIgnore = true
 
-      console.log("CHOICE", choice)
       if $candidate.attr('type') == 'radio'
         if choice?
           $found = @root.find(selector + '[value="' + choice + '"]')
diff --git a/web/app/assets/stylesheets/client/jamServer.css.scss b/web/app/assets/stylesheets/client/jamServer.css.scss
index 0ab091d0e..82af550a7 100644
--- a/web/app/assets/stylesheets/client/jamServer.css.scss
+++ b/web/app/assets/stylesheets/client/jamServer.css.scss
@@ -6,6 +6,7 @@
 
   &.active {
     display:block;
+    z-index:1000;
   }
 }
 
diff --git a/web/app/views/api_teacher_distributions/show.rabl b/web/app/views/api_teacher_distributions/show.rabl
index b7d0eda36..48c6b0bea 100644
--- a/web/app/views/api_teacher_distributions/show.rabl
+++ b/web/app/views/api_teacher_distributions/show.rabl
@@ -12,7 +12,7 @@ child(:teacher_payment => :teacher_payment) {
   attributes :real_distribution_in_cents, :created_at
 
   child(:teacher_payment_charge => :teacher_payment_charge) {
-    attributes last_billing_attempt_at
+    attributes :last_billing_attempt_at
   }
 }