From 7e810809ac62ed7c9572a9c47ae4a4c6ce0e82b0 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Mon, 28 Jul 2014 23:15:39 -0500
Subject: [PATCH 01/55] * fixing up end time format in csv export

---
 admin/app/admin/score_export.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/app/admin/score_export.rb b/admin/app/admin/score_export.rb
index ddfcfaec5..2b223a531 100644
--- a/admin/app/admin/score_export.rb
+++ b/admin/app/admin/score_export.rb
@@ -13,7 +13,7 @@ ActiveAdmin.register_page "Download CSV" do
     end
     start_time = "#{start_time}"
     if end_time.blank?
-      end_time = Time.now + 1.days
+      end_time = (Time.now + 1.days).strftime('%F')
     else
       end_time = "#{end_time}"
     end

From 95dcea9ca7eee5cd6f2b8719bb20695c169ab295 Mon Sep 17 00:00:00 2001
From: root <zonk2world@gmail.com>
Date: Tue, 29 Jul 2014 18:15:23 +0200
Subject: [PATCH 02/55] fixed issue #1632 #1954

---
 pb/src/client_container.proto                   | 1 +
 ruby/lib/jam_ruby/message_factory.rb            | 3 ++-
 ruby/lib/jam_ruby/models/notification.rb        | 1 +
 web/app/assets/javascripts/notificationPanel.js | 6 ++++--
 web/app/views/clients/_sidebar.html.erb         | 4 ++--
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pb/src/client_container.proto b/pb/src/client_container.proto
index 88bd060c2..a85e9e597 100644
--- a/pb/src/client_container.proto
+++ b/pb/src/client_container.proto
@@ -320,6 +320,7 @@ message SessionJoin {
     optional string photo_url = 2;
     optional string msg = 3;
     optional int32 track_changes_counter = 4;
+    optional string source_user_id = 5;
 }
 
 message SessionDepart {
diff --git a/ruby/lib/jam_ruby/message_factory.rb b/ruby/lib/jam_ruby/message_factory.rb
index 5ade15055..89c4670ff 100644
--- a/ruby/lib/jam_ruby/message_factory.rb
+++ b/ruby/lib/jam_ruby/message_factory.rb
@@ -395,10 +395,11 @@ module JamRuby
       )
     end
 
-    def session_join(session_id, photo_url, msg, track_changes_counter)
+    def session_join(session_id, photo_url, source_user_id, msg, track_changes_counter)
       join = Jampb::SessionJoin.new(
         :session_id => session_id,
         :photo_url => photo_url,
+        :source_user_id => source_user_id,
         :msg => msg,
         :track_changes_counter => track_changes_counter
       )
diff --git a/ruby/lib/jam_ruby/models/notification.rb b/ruby/lib/jam_ruby/models/notification.rb
index f8f59807d..e21e358c8 100644
--- a/ruby/lib/jam_ruby/models/notification.rb
+++ b/ruby/lib/jam_ruby/models/notification.rb
@@ -492,6 +492,7 @@ module JamRuby
         msg = @@message_factory.session_join(
           music_session.id,
           user.photo_url,
+          user.id,
           notification_msg,
           music_session.track_changes_counter
         )
diff --git a/web/app/assets/javascripts/notificationPanel.js b/web/app/assets/javascripts/notificationPanel.js
index 6c43937f1..d16b674b0 100644
--- a/web/app/assets/javascripts/notificationPanel.js
+++ b/web/app/assets/javascripts/notificationPanel.js
@@ -218,9 +218,11 @@
           hoveraction: val.session_id ? "session" : "",
           avatar_url: context.JK.resolveAvatarUrl(val.photo_url),
           text: val.formatted_msg,
-          date: $.timeago(val.created_at)
+          date: $.timeago(val.created_at),
+          userId: val.source_user_id
         });
-
+        
+        console.log(val);
         $list.append(notificationHtml);
 
         // val.description contains the notification record's description value from the DB (i.e., type)
diff --git a/web/app/views/clients/_sidebar.html.erb b/web/app/views/clients/_sidebar.html.erb
index fe6d75fe4..22e525d56 100644
--- a/web/app/views/clients/_sidebar.html.erb
+++ b/web/app/views/clients/_sidebar.html.erb
@@ -208,8 +208,8 @@
 <!-- Notification panel template -->
 <script type="text/template" id="template-notification-panel">
   <li session-id="{sessionId}" notification-id="{notificationId}">
-    <div class="avatar-small"><img src="{avatar_url}" /></div>
-    <div session-id="{sessionId}" hoveraction="session" class="note-text">
+    <div class="avatar-small" user-id="{userId}" hoveraction="musician"><img src="{avatar_url}" /></div>
+    <div session-id="{sessionId}" hoveraction="hoveraction" class="note-text">
       {text}<br/>
       <em>{date}</em>
       <div class="note-delete">

From c3461e82a747d816a3c360bee7b6f13c5f9c5b9d Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Tue, 29 Jul 2014 17:52:20 -0500
Subject: [PATCH 03/55] * VRFS-1976 - fixed issue where UI always picks 1st
 scheduled session; VRFS-1962 - use 'full latency' instead of just internet
 latency in musician search, find session, and new musicians email

---
 db/manifest                                   |   3 +-
 ...ms_index_sms_index_use_user_instrument.sql | 163 ++++
 ruby/lib/jam_ruby/models/search.rb            |  23 +-
 .../models/active_music_session_spec.rb       |   4 +-
 .../jam_ruby/models/music_session_spec.rb     |  12 +-
 .../javascripts/dialog/rsvpSubmitDialog.js    |   8 +-
 web/app/assets/javascripts/findMusician.js    |  42 +-
 .../assets/javascripts/scheduled_session.js   |   9 +-
 web/app/assets/javascripts/sessionList.js     |  40 +-
 web/app/assets/javascripts/utils.js           |   2 +-
 web/app/assets/stylesheets/client/client.css  |   1 +
 .../assets/stylesheets/client/help.css.scss   |  43 +
 web/app/views/api_search/index.rabl           |   6 +-
 web/app/views/clients/_help.html.erb          |  22 +
 web/app/views/clients/_musicians.html.erb     |   2 +-
 .../views/clients/_scheduledSession.html.erb  |   2 +-
 .../views/dialogs/_rsvpSubmitDialog.html.haml |   2 +-
 .../api_music_sessions_controller_spec.rb     |   8 +-
 web/spec/features/create_session_flow_spec.rb |  25 +
 web/spec/features/create_session_spec.rb      |   2 +-
 web/spec/requests/musician_search_api_spec.rb |   5 +-
 .../assets/javascripts/jquery.icheck.js       | 859 +++++++++---------
 22 files changed, 804 insertions(+), 479 deletions(-)
 create mode 100644 db/up/current_scores_ams_index_sms_index_use_user_instrument.sql
 create mode 100644 web/app/assets/stylesheets/client/help.css.scss

diff --git a/db/manifest b/db/manifest
index e23c3243d..76f231c5a 100755
--- a/db/manifest
+++ b/db/manifest
@@ -197,4 +197,5 @@ update_sms_index.sql
 connection_allow_null_locidispid.sql
 track_user_in_scores.sql
 median_aggregate.sql
-current_scores_use_median.sql
\ No newline at end of file
+current_scores_use_median.sql
+current_scores_ams_index_sms_index_use_user_instrument.sql
\ No newline at end of file
diff --git a/db/up/current_scores_ams_index_sms_index_use_user_instrument.sql b/db/up/current_scores_ams_index_sms_index_use_user_instrument.sql
new file mode 100644
index 000000000..a3f7b7b10
--- /dev/null
+++ b/db/up/current_scores_ams_index_sms_index_use_user_instrument.sql
@@ -0,0 +1,163 @@
+-- this adds the user's latency, if available
+
+DROP VIEW current_scores;
+CREATE OR REPLACE VIEW current_scores AS
+
+    SELECT * FROM (SELECT * , row_number() OVER (PARTITION BY alocidispid, blocidispid, scorer ORDER BY full_score DESC) AS pcnum FROM
+      (SELECT * FROM
+        (SELECT percent_rank() over (PARTITION BY alocidispid, blocidispid ORDER BY full_score ASC) AS pc, * FROM
+          (SELECT tmp.*, (COALESCE(a_users.last_jam_audio_latency, 13) + COALESCE(b_users.last_jam_audio_latency, 13) + tmp.score) AS full_score, a_users.last_jam_audio_latency AS a_audio_latency, b_users.last_jam_audio_latency AS b_audio_latency FROM
+            (SELECT *, row_number() OVER (PARTITION BY alocidispid, blocidispid ORDER BY scores.created_at DESC) AS rownum FROM scores) tmp
+            LEFT JOIN users as a_users ON a_users.id = tmp.auserid
+            LEFT JOIN users as b_users ON b_users.id = tmp.buserid
+             WHERE rownum < 6) AS score_ranked)
+         AS tmp2 WHERE pc <= .5 ORDER BY pc DESC) pcs )
+    AS final WHERE pcnum < 2;
+
+
+-- check that the music_sessions does not currently have an active_music_sessions
+CREATE OR REPLACE FUNCTION sms_index (my_user_id VARCHAR, my_locidispid BIGINT, my_audio_latency INTEGER) RETURNS VOID STRICT VOLATILE AS $$
+  BEGIN
+    -- output table to hold tagged music sessions with latency
+    CREATE TEMPORARY TABLE sms_music_session_tmp (music_session_id VARCHAR(64) NOT NULL, tag INTEGER, latency INTEGER) ON COMMIT DROP;
+
+    -- populate sms_music_session_tmp as all music sessions
+    -- XXX: we should pass in enough info to match pagination/query to reduce the impact of this step
+    INSERT INTO sms_music_session_tmp SELECT DISTINCT id, NULL::INTEGER AS tag, NULL::INTEGER AS latency
+      FROM music_sessions
+      WHERE  (scheduled_start IS NULL OR scheduled_start > (NOW() - (interval '15 minute')))
+      AND canceled = FALSE
+      AND id NOT IN (SELECT id FROM active_music_sessions);
+
+    -- tag accepted rsvp as 1
+    UPDATE sms_music_session_tmp q SET tag = 1 FROM rsvp_slots s, rsvp_requests_rsvp_slots rrs, rsvp_requests r WHERE
+      q.music_session_id = s.music_session_id AND
+      s.id = rrs.rsvp_slot_id AND
+      rrs.rsvp_request_id = r.id AND
+      r.user_id = my_user_id AND
+      rrs.chosen = TRUE AND
+      q.tag is NULL;
+
+    -- tag invitation as 2
+    UPDATE sms_music_session_tmp q SET tag = 2 FROM invitations i WHERE
+      q.music_session_id = i.music_session_id AND
+      i.receiver_id = my_user_id AND
+      q.tag IS NULL;
+
+    -- musician access as 3
+    UPDATE sms_music_session_tmp q SET tag = 3 FROM music_sessions m WHERE
+      q.music_session_id = m.id AND
+      m.open_rsvps = TRUE AND
+      q.tag IS NULL;
+
+    -- delete anything not tagged
+    DELETE FROM sms_music_session_tmp WHERE tag IS NULL;
+
+    -- output table to hold users involved in the sms_music_session_tmp sessions and their latency
+    CREATE TEMPORARY TABLE sms_users_tmp (music_session_id VARCHAR(64), user_id VARCHAR(64) NOT NULL, latency INTEGER) ON COMMIT DROP;
+
+    IF my_audio_latency > -1 THEN
+      -- populate sms_users_tmp with users that have an approved RSVP for sessions in the sms_music_session_tmp table, accompanied with full latency and music session
+      INSERT INTO sms_users_tmp SELECT q.music_session_id, users.id, s.full_score/2 AS latency
+      FROM sms_music_session_tmp q
+      INNER JOIN rsvp_slots               ON rsvp_slots.music_session_id = q.music_session_id
+      INNER JOIN rsvp_requests_rsvp_slots ON rsvp_requests_rsvp_slots.rsvp_slot_id = rsvp_slots.id
+      INNER JOIN rsvp_requests            ON rsvp_requests.id = rsvp_requests_rsvp_slots.rsvp_request_id
+      INNER JOIN users                    ON rsvp_requests.user_id = users.id
+      LEFT OUTER JOIN current_scores s    ON s.alocidispid = users.last_jam_locidispid
+      WHERE
+        s.blocidispid = my_locidispid AND
+        rsvp_requests_rsvp_slots.chosen = TRUE;
+
+      -- populate sms_users_tmp with invited users for session in the sms_music_session_tmp table, accompanied with full latency and music session
+      -- specify NULL for music_session_id, because we don't want RSVP users to affect the AVG computed for each session later
+      INSERT INTO sms_users_tmp SELECT NULL, users.id, s.full_score/2 AS latency
+      FROM sms_music_session_tmp q
+      INNER JOIN invitations              ON invitations.music_session_id = q.music_session_id
+      INNER JOIN users                    ON invitations.receiver_id = users.id
+      LEFT OUTER JOIN current_scores s    ON s.alocidispid = users.last_jam_locidispid
+      WHERE
+        s.blocidispid = my_locidispid AND
+        users.id NOT IN (SELECT user_id FROM sms_users_tmp);
+    END IF;
+
+    -- calculate the average latency
+    UPDATE sms_music_session_tmp q SET latency = (select AVG(u.latency) FROM sms_users_tmp u WHERE
+      q.music_session_id = u.music_session_id);
+
+    RETURN;
+  END;
+$$ LANGUAGE plpgsql;
+
+-- my_audio_latency can have a special value of -1, which means 'unknown'.
+CREATE OR REPLACE FUNCTION ams_index (my_user_id VARCHAR, my_locidispid BIGINT, my_audio_latency INTEGER) RETURNS VOID STRICT VOLATILE AS $$
+  BEGIN
+    -- output table to hold tagged music sessions with latency
+    CREATE TEMPORARY TABLE ams_music_session_tmp (music_session_id VARCHAR(64) NOT NULL, tag INTEGER, latency INTEGER) ON COMMIT DROP;
+
+    -- populate ams_music_session_tmp as all music sessions
+    INSERT INTO ams_music_session_tmp SELECT DISTINCT id, NULL::INTEGER AS tag, NULL::INTEGER AS latency
+      FROM active_music_sessions;
+
+    -- TODO worry about active music session where my_user_id is the creator?
+    -- eh, maybe, but if the music session is active and you're the creator wouldn't you already be in it?
+    -- so maybe you're on another computer, so why care? plus seth is talking about auto rsvp'ing the session
+    -- for you, so maybe not a problem.
+
+    -- tag accepted rsvp as 1
+    UPDATE ams_music_session_tmp q SET tag = 1 FROM rsvp_slots s, rsvp_requests_rsvp_slots rrs, rsvp_requests r WHERE
+      q.music_session_id = s.music_session_id AND
+      s.id = rrs.rsvp_slot_id AND
+      rrs.rsvp_request_id = r.id AND
+      r.user_id = my_user_id AND
+      rrs.chosen = TRUE AND
+      q.tag is NULL;
+
+    -- tag invitation as 2
+    UPDATE ams_music_session_tmp q SET tag = 2 FROM invitations i WHERE
+      q.music_session_id = i.music_session_id AND
+      i.receiver_id = my_user_id AND
+      q.tag IS NULL;
+
+    -- musician access as 3
+    UPDATE ams_music_session_tmp q SET tag = 3 FROM music_sessions m WHERE
+      q.music_session_id = m.id AND
+      m.musician_access = TRUE AND
+      q.tag IS NULL;
+
+    -- delete anything not tagged
+    DELETE FROM ams_music_session_tmp WHERE tag IS NULL;
+
+    -- output table to hold users involved in the ams_music_session_tmp sessions and their latency
+    CREATE TEMPORARY TABLE ams_users_tmp (music_session_id VARCHAR(64), user_id VARCHAR(64) NOT NULL, latency INTEGER) ON COMMIT DROP;
+
+    IF my_audio_latency > -1 THEN
+      -- populate ams_users_tmp with users that have a connection for sessions in the  ams_music_session_tmp table, accompanied with full latency and music session
+      INSERT INTO ams_users_tmp SELECT c.music_session_id, c.user_id, s.full_score/2 AS latency
+        FROM ams_music_session_tmp q
+        INNER JOIN connections c ON c.music_session_id = q.music_session_id
+        LEFT OUTER JOIN current_scores s ON s.alocidispid = c.locidispid
+        WHERE s.blocidispid = my_locidispid;
+
+      -- populate ams_users_tmp with users that have an approved RSVP for sessions inthe ams_music_session_tmp table, accompanied with full latency and music session
+      -- specify NULL for music_session_id, because we don't want RSVP users to affect the AVG computed for each session later
+      INSERT INTO ams_users_tmp SELECT NULL, users.id, s.full_score/2 AS latency
+        FROM ams_music_session_tmp q
+        INNER JOIN rsvp_slots               ON rsvp_slots.music_session_id = q.music_session_id
+        INNER JOIN rsvp_requests_rsvp_slots ON rsvp_requests_rsvp_slots.rsvp_slot_id = rsvp_slots.id
+        INNER JOIN rsvp_requests            ON rsvp_requests.id = rsvp_requests_rsvp_slots.rsvp_request_id
+        INNER JOIN users                    ON rsvp_requests.user_id = users.id
+        LEFT OUTER JOIN current_scores s    ON s.alocidispid = users.last_jam_locidispid
+        WHERE
+          s.blocidispid = my_locidispid AND
+          rsvp_requests_rsvp_slots.chosen = TRUE AND
+          users.id NOT IN (SELECT user_id FROM ams_users_tmp);
+    END IF;
+
+    -- calculate the average latency
+    UPDATE ams_music_session_tmp q SET latency = (select AVG(u.latency) FROM ams_users_tmp u WHERE
+      q.music_session_id = u.music_session_id);
+
+    RETURN;
+  END;
+$$ LANGUAGE plpgsql;
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/models/search.rb b/ruby/lib/jam_ruby/models/search.rb
index 1f08651ec..761660c84 100644
--- a/ruby/lib/jam_ruby/models/search.rb
+++ b/ruby/lib/jam_ruby/models/search.rb
@@ -185,6 +185,7 @@ module JamRuby
         score_join = 'left outer' # or 'inner'
         score_min = nil
         score_max = nil
+        # these score_min, score_max come from here (doubled): https://jamkazam.atlassian.net/browse/VRFS-1962
         case score_limit
           when GOOD_SCORE
             score_join = 'inner'
@@ -193,14 +194,14 @@ module JamRuby
           when MODERATE_SCORE
             score_join = 'inner'
             score_min = 40
-            score_max = 80
+            score_max = 70
           when POOR_SCORE
             score_join = 'inner'
             score_min = 80
-            score_max = 120
+            score_max = 100
           when UNACCEPTABLE_SCORE
             score_join = 'inner'
-            score_min = 120
+            score_min = 100
             score_max = nil
           when SCORED_SCORE
             score_join = 'inner'
@@ -221,11 +222,11 @@ module JamRuby
 
         rel = rel.joins('LEFT JOIN regions ON regions.countrycode = users.country AND regions.region = users.state')
 
-        rel = rel.where(['current_scores.score > ?', score_min]) unless score_min.nil?
-        rel = rel.where(['current_scores.score <= ?', score_max]) unless score_max.nil?
+        rel = rel.where(['current_scores.full_score > ?', score_min]) unless score_min.nil?
+        rel = rel.where(['current_scores.full_score <= ?', score_max]) unless score_max.nil?
 
-        rel = rel.select('current_scores.score, regions.regionname')
-        rel = rel.group('current_scores.score, regions.regionname')
+        rel = rel.select('current_scores.full_score, current_scores.score, current_scores.b_audio_latency as audio_latency, regions.regionname')
+        rel = rel.group('current_scores.full_score, current_scores.score, current_scores.b_audio_latency, regions.regionname')
       end
 
       ordering = self.order_param(params)
@@ -249,7 +250,7 @@ module JamRuby
       end
 
       unless locidispid.nil?
-        rel = rel.order('current_scores.score ASC NULLS LAST')
+        rel = rel.order('current_scores.full_score ASC NULLS LAST')
       end
 
       rel = rel.order('users.created_at DESC')
@@ -393,15 +394,15 @@ module JamRuby
       # an offline process and thus uses the last jam location as "home base"
 
       locidispid = usr.last_jam_locidispid
-      score_limit = 60
+      score_limit = 70
       limit = 50
 
       rel = User.musicians_geocoded
         .where(['users.created_at >= ? AND users.id != ?', since_date, usr.id])
         .joins('inner join current_scores on users.last_jam_locidispid = current_scores.alocidispid')
         .where(['current_scores.blocidispid = ?', locidispid])
-        .where(['current_scores.score <= ?', score_limit])
-        .order('current_scores.score') # best scores first
+        .where(['current_scores.full_score <= ?', score_limit])
+        .order('current_scores.full_score') # best scores first
         .order('users.created_at DESC') # then most recent
         .limit(limit)
 
diff --git a/ruby/spec/jam_ruby/models/active_music_session_spec.rb b/ruby/spec/jam_ruby/models/active_music_session_spec.rb
index b59dd0b45..ab02b8281 100644
--- a/ruby/spec/jam_ruby/models/active_music_session_spec.rb
+++ b/ruby/spec/jam_ruby/models/active_music_session_spec.rb
@@ -354,8 +354,8 @@ describe ActiveMusicSession do
       user = FactoryGirl.create(:user, last_jam_locidispid: 1, last_jam_audio_latency: 5)
       c3 = FactoryGirl.create(:connection, user: user, locidispid: 1, last_jam_audio_latency: 5)
 
-      Score.createx(c1.locidispid, c1.client_id, c1.addr, c3.locidispid, c3.client_id, c3.addr, 20, nil)
-      Score.createx(c2.locidispid, c2.client_id, c2.addr, c3.locidispid, c3.client_id, c3.addr, 30, nil)
+      Score.createx(c1.locidispid, c1.client_id, c1.addr, c3.locidispid, c3.client_id, c3.addr, 20, nil, nil, {auserid: creator.id, buserid: user.id})
+      Score.createx(c2.locidispid, c2.client_id, c2.addr, c3.locidispid, c3.client_id, c3.addr, 30, nil, nil, {auserid: creator2.id, buserid: user.id})
 
       # make a transaction
 
diff --git a/ruby/spec/jam_ruby/models/music_session_spec.rb b/ruby/spec/jam_ruby/models/music_session_spec.rb
index da8692250..ad4cc67de 100644
--- a/ruby/spec/jam_ruby/models/music_session_spec.rb
+++ b/ruby/spec/jam_ruby/models/music_session_spec.rb
@@ -421,7 +421,7 @@ describe MusicSession do
       let(:network_score) { 20 }
 
       before(:each) do
-        Score.createx(conn.locidispid, conn.client_id, conn.addr, searcher_conn.locidispid, searcher_conn.client_id, searcher_conn.addr, network_score, nil)
+        Score.createx(conn.locidispid, conn.client_id, conn.addr, searcher_conn.locidispid, searcher_conn.client_id, searcher_conn.addr, network_score, nil, nil, {auserid: creator.id, buserid: searcher.id})
       end
 
       it "no results" do
@@ -499,7 +499,7 @@ describe MusicSession do
         FactoryGirl.create(:invitation, receiver:invitee, sender:creator, music_session: music_session)
 
         # create a score between invitee, and searcher
-        Score.createx(invitee.last_jam_locidispid, 'immaterial', 1, searcher_conn.locidispid, searcher_conn.client_id, searcher_conn.addr, network_score, nil)
+        Score.createx(invitee.last_jam_locidispid, 'immaterial', 1, searcher_conn.locidispid, searcher_conn.client_id, searcher_conn.addr, network_score, nil, nil, {auserid: invitee.id, buserid: searcher.id})
 
         music_sessions, user_scores = sms(searcher, default_opts)
         music_sessions.length.should == 1
@@ -580,14 +580,16 @@ describe MusicSession do
       end
 
       it "searcher_1" do
+
+
         # create a bad score between searcher_1 and creator_1 (but we should still see it sort 1st because it's got an RSVP to the searcher)
-        Score.createx(searcher_conn_1.locidispid, searcher_conn_1.client_id, searcher_conn_1.addr, creator_conn_1.locidispid, creator_conn_1.client_id, creator_conn_1.addr, bad_network_score, nil)
+        Score.createx(searcher_conn_1.locidispid, searcher_conn_1.client_id, searcher_conn_1.addr, creator_conn_1.locidispid, creator_conn_1.client_id, creator_conn_1.addr, bad_network_score, nil, nil, {auserid: searcher_1.id, buserid: creator_1.id})
 
         # create a fair score between searcher_1 and creator_2 (but we should still see it sort 2st because it's got an invitation to the searcher)
-        Score.createx(searcher_conn_1.locidispid, searcher_conn_1.client_id, searcher_conn_1.addr, creator_conn_2.locidispid, creator_conn_2.client_id, creator_conn_2.addr, fair_network_score, nil)
+        Score.createx(searcher_conn_1.locidispid, searcher_conn_1.client_id, searcher_conn_1.addr, creator_conn_2.locidispid, creator_conn_2.client_id, creator_conn_2.addr, fair_network_score, nil, nil, {auserid: searcher_1.id, buserid: creator_2.id})
 
         # create a good score between searcher_1 and creator_3 (but we should still see it sort last because it's an open session; no affiliation with the searcher)
-        Score.createx(searcher_conn_1.locidispid, searcher_conn_1.client_id, searcher_conn_1.addr, creator_conn_3.locidispid, creator_conn_3.client_id, creator_conn_3.addr, good_network_score, nil)
+        Score.createx(searcher_conn_1.locidispid, searcher_conn_1.client_id, searcher_conn_1.addr, creator_conn_3.locidispid, creator_conn_3.client_id, creator_conn_3.addr, good_network_score, nil, nil, {auserid: searcher_1.id, buserid: creator_3.id})
 
         music_sessions, user_scores = sms(searcher_1, {client_id: searcher_conn_1.client_id})
 
diff --git a/web/app/assets/javascripts/dialog/rsvpSubmitDialog.js b/web/app/assets/javascripts/dialog/rsvpSubmitDialog.js
index 228b0077f..895927135 100644
--- a/web/app/assets/javascripts/dialog/rsvpSubmitDialog.js
+++ b/web/app/assets/javascripts/dialog/rsvpSubmitDialog.js
@@ -28,11 +28,15 @@
               $('.schedule-recurrence', $dialog).html("Recurs " + response.recurring_mode + " on this day at this time");
             }
 
+            var hasOpenSlots = response.open_slots && response.open_slots.length > 0;
+
+
             if (response['is_unstructured_rsvp?']) {
-              $('.rsvp-instruments', $dialog).append('<input type="checkbox" value="unstructured"/>Any Instrument<br/>');
+              var checkedState = hasOpenSlots ? '' : 'checked="checked"'
+              $('.rsvp-instruments', $dialog).append('<input type="checkbox" ' + checkedState + ' value="unstructured"/>Play Any Instrument You Like<br/>');
             }
 
-            if (response.open_slots && response.open_slots.length > 0) {
+            if (hasOpenSlots) {
               $.each(response.open_slots, function(index, val) {
                 var instrument = val.instrument_id;
 
diff --git a/web/app/assets/javascripts/findMusician.js b/web/app/assets/javascripts/findMusician.js
index 7750d836c..ea8b9f564 100644
--- a/web/app/assets/javascripts/findMusician.js
+++ b/web/app/assets/javascripts/findMusician.js
@@ -89,8 +89,8 @@
         // these are raw scores as reported by client (round trip times)
         if (score == null) return "purple";
         if (0 < score && score <= 40) return "green";
-        if (40 < score && score <= 80) return "yellow";
-        if (80 < score && score <= 120) return "red";
+        if (40 < score && score <= 70) return "yellow";
+        if (70 < score && score <= 100) return "red";
         return "blue";
     }
 
@@ -98,8 +98,8 @@
         // these are raw scores as reported by client (round trip times)
         if (score == null) return "missing";
         if (0 < score && score <= 40) return "good";
-        if (40 < score && score <= 80) return "moderate";
-        if (80 < score && score <= 120) return "poor";
+        if (40 < score && score <= 70) return "moderate";
+        if (70 < score && score <= 100) return "poor";
         return "unacceptable";
     }
 
@@ -126,6 +126,7 @@
         var mVals, musician, renderings='';
         var instr_logos, instr;
         var follows, followVals, aFollow;
+        var myAudioLatency = musicianList.my_audio_latency;
 
         for (ii=0, len=musicians.length; ii < len; ii++) {
             musician = musicians[ii];
@@ -165,7 +166,7 @@
             };
             var musician_actions = context.JK.fillTemplate(aTemplate, actionVals);
 
-            var joined_score = musician['joined_score']
+            var full_score = musician['full_score'];
             mVals = {
                 avatar_url: context.JK.resolveAvatarUrl(musician.photo_url),
                 profile_url: "/client#/profile/" + musician.id,
@@ -180,22 +181,27 @@
                 musician_id: musician['id'],
                 musician_follow_template: follows,
                 musician_action_template: musician_actions,
-                musician_one_way_score: score_to_text(joined_score),
-                musician_score_color: score_to_color(joined_score),
-                musician_score_color_alt: score_to_color_alt(joined_score)
+                musician_one_way_score: score_to_text(full_score),
+                musician_score_color: score_to_color(full_score),
+                musician_score_color_alt: score_to_color_alt(full_score)
+
             };
-            var musician_row = context.JK.fillTemplate(mTemplate, mVals);
-            renderings += musician_row;
+            var $rendering = $(context.JK.fillTemplate(mTemplate, mVals))
+
+            var $offsetParent = $results.closest('.content');
+            var options = {positions: ['top', 'bottom', 'right', 'left'], offsetParent: $offsetParent};
+            var scoreOptions = {positions: ['right', 'top', 'bottom', 'left'], offsetParent: $offsetParent, width:'600px'};
+            context.JK.helpBubble($('.follower-count', $rendering), 'musician-follower-count', {}, options);
+            context.JK.helpBubble($('.friend-count', $rendering), 'musician-friend-count', {}, options);
+            context.JK.helpBubble($('.recording-count', $rendering), 'musician-recording-count', {}, options);
+            context.JK.helpBubble($('.session-count', $rendering), 'musician-session-count', {}, options);
+            context.JK.helpBubble($('.score-count', $rendering), 'musician-score-count',
+              {full_score: full_score ? Math.round(full_score / 2) : null, my_gear_latency: myAudioLatency, their_gear_latency:musician['audio_latency'], internet_latency: musician['score']},
+              scoreOptions)
+
+          $results.append($rendering);
         }
 
-        var $renderings = $(renderings);
-        var $offsetParent = $results.closest('.content');
-        var options = {positions: ['top', 'bottom', 'right', 'left'], offsetParent: $offsetParent}
-        context.JK.helpBubble($('.follower-count', $renderings), 'musician-follower-count', {}, options);
-        context.JK.helpBubble($('.friend-count', $renderings), 'musician-friend-count', {}, options);
-        context.JK.helpBubble($('.recording-count', $renderings), 'musician-recording-count', {}, options);
-        context.JK.helpBubble($('.session-count', $renderings), 'musician-session-count', {}, options);
-        $results.append($renderings);
 
         $('.search-m-friend').on('click', friendMusician);
         $('.search-m-follow').on('click', followMusician);
diff --git a/web/app/assets/javascripts/scheduled_session.js b/web/app/assets/javascripts/scheduled_session.js
index 63c9713b4..7b7de7843 100644
--- a/web/app/assets/javascripts/scheduled_session.js
+++ b/web/app/assets/javascripts/scheduled_session.js
@@ -117,14 +117,14 @@
         var firstSession = function() {
           var $firstSession = $scheduledSessions.children().first().find('input[name="scheduled-session-info"]');
           $firstSession.attr('checked', 'checked');
-          createSessionSettings.selectedSessionId = $firstSession.attr('id');
+          createSessionSettings.selectedSessionId = $firstSession.attr('data-session-id');
 
         };
         if (createSessionSettings.selectedSessionId == null) {
           firstSession();
         }
         else {
-          var $selectedSession = $scheduledSessions.children().first().find('input[name="scheduled-session-info"][id="' + createSessionSettings.selectedSessionId + '"]');
+          var $selectedSession = $scheduledSessions.children().first().find('input[name="scheduled-session-info"][data-session-id="' + createSessionSettings.selectedSessionId + '"]');
           if ($selectedSession.length)
             $selectedSession.attr('checked', 'checked');
           else
@@ -349,6 +349,7 @@
 
     function beforeMoveStep1() {
       if (createSessionSettings.createType == 'start-scheduled') {
+        createSessionSettings.selectedSessionId = $scheduledSessions.find('.iradio_minimal.checked input[name="scheduled-session-info"]').attr('data-session-id');
         var session = scheduledSessions[createSessionSettings.selectedSessionId];
 
         if(session == null) {
@@ -382,7 +383,7 @@
         var startTime = new Date(session.scheduled_start);
         var diffTime = startTime.getTime() - currentTime.getTime();
         if (diffTime > ONE_HOUR) {
-          var confirmDialog = new context.JK.ConfirmDialog(app, "Start Session Now",
+          var confirmDialog = new context.JK.ConfirmDialog(app, "START SESSION NOW",
           "You are starting a session that is scheduled to begin more than one hour from now. Are you sure you want to do this?",
           "Future Session", moveToFinish);
           confirmDialog.initialize();
@@ -416,7 +417,7 @@
         createSessionSettings.startTime = $startTimeList.val();
         createSessionSettings.endTime = $endTimeList.val();
         createSessionSettings.notations = [];
-        createSessionSettings.selectedSessionId = $scheduledSessions.find('input[name="scheduled-session-info"][checked="checked"]').attr('id');
+        createSessionSettings.selectedSessionId = $scheduledSessions.find('.iradio_minimal.checked input[name="scheduled-session-info"]').attr('data-session-id');
         createSessionSettings.timezone.value = $timezoneList.val();
         createSessionSettings.timezone.label = $timezoneList.get(0).options[$timezoneList.get(0).selectedIndex].text;
         createSessionSettings.recurring_mode.label = $recurringModeList.get(0).options[$recurringModeList.get(0).selectedIndex].text;
diff --git a/web/app/assets/javascripts/sessionList.js b/web/app/assets/javascripts/sessionList.js
index b471e5a1f..4321cc183 100644
--- a/web/app/assets/javascripts/sessionList.js
+++ b/web/app/assets/javascripts/sessionList.js
@@ -21,9 +21,9 @@
 
     var LATENCY = {
       GOOD : {description: "GOOD", style: "latency-green", min: 0.0, max: 20.0},
-      MEDIUM : {description: "MEDIUM", style: "latency-yellow", min: 20.0, max: 40.0},
-      POOR : {description: "POOR", style: "latency-red", min: 40.0, max: 10000000000.0},
-      UNREACHABLE: {description: "UNREACHABLE", style: "latency-grey", min: -1, max: -1},
+      MEDIUM : {description: "MEDIUM", style: "latency-yellow", min: 20.0, max: 35.0},
+      POOR : {description: "POOR", style: "latency-red", min: 35.0, max: 50},
+      UNACCEPTABLE: {description: "UNACCEPTABLE", style: "latency-grey", min: 50, max: 10000000},
       UNKNOWN: {description: "UNKNOWN", style: "latency-grey", min: -2, max: -2}
     };
 
@@ -350,7 +350,10 @@
     }
 
     function createLatency(user) {
-      var latencyStyle = LATENCY.UNREACHABLE.style, latencyDescription = LATENCY.UNREACHABLE.description
+
+      var latencyStyle;
+      var latencyDescription;
+
       if (user.id === context.JK.currentUserId) {
         latencyStyle = LATENCY.GOOD.style, latencyDescription = LATENCY.GOOD.description;
       }
@@ -358,24 +361,25 @@
       else {
         var latency = user.latency;
 
-        if (!latency || latency === 1000) {
-          // 1000 is a magical number returned by new scoring API to indicate one or more people in the session have an unknown score
+        if (!latency) {
           latencyDescription = LATENCY.UNKNOWN.description;
           latencyStyle = LATENCY.UNKNOWN.style;
         }
+        else if (latency <= LATENCY.GOOD.max) {
+          latencyDescription = LATENCY.GOOD.description;
+          latencyStyle = LATENCY.GOOD.style;
+        }
+        else if (latency > LATENCY.MEDIUM.min && latency <= LATENCY.MEDIUM.max) {
+          latencyDescription = LATENCY.MEDIUM.description;
+          latencyStyle = LATENCY.MEDIUM.style;
+        }
+        else if (latency > LATENCY.POOR.min && latency <= LATENCY.UNACCEPTABLE.max) {
+          latencyDescription = LATENCY.POOR.description;
+          latencyStyle = LATENCY.POOR.style;
+        }
         else {
-          if (latency <= LATENCY.GOOD.max) {
-            latencyDescription = LATENCY.GOOD.description;
-            latencyStyle = LATENCY.GOOD.style;
-          }
-          else if (latency > LATENCY.MEDIUM.min && latency <= LATENCY.MEDIUM.max) {
-            latencyDescription = LATENCY.MEDIUM.description;
-            latencyStyle = LATENCY.MEDIUM.style;
-          }
-          else {
-            latencyDescription = LATENCY.POOR.description;
-            latencyStyle = LATENCY.POOR.style;
-          }
+          latencyStyle = LATENCY.UNREACHABLE.style
+          latencyDescription = LATENCY.UNREACHABLE.description
         }
       }
 
diff --git a/web/app/assets/javascripts/utils.js b/web/app/assets/javascripts/utils.js
index 3270cc59e..38785e099 100644
--- a/web/app/assets/javascripts/utils.js
+++ b/web/app/assets/javascripts/utils.js
@@ -185,7 +185,7 @@
       cornerRadius: 0,
       cssStyles: {
         fontSize: '11px',
-        color: 'white',
+        color: '#cccccc',
         whiteSpace: 'normal'
       }
     };
diff --git a/web/app/assets/stylesheets/client/client.css b/web/app/assets/stylesheets/client/client.css
index d6325a7c0..68b4073ce 100644
--- a/web/app/assets/stylesheets/client/client.css
+++ b/web/app/assets/stylesheets/client/client.css
@@ -53,6 +53,7 @@
  *= require ./searchResults
  *= require ./clientUpdate
  *= require ./musician
+ *= require ./help
  *= require ./jquery-ui-overrides
  *= require web/audioWidgets
  *= require web/recordings
diff --git a/web/app/assets/stylesheets/client/help.css.scss b/web/app/assets/stylesheets/client/help.css.scss
new file mode 100644
index 000000000..691bc7c74
--- /dev/null
+++ b/web/app/assets/stylesheets/client/help.css.scss
@@ -0,0 +1,43 @@
+.screen {
+  .bt-wrapper {
+    .bt-content {
+
+      color:#cccccc;
+
+      font-size:14px;
+
+      p {
+        font-size:14px;
+      }
+      ul {
+        font-size:14px;
+      }
+
+      li {
+        margin-left:1em;
+        margin-bottom:.5em;
+      }
+
+      .definition {
+        font-weight:bold;
+      }
+
+      .help-musician-score-count {
+        .measurement {
+
+        }
+
+        .measurement-value {
+          font-size:24px;
+        }
+
+        .measurement-absent {
+          font-style:italic;
+          font-size:12px;
+          display:block;
+        }
+      }
+
+    }
+  }
+}
\ No newline at end of file
diff --git a/web/app/views/api_search/index.rabl b/web/app/views/api_search/index.rabl
index 5c1f8b002..e7120fca6 100644
--- a/web/app/views/api_search/index.rabl
+++ b/web/app/views/api_search/index.rabl
@@ -41,9 +41,13 @@ if @search.musicians_filter_search?
   node :page_count do |foo|
     @search.page_count
   end
+
+  node :my_audio_latency do |user|
+    current_user.last_jam_audio_latency
+  end
          
   child(:results => :musicians) {
-      attributes :id, :first_name, :last_name, :name, :city, :state, :country, :email, :online, :musician, :photo_url, :biography, :joined_score, :regionname
+      attributes :id, :first_name, :last_name, :name, :city, :state, :country, :email, :online, :musician, :photo_url, :biography, :regionname, :score, :full_score, :audio_latency
 
       node :is_friend do |musician|
         @search.is_friend?(musician)
diff --git a/web/app/views/clients/_help.html.erb b/web/app/views/clients/_help.html.erb
index a476f3e24..1a531a89b 100644
--- a/web/app/views/clients/_help.html.erb
+++ b/web/app/views/clients/_help.html.erb
@@ -56,4 +56,26 @@
 
 <script type="text/template" id="template-help-musician-session-count">
   The number of sessions that this user has played in.
+</script>
+
+<script type="text/template" id="template-help-musician-score-count">
+  <div class="help-musician-score-count">
+  <p>The score shown is the one-way latency (or delay) in milliseconds from you to this user. This score is calculated using the following three values that JamKazam gathers:</p>
+  <ul>
+    <li><span class="definition">Your Audio Gear Latency:</span> <span class="measurement my-gear-latency"><span class="measurement-value">{{data.my_gear_latency ? data.my_gear_latency + ' ms': '13 ms*'}}</span> <span class="measurement-absent">{{data.my_gear_latency ? '' : "(you have not qualified any gear, so we picked an average gear latency)"}}</span></span></li>
+    <li><span class="definition">Their Audio Gear Latency:</span> <span class="measurement their-gear-latency"><span class="measurement-value">{{data.their_gear_latency ? data.their_gear_latency + ' ms': '13 ms*'}}</span> <span class="measurement-absent">{{data.their_gear_latency ? '' : "(they have not qualified any gear, so we picked an average gear latency)"}}</span></span></li>
+    <li><span class="definition">Round-trip Internet Latency:</span> <span class="measurement internet-latency"><span class="measurement-value">{{data.internet_latency ? data.internet_latency + ' ms': '?'}}</span> <span class="measurement-absent">{{data.internet_latency ? '' : "(we have not scored you with this user yet)"}}</span></span></li>
+  </ul>
+  <p> <span class="definition">Total One-Way Latency:</span> <span class="measurement my-gear-latency"><span class="measurement-value">( {{data.my_gear_latency ? data.my_gear_latency: '13'}} + {{data.their_gear_latency ? data.their_gear_latency: '13'}} + {{data.internet_latency ? data.internet_latency: '?'}} ) / 2 = {{data.full_score ? data.full_score + ' ms' : "?"}}</span> <span class="measurement-absent">{{data.full_score ? '' : "(when we don't know internet latency, we don't try to guess your one-way latency)"}}</span></span>
+
+  <p>We categorize this score as good, fair, poor, unacceptable, or unknown.  Those categories are defined as follows:
+  <ul>
+    <li><span class="definition">Good:</span> 20ms or less <img src="/assets/content/icon_green_score.png" /></li>
+    <li><span class="definition">Fair:</span> 20ms to 35ms <img src="/assets/content/icon_yellow_score.png" /></li>
+    <li><span class="definition">Poor:</span> 35ms to 50ms <img src="/assets/content/icon_red_score.png" /></li>
+    <li><span class="definition">Unacceptable:</span> Above 50ms <img src="/assets/content/icon_blue_score.png" /></li>
+    <li><span class="definition">Unknown:</span> No internet score is available between you and them. <img src="/assets/content/icon_purple_score.png" /></li>
+  </ul>
+  </div>
+
 </script>
\ No newline at end of file
diff --git a/web/app/views/clients/_musicians.html.erb b/web/app/views/clients/_musicians.html.erb
index bbb81888e..df1b044b4 100644
--- a/web/app/views/clients/_musicians.html.erb
+++ b/web/app/views/clients/_musicians.html.erb
@@ -23,7 +23,7 @@
 <% end -%>
 
 <!-- Session Row Template -->
-  <script type="text/template" id="template-find-musician-row">
+<script type="text/template" id="template-find-musician-row">
   <div class="profile-band-list-result musician-list-result">
     <div class="f11" data-hint="container">
       <div class="left" style="width:63px;margin-top:-12px;">
diff --git a/web/app/views/clients/_scheduledSession.html.erb b/web/app/views/clients/_scheduledSession.html.erb
index a55d8d0cb..ca05f28d1 100644
--- a/web/app/views/clients/_scheduledSession.html.erb
+++ b/web/app/views/clients/_scheduledSession.html.erb
@@ -456,7 +456,7 @@
 <!-- Scheduled session template -->
 <script type="text/template" id="template-scheduled-session">
   <li>
-    <input type="radio" name="scheduled-session-info" id="{{data.id}}" value="false" />
+    <input type="radio" name="scheduled-session-info" data-session-id="{{data.id}}" value="false" />
     <label for="{{data.id}}" class="radio-text w85">
       {{data.scheduled_start}} : {{data.name}}
     </label>
diff --git a/web/app/views/dialogs/_rsvpSubmitDialog.html.haml b/web/app/views/dialogs/_rsvpSubmitDialog.html.haml
index f1949dd4a..b27837203 100644
--- a/web/app/views/dialogs/_rsvpSubmitDialog.html.haml
+++ b/web/app/views/dialogs/_rsvpSubmitDialog.html.haml
@@ -12,7 +12,7 @@
       .error{:style => 'display:none'} You must select at least 1 instrument.
       .rsvp-instruments
 
-    .comment-instructions Enter a message to the other musicians in the session (optional):
+      .comment-instructions Enter a message to the other musicians in the session (optional):
     %textarea.txtComment{rows: '2', placeholder: 'Enter a comment...'}
     .buttons
       .left
diff --git a/web/spec/controllers/api_music_sessions_controller_spec.rb b/web/spec/controllers/api_music_sessions_controller_spec.rb
index 50908d65f..aca3fce10 100644
--- a/web/spec/controllers/api_music_sessions_controller_spec.rb
+++ b/web/spec/controllers/api_music_sessions_controller_spec.rb
@@ -57,7 +57,7 @@ describe ApiMusicSessionsController do
       ams = FactoryGirl.create(:active_music_session, creator: other)
       other_conn.join_the_session(ams.music_session, true, tracks, other, 10)
       other_conn.errors.any?.should be_false
-      Score.createx(conn.locidispid, conn.client_id, conn.addr, other_conn.locidispid, other_conn.client_id, other_conn.addr, network_score, nil)
+      Score.createx(conn.locidispid, conn.client_id, conn.addr, other_conn.locidispid, other_conn.client_id, other_conn.addr, network_score, nil, nil, {auserid: user.id, buserid: other.id})
 
       get :ams_index, {client_id: conn.client_id}
       json = JSON.parse(response.body, :symbolize_names => true)
@@ -75,7 +75,7 @@ describe ApiMusicSessionsController do
       third_user.last_jam_audio_latency = 10  # RSVP's are an 'offline' search, meaning they use user.last_jam_audio_latency instead of connection.last_jam_audio_latency
       third_user.last_jam_locidispid = conn.locidispid
       third_user.save!
-      Score.createx(conn.locidispid, conn.client_id, conn.addr, other_conn.locidispid, other_conn.client_id, other_conn.addr, network_score, nil)
+      Score.createx(conn.locidispid, conn.client_id, conn.addr, other_conn.locidispid, other_conn.client_id, other_conn.addr, network_score, nil, nil, {auserid: user.id, buserid: other.id})
 
       # set up a second RSVP (other than the creators, pointing to the third_user)
       rsvp_slot = FactoryGirl.create(:rsvp_slot, music_session: ams.music_session, instrument: Instrument.find('piano'))
@@ -139,14 +139,14 @@ describe ApiMusicSessionsController do
     it "scores with invitees and RSVP's" do
       # create a session with someone else in it, but no score
       sms = FactoryGirl.create(:music_session, creator: other)
-      Score.createx(conn.locidispid, conn.client_id, conn.addr, other_conn.locidispid, other_conn.client_id, other_conn.addr, network_score, nil)
+      Score.createx(conn.locidispid, conn.client_id, conn.addr, other_conn.locidispid, other_conn.client_id, other_conn.addr, network_score, nil, nil, {auserid: user.id, buserid: other.id})
 
       invitee = FactoryGirl.create(:user, last_jam_audio_latency: 30, last_jam_locidispid: 3)
       FactoryGirl.create(:friendship, user: other, friend: invitee)
       FactoryGirl.create(:friendship, user: invitee, friend: other)
       FactoryGirl.create(:invitation, sender:other, receiver:invitee, music_session: sms)
 
-      Score.createx(invitee.last_jam_locidispid, 'immaterial', 1, conn.locidispid, conn.client_id, conn.addr, network_score, nil)
+      Score.createx(invitee.last_jam_locidispid, 'immaterial', 1, conn.locidispid, conn.client_id, conn.addr, network_score, nil, nil, {auserid: invitee.id, buserid: user.id})
 
       get :sms_index, {client_id: conn.client_id}
       json = JSON.parse(response.body, :symbolize_names => true)
diff --git a/web/spec/features/create_session_flow_spec.rb b/web/spec/features/create_session_flow_spec.rb
index d61b9f213..0d578ed17 100644
--- a/web/spec/features/create_session_flow_spec.rb
+++ b/web/spec/features/create_session_flow_spec.rb
@@ -17,6 +17,31 @@ describe "Create Session UI", :js => true, :type => :feature, :capybara_feature
       end
     end
 
+    # VRFS-1976
+    it "create two sessions; select the second one" do
+
+      # this is tricky because of iCheck and it's custom way of dealing with 'checked' state
+      start1 = 15.minutes.ago
+      session1 = FactoryGirl.create(:music_session, description: 'My Session 1', creator: user1, scheduled_start: start1)
+      session2 = FactoryGirl.create(:music_session, description: 'My Session 2', creator: user1)
+
+
+      in_client(user1) do
+        # should reload the session page, so that we see new sessions
+        visit '/client#/createSession'
+
+        # pick the second session
+        page.find("#scheduled-session-list input[data-session-id='#{session2.id}'] + ins").trigger(:click)
+        page.find('.btn-next').trigger(:click)
+
+        # check if future dialog is showing; if so, accept
+        accept = first('#btn-confirm-ok', text: "START SESSION NOW")
+        accept.trigger(:click) if accept
+
+        page.find('#session-description-disp', text: 'My Session 2')
+      end
+    end
+
     describe "step 1" do
       it "initial status" do
         in_client(user1) do
diff --git a/web/spec/features/create_session_spec.rb b/web/spec/features/create_session_spec.rb
index 4772aa869..904f5239c 100644
--- a/web/spec/features/create_session_spec.rb
+++ b/web/spec/features/create_session_spec.rb
@@ -67,7 +67,7 @@ describe "Create Session", :js => true, :type => :feature, :capybara_feature =>
             sleep 2
             expect(page).to have_selector('h1', text: 'Future Session')
             expect(page).to have_content "Are you sure"
-            find('#btn-confirm-ok', text: 'Start Session Now').trigger(:click)
+            find('#btn-confirm-ok', text: 'START SESSION NOW').trigger(:click)
             sleep 1
             expect(page).to have_selector('.session-step-title', text: 'Review & Confirm')
             expect(page).to have_content first_session.name
diff --git a/web/spec/requests/musician_search_api_spec.rb b/web/spec/requests/musician_search_api_spec.rb
index 5e6f67f0a..9fff2b1f6 100644
--- a/web/spec/requests/musician_search_api_spec.rb
+++ b/web/spec/requests/musician_search_api_spec.rb
@@ -61,7 +61,7 @@ describe "Musician Search API", :type => :api do
       it "gets musicians for long-distance locations" do
         get_query({score_limit: Search::GOOD_SCORE})
         good_response
-        (json['musicians'] || []).count.should == 5
+        (json['musicians'] || []).count.should == 3 # only users that have the 10 latency are low enough
       end
 
     end
@@ -106,8 +106,9 @@ describe "Musician Search API", :type => :api do
         f5.save
 
         expect(@user4.followers.count).to be 3
-        get_query
+        get_query(orderby: :followed)
         good_response
+        puts last_response.body
         musician = json["musicians"][0]
         expect(musician["id"]).to eq(@user4.id)
         followings = musician['followings']
diff --git a/web/vendor/assets/javascripts/jquery.icheck.js b/web/vendor/assets/javascripts/jquery.icheck.js
index ab4eed092..57f0544b8 100644
--- a/web/vendor/assets/javascripts/jquery.icheck.js
+++ b/web/vendor/assets/javascripts/jquery.icheck.js
@@ -1,462 +1,509 @@
 /*!
- * iCheck v0.9.1, http://git.io/uhUPMA
- * =================================
- * Powerful jQuery plugin for checkboxes and radio buttons customization
+ * iCheck v1.0.2, http://git.io/arlzeA
+ * ===================================
+ * Powerful jQuery and Zepto plugin for checkboxes and radio buttons customization
  *
- * (c) 2013 Damir Foy, http://damirfoy.com
+ * (c) 2013 Damir Sultanov, http://fronteed.com
  * MIT Licensed
  */
 
 (function($) {
 
-    // Cached vars
-    var _iCheck = 'iCheck',
-        _iCheckHelper = _iCheck + '-helper',
-        _checkbox = 'checkbox',
-        _radio = 'radio',
-        _checked = 'checked',
-        _unchecked = 'un' + _checked,
-        _disabled = 'disabled',
-        _determinate = 'determinate',
-        _indeterminate = 'in' + _determinate,
-        _update = 'update',
-        _type = 'type',
-        _click = 'click',
-        _touch = 'touchbegin.i touchend.i',
-        _add = 'addClass',
-        _remove = 'removeClass',
-        _callback = 'trigger',
-        _label = 'label',
-        _cursor = 'cursor',
-        _mobile = /ipad|iphone|ipod|android|blackberry|windows phone|opera mini|silk/i.test(navigator.userAgent);
+  // Cached vars
+  var _iCheck = 'iCheck',
+    _iCheckHelper = _iCheck + '-helper',
+    _checkbox = 'checkbox',
+    _radio = 'radio',
+    _checked = 'checked',
+    _unchecked = 'un' + _checked,
+    _disabled = 'disabled',
+    _determinate = 'determinate',
+    _indeterminate = 'in' + _determinate,
+    _update = 'update',
+    _type = 'type',
+    _click = 'click',
+    _touch = 'touchbegin.i touchend.i',
+    _add = 'addClass',
+    _remove = 'removeClass',
+    _callback = 'trigger',
+    _label = 'label',
+    _cursor = 'cursor',
+    _mobile = /ipad|iphone|ipod|android|blackberry|windows phone|opera mini|silk/i.test(navigator.userAgent);
 
-    // Plugin init
-    $.fn[_iCheck] = function(options, fire) {
+  // Plugin init
+  $.fn[_iCheck] = function(options, fire) {
 
-        // Walker
-        var handle = ':' + _checkbox + ', :' + _radio,
-            stack = $(),
-            walker = function(object) {
-                object.each(function() {
-                    var self = $(this);
+    // Walker
+    var handle = 'input[type="' + _checkbox + '"], input[type="' + _radio + '"]',
+      stack = $(),
+      walker = function(object) {
+        object.each(function() {
+          var self = $(this);
 
-                    if (self.is(handle)) {
-                        stack = stack.add(self);
-                    } else {
-                        stack = stack.add(self.find(handle));
-                    };
-                });
-            };
+          if (self.is(handle)) {
+            stack = stack.add(self);
+          } else {
+            stack = stack.add(self.find(handle));
+          }
+        });
+      };
 
-        // Check if we should operate with some method
-        if (/^(check|uncheck|toggle|indeterminate|determinate|disable|enable|update|destroy)$/i.test(options)) {
+    // Check if we should operate with some method
+    if (/^(check|uncheck|toggle|indeterminate|determinate|disable|enable|update|destroy)$/i.test(options)) {
 
-            // Normalize method's name
-            options = options.toLowerCase();
+      // Normalize method's name
+      options = options.toLowerCase();
 
-            // Find checkboxes and radio buttons
-            walker(this);
+      // Find checkboxes and radio buttons
+      walker(this);
 
-            return stack.each(function() {
-                if (options == 'destroy') {
-                    tidy(this, 'ifDestroyed');
-                } else {
-                    operate($(this), true, options);
-                };
+      return stack.each(function() {
+        var self = $(this);
 
-                // Fire method's callback
-                if ($.isFunction(fire)) {
-                    fire();
-                };
-            });
-
-            // Customization
-        } else if (typeof options == 'object' || !options) {
-
-            // Check if any options were passed
-            var settings = $.extend({
-                    checkedClass: _checked,
-                    disabledClass: _disabled,
-                    indeterminateClass: _indeterminate,
-                    labelHover: true
-                }, options),
-
-                selector = settings.handle,
-                hoverClass = settings.hoverClass || 'hover',
-                focusClass = settings.focusClass || 'focus',
-                activeClass = settings.activeClass || 'active',
-                labelHover = !!settings.labelHover,
-                labelHoverClass = settings.labelHoverClass || 'hover',
-
-            // Setup clickable area
-                area = ('' + settings.increaseArea).replace('%', '') | 0;
-
-            // Selector limit
-            if (selector == _checkbox || selector == _radio) {
-                handle = ':' + selector;
-            };
-
-            // Clickable area limit
-            if (area < -50) {
-                area = -50;
-            };
-
-            // Walk around the selector
-            walker(this);
-
-            return stack.each(function() {
-
-                // If already customized
-                tidy(this);
-
-                var self = $(this),
-                    node = this,
-                    id = node.id,
-
-                // Layer styles
-                    offset = -area + '%',
-                    size = 100 + (area * 2) + '%',
-                    layer = {
-                        position: 'absolute',
-                        top: offset,
-                        left: offset,
-                        display: 'block',
-                        width: size,
-                        height: size,
-                        margin: 0,
-                        padding: 0,
-                        background: '#fff',
-                        border: 0,
-                        opacity: 0
-                    },
-
-                // Choose how to hide input
-                    hide = _mobile ? {
-                        position: 'absolute',
-                        visibility: 'hidden'
-                    } : area ? layer : {
-                        position: 'absolute',
-                        opacity: 0
-                    },
-
-                // Get proper class
-                    className = node[_type] == _checkbox ? settings.checkboxClass || 'i' + _checkbox : settings.radioClass || 'i' + _radio,
-
-                // Find assigned labels
-                    label = $(_label + '[for="' + id + '"]').add(self.closest(_label)),
-
-                // Wrap input
-                    parent = self.wrap('<div class="' + className + '"/>')[_callback]('ifCreated').parent().append(settings.insert),
-
-                // Layer addition
-                    helper = $('<ins class="' + _iCheckHelper + '"/>').css(layer).appendTo(parent);
-
-                // Finalize customization
-                self.data(_iCheck, {o: settings, s: self.attr('style')}).css(hide);
-                !!settings.inheritClass && parent[_add](node.className);
-                !!settings.inheritID && id && parent.attr('id', _iCheck + '-' + id);
-                parent.css('position') == 'static' && parent.css('position', 'relative');
-                operate(self, true, _update);
-
-                // Label events
-                if (label.length) {
-                    label.on(_click + '.i mouseenter.i mouseleave.i ' + _touch, function(event) {
-                        var type = event[_type],
-                            item = $(this);
-
-                        // Do nothing if input is disabled
-                        if (!node[_disabled]) {
-
-                            // Click
-                            if (type == _click) {
-                                operate(self, false, true);
-
-                                // Hover state
-                            } else if (labelHover) {
-
-                                // mouseleave|touchend
-                                if (/ve|nd/.test(type)) {
-                                    parent[_remove](hoverClass);
-                                    item[_remove](labelHoverClass);
-                                } else {
-                                    parent[_add](hoverClass);
-                                    item[_add](labelHoverClass);
-                                };
-                            };
-
-                            if (_mobile) {
-                                event.stopPropagation();
-                            } else {
-                                return false;
-                            };
-                        };
-                    });
-                };
-
-                // Input events
-                self.on(_click + '.i focus.i blur.i keyup.i keydown.i keypress.i', function(event) {
-                    var type = event[_type],
-                        key = event.keyCode;
-
-                    // Click
-                    if (type == _click) {
-                        return false;
-
-                        // Keydown
-                    } else if (type == 'keydown' && key == 32) {
-                        if (!(node[_type] == _radio && node[_checked])) {
-                            if (node[_checked]) {
-                                off(self, _checked);
-                            } else {
-                                on(self, _checked);
-                            };
-                        };
-
-                        return false;
-
-                        // Keyup
-                    } else if (type == 'keyup' && node[_type] == _radio) {
-                        !node[_checked] && on(self, _checked);
-
-                        // Focus/blur
-                    } else if (/us|ur/.test(type)) {
-                        parent[type == 'blur' ? _remove : _add](focusClass);
-                    };
-                });
-
-                // Helper events
-                helper.on(_click + ' mousedown mouseup mouseover mouseout ' + _touch, function(event) {
-                    var type = event[_type],
-
-                    // mousedown|mouseup
-                        toggle = /wn|up/.test(type) ? activeClass : hoverClass;
-
-                    // Do nothing if input is disabled
-                    if (!node[_disabled]) {
-
-                        // Click
-                        if (type == _click) {
-                            operate(self, false, true);
-
-                            // Active and hover states
-                        } else {
-
-                            // State is on
-                            if (/wn|er|in/.test(type)) {
-
-                                // mousedown|mouseover|touchbegin
-                                parent[_add](toggle);
-
-                                // State is off
-                            } else {
-                                parent[_remove](toggle + ' ' + activeClass);
-                            };
-
-                            // Label hover
-                            if (label.length && labelHover && toggle == hoverClass) {
-
-                                // mouseout|touchend
-                                label[/ut|nd/.test(type) ? _remove : _add](labelHoverClass);
-                            };
-                        };
-
-                        if (_mobile) {
-                            event.stopPropagation();
-                        } else {
-                            return false;
-                        };
-                    };
-                });
-            });
+        if (options == 'destroy') {
+          tidy(self, 'ifDestroyed');
         } else {
-            return this;
-        };
-    };
+          operate(self, true, options);
+        }
 
-    // Do something with inputs
-    function operate(input, direct, method) {
-        var node = input[0];
-        state = /er/.test(method) ? _indeterminate : /bl/.test(method) ? _disabled : _checked,
-            active = method == _update ? {
-                checked: node[_checked],
-                disabled: node[_disabled],
-                indeterminate: input.attr(_indeterminate) == 'true' || input.attr(_determinate) == 'false'
-            } : node[state];
+        // Fire method's callback
+        if ($.isFunction(fire)) {
+          fire();
+        }
+      });
 
-        // Check, disable or indeterminate
-        if (/^(ch|di|in)/.test(method) && !active) {
-            on(input, state);
+      // Customization
+    } else if (typeof options == 'object' || !options) {
 
-            // Uncheck, enable or determinate
-        } else if (/^(un|en|de)/.test(method) && active) {
-            off(input, state);
+      // Check if any options were passed
+      var settings = $.extend({
+          checkedClass: _checked,
+          disabledClass: _disabled,
+          indeterminateClass: _indeterminate,
+          labelHover: true
+        }, options),
 
-            // Update
-        } else if (method == _update) {
+        selector = settings.handle,
+        hoverClass = settings.hoverClass || 'hover',
+        focusClass = settings.focusClass || 'focus',
+        activeClass = settings.activeClass || 'active',
+        labelHover = !!settings.labelHover,
+        labelHoverClass = settings.labelHoverClass || 'hover',
 
-            // Handle states
-            for (var state in active) {
-                if (active[state]) {
-                    on(input, state, true);
+      // Setup clickable area
+        area = ('' + settings.increaseArea).replace('%', '') | 0;
+
+      // Selector limit
+      if (selector == _checkbox || selector == _radio) {
+        handle = 'input[type="' + selector + '"]';
+      }
+
+      // Clickable area limit
+      if (area < -50) {
+        area = -50;
+      }
+
+      // Walk around the selector
+      walker(this);
+
+      return stack.each(function() {
+        var self = $(this);
+
+        // If already customized
+        tidy(self);
+
+        var node = this,
+          id = node.id,
+
+        // Layer styles
+          offset = -area + '%',
+          size = 100 + (area * 2) + '%',
+          layer = {
+            position: 'absolute',
+            top: offset,
+            left: offset,
+            display: 'block',
+            width: size,
+            height: size,
+            margin: 0,
+            padding: 0,
+            background: '#fff',
+            border: 0,
+            opacity: 0
+          },
+
+        // Choose how to hide input
+          hide = _mobile ? {
+            position: 'absolute',
+            visibility: 'hidden'
+          } : area ? layer : {
+            position: 'absolute',
+            opacity: 0
+          },
+
+        // Get proper class
+          className = node[_type] == _checkbox ? settings.checkboxClass || 'i' + _checkbox : settings.radioClass || 'i' + _radio,
+
+        // Find assigned labels
+          label = $(_label + '[for="' + id + '"]').add(self.closest(_label)),
+
+        // Check ARIA option
+          aria = !!settings.aria,
+
+        // Set ARIA placeholder
+          ariaID = _iCheck + '-' + Math.random().toString(36).substr(2,6),
+
+        // Parent & helper
+          parent = '<div class="' + className + '" ' + (aria ? 'role="' + node[_type] + '" ' : ''),
+          helper;
+
+        // Set ARIA "labelledby"
+        if (aria) {
+          label.each(function() {
+            parent += 'aria-labelledby="';
+
+            if (this.id) {
+              parent += this.id;
+            } else {
+              this.id = ariaID;
+              parent += ariaID;
+            }
+
+            parent += '"';
+          });
+        }
+
+        // Wrap input
+        parent = self.wrap(parent + '/>')[_callback]('ifCreated').parent().append(settings.insert);
+
+        // Layer addition
+        helper = $('<ins class="' + _iCheckHelper + '"/>').css(layer).appendTo(parent);
+
+        // Finalize customization
+        self.data(_iCheck, {o: settings, s: self.attr('style')}).css(hide);
+        !!settings.inheritClass && parent[_add](node.className || '');
+        !!settings.inheritID && id && parent.attr('id', _iCheck + '-' + id);
+        parent.css('position') == 'static' && parent.css('position', 'relative');
+        operate(self, true, _update);
+
+        // Label events
+        if (label.length) {
+          label.on(_click + '.i mouseover.i mouseout.i ' + _touch, function(event) {
+            var type = event[_type],
+              item = $(this);
+
+            // Do nothing if input is disabled
+            if (!node[_disabled]) {
+
+              // Click
+              if (type == _click) {
+                if ($(event.target).is('a')) {
+                  return;
+                }
+                operate(self, false, true);
+
+                // Hover state
+              } else if (labelHover) {
+
+                // mouseout|touchend
+                if (/ut|nd/.test(type)) {
+                  parent[_remove](hoverClass);
+                  item[_remove](labelHoverClass);
                 } else {
-                    off(input, state, true);
-                };
-            };
+                  parent[_add](hoverClass);
+                  item[_add](labelHoverClass);
+                }
+              }
 
-        } else if (!direct || method == 'toggle') {
+              if (_mobile) {
+                event.stopPropagation();
+              } else {
+                return false;
+              }
+            }
+          });
+        }
 
-            // Helper or label was clicked
-            if (!direct) {
-                input[_callback]('ifClicked');
-            };
+        // Input events
+        self.on(_click + '.i focus.i blur.i keyup.i keydown.i keypress.i', function(event) {
+          var type = event[_type],
+            key = event.keyCode;
 
-            // Toggle checked state
-            if (active) {
-                if (node[_type] !== _radio) {
-                    off(input, state);
-                };
-            } else {
-                on(input, state);
-            };
-        };
-    };
+          // Click
+          if (type == _click) {
+            return false;
 
-    // Add checked, disabled or indeterminate state
-    function  on(input, state, keep) {
-        var node = input[0],
-            parent = input.parent(),
-            checked = state == _checked,
-            indeterminate = state == _indeterminate,
-            callback = indeterminate ? _determinate : checked ? _unchecked : 'enabled',
-            regular = option(node, callback + capitalize(node[_type])),
-            specific = option(node, state + capitalize(node[_type]));
+            // Keydown
+          } else if (type == 'keydown' && key == 32) {
+            if (!(node[_type] == _radio && node[_checked])) {
+              if (node[_checked]) {
+                off(self, _checked);
+              } else {
+                on(self, _checked);
+              }
+            }
 
-        // Prevent unnecessary actions
-        if (node[state] !== true) {
+            return false;
 
-            // Toggle assigned radio buttons
-            if (!keep && state == _checked && node[_type] == _radio && node.name) {
-                var form = input.closest('form'),
-                    inputs = 'input[name="' + node.name + '"]';
+            // Keyup
+          } else if (type == 'keyup' && node[_type] == _radio) {
+            !node[_checked] && on(self, _checked);
 
-                inputs = form.length ? form.find(inputs) : $(inputs);
+            // Focus/blur
+          } else if (/us|ur/.test(type)) {
+            parent[type == 'blur' ? _remove : _add](focusClass);
+          }
+        });
 
-                inputs.each(function() {
-                    if (this !== node && $.data(this, _iCheck)) {
-                        off($(this), state);
-                    };
-                });
-            };
+        // Helper events
+        helper.on(_click + ' mousedown mouseup mouseover mouseout ' + _touch, function(event) {
+          var type = event[_type],
 
-            // Indeterminate state
-            if (indeterminate) {
+          // mousedown|mouseup
+            toggle = /wn|up/.test(type) ? activeClass : hoverClass;
 
-                // Add indeterminate state
-                node[state] = true;
+          // Do nothing if input is disabled
+          if (!node[_disabled]) {
 
-                // Remove checked state
-                if (node[_checked]) {
-                    off(input, _checked, 'force');
-                };
+            // Click
+            if (type == _click) {
+              operate(self, false, true);
 
-                // Checked or disabled state
+              // Active and hover states
             } else {
 
-                // Add checked or disabled state
-                if (!keep) {
-                    node[state] = true;
-                };
+              // State is on
+              if (/wn|er|in/.test(type)) {
 
-                // Remove indeterminate state
-                if (checked && node[_indeterminate]) {
-                    off(input, _indeterminate, false);
-                };
-            };
+                // mousedown|mouseover|touchbegin
+                parent[_add](toggle);
 
-            // Trigger callbacks
-            callbacks(input, checked, state, keep);
-        };
+                // State is off
+              } else {
+                parent[_remove](toggle + ' ' + activeClass);
+              }
 
-        // Add proper cursor
-        if (node[_disabled] && !!option(node, _cursor, true)) {
-            parent.find('.' + _iCheckHelper).css(_cursor, 'default');
-        };
+              // Label hover
+              if (label.length && labelHover && toggle == hoverClass) {
 
-        // Add state class
-        parent[_add](specific || option(node, state));
+                // mouseout|touchend
+                label[/ut|nd/.test(type) ? _remove : _add](labelHoverClass);
+              }
+            }
 
-        // Remove regular state class
-        parent[_remove](regular || option(node, callback) || '');
-    };
+            if (_mobile) {
+              event.stopPropagation();
+            } else {
+              return false;
+            }
+          }
+        });
+      });
+    } else {
+      return this;
+    }
+  };
 
-    // Remove checked, disabled or indeterminate state
-    function off(input, state, keep) {
-        var node = input[0],
-            parent = input.parent(),
-            checked = state == _checked,
-            indeterminate = state == _indeterminate,
-            callback = indeterminate ? _determinate : checked ? _unchecked : 'enabled',
-            regular = option(node, callback + capitalize(node[_type])),
-            specific = option(node, state + capitalize(node[_type]));
+  // Do something with inputs
+  function operate(input, direct, method) {
+    var node = input[0],
+      state = /er/.test(method) ? _indeterminate : /bl/.test(method) ? _disabled : _checked,
+      active = method == _update ? {
+        checked: node[_checked],
+        disabled: node[_disabled],
+        indeterminate: input.attr(_indeterminate) == 'true' || input.attr(_determinate) == 'false'
+      } : node[state];
 
-        // Prevent unnecessary actions
-        if (node[state] !== false) {
+    // Check, disable or indeterminate
+    if (/^(ch|di|in)/.test(method) && !active) {
+      on(input, state);
 
-            // Toggle state
-            if (indeterminate || !keep || keep == 'force') {
-                node[state] = false;
-            };
+      // Uncheck, enable or determinate
+    } else if (/^(un|en|de)/.test(method) && active) {
+      off(input, state);
 
-            // Trigger callbacks
-            callbacks(input, checked, callback, keep);
-        };
+      // Update
+    } else if (method == _update) {
 
-        // Add proper cursor
-        if (!node[_disabled] && !!option(node, _cursor, true)) {
-            parent.find('.' + _iCheckHelper).css(_cursor, 'pointer');
-        };
+      // Handle states
+      for (var each in active) {
+        if (active[each]) {
+          on(input, each, true);
+        } else {
+          off(input, each, true);
+        }
+      }
 
-        // Remove state class
-        parent[_remove](specific || option(node, state) || '');
+    } else if (!direct || method == 'toggle') {
 
-        // Add regular state class
-        parent[_add](regular || option(node, callback));
-    };
+      // Helper or label was clicked
+      if (!direct) {
+        input[_callback]('ifClicked');
+      }
 
-    // Remove all traces
-    function tidy(node, callback) {
-        if ($.data(node, _iCheck)) {
-            var input = $(node);
+      // Toggle checked state
+      if (active) {
+        if (node[_type] !== _radio) {
+          off(input, state);
+        }
+      } else {
+        on(input, state);
+      }
+    }
+  }
 
-            // Remove everything except input
-            input.parent().html(input.attr('style', $.data(node, _iCheck).s || '')[_callback](callback || ''));
+  // Add checked, disabled or indeterminate state
+  function on(input, state, keep) {
+    var node = input[0],
+      parent = input.parent(),
+      checked = state == _checked,
+      indeterminate = state == _indeterminate,
+      disabled = state == _disabled,
+      callback = indeterminate ? _determinate : checked ? _unchecked : 'enabled',
+      regular = option(input, callback + capitalize(node[_type])),
+      specific = option(input, state + capitalize(node[_type]));
 
-            // Unbind events
-            input.off('.i').unwrap();
-            $(_label + '[for="' + node.id + '"]').add(input.closest(_label)).off('.i');
-        };
-    };
+    // Prevent unnecessary actions
+    if (node[state] !== true) {
 
-    // Get some option
-    function option(node, state, regular) {
-        if ($.data(node, _iCheck)) {
-            return $.data(node, _iCheck).o[state + (regular ? '' : 'Class')];
-        };
-    };
+      // Toggle assigned radio buttons
+      if (!keep && state == _checked && node[_type] == _radio && node.name) {
+        var form = input.closest('form'),
+          inputs = 'input[name="' + node.name + '"]';
 
-    // Capitalize some string
-    function capitalize(string) {
-        return string.charAt(0).toUpperCase() + string.slice(1);
-    };
+        inputs = form.length ? form.find(inputs) : $(inputs);
 
-    // Executable handlers
-    function callbacks(input, checked, callback, keep) {
+        inputs.each(function() {
+          if (this !== node && $(this).data(_iCheck)) {
+            off($(this), state);
+          }
+        });
+      }
+
+      // Indeterminate state
+      if (indeterminate) {
+
+        // Add indeterminate state
+        node[state] = true;
+
+        // Remove checked state
+        if (node[_checked]) {
+          off(input, _checked, 'force');
+        }
+
+        // Checked or disabled state
+      } else {
+
+        // Add checked or disabled state
         if (!keep) {
-            if (checked) {
-                input[_callback]('ifToggled');
-            };
+          node[state] = true;
+        }
 
-            input[_callback]('ifChanged')[_callback]('if' + capitalize(callback));
-        };
-    };
-})(jQuery);
+        // Remove indeterminate state
+        if (checked && node[_indeterminate]) {
+          off(input, _indeterminate, false);
+        }
+      }
+
+      // Trigger callbacks
+      callbacks(input, checked, state, keep);
+    }
+
+    // Add proper cursor
+    if (node[_disabled] && !!option(input, _cursor, true)) {
+      parent.find('.' + _iCheckHelper).css(_cursor, 'default');
+    }
+
+    // Add state class
+    parent[_add](specific || option(input, state) || '');
+
+    // Set ARIA attribute
+    if (!!parent.attr('role') && !indeterminate) {
+      parent.attr('aria-' + (disabled ? _disabled : _checked), 'true');
+    }
+
+    // Remove regular state class
+    parent[_remove](regular || option(input, callback) || '');
+  }
+
+  // Remove checked, disabled or indeterminate state
+  function off(input, state, keep) {
+    var node = input[0],
+      parent = input.parent(),
+      checked = state == _checked,
+      indeterminate = state == _indeterminate,
+      disabled = state == _disabled,
+      callback = indeterminate ? _determinate : checked ? _unchecked : 'enabled',
+      regular = option(input, callback + capitalize(node[_type])),
+      specific = option(input, state + capitalize(node[_type]));
+
+    // Prevent unnecessary actions
+    if (node[state] !== false) {
+
+      // Toggle state
+      if (indeterminate || !keep || keep == 'force') {
+        node[state] = false;
+      }
+
+      // Trigger callbacks
+      callbacks(input, checked, callback, keep);
+    }
+
+    // Add proper cursor
+    if (!node[_disabled] && !!option(input, _cursor, true)) {
+      parent.find('.' + _iCheckHelper).css(_cursor, 'pointer');
+    }
+
+    // Remove state class
+    parent[_remove](specific || option(input, state) || '');
+
+    // Set ARIA attribute
+    if (!!parent.attr('role') && !indeterminate) {
+      parent.attr('aria-' + (disabled ? _disabled : _checked), 'false');
+    }
+
+    // Add regular state class
+    parent[_add](regular || option(input, callback) || '');
+  }
+
+  // Remove all traces
+  function tidy(input, callback) {
+    if (input.data(_iCheck)) {
+
+      // Remove everything except input
+      input.parent().html(input.attr('style', input.data(_iCheck).s || ''));
+
+      // Callback
+      if (callback) {
+        input[_callback](callback);
+      }
+
+      // Unbind events
+      input.off('.i').unwrap();
+      $(_label + '[for="' + input[0].id + '"]').add(input.closest(_label)).off('.i');
+    }
+  }
+
+  // Get some option
+  function option(input, state, regular) {
+    if (input.data(_iCheck)) {
+      return input.data(_iCheck).o[state + (regular ? '' : 'Class')];
+    }
+  }
+
+  // Capitalize some string
+  function capitalize(string) {
+    return string.charAt(0).toUpperCase() + string.slice(1);
+  }
+
+  // Executable handlers
+  function callbacks(input, checked, callback, keep) {
+    if (!keep) {
+      if (checked) {
+        input[_callback]('ifToggled');
+      }
+
+      input[_callback]('ifChanged')[_callback]('if' + capitalize(callback));
+    }
+  }
+})(window.jQuery || window.Zepto);
\ No newline at end of file

From 10fbf7584e828c62750699d37e63025c5a03717f Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Tue, 29 Jul 2014 17:55:34 -0500
Subject: [PATCH 04/55] * marking time sensitive test as pending

---
 web/spec/features/create_session_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/spec/features/create_session_spec.rb b/web/spec/features/create_session_spec.rb
index 904f5239c..a75e48adf 100644
--- a/web/spec/features/create_session_spec.rb
+++ b/web/spec/features/create_session_spec.rb
@@ -59,6 +59,7 @@ describe "Create Session", :js => true, :type => :feature, :capybara_feature =>
         end
 
         context "attempt to start a session more than an hour from now" do
+          pending "play with Database.db_timezone on this one"
           let (:first_session) { FactoryGirl.create(:music_session, creator: user1, scheduled_start: now + 75.minutes) }
 
           it "warns the user that session starts in the future, and user can start session" do

From 027456105bb797f7fab8ca7113dbfc048d898ed6 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Tue, 29 Jul 2014 18:11:00 -0500
Subject: [PATCH 05/55] * VRFS-1968 - locids are now in score history

---
 db/manifest                                     | 3 ++-
 db/up/locidispid_in_score_histories.sql         | 5 +++++
 ruby/lib/jam_ruby/models/score_history.rb       | 6 ++++--
 ruby/spec/jam_ruby/models/score_history_spec.rb | 2 ++
 4 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 db/up/locidispid_in_score_histories.sql

diff --git a/db/manifest b/db/manifest
index 76f231c5a..8bad4f17c 100755
--- a/db/manifest
+++ b/db/manifest
@@ -198,4 +198,5 @@ connection_allow_null_locidispid.sql
 track_user_in_scores.sql
 median_aggregate.sql
 current_scores_use_median.sql
-current_scores_ams_index_sms_index_use_user_instrument.sql
\ No newline at end of file
+current_scores_ams_index_sms_index_use_user_instrument.sql
+locidispid_in_score_histories.sql
\ No newline at end of file
diff --git a/db/up/locidispid_in_score_histories.sql b/db/up/locidispid_in_score_histories.sql
new file mode 100644
index 000000000..38846045b
--- /dev/null
+++ b/db/up/locidispid_in_score_histories.sql
@@ -0,0 +1,5 @@
+-- https://jamkazam.atlassian.net/browse/VRFS-1968
+-- store both locids  in score_histories
+
+ALTER TABLE score_histories ADD COLUMN from_locidispid BIGINT NOT NULL;
+ALTER TABLE score_histories ADD COLUMN to_locidispid BIGINT NOT NULL;
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/models/score_history.rb b/ruby/lib/jam_ruby/models/score_history.rb
index ed90892d4..4c82e3326 100644
--- a/ruby/lib/jam_ruby/models/score_history.rb
+++ b/ruby/lib/jam_ruby/models/score_history.rb
@@ -15,14 +15,15 @@ module JamRuby
 
       result = connection.execute(
           "INSERT INTO score_histories
-            (from_client_id, from_user_id, from_latency_tester_id, from_addr, from_isp, from_country, from_region, from_city, from_postal, from_latitude, from_longitude,
-             to_client_id, to_user_id, to_latency_tester_id, to_addr, to_isp, to_country, to_region, to_city, to_postal, to_latitude, to_longitude,
+            (from_client_id, from_user_id, from_latency_tester_id, from_addr, from_locidispid, from_isp, from_country, from_region, from_city, from_postal, from_latitude, from_longitude,
+             to_client_id, to_user_id, to_latency_tester_id, to_addr, to_locidispid, to_isp, to_country, to_region, to_city, to_postal, to_latitude, to_longitude,
              score, score_dt, scoring_data)
           SELECT
             s.anodeid     AS from_client_id,
             s.auserid     AS from_user_id,
             s.alatencytestid AS from_latency_tester_id,
             s.aaddr       AS from_addr,
+            s.alocidispid AS from_locidispid,
             x.company     AS from_isp,
             a.countrycode AS from_country,
             a.region      AS from_region,
@@ -34,6 +35,7 @@ module JamRuby
             s.buserid     AS to_user_id,
             s.blatencytestid AS to_latency_tester_id,
             s.baddr       AS to_addr,
+            s.blocidispid AS to_locidispid,
             y.company     AS to_isp,
             b.countrycode AS to_country,
             b.region      AS to_region,
diff --git a/ruby/spec/jam_ruby/models/score_history_spec.rb b/ruby/spec/jam_ruby/models/score_history_spec.rb
index 67fcdae11..8c16dfc0c 100644
--- a/ruby/spec/jam_ruby/models/score_history_spec.rb
+++ b/ruby/spec/jam_ruby/models/score_history_spec.rb
@@ -38,6 +38,7 @@ describe ScoreHistory do
       score_history.from_user_id.should == score1.auserid
       score_history.from_latency_tester_id.should == score1.alatencytestid
       score_history.from_addr.should == score1.aaddr
+      score_history.from_locidispid.should == score1.alocidispid
       score_history.from_isp.should == austin[:jamisp].jam_company.company
       score_history.from_country.should == austin[:geoiplocation].countrycode
       score_history.from_region.should == austin[:geoiplocation].region
@@ -49,6 +50,7 @@ describe ScoreHistory do
       score_history.to_user_id.should == score1.buserid
       score_history.to_latency_tester_id.should == score1.blatencytestid
       score_history.to_addr.should == score1.baddr
+      score_history.to_locidispid.should == score1.blocidispid
       score_history.to_isp.should == dallas[:jamisp].jam_company.company
       score_history.to_country.should == dallas[:geoiplocation].countrycode
       score_history.to_region.should == dallas[:geoiplocation].region

From 4ecf7abb1ee4671d68c68c976a56070295d316f3 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Tue, 29 Jul 2014 18:49:36 -0500
Subject: [PATCH 06/55] * VRFS-1978 - state is now autopopulated again

---
 db/up/scores_better_test_data.sql       |  4 ++--
 web/app/controllers/users_controller.rb |  4 +++-
 web/app/views/users/new.html.erb        |  2 +-
 web/spec/features/signup_spec.rb        | 18 ++++++++++++++++--
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/db/up/scores_better_test_data.sql b/db/up/scores_better_test_data.sql
index 52a8e9842..0f5935cc6 100644
--- a/db/up/scores_better_test_data.sql
+++ b/db/up/scores_better_test_data.sql
@@ -86,10 +86,10 @@ CREATE OR REPLACE FUNCTION generate_scores_dataset () RETURNS VOID STRICT VOLATI
       INSERT INTO cities (city, region, countrycode) select distinct city, region, countrycode from geoiplocations where length(city) > 0 and length(countrycode) > 0;
 
       DELETE FROM regions;
-      INSERT INTO regions (region, countrycode) select distinct region, countrycode from cities;
+      INSERT INTO regions (region, regionname, countrycode) select distinct region, region, countrycode from cities;
 
       DELETE FROM countries;
-      INSERT INTO countries (countrycode) select distinct countrycode from regions;
+      INSERT INTO countries (countrycode, countryname) select distinct countrycode, countrycode from regions;
 
     END IF;
     RETURN;
diff --git a/web/app/controllers/users_controller.rb b/web/app/controllers/users_controller.rb
index 8859fcbe4..242a658ef 100644
--- a/web/app/controllers/users_controller.rb
+++ b/web/app/controllers/users_controller.rb
@@ -463,6 +463,9 @@ JS
   end
 
   def load_location(remote_ip, location = nil)
+    # useful if you need to repro something on 127.0.0.1
+    # remote_ip = ' 23.119.29.89'
+
     @location = location
 
     if @location.nil?
@@ -471,7 +474,6 @@ JS
 
     @location[:country] = "US" if @location[:country].nil?
 
-    # right now we only accept US signups for beta
     @countriesx = MaxMindManager.countries
     # populate regions based on current country
     @regions = MaxMindManager.regions(@location[:country])
diff --git a/web/app/views/users/new.html.erb b/web/app/views/users/new.html.erb
index ffce472cd..83f79f482 100644
--- a/web/app/views/users/new.html.erb
+++ b/web/app/views/users/new.html.erb
@@ -55,7 +55,7 @@
               <option value="" <%= @location[:state].blank? ? "selected" : "" %>>State/Province</option>
               <% @regions.each do |region| %>
                   <% unless region.blank? %>
-                      <option value="<%= region[:region] %>" <%= @location[:state] == region ? "selected" : "" %>><%= region[:name] %></option>
+                      <option value="<%= region[:region] %>" <%= @location[:state] == region[:region] ? "selected" : "" %>><%= region[:name] %></option>
                   <% end %>
               <% end %>
 
diff --git a/web/spec/features/signup_spec.rb b/web/spec/features/signup_spec.rb
index f8f223cf4..22533ac61 100644
--- a/web/spec/features/signup_spec.rb
+++ b/web/spec/features/signup_spec.rb
@@ -7,12 +7,21 @@ describe "Signup", :js => true, :type => :feature, :capybara_feature => true do
   before(:each) do
     @mac_client = FactoryGirl.create(:artifact_update)
     UserMailer.deliveries.clear
+    MaxMindManager.create_phony_database
   end
 
   describe "signup page" do
     before { visit signup_path }
 
-    it { should have_selector('h2',    text: 'Create a JamKazam account') }
+    it "should initialize successfully" do
+      should have_selector('h2', text: 'Create a JamKazam account')
+
+      # we should see these locations in the signup form already chosen
+      location = GeoIpLocations.lookup('127.0.0.1')
+      find('.field.country .easydropdown .selected', text:location[:country])
+      find('.field.state .easydropdown .selected', text:location[:state])
+      find('.field.city .easydropdown .selected', text:location[:city])
+    end
 
     describe "with valid musician information" do
       before do
@@ -30,7 +39,12 @@ describe "Signup", :js => true, :type => :feature, :capybara_feature => true do
       it {
           should have_title("JamKazam | Congratulations")
           should have_content("You have successfully registered as a JamKazam musician.")
-          User.find_by_email('newuser1@jamkazam.com').musician_instruments.length.should == 1
+          user = User.find_by_email('newuser1@jamkazam.com')
+          user.musician_instruments.length.should == 1
+          location = GeoIpLocations.lookup('127.0.0.1')
+          user.country.should == location[:country]
+          user.state.should == location[:state]
+          user.city.should == location[:city]
           # an email is sent on no-invite signup
           UserMailer.deliveries.length.should == 1
           UserMailer.deliveries[0].html_part.body.include?("To confirm this email address")== 1

From 051e7f8bdea7d9a0ca446aef0c7e4606cdc637a3 Mon Sep 17 00:00:00 2001
From: Brian Smith <briansmith@jamkazam.com>
Date: Tue, 29 Jul 2014 21:20:38 -0400
Subject: [PATCH 07/55] VRFS-1972 show correct information under Still Needed
 section for sessions with unstructured RSVPs

---
 web/app/views/music_sessions/session_info.html.haml | 5 ++++-
 web/spec/features/session_info_spec.rb              | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/web/app/views/music_sessions/session_info.html.haml b/web/app/views/music_sessions/session_info.html.haml
index 7d82077aa..717648ff8 100644
--- a/web/app/views/music_sessions/session_info.html.haml
+++ b/web/app/views/music_sessions/session_info.html.haml
@@ -96,7 +96,10 @@
         %br/
         .left.w65.ib.still-needed
           %strong Still Needed
-          - if @open_slots.blank?
+          - if @music_session.is_unstructured_rsvp
+            .clearall.left.w100.h20.ib.mb10
+              Open to any instrument
+          - elsif @open_slots.blank?
             .clearall.left.w100.h20.ib.mb10
               All slots are taken
           - else
diff --git a/web/spec/features/session_info_spec.rb b/web/spec/features/session_info_spec.rb
index c0ae5682b..abcd8685c 100644
--- a/web/spec/features/session_info_spec.rb
+++ b/web/spec/features/session_info_spec.rb
@@ -207,6 +207,10 @@ describe "Session Info", :js => true, :type => :feature, :capybara_feature => tr
 
     # musician_access = true, approval_required = false
     it "should allow anyone to view for 'at will' option after session starts" do
+      @music_session.musician_access = true
+      @music_session.approval_required = false
+      @music_session.save!
+
       # attempt to access with musician who was invited but didn't RSVP
       fast_signin(@session_invitee, @url)
       ensure_success({:show_cta => true, :button_text => 'RSVP NOW!'})
@@ -235,6 +239,10 @@ describe "Session Info", :js => true, :type => :feature, :capybara_feature => tr
 
     # musician_access = true, approval_required = true
     it "should allow anyone to view for 'join by approval' option after session starts" do
+      @music_session.musician_access = true
+      @music_session.approval_required = true
+      @music_session.save!
+
       # attempt to access with musician who was invited but didn't RSVP
       fast_signin(@session_invitee, @url)
       ensure_success({:show_cta => true, :button_text => 'RSVP NOW!'})

From fa7672c0e60eee409f44a80efdc994904a020be3 Mon Sep 17 00:00:00 2001
From: Brian Smith <briansmith@jamkazam.com>
Date: Tue, 29 Jul 2014 21:32:13 -0400
Subject: [PATCH 08/55] fix issue where Session Info page was not being
 refreshed after submitting or cancelling RSVPs

---
 web/app/assets/javascripts/web/session_info.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/web/app/assets/javascripts/web/session_info.js b/web/app/assets/javascripts/web/session_info.js
index 7e8ef3dac..0298bdaed 100644
--- a/web/app/assets/javascripts/web/session_info.js
+++ b/web/app/assets/javascripts/web/session_info.js
@@ -174,7 +174,10 @@
                 $('.call-to-action').html('Tell the session organizer if you can no longer join this session');
                 $btnAction.html('CANCEL RSVP');
                 $btnAction.click(function(e) {
-                  ui.launchRsvpCancelDialog(musicSessionId, rsvp.id);
+                  ui.launchRsvpCancelDialog(musicSessionId, rsvp.id)
+                    .one(EVENTS.DIALOG_CLOSED, function() {
+                      location.reload();
+                    });
                 });
               }
             }
@@ -184,7 +187,10 @@
             $('.call-to-action').html("Tell the session organizer you'd like to play in this session");
             $btnAction.html('RSVP NOW!');
             $btnAction.click(function(e) {
-              ui.launchRsvpSubmitDialog(musicSessionId);
+              ui.launchRsvpSubmitDialog(musicSessionId)
+                .one(EVENTS.RSVP_SUBMITTED, function() {
+                  location.reload();
+                })
             });
           }
         })
@@ -201,14 +207,6 @@
       });
 
       addLatencyDetails();
-
-      $(document).on(EVENTS.RSVP_SUBMITTED, function() {
-        location.reload();
-      });
-
-      $(document).on(EVENTS.RSVP_CANCELED, function() {
-        location.reload();
-      });
     }
     
     this.initialize = initialize;

From 9815675bc2f84530117e757f7392ee1796c3903b Mon Sep 17 00:00:00 2001
From: Brian Smith <briansmith@jamkazam.com>
Date: Tue, 29 Jul 2014 21:35:22 -0400
Subject: [PATCH 09/55] reduce space between Still Needed and Invited sections
 in right sidebar

---
 web/app/views/music_sessions/session_info.html.haml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web/app/views/music_sessions/session_info.html.haml b/web/app/views/music_sessions/session_info.html.haml
index 717648ff8..a4ba55070 100644
--- a/web/app/views/music_sessions/session_info.html.haml
+++ b/web/app/views/music_sessions/session_info.html.haml
@@ -111,8 +111,6 @@
                   = slot.instrument_id.capitalize
                   = "(#{slot.proficiency_desc})"
 
-
-        %br{:clear => "all"}/
         %br/
         .w65.ib.invited
           %strong Invited

From 12397069d304a0b0320c6acb1fe5f5b24affb81e Mon Sep 17 00:00:00 2001
From: Brian Smith <briansmith@jamkazam.com>
Date: Tue, 29 Jul 2014 21:41:03 -0400
Subject: [PATCH 10/55] handle correct event

---
 web/app/assets/javascripts/web/session_info.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/app/assets/javascripts/web/session_info.js b/web/app/assets/javascripts/web/session_info.js
index 0298bdaed..d95684437 100644
--- a/web/app/assets/javascripts/web/session_info.js
+++ b/web/app/assets/javascripts/web/session_info.js
@@ -175,7 +175,7 @@
                 $btnAction.html('CANCEL RSVP');
                 $btnAction.click(function(e) {
                   ui.launchRsvpCancelDialog(musicSessionId, rsvp.id)
-                    .one(EVENTS.DIALOG_CLOSED, function() {
+                    .one(EVENTS.RSVP_CANCELED, function() {
                       location.reload();
                     });
                 });

From 19f36b7d1b87394acd410d15394bf9aaa7907291 Mon Sep 17 00:00:00 2001
From: Brian Smith <briansmith@jamkazam.com>
Date: Tue, 29 Jul 2014 21:52:08 -0400
Subject: [PATCH 11/55] copy is_unstructured_rsvp flag on RsvpSlot

---
 ruby/lib/jam_ruby/models/music_session.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb
index 271bd5863..e5187e6c6 100644
--- a/ruby/lib/jam_ruby/models/music_session.rb
+++ b/ruby/lib/jam_ruby/models/music_session.rb
@@ -111,6 +111,7 @@ module JamRuby
           new_slot = RsvpSlot.new
           new_slot.instrument_id = slot.instrument_id
           new_slot.proficiency_level = slot.proficiency_level
+          new_slot.is_unstructured_rsvp = slot.is_unstructured_rsvp
           new_session.rsvp_slots << new_slot
 
           # get the request for this slot that was approved (should only be ONE)

From 9797bd8e921ca290267149694ff10a0129477fb0 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Tue, 29 Jul 2014 20:55:43 -0500
Subject: [PATCH 12/55] * put pending in it block. sigh

---
 web/spec/features/create_session_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/spec/features/create_session_spec.rb b/web/spec/features/create_session_spec.rb
index a75e48adf..e0fb1a428 100644
--- a/web/spec/features/create_session_spec.rb
+++ b/web/spec/features/create_session_spec.rb
@@ -59,10 +59,10 @@ describe "Create Session", :js => true, :type => :feature, :capybara_feature =>
         end
 
         context "attempt to start a session more than an hour from now" do
-          pending "play with Database.db_timezone on this one"
           let (:first_session) { FactoryGirl.create(:music_session, creator: user1, scheduled_start: now + 75.minutes) }
 
           it "warns the user that session starts in the future, and user can start session" do
+            pending "play with Database.db_timezone on this one"
             sleep 1
             find('.btn-next').trigger(:click)
             sleep 2

From 0a075da783feb0f62040b3209320630b59c57ebc Mon Sep 17 00:00:00 2001
From: Brian Smith <briansmith@jamkazam.com>
Date: Tue, 29 Jul 2014 22:07:46 -0400
Subject: [PATCH 13/55] VRFS-1983 session organizer cancelling RSVP should send
 notification to RSVP requester

---
 ruby/lib/jam_ruby/models/rsvp_request.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruby/lib/jam_ruby/models/rsvp_request.rb b/ruby/lib/jam_ruby/models/rsvp_request.rb
index 6ba1d2ab9..3558df969 100644
--- a/ruby/lib/jam_ruby/models/rsvp_request.rb
+++ b/ruby/lib/jam_ruby/models/rsvp_request.rb
@@ -253,7 +253,7 @@ module JamRuby
 
         # send notification
         if music_session.creator.id == user.id
-          Notification.send_scheduled_session_rsvp_cancelled_org(music_session, user)
+          Notification.send_scheduled_session_rsvp_cancelled_org(music_session, rsvp_request.user)
         else
           Notification.send_scheduled_session_rsvp_cancelled(music_session, user)
         end

From d3b22afe16887018275be3fb7930e4053e21db02 Mon Sep 17 00:00:00 2001
From: Brian Smith <briansmith@jamkazam.com>
Date: Tue, 29 Jul 2014 22:40:42 -0400
Subject: [PATCH 14/55] schedule sessions that are at least 4 hours old

---
 .../lib/jam_ruby/resque/scheduled/music_session_scheduler.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruby/lib/jam_ruby/resque/scheduled/music_session_scheduler.rb b/ruby/lib/jam_ruby/resque/scheduled/music_session_scheduler.rb
index f54215896..762d0c915 100644
--- a/ruby/lib/jam_ruby/resque/scheduled/music_session_scheduler.rb
+++ b/ruby/lib/jam_ruby/resque/scheduled/music_session_scheduler.rb
@@ -27,8 +27,9 @@ module JamRuby
     end
 
     def run
-      # get all weekly sessions that have ended in the last 15 minutes
-      criteria = "recurring_mode = 'weekly' AND session_removed_at is not null AND canceled = false AND next_session_scheduled = false"
+      # get all weekly sessions that started at least 4 hours ago
+      time_threshold = Time.now.
+      criteria = "recurring_mode = 'weekly' AND scheduled_start + interval '4hours' < NOW() AND canceled = false AND next_session_scheduled = false"
       MusicSession.find_each(:conditions => criteria) do |music_session|
         music_session.copy
       end

From 9013ff2e940b5305d0b640289608d66fea819894 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Tue, 29 Jul 2014 21:42:35 -0500
Subject: [PATCH 15/55] * VRFS-1987 fix stupid typo caused by refactor of
 MusicSession to ActiveMusicSession

---
 ruby/lib/jam_ruby/models/music_session.rb |  2 +-
 web/app/views/api_feeds/show.rabl         |  2 +-
 web/spec/features/feed_spec.rb            | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb
index 271bd5863..f08235890 100644
--- a/ruby/lib/jam_ruby/models/music_session.rb
+++ b/ruby/lib/jam_ruby/models/music_session.rb
@@ -409,7 +409,7 @@ module JamRuby
     end
 
     def has_mount?
-      active_music_session && active_music_session.mount
+      !active_music_session.nil? && !active_music_session.mount.nil?
     end
 
     def can_cancel?  user
diff --git a/web/app/views/api_feeds/show.rabl b/web/app/views/api_feeds/show.rabl
index 140828833..e502fcbf7 100644
--- a/web/app/views/api_feeds/show.rabl
+++ b/web/app/views/api_feeds/show.rabl
@@ -60,7 +60,7 @@ glue :music_session do
     attributes :id, :name, :location, :photo_url
   }
 
-  child(:active_music_session => :music_session) do
+  child(:active_music_session => :active_music_session) do
     # only show mount info if fan_access is public.  Eventually we'll also need to show this in other scenarios, like if invited
     child({:mount => :mount}, :if => lambda { |music_session| music_session.fan_access}) {
       attributes :id, :name, :sourced, :listeners, :bitrate, :subtype, :url
diff --git a/web/spec/features/feed_spec.rb b/web/spec/features/feed_spec.rb
index 4e3bff388..d545d8c38 100644
--- a/web/spec/features/feed_spec.rb
+++ b/web/spec/features/feed_spec.rb
@@ -10,6 +10,22 @@ describe "Feed", :js => true, :type => :feature, :capybara_feature => true do
   end
 
 
+  describe "regressions" do
+
+    describe "mount" do
+
+      it "should render when has mount" do
+        # regression for VRFS-1987
+        ams = FactoryGirl.create(:active_music_session)
+        FactoryGirl.create(:icecast_mount, music_session_id: ams.id)
+
+        fast_signin user, "/client#/feed"
+        find('#feedScreen')
+
+        find(".feed-entry.music-session-history-entry[data-music-session='#{ams.id}']")
+      end
+    end
+  end
   describe "sessions" do
 
     before(:each) do
@@ -40,6 +56,7 @@ describe "Feed", :js => true, :type => :feature, :capybara_feature => true do
     #   it " and render artist hover bubble"
     # end
 
+
     it "should render stats" do
       visit "/client#/feed"
 

From 24eb53cc07123a3f370984196adba14b663c7bf2 Mon Sep 17 00:00:00 2001
From: Brian Smith <briansmith@jamkazam.com>
Date: Tue, 29 Jul 2014 22:46:07 -0400
Subject: [PATCH 16/55] fix syntax error and tests

---
 .../jam_ruby/resque/scheduled/music_session_scheduler.rb   | 1 -
 ruby/spec/jam_ruby/resque/music_session_scheduler_spec.rb  | 7 +++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ruby/lib/jam_ruby/resque/scheduled/music_session_scheduler.rb b/ruby/lib/jam_ruby/resque/scheduled/music_session_scheduler.rb
index 762d0c915..cd706285a 100644
--- a/ruby/lib/jam_ruby/resque/scheduled/music_session_scheduler.rb
+++ b/ruby/lib/jam_ruby/resque/scheduled/music_session_scheduler.rb
@@ -28,7 +28,6 @@ module JamRuby
 
     def run
       # get all weekly sessions that started at least 4 hours ago
-      time_threshold = Time.now.
       criteria = "recurring_mode = 'weekly' AND scheduled_start + interval '4hours' < NOW() AND canceled = false AND next_session_scheduled = false"
       MusicSession.find_each(:conditions => criteria) do |music_session|
         music_session.copy
diff --git a/ruby/spec/jam_ruby/resque/music_session_scheduler_spec.rb b/ruby/spec/jam_ruby/resque/music_session_scheduler_spec.rb
index ac4d95146..af872943b 100644
--- a/ruby/spec/jam_ruby/resque/music_session_scheduler_spec.rb
+++ b/ruby/spec/jam_ruby/resque/music_session_scheduler_spec.rb
@@ -18,8 +18,8 @@ describe "MusicSessionScheduler" do
 
       MusicSession.all.count.should == 1
 
-      # end the session
-      ms.session_removed_at = Time.now
+      # move the session back more than 4 hours
+      ms.scheduled_start = Time.now - 5.hours
       ms.save!
 
       # run the scheduler again
@@ -27,7 +27,6 @@ describe "MusicSessionScheduler" do
 
       MusicSession.all.count.should == 2
 
-      MusicSession.where(:session_removed_at => nil).count.should == 1
       MusicSession.where(:next_session_scheduled => true).count.should == 1
     end
 
@@ -40,7 +39,7 @@ describe "MusicSessionScheduler" do
       @scheduler.run
       MusicSession.all.count.should == 1
 
-      ms.session_removed_at = Time.now
+      ms.scheduled_start = Time.now - 3.hours
       ms.save!
 
       @scheduler.run

From 209b6f2d7e65384db7b8b889027a89ba5ba9134d Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Tue, 29 Jul 2014 22:13:38 -0500
Subject: [PATCH 17/55] * sort score histories by date desc

---
 admin/app/admin/score_history.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin/app/admin/score_history.rb b/admin/app/admin/score_history.rb
index 02306ec43..85ed34393 100644
--- a/admin/app/admin/score_history.rb
+++ b/admin/app/admin/score_history.rb
@@ -2,6 +2,7 @@ ActiveAdmin.register JamRuby::ScoreHistory, :as => 'Score History' do
   menu :parent => 'Score'
 
   config.batch_actions = false
+  config.sort_order = 'score_dt_desc'
   config.clear_action_items!
   config.filters = true
   config.per_page = 100

From 210510a5a4bae750c9fcefd65f5e9024a94aae04 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Tue, 29 Jul 2014 22:25:04 -0500
Subject: [PATCH 18/55] * VRFS-1964 - any 'web' layout page does not show
 websocket coneciton wo

---
 web/app/assets/stylesheets/web/main.css.scss | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/web/app/assets/stylesheets/web/main.css.scss b/web/app/assets/stylesheets/web/main.css.scss
index d3725237e..ab7a08f43 100644
--- a/web/app/assets/stylesheets/web/main.css.scss
+++ b/web/app/assets/stylesheets/web/main.css.scss
@@ -599,9 +599,6 @@ strong {
   }
 }
 
-body.jam.web.welcome .no-websocket-connection {
-  display:none;
-}
-body.jam.web.register .no-websocket-connection {
+body.jam.web .no-websocket-connection {
   display:none;
 }
\ No newline at end of file

From e4a30c768a7a888f6352fa6612c543947d937b07 Mon Sep 17 00:00:00 2001
From: Brian Smith <briansmith@jamkazam.com>
Date: Tue, 29 Jul 2014 23:29:42 -0400
Subject: [PATCH 19/55] VRFS-1979 show landing page for email confirmation

---
 web/app/controllers/users_controller.rb     |  3 ---
 web/app/views/users/signup_confirm.html.erb | 14 +++++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/web/app/controllers/users_controller.rb b/web/app/controllers/users_controller.rb
index 242a658ef..212a8e12b 100644
--- a/web/app/controllers/users_controller.rb
+++ b/web/app/controllers/users_controller.rb
@@ -228,9 +228,6 @@ class UsersController < ApplicationController
 
     if !@user.nil? && !@user.errors.any?
       UserMailer.welcome_message(@user).deliver
-      sign_in @user
-      redirect_to :client
-      return
     elsif !@user.nil?
       # new user with validation errors;
       logger.debug("#{@user} has errors. can not sign in until remedied.  #{@user.errors.inspect}")
diff --git a/web/app/views/users/signup_confirm.html.erb b/web/app/views/users/signup_confirm.html.erb
index 5dac7548f..7fdb14f82 100644
--- a/web/app/views/users/signup_confirm.html.erb
+++ b/web/app/views/users/signup_confirm.html.erb
@@ -1,8 +1,7 @@
 <% provide(:title, 'Signup Confirmation') %>
 
 <% if @user.nil? %>
-    <h1>Signup Already Confirmed</h1>
-
+  <h1>Signup Already Confirmed</h1>
   <br/>
   <br/>
   <p>
@@ -13,5 +12,14 @@
     Please proceed to <%= link_to 'the home page', root_path %> and log in.
   </p>
 <% else %>
-  The server had a problem. Please try to confirm your email later.
+  <h1>Email Confirmed</h1>
+  <br/>
+  <br/>
+  <p>
+    You have successfully confirmed this email address.
+  </p>
+  <br/>
+  <p>
+    You can proceed to the website <%= link_to 'home page', root_path %> and sign in, or close this page in your browser.
+  </p>
 <% end %>

From fd498518152bb8537db065d37609e58d1ef9c40b Mon Sep 17 00:00:00 2001
From: Brian Smith <briansmith@jamkazam.com>
Date: Tue, 29 Jul 2014 23:43:48 -0400
Subject: [PATCH 20/55] VRFS-1979 fix test

---
 web/spec/features/signup_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/spec/features/signup_spec.rb b/web/spec/features/signup_spec.rb
index 22533ac61..4cb1c74bd 100644
--- a/web/spec/features/signup_spec.rb
+++ b/web/spec/features/signup_spec.rb
@@ -59,10 +59,10 @@ describe "Signup", :js => true, :type => :feature, :capybara_feature => true do
         end
 
         it {
-          should have_title("JamKazam")
-          should have_selector('h2', text: "musicians")
+          should have_title("Signup Confirmation")
+          should have_selector('h1', text: "Email Confirmed")
           UserMailer.deliveries.length.should == 1
-          UserMailer.deliveries[0].html_part.body.include?("Following are links to some resources")== 1
+          UserMailer.deliveries[0].html_part.body.include?("Following are links to some resources") == 1
         }
       end
     end

From ebd66846cef8e643c9cab684b82695d94c6782e0 Mon Sep 17 00:00:00 2001
From: Brian Smith <briansmith@jamkazam.com>
Date: Wed, 30 Jul 2014 00:02:17 -0400
Subject: [PATCH 21/55] remove Jamtracks option from update session screen

---
 web/app/views/clients/_account_session_properties.html.haml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/app/views/clients/_account_session_properties.html.haml b/web/app/views/clients/_account_session_properties.html.haml
index 16d59f872..02d4f211a 100644
--- a/web/app/views/clients/_account_session_properties.html.haml
+++ b/web/app/views/clients/_account_session_properties.html.haml
@@ -95,7 +95,6 @@
                 %option{value: "Standard"} Standard
                 %option{value: "Creative Commons"} Creative Commons
                 %option{value: "Offline"} Offline
-                %option{value: "Jamtracks"} Jamtracks
             .clearall.left-column
               Notation Files:
             .right-column

From 9e574b33e81b507b625364ddd592dd4f6cf8af18 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Tue, 29 Jul 2014 23:04:28 -0500
Subject: [PATCH 22/55] * VRFS-1916 - two tables were used instead of one

---
 web/app/assets/javascripts/findSession.js   | 4 ++--
 web/app/views/clients/_sessionList.html.erb | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/web/app/assets/javascripts/findSession.js b/web/app/assets/javascripts/findSession.js
index 2d8141a8e..80e0fa67f 100644
--- a/web/app/assets/javascripts/findSession.js
+++ b/web/app/assets/javascripts/findSession.js
@@ -273,11 +273,11 @@
     }
 
     function clearResults() {
-      $('table#sessions-active').empty();
+      $('table#sessions-active').find("tr:gt(0)").remove();
 
       currentScheduledSessionsPage = 0;
       $ssScroller.infinitescroll('resume');
-      $('table#sessions-scheduled').empty();
+      $('table#sessions-scheduled').find("tr:gt(0)").remove();
       $ssNoMoreEntries.hide();
     }
 
diff --git a/web/app/views/clients/_sessionList.html.erb b/web/app/views/clients/_sessionList.html.erb
index 6a8ac17b3..d5d34f228 100644
--- a/web/app/views/clients/_sessionList.html.erb
+++ b/web/app/views/clients/_sessionList.html.erb
@@ -1,7 +1,7 @@
 <h2><%= title %></h2>
 <br/>
 <div class="findsession-container">
-  <table class="findsession-table" cellspacing="0" cellpadding="0" border="0">
+  <table id="<%= category %>" class="findsession-table" cellspacing="0" cellpadding="0" border="0">
     <!-- header -->
     <tr>
       <th align="left" width="30%">SESSION</th>
@@ -12,7 +12,4 @@
     </tr>
     <!-- session row goes here -->
   </table>
-  <table id="<%= category %>" class="findsession-table" cellspacing="0" cellpadding="0" border="0">
-    <!-- session row goes here -->
-  </table>
 </div>
\ No newline at end of file

From 2c7e4ec581e6436420c46ec155b200110cd3d6a8 Mon Sep 17 00:00:00 2001
From: Brian Smith <briansmith@jamkazam.com>
Date: Wed, 30 Jul 2014 00:39:33 -0400
Subject: [PATCH 23/55] remove fan/band chat option to match Create Session

---
 web/app/views/clients/_account_session_properties.html.haml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/app/views/clients/_account_session_properties.html.haml b/web/app/views/clients/_account_session_properties.html.haml
index 02d4f211a..69a6364d5 100644
--- a/web/app/views/clients/_account_session_properties.html.haml
+++ b/web/app/views/clients/_account_session_properties.html.haml
@@ -80,7 +80,6 @@
               Fan Access:
             .right-column
               %select#session-prop-fans-access
-                %option{value: "listen-chat-band"} Fans may listen, chat with the band
                 %option{value: "listen-chat-each", selected: "selected"} Fans may listen, chat with each other
                 %option{value: "no-listen-chat"} Fans may not listen to session
             .clearall.right-no-left

From da0f596fc1953844e53ec45fe8eacc2fe8402093 Mon Sep 17 00:00:00 2001
From: Brian Smith <briansmith@jamkazam.com>
Date: Wed, 30 Jul 2014 00:46:10 -0400
Subject: [PATCH 24/55] VRFS-1965 hide button if button text is empty

---
 web/app/assets/javascripts/notificationPanel.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/web/app/assets/javascripts/notificationPanel.js b/web/app/assets/javascripts/notificationPanel.js
index 6c43937f1..622dd0fac 100644
--- a/web/app/assets/javascripts/notificationPanel.js
+++ b/web/app/assets/javascripts/notificationPanel.js
@@ -307,10 +307,15 @@
         }
 
         var $action_btn = $notification.find($btnNotificationAction);
-        $action_btn.text(actionText);
-        $action_btn.click(function() {
-          callback(payload);
-        });
+        if (actionText === '') {
+          $action_btn.hide();
+        }
+        else {
+          $action_btn.text(actionText);
+          $action_btn.click(function() {
+            callback(payload);
+          });
+        }
       }
 
       else if (type === context.JK.MessageType.MUSICIAN_RECORDING_SAVED || type === context.JK.MessageType.BAND_RECORDING_SAVED) {

From 95b2c3675c56c042a141ba4926006efad9c06505 Mon Sep 17 00:00:00 2001
From: root <zonk2world@gmail.com>
Date: Wed, 30 Jul 2014 07:37:14 +0200
Subject: [PATCH 25/55] fix #1632, fix #1954

---
 web/app/assets/javascripts/notificationPanel.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/app/assets/javascripts/notificationPanel.js b/web/app/assets/javascripts/notificationPanel.js
index 2c50316de..e1d7f955d 100644
--- a/web/app/assets/javascripts/notificationPanel.js
+++ b/web/app/assets/javascripts/notificationPanel.js
@@ -222,7 +222,6 @@
           userId: val.source_user_id
         });
         
-        console.log(val);
         $list.append(notificationHtml);
 
         // val.description contains the notification record's description value from the DB (i.e., type)

From 45ef4d05e3c829a3d1d67fb4da14eb1e3461386b Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Wed, 30 Jul 2014 08:41:47 -0500
Subject: [PATCH 26/55] VRFS-1989 - update to ftue video links

---
 web/app/controllers/users_controller.rb                |  8 ++++----
 .../views/clients/wizard/gear/_gear_wizard.html.haml   | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/web/app/controllers/users_controller.rb b/web/app/controllers/users_controller.rb
index 212a8e12b..c2d92c062 100644
--- a/web/app/controllers/users_controller.rb
+++ b/web/app/controllers/users_controller.rb
@@ -197,11 +197,11 @@ class UsersController < ApplicationController
 
     @slides = [
         Slide.new("JamKazam Overview",      "web/carousel_musicians.jpg",   "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"),
-        Slide.new("Getting Started",        "web/carousel_fans.jpg",        "http://www.youtube.com/embed/VexH4834o9I?autoplay=1"),
-        Slide.new("Playing in a Session",   "web/carousel_bands.jpg",       "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"),
+        Slide.new("Getting Started",        "web/carousel_fans.jpg",        "http://www.youtube.com/embed/DBo--aj_P1w?autoplay=1"),
+        Slide.new("Playing in a Session",   "web/carousel_bands.jpg",       "http://www.youtube.com/embed/zJ68hA8-fLA?autoplay=1"),
         Slide.new("JamKazam Overview",      "web/carousel_musicians.jpg",   "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"),
-        Slide.new("Getting Started",        "web/carousel_fans.jpg",        "http://www.youtube.com/embed/VexH4834o9I?autoplay=1"),
-        Slide.new("Playing in a Session",   "web/carousel_bands.jpg",       "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1")
+        Slide.new("Getting Started",        "web/carousel_fans.jpg",        "http://www.youtube.com/embed/DBo--aj_P1w?autoplay=1"),
+        Slide.new("Playing in a Session",   "web/carousel_bands.jpg",       "http://www.youtube.com/embed/zJ68hA8-fLA?autoplay=1")
     ]
 
     @promo_buzz = PromoBuzz.active
diff --git a/web/app/views/clients/wizard/gear/_gear_wizard.html.haml b/web/app/views/clients/wizard/gear/_gear_wizard.html.haml
index 37450ac88..44b4da12b 100644
--- a/web/app/views/clients/wizard/gear/_gear_wizard.html.haml
+++ b/web/app/views/clients/wizard/gear/_gear_wizard.html.haml
@@ -170,11 +170,11 @@
           %h2 Tutorial Videos
           %ul
             %li
-              %a{href: '#'} Creating a Session
+              %a{href: 'https://www.youtube.com/watch?v=EZZuGcDUoWk', rel: 'external'} Creating a Session
             %li
-              %a{href: '#'} Finding a Session
+              %a{href: 'https://www.youtube.com/watch?v=xWponSJo-GU', rel: 'external'} Finding a Session
             %li
-              %a{href: '#'} Playing in a Session
+              %a{href: 'https://www.youtube.com/watch?v=zJ68hA8-fLA', rel: 'external'} Playing in a Session
             %li
               %a{href: '#'} Connecting with Other Musicians
             %li
@@ -184,9 +184,9 @@
           %h2 Other Valuable Resource Links
           %ul
             %li
-              %a{href: '#'} JamKazam Support Center
+              %a{href: 'https://jamkazam.desk.com/', rel: 'external'} JamKazam Support Center
             %li
-              %a{href: '#'} JamKazam Community Forum
+              %a{href: 'http://forums.jamkazam.com', rel: 'external'} JamKazam Community Forum
     .wizard-buttons
 
 %script{type: 'text/template', id: 'template-ftuesteps'}

From 8966a3fc2f0cc9cffd7cead6f208dc25a23317e1 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Wed, 30 Jul 2014 15:11:03 -0500
Subject: [PATCH 27/55] * VRFS-1992 - check open_rsvps for daily session email,
 VRFS-1991 - remove hardcoded 10 in audio latency on create/join, VRFS-1990 -
 only send update rsvp notification if scheduled start time changes

---
 .../jam_ruby/models/active_music_session.rb    |  6 +++---
 .../models/email_batch_scheduled_sessions.rb   |  3 +--
 ruby/lib/jam_ruby/models/music_session.rb      |  8 +++++++-
 .../email_batch_spec_scheduled_session.rb      | 10 ++++++++++
 .../spec/jam_ruby/models/music_session_spec.rb | 15 +++++++++++++++
 web/app/assets/javascripts/jam_rest.js         | 18 +-----------------
 web/app/assets/javascripts/wizard/gear_test.js |  2 +-
 .../assets/javascripts/wizard/gear_utils.js    |  8 --------
 .../api_music_sessions_controller.rb           |  6 ++++--
 web/app/controllers/api_scoring_controller.rb  |  3 +++
 web/app/controllers/api_users_controller.rb    |  2 +-
 web/spec/features/profile_history_spec.rb      |  1 +
 web/spec/support/app_config.rb                 |  4 ++++
 13 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/ruby/lib/jam_ruby/models/active_music_session.rb b/ruby/lib/jam_ruby/models/active_music_session.rb
index edc98fd9f..b3640ec75 100644
--- a/ruby/lib/jam_ruby/models/active_music_session.rb
+++ b/ruby/lib/jam_ruby/models/active_music_session.rb
@@ -450,7 +450,7 @@ module JamRuby
       [music_sessions, user_scores]
     end
 
-    def self.participant_create user, music_session_id, client_id, as_musician, tracks
+    def self.participant_create user, music_session_id, client_id, as_musician, tracks, audio_latency
       music_session = MusicSession.find(music_session_id)
 
       if music_session.active_music_session
@@ -462,7 +462,7 @@ module JamRuby
 
           active_music_session.with_lock do # VRFS-1297
             active_music_session.tick_track_changes
-            connection = ConnectionManager.new.join_music_session(user, client_id, active_music_session, as_musician, tracks, 10)
+            connection = ConnectionManager.new.join_music_session(user, client_id, active_music_session, as_musician, tracks, audio_latency)
 
             if connection.errors.any?
               # rollback the transaction to make sure nothing is disturbed in the database
@@ -519,7 +519,7 @@ module JamRuby
 
               # auto-join this user into the newly created session
               as_musician = true
-              connection = ConnectionManager.new.join_music_session(user, client_id, active_music_session, as_musician, tracks, 10)
+              connection = ConnectionManager.new.join_music_session(user, client_id, active_music_session, as_musician, tracks, audio_latency)
 
               unless connection.errors.any?
                 user.update_progression_field(:first_music_session_at)
diff --git a/ruby/lib/jam_ruby/models/email_batch_scheduled_sessions.rb b/ruby/lib/jam_ruby/models/email_batch_scheduled_sessions.rb
index 50b542b89..9bc6a742c 100644
--- a/ruby/lib/jam_ruby/models/email_batch_scheduled_sessions.rb
+++ b/ruby/lib/jam_ruby/models/email_batch_scheduled_sessions.rb
@@ -140,8 +140,7 @@ INNER JOIN users ON users.id = msess.user_id
 INNER JOIN rsvp_slots AS rs ON rs.music_session_id = msess.id
 LEFT JOIN rsvp_requests_rsvp_slots AS rrrs ON rrrs.rsvp_slot_id = rs.id
 WHERE
-    musician_access = 't' AND
-    approval_required = 'f' AND
+    open_rsvps = TRUE AND
     users.last_jam_locidispid IS NOT NULL AND
     msess.created_at > '#{earliest_session_create_time}' AND
     msess.created_at < '#{latest_session_create_time}' AND
diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb
index 290fd93f4..35a5a7892 100644
--- a/ruby/lib/jam_ruby/models/music_session.rb
+++ b/ruby/lib/jam_ruby/models/music_session.rb
@@ -10,7 +10,7 @@ module JamRuby
 
     RECURRING_MODES = [NO_RECURRING, RECURRING_WEEKLY]
 
-    attr_accessor :legal_terms, :language_description, :access_description
+    attr_accessor :legal_terms, :language_description, :access_description, :scheduling_info_changed
 
     attr_accessor :approved_rsvps, :open_slots, :pending_invitations
 
@@ -58,11 +58,17 @@ module JamRuby
     before_create :generate_share_token
     before_create :add_to_feed
     #before_save   :update_scheduled_start
+    before_save :check_scheduling_info_changed
 
     SHARE_TOKEN_LENGTH = 8
 
     SEPARATOR = '|'
 
+    def check_scheduling_info_changed
+      @scheduling_info_changed = scheduled_start_changed?
+      true
+    end
+
     def add_to_feed
       feed = Feed.new
       feed.music_session = self
diff --git a/ruby/spec/jam_ruby/models/email_batch_spec_scheduled_session.rb b/ruby/spec/jam_ruby/models/email_batch_spec_scheduled_session.rb
index b632234bc..c23eca414 100644
--- a/ruby/spec/jam_ruby/models/email_batch_spec_scheduled_session.rb
+++ b/ruby/spec/jam_ruby/models/email_batch_spec_scheduled_session.rb
@@ -89,6 +89,16 @@ describe EmailBatchScheduledSessions do
       expect(UserMailer.deliveries.length).to eq(2)
     end
 
+    it "won't find an open_rsvps=false session" do
+      session1.open_rsvps = false
+      session1.save!
+      session2.open_rsvps = false
+      session2.save!
+
+      obj = scheduled_batch.fetch_recipients
+      expect(obj.count).to eq(0)
+    end
+
     it 'handles large batches' do
       creators = []
       8.downto(1) do |nn|
diff --git a/ruby/spec/jam_ruby/models/music_session_spec.rb b/ruby/spec/jam_ruby/models/music_session_spec.rb
index ad4cc67de..f7b9f2a8f 100644
--- a/ruby/spec/jam_ruby/models/music_session_spec.rb
+++ b/ruby/spec/jam_ruby/models/music_session_spec.rb
@@ -779,5 +779,20 @@ describe MusicSession do
       end
     end
   end
+
+  describe "scheduled session rescheduled logic" do
+
+    it "detect change to scheduling info" do
+
+      music_session1.description = "Hey!"
+      music_session1.save!
+      music_session1.scheduling_info_changed.should be_false
+
+      music_session1.scheduled_start = Time.now - 1.days
+      music_session1.save!
+      music_session1.scheduling_info_changed.should be_true
+
+    end
+  end
 end
 
diff --git a/web/app/assets/javascripts/jam_rest.js b/web/app/assets/javascripts/jam_rest.js
index 36cdcffc7..619ea3036 100644
--- a/web/app/assets/javascripts/jam_rest.js
+++ b/web/app/assets/javascripts/jam_rest.js
@@ -883,11 +883,7 @@
                 dataType: "json",
                 contentType: 'application/json',
                 url: "/api/users/progression/certified_gear",
-                processData: false,
-                data: JSON.stringify({
-                    success: options.success,
-                    reason: options.reason
-                })
+                data: JSON.stringify(options)
             });
         }
 
@@ -1184,17 +1180,6 @@
           });
         }
 
-        function updateAudioLatency(options) {
-          var id = getId(options);
-          return $.ajax({
-            type: "POST",
-            url: '/api/users/' + id + '/audio_latency',
-            dataType: "json",
-            contentType: 'application/json',
-            data: options,
-          });
-        }
-
         function initialize()  {
             return self;
         }
@@ -1298,7 +1283,6 @@
         this.getChatMessages = getChatMessages;
         this.createDiagnostic = createDiagnostic;
         this.getLatencyTester = getLatencyTester;
-        this.updateAudioLatency = updateAudioLatency;
 
         return this;
     };
diff --git a/web/app/assets/javascripts/wizard/gear_test.js b/web/app/assets/javascripts/wizard/gear_test.js
index 032a427f2..c6c897daf 100644
--- a/web/app/assets/javascripts/wizard/gear_test.js
+++ b/web/app/assets/javascripts/wizard/gear_test.js
@@ -433,7 +433,7 @@
 
         context.JK.GA.trackAudioTestData(uniqueDeviceName(), context.JK.GA.AudioTestDataReasons.pass, latencyScore);
 
-        rest.userCertifiedGear({success: true, client_id: app.clientId, audio_latency: getLatencyScore()});
+        rest.userCertifiedGear({success: true, client_id: app.clientId, audio_latency: getLatencyScore().latency});
       }
 
       function onGearTestFail(e, data) {
diff --git a/web/app/assets/javascripts/wizard/gear_utils.js b/web/app/assets/javascripts/wizard/gear_utils.js
index 6eb7aa2eb..13e182582 100644
--- a/web/app/assets/javascripts/wizard/gear_utils.js
+++ b/web/app/assets/javascripts/wizard/gear_utils.js
@@ -269,14 +269,6 @@
     return result;
   }
 
-  gearUtils.updateAudioLatency = function(app) {
-    var latency = jamClient.FTUEGetExpectedLatency().latency;
-    return rest.updateAudioLatency({client_id: app.clientId, audio_latency: latency})
-      .fail(function(jqXHR) {
-        app.notifyServerError(jqXHR, "Unable to sync audio latency")
-      });
-  }
-
   // if the user has a good user network score, immediately returns with a resolved deferred object.
   // if not, the user will have the network test dialog prompted... once it's closed, then you'll be told reject() if score is still bad, or resolve() if now good
   gearUtils.guardAgainstBadNetworkScore = function(app) {
diff --git a/web/app/controllers/api_music_sessions_controller.rb b/web/app/controllers/api_music_sessions_controller.rb
index ca84595f0..eae4ec2fb 100644
--- a/web/app/controllers/api_music_sessions_controller.rb
+++ b/web/app/controllers/api_music_sessions_controller.rb
@@ -224,7 +224,8 @@ class ApiMusicSessionsController < ApiController
           response.status = :unprocessable_entity
           respond_with @music_session
         else
-          Notification.send_scheduled_session_rescheduled(@music_session)
+          Notification.send_scheduled_session_rescheduled(@music_session) if @music_session.scheduling_info_changed
+
           respond_with @music_session, responder: ApiResponder, :location => api_session_history_detail_url(@music_session)
         end
       else
@@ -287,7 +288,8 @@ class ApiMusicSessionsController < ApiController
           params[:id],
           params[:client_id],
           params[:as_musician],
-          params[:tracks]
+          params[:tracks],
+          params[:audio_latency]
       )
 
       if @connection.errors.any?
diff --git a/web/app/controllers/api_scoring_controller.rb b/web/app/controllers/api_scoring_controller.rb
index 34420e355..a72f5e579 100644
--- a/web/app/controllers/api_scoring_controller.rb
+++ b/web/app/controllers/api_scoring_controller.rb
@@ -24,6 +24,9 @@ class ApiScoringController < ApiController
 
     conn = Connection.where(client_id: clientid, user_id: current_user.id).first
     if conn.nil? then render :json => {message: 'session not found'}, :status => 404; return end
+
+    if conn.locidispid.nil? then render :json => {message: 'no locidispid for connection'}, :status => 404; return end
+
     # if !current_user.id.eql?(conn.user.id) then render :json => {message: 'session not owned by user'}, :status => 403; return end
 
     result_client_ids = JamRuby::GetWork.get_work_list(conn.locidispid, conn.addr)
diff --git a/web/app/controllers/api_users_controller.rb b/web/app/controllers/api_users_controller.rb
index 27f5f268d..30d507bc7 100644
--- a/web/app/controllers/api_users_controller.rb
+++ b/web/app/controllers/api_users_controller.rb
@@ -534,7 +534,7 @@ class ApiUsersController < ApiController
 
       if !@user.errors.any?
         # update audio gear latency information
-        @user.update_audio_latency(connection, params[:audio_latency])
+        @user.update_audio_latency(connection, params[:audio_latency]) if params[:audio_latency]
       end
     else
       @user.failed_qualification(params[:reason])
diff --git a/web/spec/features/profile_history_spec.rb b/web/spec/features/profile_history_spec.rb
index ef500f420..551b1dc22 100644
--- a/web/spec/features/profile_history_spec.rb
+++ b/web/spec/features/profile_history_spec.rb
@@ -8,6 +8,7 @@ describe "Profile History", :js => true, :type => :feature, :capybara_feature =>
 
   before do
     MusicSession.delete_all
+    ActiveMusicSession.delete_all
     Recording.delete_all
     set_login_cookie user
     stub_const("APP_CONFIG", web_config)
diff --git a/web/spec/support/app_config.rb b/web/spec/support/app_config.rb
index 166145ae4..762168dde 100644
--- a/web/spec/support/app_config.rb
+++ b/web/spec/support/app_config.rb
@@ -54,6 +54,10 @@ def web_config
     def max_track_part_upload_failures
       3
     end
+
+    def icecast_hardcoded_source_password
+      'blueberryjam'
+    end
   end
   klass.new
 end

From 0abb38d48a4bcf75a40d35bec0f22eec9cbc55d5 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Wed, 30 Jul 2014 15:13:07 -0500
Subject: [PATCH 28/55] * remove debugigng puts

---
 web/spec/requests/musician_search_api_spec.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/spec/requests/musician_search_api_spec.rb b/web/spec/requests/musician_search_api_spec.rb
index 9fff2b1f6..95a77fbc3 100644
--- a/web/spec/requests/musician_search_api_spec.rb
+++ b/web/spec/requests/musician_search_api_spec.rb
@@ -108,7 +108,6 @@ describe "Musician Search API", :type => :api do
         expect(@user4.followers.count).to be 3
         get_query(orderby: :followed)
         good_response
-        puts last_response.body
         musician = json["musicians"][0]
         expect(musician["id"]).to eq(@user4.id)
         followings = musician['followings']

From 00993acfedd0b72e44102479ea85b5ad074cfea2 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Wed, 30 Jul 2014 15:35:56 -0500
Subject: [PATCH 29/55] * VRFS-1988 set up infra to allow for scheduler.yml
 override file

---
 web/lib/tasks/scheduler.rake | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/web/lib/tasks/scheduler.rake b/web/lib/tasks/scheduler.rake
index 099d915dc..387ff20ed 100644
--- a/web/lib/tasks/scheduler.rake
+++ b/web/lib/tasks/scheduler.rake
@@ -16,7 +16,15 @@ task :scheduler => :environment do
 
   # The schedule doesn't need to be stored in a YAML, it just needs to
   # be a hash.  YAML is usually the easiest.
-  Resque.schedule = YAML.load_file(File.join(File.dirname(__FILE__), '../..', 'config/scheduler.yml'))
+  config = YAML.load_file(File.join(File.dirname(__FILE__), '../..', 'config/scheduler.yml'))
+
+  if File.exist? File.join(File.dirname(__FILE__), '../..', 'config/scheduler_override.yml')
+    puts "scheduler_override file found. loading..."
+    override = YAML.load_file(File.join(File.dirname(__FILE__), '../..', 'config/scheduler_override.yml'))
+    config.merge!(override)
+  end
+
+  Resque.schedule = config
 
   # If your schedule already has +queue+ set for each job, you don't
   # need to require your jobs.  This can be an advantage since it's

From 699e8a6c5d6cd70ef004e1027d2df90d1772352d Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Wed, 30 Jul 2014 15:44:46 -0500
Subject: [PATCH 30/55] * check for empty file for VRFS-1988

---
 web/lib/tasks/scheduler.rake | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/web/lib/tasks/scheduler.rake b/web/lib/tasks/scheduler.rake
index 387ff20ed..913e68b65 100644
--- a/web/lib/tasks/scheduler.rake
+++ b/web/lib/tasks/scheduler.rake
@@ -21,7 +21,12 @@ task :scheduler => :environment do
   if File.exist? File.join(File.dirname(__FILE__), '../..', 'config/scheduler_override.yml')
     puts "scheduler_override file found. loading..."
     override = YAML.load_file(File.join(File.dirname(__FILE__), '../..', 'config/scheduler_override.yml'))
-    config.merge!(override)
+    if override # override will be false if file is empty
+      config.merge!(override)
+    else
+      puts "schedule_override is empty... skipping..."
+    end
+
   end
 
   Resque.schedule = config

From a11ae44a907061ed3269967c30060a2659797f13 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Wed, 30 Jul 2014 16:39:59 -0500
Subject: [PATCH 31/55] * VRFS-1951 - make sure staging emails don't get sent
 from my machie

---
 db/manifest                                   |  3 +-
 db/up/define_environment_in_db.sql            |  3 +
 ruby/lib/jam_ruby/models/generic_state.rb     | 15 +++++
 .../jam_ruby/models/generic_state_spec.rb     | 60 +++++++++++++++++++
 web/config/initializers/email.rb              |  8 ++-
 5 files changed, 86 insertions(+), 3 deletions(-)
 create mode 100644 db/up/define_environment_in_db.sql
 create mode 100644 ruby/spec/jam_ruby/models/generic_state_spec.rb

diff --git a/db/manifest b/db/manifest
index 8bad4f17c..06a48eb7d 100755
--- a/db/manifest
+++ b/db/manifest
@@ -199,4 +199,5 @@ track_user_in_scores.sql
 median_aggregate.sql
 current_scores_use_median.sql
 current_scores_ams_index_sms_index_use_user_instrument.sql
-locidispid_in_score_histories.sql
\ No newline at end of file
+locidispid_in_score_histories.sql
+define_environment_in_db.sql
\ No newline at end of file
diff --git a/db/up/define_environment_in_db.sql b/db/up/define_environment_in_db.sql
new file mode 100644
index 000000000..d05c9ef74
--- /dev/null
+++ b/db/up/define_environment_in_db.sql
@@ -0,0 +1,3 @@
+-- https://jamkazam.atlassian.net/browse/VRFS-1951
+-- we need to know the environment in the database for advanced behaviors
+ALTER TABLE generic_state ADD COLUMN environment VARCHAR(255) NOT NULL DEFAULT 'development';
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/models/generic_state.rb b/ruby/lib/jam_ruby/models/generic_state.rb
index dae283c04..9390a58c2 100644
--- a/ruby/lib/jam_ruby/models/generic_state.rb
+++ b/ruby/lib/jam_ruby/models/generic_state.rb
@@ -4,6 +4,21 @@ module JamRuby
 
     self.table_name = 'generic_state'
 
+    validates :environment, :inclusion => {:in => ['development', 'staging', 'production', 'test']}
+
+    def self.allow_emails?
+
+      database_environment = singleton.environment
+
+      # if the database says we are in production/staging, then the config has to also agree and say we are in production/staging to send emails
+      # this is to protect against developers loading a staging or production environment and possibly sending emails to
+      # we even go one step further, and make sure ENV['BUILD_NUMBER'] is set, which is something you do in production, but would be very rare in development
+
+      # or if your database says 'development' and config say 'development', then we allow emails to go out too
+      (!ENV['BUILD_NUMBER'].nil? && (Environment.mode == 'production' || Environment.mode == 'staging') && (database_environment == 'production' || database_environment == 'staging')) ||
+          (database_environment == 'development' && Environment.mode == 'development')
+    end
+
     def self.singleton
       GenericState.find('default')
     end
diff --git a/ruby/spec/jam_ruby/models/generic_state_spec.rb b/ruby/spec/jam_ruby/models/generic_state_spec.rb
new file mode 100644
index 000000000..ba7ca0595
--- /dev/null
+++ b/ruby/spec/jam_ruby/models/generic_state_spec.rb
@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe GenericState do
+
+  def database_env (env)
+    singleton = GenericState.singleton
+    singleton.environment = env
+    singleton.save!
+  end
+
+  def rails_env (env)
+    JamRuby::Environment.should_receive(:mode).any_number_of_times.and_return(env)
+  end
+
+  describe "allow_emails?" do
+
+    it "allows emails if database is production and env is production, with build number" do
+      database_env('production')
+      rails_env('production')
+      stub_const("ENV", {'BUILD_NUMBER' => 1})
+
+      GenericState.allow_emails?.should be_true
+    end
+
+    it "no emails if database is production and env is production, no build number" do
+      database_env('production')
+      rails_env('production')
+
+      GenericState.allow_emails?.should be_false
+    end
+
+    it "allows emails if database is development and env is development" do
+      database_env('development')
+      rails_env('development')
+
+      GenericState.allow_emails?.should be_true
+    end
+
+    it "no emails if database development, and environment is test" do
+      database_env('development')
+      rails_env('test')
+      GenericState.allow_emails?.should be_false
+    end
+
+    it "no emails if database production, and environment is development" do
+      database_env('production')
+      rails_env('development')
+      stub_const("ENV", {'BUILD_NUMBER' => 1})
+
+      GenericState.allow_emails?.should be_false
+    end
+
+    it "no emails if database production, and environment is test" do
+      database_env('production')
+      rails_env('development')
+
+      GenericState.allow_emails?.should be_false
+    end
+  end
+end
\ No newline at end of file
diff --git a/web/config/initializers/email.rb b/web/config/initializers/email.rb
index 41e1651d0..8d9daf5a5 100644
--- a/web/config/initializers/email.rb
+++ b/web/config/initializers/email.rb
@@ -1,5 +1,7 @@
+@@log = Logging.logger['EmailInitializer']
+
 ActionMailer::Base.raise_delivery_errors = true
-ActionMailer::Base.delivery_method = Rails.env == "test" ? :test : :smtp
+ActionMailer::Base.delivery_method = GenericState.allow_emails? ? :smtp : :test
 ActionMailer::Base.smtp_settings = {
     :address        => Rails.application.config.email_smtp_address,
     :port           => Rails.application.config.email_smtp_port,
@@ -8,4 +10,6 @@ ActionMailer::Base.smtp_settings = {
     :user_name      => Rails.application.config.email_smtp_user_name,
     :password       => Rails.application.config.email_smtp_password ,
     :enable_starttls_auto => Rails.application.config.email_smtp_starttls_auto
-}
\ No newline at end of file
+}
+
+@@log.debug("ActionMailer.delivery_method = #{ActionMailer::Base.delivery_method}")

From 2aab3c902dd0247758a9b1d13a39370aa7c760da Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Wed, 30 Jul 2014 17:29:26 -0500
Subject: [PATCH 32/55] * fixing test that failed on build server

---
 ruby/spec/jam_ruby/models/generic_state_spec.rb | 1 +
 web/config/initializers/resque.rb               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ruby/spec/jam_ruby/models/generic_state_spec.rb b/ruby/spec/jam_ruby/models/generic_state_spec.rb
index ba7ca0595..7fdb0137c 100644
--- a/ruby/spec/jam_ruby/models/generic_state_spec.rb
+++ b/ruby/spec/jam_ruby/models/generic_state_spec.rb
@@ -25,6 +25,7 @@ describe GenericState do
     it "no emails if database is production and env is production, no build number" do
       database_env('production')
       rails_env('production')
+      stub_const("ENV", {'BUILD_NUMBER' => nil})
 
       GenericState.allow_emails?.should be_false
     end
diff --git a/web/config/initializers/resque.rb b/web/config/initializers/resque.rb
index 5077fea0f..a9d463f8d 100644
--- a/web/config/initializers/resque.rb
+++ b/web/config/initializers/resque.rb
@@ -1,7 +1,7 @@
 Resque.redis = Rails.application.config.redis_host
 
 
-if !$rails_rake_task && Rails.env == 'development' && ENV['RUN_JOBS_INLINE'] == '1'
+if !$rails_rake_task && Rails.env == 'development' && (ENV['RUN_JOBS_INLINE'] == '1' || ENV['RUN_INLINE_JOBS'] == '1')
 
   Thread.new do
     system('INTERVAL=1 bundle exec rake all_jobs')

From 72155c7ea6c151277c6fd035f9c54f9ab3e02f46 Mon Sep 17 00:00:00 2001
From: Anthony Davis <anthony@jamkazam.com>
Date: Wed, 30 Jul 2014 20:03:07 -0500
Subject: [PATCH 33/55] VRFS-1328 - built composite function resembling audio
 taper for DAW-like faders

---
 web/app/assets/javascripts/faderHelpers.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/web/app/assets/javascripts/faderHelpers.js b/web/app/assets/javascripts/faderHelpers.js
index 98b901626..9da5eb923 100644
--- a/web/app/assets/javascripts/faderHelpers.js
+++ b/web/app/assets/javascripts/faderHelpers.js
@@ -203,6 +203,19 @@
       return temp;
     },
 
+
+    convertPercentToAudioTaper: function (input) {
+
+      // composite function resembling audio taper
+      if (input <= 1)  { return -80; }
+      if (input <= 28) { return (2 * input - 80); }
+      if (input <= 79) { return (0.5 * input - 38); }
+      if (input < 99)  { return (0.875 * input - 67.5); }
+      if (input >= 99) { return 20; }
+
+    },
+
+
     setFaderValue: function (faderId, faderValue) {
       var $fader = $('[fader-id="' + faderId + '"]');
       this.setHandlePosition($fader, faderValue);

From 70da64a26eadf466dffc6e07fc13082c086e16e8 Mon Sep 17 00:00:00 2001
From: Anthony Davis <anthony@jamkazam.com>
Date: Wed, 30 Jul 2014 20:05:04 -0500
Subject: [PATCH 34/55] VRFS-1328 - wire up faders to use audio taper curve
 instead of percentage

---
 web/app/assets/javascripts/session.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js
index 25a5e0915..b77a45831 100644
--- a/web/app/assets/javascripts/session.js
+++ b/web/app/assets/javascripts/session.js
@@ -1147,8 +1147,8 @@
             // volumes on trackVolumeObject, and call SetControlState to stick.
             var sliderValue = percentToMixerValue(
                 currentMixerRangeMin, currentMixerRangeMax, volumePercent);
-            context.trackVolumeObject.volL = sliderValue;
-            context.trackVolumeObject.volR = sliderValue;
+            context.trackVolumeObject.volL = context.JK.FaderHelpers.convertPercentToAudioTaper(volumePercent);
+            context.trackVolumeObject.volR = context.JK.FaderHelpers.convertPercentToAudioTaper(volumePercent);
             // Special case for L2M mix:
             if (mixerId === '__L2M__') {
                 logger.debug("L2M volumePercent=" + volumePercent);

From 9544e3d075b5adb1815f7b429f54e74c895c2e07 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Wed, 30 Jul 2014 21:05:59 -0500
Subject: [PATCH 35/55] * rename new column because it's not working for
 reasons I can't understand on the build server

---
 db/up/define_environment_in_db.sql              | 2 +-
 ruby/lib/jam_ruby/models/generic_state.rb       | 4 ++--
 ruby/spec/jam_ruby/models/generic_state_spec.rb | 2 +-
 web/spec/spec_helper.rb                         | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/db/up/define_environment_in_db.sql b/db/up/define_environment_in_db.sql
index d05c9ef74..a419e8c8a 100644
--- a/db/up/define_environment_in_db.sql
+++ b/db/up/define_environment_in_db.sql
@@ -1,3 +1,3 @@
 -- https://jamkazam.atlassian.net/browse/VRFS-1951
 -- we need to know the environment in the database for advanced behaviors
-ALTER TABLE generic_state ADD COLUMN environment VARCHAR(255) NOT NULL DEFAULT 'development';
\ No newline at end of file
+ALTER TABLE generic_state ADD COLUMN env VARCHAR(255) NOT NULL DEFAULT 'development';
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/models/generic_state.rb b/ruby/lib/jam_ruby/models/generic_state.rb
index 9390a58c2..546006794 100644
--- a/ruby/lib/jam_ruby/models/generic_state.rb
+++ b/ruby/lib/jam_ruby/models/generic_state.rb
@@ -4,11 +4,11 @@ module JamRuby
 
     self.table_name = 'generic_state'
 
-    validates :environment, :inclusion => {:in => ['development', 'staging', 'production', 'test']}
+    validates :env, :inclusion => {:in => ['development', 'staging', 'production', 'test']}
 
     def self.allow_emails?
 
-      database_environment = singleton.environment
+      database_environment = singleton.env
 
       # if the database says we are in production/staging, then the config has to also agree and say we are in production/staging to send emails
       # this is to protect against developers loading a staging or production environment and possibly sending emails to
diff --git a/ruby/spec/jam_ruby/models/generic_state_spec.rb b/ruby/spec/jam_ruby/models/generic_state_spec.rb
index 7fdb0137c..671daeaba 100644
--- a/ruby/spec/jam_ruby/models/generic_state_spec.rb
+++ b/ruby/spec/jam_ruby/models/generic_state_spec.rb
@@ -4,7 +4,7 @@ describe GenericState do
 
   def database_env (env)
     singleton = GenericState.singleton
-    singleton.environment = env
+    singleton.env = env
     singleton.save!
   end
 
diff --git a/web/spec/spec_helper.rb b/web/spec/spec_helper.rb
index f92c77a43..d02e69c97 100644
--- a/web/spec/spec_helper.rb
+++ b/web/spec/spec_helper.rb
@@ -28,7 +28,6 @@ bputs "before db_config load"
 db_config = YAML::load(File.open('config/database.yml'))["test"]
 # initialize ActiveRecord's db connection\
 
-
 bputs "before recreate db"
 SpecDb::recreate_database(db_config)
 

From ac13d9780821788462ffd956ba3078b18de46f77 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Wed, 30 Jul 2014 21:28:14 -0500
Subject: [PATCH 36/55] * VRFS-1996 - mixer-id added to wrong element

---
 web/app/assets/javascripts/session.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js
index b77a45831..4a6d11ace 100644
--- a/web/app/assets/javascripts/session.js
+++ b/web/app/assets/javascripts/session.js
@@ -569,6 +569,7 @@
                     $voiceChat.show();
                     $voiceChat.attr('mixer-id', mixer.id);
                     var $voiceChatGain = $voiceChat.find('.voicechat-gain');
+                    $voiceChatGain.attr('mixer-id', mixer.id);
                     var $voiceChatMute = $voiceChat.find('.voicechat-mute').attr('mixer-id', mixer.id);
                     var gainPercent = percentFromMixerValue(
                         mixer.range_low, mixer.range_high, mixer.volume_left);

From 2cdafacd16c871b9ef64d9d5cb380b82fa13ba24 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Wed, 30 Jul 2014 21:35:37 -0500
Subject: [PATCH 37/55] * adding more debugs for problem on server

---
 web/spec/spec_helper.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/web/spec/spec_helper.rb b/web/spec/spec_helper.rb
index d02e69c97..d4aedf836 100644
--- a/web/spec/spec_helper.rb
+++ b/web/spec/spec_helper.rb
@@ -6,13 +6,18 @@ def bputs(msg)
   end
 end
 
+bputs "before simplecov"
+
 require 'simplecov'
+bputs "before rubygems"
 require 'rubygems'
+bputs "before omniauth"
 #require 'spork'
 require 'omniauth'
 #uncomment the following line to use spork with the debugger
 #require 'spork/ext/ruby-debug'
 
+
 ENV["RAILS_ENV"] ||= 'test'
 
 bputs "before activerecord load"

From 39c9b4335ae24fe80741894e65d76c434130a491 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Wed, 30 Jul 2014 21:55:40 -0500
Subject: [PATCH 38/55] * VRFS-1997 - click guard of create session

---
 web/app/assets/javascripts/scheduled_session.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/web/app/assets/javascripts/scheduled_session.js b/web/app/assets/javascripts/scheduled_session.js
index 7b7de7843..8d4227e6d 100644
--- a/web/app/assets/javascripts/scheduled_session.js
+++ b/web/app/assets/javascripts/scheduled_session.js
@@ -570,21 +570,25 @@
     }
 
     function startSessionClicked() {
+      var $btn = $(this);
+      if($btn.is('.disabled')) { return; }
+      $btn.addClass('disabled')
 
       if(willOptionStartSession()) {
         gearUtils.guardAgainstInvalidConfiguration(app)
           .fail(function() {
+            $btn.removeClass('disabled')
             app.notify(
               { title: "Unable to Start New Session",
                 text: "You can only start a session once you have working audio gear and a tested internet connection."
               })
           })
           .done(function(){
-            startSession();
+            startSession($btn);
           });
       }
       else {
-        startSession();
+        startSession($btn);
       }
     }
 
@@ -593,7 +597,7 @@
       return createType == "immediately" || createType == "schedule-future" || createType == "rsvp";
     }
 
-    function startSession() {
+    function startSession($startBtn) {
 
       var data = {};
 
@@ -700,6 +704,7 @@
             context.JK.GA.trackSessionMusicians(context.JK.GA.SessionCreationTypes.create);
           })
           .fail(function(jqXHR) {
+            $startBtn.removeClass('disabled');
             var handled = false;
             if(jqXHR.status = 422) {
               var response = JSON.parse(jqXHR.responseText);
@@ -712,6 +717,8 @@
               app.notifyServerError(jqXHR, "Unable to Create Session");
             }
           })
+          .always(function() {
+          })
 
       };
 
@@ -735,9 +742,10 @@
             }
           })
           .fail(function(jqXHR){
+            $startBtn.removeClass('disabled');
             logger.debug("unable to schedule a session")
             app.notifyServerError(jqXHR, "Unable to schedule a session");
-          });
+          })
       }
     }
 

From 8deddd269eeeedbafc37af18a0429b256a04e0eb Mon Sep 17 00:00:00 2001
From: Anthony Davis <anthony@jamkazam.com>
Date: Wed, 30 Jul 2014 23:43:04 -0500
Subject: [PATCH 39/55] Fixing intermittent test failure

---
 web/spec/support/utilities.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/spec/support/utilities.rb b/web/spec/support/utilities.rb
index 27b50ad35..db6d009be 100644
--- a/web/spec/support/utilities.rb
+++ b/web/spec/support/utilities.rb
@@ -543,7 +543,7 @@ def change_session_genre   #randomly just change it
   find('#session-settings-dialog') # ensure the dialog is visible
       within('#session-settings-dialog') do
         wait_for_ajax
-        @new_genre = get_options(here).-(["Select Genre"]).-(selected_genres).sample.to_s
+        @new_genre = get_options(here).-(["Select Genre", "Unspecified"]).-(selected_genres).sample.to_s
         jk_select(@new_genre, '#session-settings-dialog select[name="genres"]')
         wait_for_ajax
         find('#session-settings-dialog-submit').trigger(:click)

From a1b9191402872aceccba3e7ae7b82f203480581e Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Thu, 31 Jul 2014 01:00:01 -0500
Subject: [PATCH 40/55] * open profile from account session details page in
 same window

---
 web/app/views/clients/_account_session_detail.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/app/views/clients/_account_session_detail.html.haml b/web/app/views/clients/_account_session_detail.html.haml
index 4d6ee95c0..7057069b8 100644
--- a/web/app/views/clients/_account_session_detail.html.haml
+++ b/web/app/views/clients/_account_session_detail.html.haml
@@ -89,7 +89,7 @@
         %td
           {{data.latency}}
   .right
-    %a{href: "/client#/profile/{{data.user_id}}", class: 'button-orange left', 'user-id' => "{{data.user_id}}", target: "_blank"} PROFILE
+    %a{href: "/client#/profile/{{data.user_id}}", class: 'button-orange left', 'user-id' => "{{data.user_id}}"} PROFILE
     %a{href: "#", class: 'button-orange left approveRsvpRequest', 'user-id' => "{{data.user_id}}", 'request-id' => "{{data.request_id}}"} APPROVE
     %a{href: "#", class: 'button-orange left declineRsvpRequest', 'user-id' => "{{data.user_id}}", 'request-id' => "{{data.request_id}}"} DECLINE
     .clearall

From 8e7a566125abf3f1eb8aecaf372e05b61c3e3edd Mon Sep 17 00:00:00 2001
From: root <zonk2world@gmail.com>
Date: Thu, 31 Jul 2014 14:49:13 +0200
Subject: [PATCH 41/55] birthday dropdown

---
 .../assets/javascripts/accounts_profile.js    |   9 +++++++++
 .../javascripts/accounts_profile_avatar.js    |   5 +++--
 web/app/assets/javascripts/globals.js         |   5 +++--
 web/app/assets/javascripts/user_dropdown.js   |  13 ++++++++++---
 .../views/clients/_account_profile.html.erb   |   2 +-
 web/spec/features/account_spec.rb             |  18 ++++++++++++++++++
 web/spec/features/avatar_spec.rb              |   3 +++
 web/spec/files/avatar.jpeg                    | Bin 0 -> 6651 bytes
 8 files changed, 47 insertions(+), 8 deletions(-)
 create mode 100644 web/spec/files/avatar.jpeg

diff --git a/web/app/assets/javascripts/accounts_profile.js b/web/app/assets/javascripts/accounts_profile.js
index 5c7cb6123..d904f5f0e 100644
--- a/web/app/assets/javascripts/accounts_profile.js
+++ b/web/app/assets/javascripts/accounts_profile.js
@@ -4,7 +4,9 @@
 
     context.JK = context.JK || {};
     context.JK.AccountProfileScreen = function(app) {
+        var $document = $(document);
         var logger = context.JK.logger;
+        var EVENTS = context.JK.EVENTS;
         var api = context.JK.Rest();
         var userId;
         var user = {};
@@ -63,6 +65,7 @@
                 $('select#user_birth_date_1i', content_root).val(parseInt(birthDateYear));
                 $('select#user_birth_date_2i', content_root).val(parseInt(birthDateMonth));
                 $('select#user_birth_date_3i', content_root).val(parseInt(birthDateDay));
+
             }
 
             // update instruments
@@ -87,6 +90,7 @@
             }
 
             context.JK.dropdown($('select', content_root));
+
         }
 
         function isUserInstrument(instrument, userInstruments) {
@@ -317,7 +321,9 @@
                                     .always(function() { loadingCitiesData = false;})
                             }
                     }
+
                 })
+            context.JK.dropdown($('select'));
         }
 
         function navToAccount() {
@@ -366,6 +372,9 @@
                 },
                 null,
                 true);
+            
+            $document.triggerHandler(EVENTS.USER_UPDATED, response);
+
         }
 
         function postUpdateProfileFailure(xhr, textStatus, errorMessage) {
diff --git a/web/app/assets/javascripts/accounts_profile_avatar.js b/web/app/assets/javascripts/accounts_profile_avatar.js
index 388bed37c..c89039d97 100644
--- a/web/app/assets/javascripts/accounts_profile_avatar.js
+++ b/web/app/assets/javascripts/accounts_profile_avatar.js
@@ -6,6 +6,7 @@
     context.JK.AccountProfileAvatarScreen = function(app) {
         var self = this;
         var logger = context.JK.logger;
+        var EVENTS = context.JK.EVENTS;
         var rest = context.JK.Rest();
         var user = {};
         var tmpUploadPath = null;
@@ -381,9 +382,9 @@
             self.userDetail = response;
 
             // notify any listeners that the avatar changed
-            userDropdown.loadMe();
+            // userDropdown.loadMe();
             // $('.avatar_large img').trigger('avatar_changed', [self.userDetail.photo_url]);
-
+            $(document).triggerHandler(EVENTS.USER_UPDATED, response);
             app.notify(
                 {   title: "Avatar Changed",
                     text: "You have updated your avatar successfully."
diff --git a/web/app/assets/javascripts/globals.js b/web/app/assets/javascripts/globals.js
index 087e0213d..309c40509 100644
--- a/web/app/assets/javascripts/globals.js
+++ b/web/app/assets/javascripts/globals.js
@@ -32,8 +32,9 @@
       SHOW_SIGNUP : 'show_signup',
       SHOW_SIGNIN : 'show_signin',
       RSVP_SUBMITTED: 'rsvp_submitted',
-      RSVP_CANCELED : 'rsvp_canceled'
-    }
+      RSVP_CANCELED : 'rsvp_canceled',
+      USER_UPDATED : 'user_updated'
+    };
 
   context.JK.ALERT_NAMES = {
     NO_EVENT : 0,
diff --git a/web/app/assets/javascripts/user_dropdown.js b/web/app/assets/javascripts/user_dropdown.js
index 656ce71ab..3242ec824 100644
--- a/web/app/assets/javascripts/user_dropdown.js
+++ b/web/app/assets/javascripts/user_dropdown.js
@@ -6,7 +6,7 @@
 
   context.JK = context.JK || {};
   context.JK.UserDropdown = function (app) {
-
+    var EVENTS = context.JK.EVENTS;
     var logger = context.JK.logger;
     var rest = new JK.Rest();
     var userMe = null;
@@ -53,12 +53,16 @@
       $('.shortcuts .test-network').on('click', function(e) {
         app.layout.showDialog('network-test');
         return false;
-      })
+      });
 
       $('#header-avatar').on('avatar_changed', function (event, newAvatarUrl) {
         updateAvatar(newAvatarUrl);
         event.preventDefault();
         return false;
+      });
+      $(document).on(EVENTS.USER_UPDATED, function(e, data) {
+        userMe = data;
+        updateHeader();
       })
     }
 
@@ -115,5 +119,8 @@
       loadMe();
     }
     this.loadMe = loadMe;
+
   }
-})(window, jQuery);
\ No newline at end of file
+})(window, jQuery);
+
+
diff --git a/web/app/views/clients/_account_profile.html.erb b/web/app/views/clients/_account_profile.html.erb
index bf1ec484f..c297b0f7b 100644
--- a/web/app/views/clients/_account_profile.html.erb
+++ b/web/app/views/clients/_account_profile.html.erb
@@ -79,7 +79,7 @@
 
         <div class="field right w45 birth_date">
           <label>Birth Date:</label>
-          <%= date_select("user", "birth_date", :use_short_month => true, :start_year => 1900, :end_year => Time.now.year - 18, :order => [:month, :day, :year], :default => -25.years.from_now) %>
+          <%= date_select("user", "birth_date", :use_short_month => true, :start_year => 1900, :end_year => Time.now.year - 18, :order => [:month, :day, :year], :default => -25.years.from_now, :html=>{:class => "account-profile-birthdate"} ) %>
         </div>
 
         <br class="clearall"/>
diff --git a/web/spec/features/account_spec.rb b/web/spec/features/account_spec.rb
index 64fa2baf5..ba5500e8f 100644
--- a/web/spec/features/account_spec.rb
+++ b/web/spec/features/account_spec.rb
@@ -99,7 +99,25 @@ describe "Account", :js => true, :type => :feature, :capybara_feature => true do
           user.subscribe_email.should be_false
           user.first_name.should == "Bobby"
           user.last_name.should == "Toes"
+          should have_selector('#profile #user', text: 'Bobby Toes')
+
+
+
+          jk_select("Jan", '#account-edit-profile-form select[name="user[birth_date(2i)]"]')
+          #jk_select("Jan", '#account-edit-profile-form #user_birth_date_2i')
+          jk_select("12", '#account-edit-profile-form #user_birth_date_3i')
+          jk_select("1960", '#account-edit-profile-form #user_birth_date_1i')
+          find("#account-edit-profile-submit").trigger(:click)
+          
+          user.reload
+          user.birth_date == "1960-01-12"
+
+          should have_selector('#account-edit-profile-form .birth_date li.active', text: "Jan")
+          should have_selector('#account-edit-profile-form .birth_date li.active', text: "12")
+          should have_selector('#account-edit-profile-form .birth_date li.active', text: "1960")
+
         }
+
       end
 
       describe "unsuccessfully" do
diff --git a/web/spec/features/avatar_spec.rb b/web/spec/features/avatar_spec.rb
index 18aab6609..1e9c6521f 100644
--- a/web/spec/features/avatar_spec.rb
+++ b/web/spec/features/avatar_spec.rb
@@ -18,6 +18,9 @@ describe "Avatar", :js => true, :type => :feature, :capybara_feature => true do
     visit "/client#/account/profile/avatar"
 
     find('#account-edit-avatar-upload')
+    # within_frame 'filepicker_dialog' do
+    #   attach_file '#fileUploadInput', Rails.root.join('spec', 'files', 'avatar.jpg')
+    # end
   end
 
   it {
diff --git a/web/spec/files/avatar.jpeg b/web/spec/files/avatar.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..799e5cbba0cd2dcf111673f9ee0316f8ac308f81
GIT binary patch
literal 6651
zcmZu#1ymH>-=5tim5^FWB&0i*kPxJokd%BW>68#eL0piOML>}5Rs<<&MWj<YRvJM>
zK|qvJ_-1!~<DCCDoHKi2hdXzEPyC)cXESF@zy&RJq&fhB000F10nR=E;Q%QSF)cMU
z9W4zl9UUD#9W5;!P74m{nd#|i;q<ihth5XldD$44xmajv*~Qqo_ymN7h3Q!(WF!Qo
zd4+@pAm`4VqadeXzHotAgp-X^T2N3#5Fscc44wqBzaS7og4i+mR}pFO6CovtKfp2e
zK%Bh=s7QciU>OGC0H9P57!~BK6S#<7A|ZCE{~Qn~0U;4Fj0F5v{Q>}i!k}aXgb)H!
z7$JBG1pHTaF_;|zHHY{$1E0|9_T?QyBISHy8sEg-%Z4}KjnYaWjKZE2)QrLHSLiwY
z9u|W0Fo8FK!v1>`0Gtv=1O>knr2?Q(2!xP`kO1~)4d6Wqs0gXq#jep9*!kpF({dz^
z?uZ+<FViXSo?!qoa3&}fj0#W$wmP49jTzH-zP%-1U%28RowHxYGdBOp)R>^@J8Hq-
zU*jq@jly7=c%Nrby3Q<V;{i)Fsoyex&hNxwR92rsri3(WNDQ+1buSwa6O_Bbn}h{I
zueAoK@GU+rBk;}U)pu)igIa8Hn_gyN9C0~y1G>{oLI=x+j|2CWjHfl6FFhi!&{1+J
zM@P-Og*bfA^ysUtdN{}V=^kWKaJ5ETZI_bfRfA&Lf$S#2!zDq<pG;&(Mu6<9-}P3_
zwg653?&<etya`8<JMY((*G&m#P@i*uERgF>EVTEQmy5_OMcPOaAEfPmBM~-IEr7jR
zT3~l}x$NvRpmOq<Vp(n53PNMqNZ66KH;yKy7`Yb8Okyb#cGQpQjn6)QQS|+76XwqE
zcd!y-CAHpZSMer`!vLm%fb%Ae@QoI;%PN(ofW6MR(z-sKSm$7`%c)C``aPL_<4^bH
z@3HqM42}8ES3~q~>pXjDVc+@I2>CHDtylA0&Nb5ghP#uK5H5Uu6_wJL?}gbt!5oOE
z*U<1ZCKEL6B&2V<`Q+c_&-yTT|M;>hw_6ZO=^h6MG^%mrmTWT~48sFu<<iEop@htM
zpBa=>uWnD{SDo4P#*=*=%uvr_fuYw+UlKy@%>y<R9t`p9!%dV1-&h1u`OiGy?*YR&
zV&qCPjL9j3SiDf~^Xe#og~sAePHVU2#Y>%U6OSL$0i&o5PUB5X{R4PM#M7iL3U?;G
z374t35{S=0kh8+DA6h#`SUQOsRj`yw(8%2hyJ^6iti&6gnhf1bO>QlKU0GwLmx6C~
zD;DiB?YKUBId{LHx$@3<Pr-7L#?3EpEO+f9W}-;pA1z4UGeETC^chv2vS${3X}S5t
zo}G>VE&;bVHMBHA`MwZHNF{vvNF%k~=lW^LQl^`dhZ52iI`bHD)f;*ZKD*Px>bFq|
zCnr5`5+aYmzHJE8yztBO2_%lPt-_c%s{VlG^5?KI-b7VG%G-S6K_|RJFTg_c-G%NM
zlj=@xUjvHftv_BMag^Jg1R{;vSoBHOWcBkVLneT~2l#@aaPS*DgMhO!F6v#1zK)3W
zN~&B6U)6N_EW3RUiO$3>pQv#6^7)9k>?B9@VK$ofq^ZsEz3_Se!!+NoObDs*SoqUw
zpplC@Mim+zb5}`(@2++~8>v;S<KAL~<kzE=I0}M<5mi-!Lh|Yp0Y%Y3{n~+A))F0(
z39lwKbN?1As|QJb1zODOOfB%`9n8$H50;{~7rPtJfQXUQqp6(wwkTGNHSq!Wy_%U~
zrt4_E;+EmcG97VC>vjDBu2<WR5)RyYKD<O8;eFd&61RK~HqslgESgPEnu9_zCB#AU
zu_tftG=ZfkfA<kK@!5^3IS;s(Eu>;<?6K~Epl}4xgOQ<wh1U_k!9pl-L>EKWH%K$a
z^YjU@q$_?)R#@-|cx+UBj@)!h>7RjEiEEx8FA-u0oIxGS21xe)?#7?mk^CuTQCeRO
zh`kaizLa=x!k=-Tq~u~l15j4MetOE(xN8^8U*(pftQzz2l&N+LVGU!}c$G&(eYy5}
zR}50kZLsLWD5HnKK)6_Ct(cGd%?`7->coj=mO;ekX$r-q1{Y4;ttgTtx33wVh^m_r
zt#DlJe^OB_vy(ABmn(1f<}V6=5SjUkV2bu}LGojyhct}P^9;~6XY5*XVdzLRf{zt{
zpBUM7a?@Ufyq)*hnTjh_VnQ}~!mTZ<(buogH&dMeHD*`IrqCt`$!5FKknHlV7A?}?
z*qBX*C)4ZvRW*?OxFHvq2d$k6$7p5kej+qb`NyV?17FdeN?C~PbE{94uaU<>h%582
z)9qu)Ei~oO@X?*s6P33w`xL)9Ovw$INpY2V|ELdAjjw}iEVoBqIMn%-box`cAX83j
z;-o*OCqS2lSxVXAfEo`n)?m1C67iHL!y`^sY8vrDAEy;1h3hH#<<9})XJZqR{z{i6
z*l~bi!Nxnd#G4!i+J|vE3ko!{>8)Nfp`)U-bn;=aF_HvTLJE(S+eSxac&QW*#bgsb
zcFX!!8m|h&`V46|)*<IEWVw>f^H{Yb#gZHd_1I7}j8aO*dn9<0{+FsyoJGC});oWs
zB-yl`b+`O0wjI&<wjcI()n)a$EZR8I$o83P`+VwMjHlz<m8859#hP+J{dK)FZSZZV
zcjAc%B`<^QNbc+{8m=n4L*BYtKPyvG7L9T8FR(RrIL0DM69r+4_95WC(DH!VAb5H%
zk^jI;*I&y0{W36ihulh^oX2}|5<r85b$gLUuny8!XDjO-cfha$jhr*Bs6@SwvOT*l
z&l4KPbFT6Uo2-w^AQOr#hEM3WU6JPw5JjNEc**^Sq0j+qn;j8F9($?LZ?2bl;B4<W
z6YNfN&W{gmot7iHPKK2S15Jno1s`7bw;~soghj5oe(<vE624{Q%j5hy=ss0Vpf!_@
z%K8?u)c^;mF>88HGs<&M%Y52yqf>$@jf%_MHcOT)1^ADe704My4RZfRP^<(e*Y5O$
zkt<KJj`hg(BG$e5hD&ZS*YkqbKVOX$OGp4Q1aurYv49*~7Bu+dt=EuDT;onMp|@%n
z8?T>zZM+&%W{k1<dP~@|rF56^`~7&0o*#kQbNBw!=l*Ng0M2!cq?ElBI_JP{=d;cI
z5og$t%%J!-wa2??R!;fB7?vm{^NTn#qOF8a+?Z0zpPRI||4^7#=;LFmntE_<Y5)eE
zoT}?~A+RP7nS&cqyd9tr8@kf)*DaGgb+D634k52UlWF6&C}k`fp#cNO5D3ji`UjbP
z5HFM3k>S}cQgj3&NAn+P<tO-4_81pM1Z5a1zaHXa7Y};GKnu2&F21{b+I?C&(@g|~
zB{ZQ?7Ur+VJ9|Wbug1py3{`ZzgUo$r=)6-YDoBfw<yO*}Q_Ps96JQEk9SzE{PMp$t
zv!ipV{&7m=cL81kCv54Bocc(w6+BEg!dhLk7XJ;Cyc^~UM^ZQ;fx*FRCVf$lxt<-5
z!CW9gxAOld2l`|n&7r<kgqLlWG-*!DsaGdw#h?(rcmJ48fr<*Evf{w?Vox6@pXb)P
zMBmGw;}Ztz?}iD625D}O@VTIvCY<G?{%x70|62Yg3Ie)8lriY}$`5ax=!49{TDU&m
zvmv_033ZGrJf@PU4pHUtlgKFR$trC45wM}DIYP4;)P6V@+RP94lC7bzGI$gFmt(2A
z?f+_|JV)q%Rbp!hdK7K($6^sKJ_)cFpTi<h^nRJ3<N*m$Qlr~uq+T#3p;ROS>W~5X
zHT8hF3IOYB%Od^Med#A7!*BvOn^j)Ue)$~eH)<octIwB8j%sQ-ruke)$*>lLWBPS}
z36Srk=<vv-UcOFmJmJHSEn7D?|C~FxUM=5M!e)(kd-!yQ%Niw~+gE>IAp4Wfz?gxr
znR<gZ*dU1uI1L~w^LfT6)`fVc7jH*!YoW1MvoZeLTAc<5bC$r6fz2fU*4d5eB?g7<
ztv61LA#oDAuyiF&Tt>smH3mzYD1H@b<a9tMu!c(+Gev)5B|04S?Bj)8?K|04`b-DW
zwukXup8OQ~<!<#@UJo2a9HuBC^caF3GQN<w#LkyAH!YcN`1}*yx}^aR|3vx?PA~>&
zS!)^Y8De{&y42q_=aV>8LS%QC8Ur~03$hKoQs+&iT<Y}7YqfX`8Y{3i9o*fTVXxu=
zRE!&nxtm}LhVCG{DKrNp8>bQa?i)BtbKe>7-g<<@Es|cxI1Hcc{@c&F8HHY+@5gxr
zJwDTw{F_Pse}Xo$fjf=KWpDL(qXy8QDY0jR0ts;@VsX^|BP<TR^hs)rwGupygu-k(
zQ`xk5LIc>c%jR7w)uP4M8@EqE;S&jf&&1dqtb^ss6+^7a)w2=f>)yqQ*W`ccf};8C
z1&R!(uBS1(ZDLD@3=ze7-M=H(6uo#q0o6H1-<|gdEKO?O(^a@@`=G5?kOXO(r1~0e
zGtV+(bF#><Z}645ckN4DQgl3~fO-+gEf8dPRv5$!rae2@XowABGh0tj4ZFI+95$LY
zXSV9BzctY`R6#C?KACR#EnLO*;-YqoJTGZ;gSU0XD^DbApZ!aI^_p_&S+OZ})DRu#
zUze|!_swWZj25czRp45efmN2lP=tlR{run|Nukt%0E3#xVJiXepv;^mFRijnwoo%G
zv#-MRT_~hK!-8)-?vMOYX*Dnxn=2$>V5R+E{BBg-?HMA5_(!|LX3l^#RvDR_E6PNP
z{o>LFR);(p-X5GpGjAxb#_FWT^~m`M6n}MYYAc1tH@v*xVa@G=GcvwR&~jtI4JOvj
zu<6}h3MUwRHo-@ET%#kvK_^T?{Om(yWf}eqS}P$4ID|2s9G0%WrZ--2@)O(37OOR7
zCWcl=A)jg0cqyfo9O=N+ibFb88ab-B{_IbR$LkD-H5PP}!w^<yr?C@_`r$#%rfw?P
z$kzjW((MeMT;;;})G}YKR-6}_=C1Bn24LzaSq@W1;kNaGn5&LO7W0ENa?8~&IRdKz
zhsfWSrZO&`3{s-n_l+@Cf~kz&2W(b#Zc!w=A-P7+0vB_uEFm!ty0ww9GB@MuBW+wN
zXu9POA}pa(avy7NWcf5;Oyt;J-8P}Ko3zoji81%`ulFAfq}EwAbV5FRBM^9~?McQx
zVVueEJ7@7oh|zQL{MN4M=i?U@%%{^2&K)GbD$zh|6z_hQJ;h}_w;aVVxCMR2)tjqD
zp5w1QZL#9<-F;VOf~ot}@6!CcJbAEZ>&yIK$1Gk7^T|IpTme_ba9jhmUS6O*xsnKX
zVGBykH=A~*8<_p8JgCM(e2)e_RekT#*OjNUT>`a_THglCj?J_ekdJ-WeP}+D5MFX{
z^VLm51B<?=hf?Ridnz$j^!v<SYyEC{_iD;F+2(SO^8}trK7waJ=a<Po(LT>WYg65b
zxEa&J^`qo;>44fv-zyDW2f$axLZx~|Kj&Ym@|JB~sb|2pNBZ+_9`~GYhZQXTfw5XQ
zea+unt{sic%F_(bn2-xT$XJ|x75n(pC(0&zp)c(r?6&o7Q{CMor*pGa^7@_-Us`P+
z{@RlGw?pRj)6+Lr?$g=3j1iWIdLx9`qW@C6VS6tdY%^~j?6kq_+vnr#UDjPuVy>8u
z%dJA6+C#WhLnCGfetvDtl<3{QF|}lVNo;l7e7vqam()8XN&||sAl!c1;_z1VtetL8
zO^|ha*|1_O|9pfMHgfUmBK94_Tr2dklrv<Zfm}1{#kT#iy9C5z^K>oG+mrsJXq^p&
zAMT|Bf7Z-Y);<2eHs(f+7Q%^m1{dT9;hh-SkQ7k{`WF3((V|MR)vF@z5f=8CW}Y#E
zjL{Pzuh4H5)<+#Z6pZ0lmQFK$1tZZ0B~0@+RU=i84rmxnS!|?_@`u;g<Q$vZw0=#0
zrRCsrV2h514j-|S90i6@te!ZweX`H&j0iKm#1bA{ZYifXQ)hn$^e=5|4<#<dYBaC4
zND8mV=PUh?1H-ZV8@KO{DI{#ZTbi+gp^-iE#~MvWpG3sa)ICh<qq}e&#G8>h4z3b*
zA2bh%f8pFgW7DvhUmVi-FfF@uNZ5L9!Rwaeo=R@@)7@OevYCOR_(bFxaK}lT@h1__
zUH-9wZXpbtkk$F6Z7~y)3a)tL!WQ0=*2L>I!sv$Nj1Z4ri^Iv5aPso}ld4-S%0G8<
z#g=8nehZjFiYsLX6_*hhHWMythW&O|2F_M$WpjGuH!aUL`0&7*;uZ5{Tk{0Ltuw$O
zE7jc(S=nl_6>c($^CcTu^VYhsF_ln)3%1v22v`UML^$r|*_o)lJRRw^cj=*}WO~J-
z;c}xXFgy1>g>}~(_$}8xz1*h!V9omOjx9nTOQ-ky#H<HGb`Grr;lYC<BzLnsD}b4c
z7K^rUNed$u%t|YjUU0*Uq+L5Ic!$2KD&b<}VO()UUR{lkd*pMf;v!di;h{Afu?C8o
zSl>%C=S|#XNq&#R6b7PRq^1Vj&2Y7NTIfhv6F&=IBX3q);%ze9oY`zj65Y!dA3aSy
zdbSX=UvDv7`TSa><}VRBW~ZhKDTfP77ccTbIVgT?;8SG2tau~#B~zGVq3(f@&5FpQ
zUs>c^cA<3~om6FEHk3PI(h+r6xs_FrAL)e;8zR*)-JJ$0j-QOJH^_IKkCV}ww=hZH
zIo8dabTamiGpIR)QR`tGY$VYraMm-RJJ@8Lv<{vUX@|CD0$ie+VlY}&s%A*80tvn=
z3O1tAvD{ETeU!i=@h;EO)L?z>6<x&0wWJI$c5{vnWCi0>?wqnzhQWy;WsW`+$k1ec
za9&ttu*j}ndRQj^o4%RCjQ}I$Y_c?AW8KXKy*9PJt8lwTk@J3vuWP+wmg&g~)zg+P
z;n?><`s*sb)2p2uJ06S0f!<(bR^z6X&mjL~dZR0Z9n(Wu&&0fkkv6Z(^)+=1synyy
z+J{npsUF=Sl=V}FSU#ocEovD8Wl=8ux+SOa(PT>@i0jjVC`ojs7FIfc9vLWB#y>mo
z_hP{T+505VQ)`xoEvHMjj@q4fg*T?&dA&TJO0+jjaj-1Kh4!oV^vL>Zk_22L<$R<m
zyf?aueOXn8k-hbj<D27`*?~c9t}%s2P~PU`4|??dRgD)P1>|s&07|i%f3Ml}$uoC5
z35mHdnAxr(`%(ZZOT}Teq;n-MG*alN#RBV2`;vP9eCdHFlVuBIb^Pq@`i6<k9rbz%
z>|GMc%I*49-9<m=%A5hj@OQuBqRiiaT#fSx(yL})7@!P4yzx5sM~c*o;};9Wa}oO_
z9y+?<o`$3w>tObEPEAE>DFYR!>4@MpS{oHR8N%!rxlTRO*Cm+jZ+F4vNcKvIjvlDj
zz>w}RX)-gRa#xKPy416VpE<pYta3i|%8({`X!|F+yNa|ts%tp(3}Zxmfcdq<w#Vv)
z@{PVpDx~{vAD;mlm(?bPLKtjMGc8>f_ulWkWY&wAx|ya{6aqSh<hRvl-}dFtfX8hu
z6YIRqMsMIK#k#aJV3+cUUva-``q=agKtG6cUUm7sfZp2?SG@K7Bx{*o{non<qX?BV
zpcI_LD)-%JDXHk_vC66IZe7SX^{cSUKaXEF4JF?Gq8Ksd)Tpw&kI<OEH~UMp3cXd4
zAHWuWtku(Fw7B8u@#W<8b+cmsa>d9-PQQxiF>Q=A^7+;qrMIeYj2_o`dR~#y4GdC#
zNrRb94ZQ!L5M5+?yLK;ys85=xM*4N*&KZEXS;L?hWo}MlK5Jfg`h{tJ?|cWw;4|Fw
zaeuD)<*=m%7EjmTR!<90Go|HF=E3xRGVaUAT-9R-Vr`!vOV@1W-HdZMXyhfw@!U0K
zH21j3>+wL?Z$poD8J-SiB(r;f)EBALq}x`p?H)PIAIT^>?JXpyD$jt%jkvTpl-x>v
zNj;4un5i2kwmM92T)G=DkjbS&k>(pe9kce(cB|GSV+vtV0jXe)e7ZS`%Unt`X&EjT
z`x8i|eO{|`(REStg3<)^3)l#03!qQ}Re()ZiHZtPjz-b)MnlwiQK(QV0Ot$1i_URC
K!A<Mg?EeAVHYoA{

literal 0
HcmV?d00001


From 18cb0d64735a9dbd3ec8c199af29dafa4f90196c Mon Sep 17 00:00:00 2001
From: root <zonk2world@gmail.com>
Date: Thu, 31 Jul 2014 16:54:51 +0200
Subject: [PATCH 42/55] account_spec

---
 web/spec/features/account_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/spec/features/account_spec.rb b/web/spec/features/account_spec.rb
index ba5500e8f..80c2ab1b0 100644
--- a/web/spec/features/account_spec.rb
+++ b/web/spec/features/account_spec.rb
@@ -11,7 +11,7 @@ describe "Account", :js => true, :type => :feature, :capybara_feature => true do
     emulate_client
     sign_in_poltergeist user
     visit "/client#/account"
-
+    
     find('div.account-mid.identity')
   end
 
@@ -102,9 +102,9 @@ describe "Account", :js => true, :type => :feature, :capybara_feature => true do
           should have_selector('#profile #user', text: 'Bobby Toes')
 
 
-
-          jk_select("Jan", '#account-edit-profile-form select[name="user[birth_date(2i)]"]')
-          #jk_select("Jan", '#account-edit-profile-form #user_birth_date_2i')
+          # Update birth date and check updated birth date 
+          
+          jk_select("Jan", '#account-edit-profile-form #user_birth_date_2i')
           jk_select("12", '#account-edit-profile-form #user_birth_date_3i')
           jk_select("1960", '#account-edit-profile-form #user_birth_date_1i')
           find("#account-edit-profile-submit").trigger(:click)

From 6f79878f91e910be506f5bdc7c1988def6906d6c Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Thu, 31 Jul 2014 10:32:20 -0500
Subject: [PATCH 43/55] * VRFS-1975/VRFS-2003 - don't send two participant
 creates back-to-back

---
 .../assets/javascripts/scheduled_session.js   | 41 ++++---------------
 web/app/assets/javascripts/session.js         |  6 +++
 web/app/assets/javascripts/sessionModel.js    | 13 ++++--
 .../participant_create.rabl                   | 11 +++++
 .../api_music_sessions/participant_show.rabl  |  5 +--
 5 files changed, 35 insertions(+), 41 deletions(-)
 create mode 100644 web/app/views/api_music_sessions/participant_create.rabl

diff --git a/web/app/assets/javascripts/scheduled_session.js b/web/app/assets/javascripts/scheduled_session.js
index 8d4227e6d..4075157cb 100644
--- a/web/app/assets/javascripts/scheduled_session.js
+++ b/web/app/assets/javascripts/scheduled_session.js
@@ -571,7 +571,7 @@
 
     function startSessionClicked() {
       var $btn = $(this);
-      if($btn.is('.disabled')) { return; }
+      if($btn.is('.disabled')) { return false; }
       $btn.addClass('disabled')
 
       if(willOptionStartSession()) {
@@ -590,6 +590,8 @@
       else {
         startSession($btn);
       }
+
+      return false;
     }
 
     // did the user have to pick the RSVP slots explicitely?
@@ -687,39 +689,12 @@
       }
 
       var joinSession = function(sessionId) {
-        var tracks = context.JK.TrackHelpers.getUserTracks(context.jamClient);
-
-        var options = {};
-        options.client_id = app.clientId;
-        options.session_id = sessionId;
-        options.as_musician = true;
-        options.tracks = tracks;
-        rest.joinSession(options)
-          .done(function(response) {
-            var invitationCount = data.invitations.length;
-
-            context.location = '/client#/session/' + sessionId;
-
-            context.JK.GA.trackSessionCount(data.musician_access, data.fan_access, invitationCount);
-            context.JK.GA.trackSessionMusicians(context.JK.GA.SessionCreationTypes.create);
-          })
-          .fail(function(jqXHR) {
-            $startBtn.removeClass('disabled');
-            var handled = false;
-            if(jqXHR.status = 422) {
-              var response = JSON.parse(jqXHR.responseText);
-              if(response["errors"] && response["errors"]["tracks"] && response["errors"]["tracks"][0] == "Please select at least one track") {
-                app.notifyAlert("No Inputs Configured", $('<span>You will need to reconfigure your audio device.</span>'));
-                handled = true;
-              }
-            }
-            if(!handled) {
-              app.notifyServerError(jqXHR, "Unable to Create Session");
-            }
-          })
-          .always(function() {
-          })
+        var invitationCount = data.invitations.length;
+        context.JK.GA.trackSessionCount(data.musician_access, data.fan_access, invitationCount);
 
+        // we redirect to the session screen, which handles the REST call to POST /participants.
+        logger.debug("joining session screen: " + sessionId)
+        context.location = '/client#/session/' + sessionId;
       };
 
       if (createSessionSettings.createType == 'start-scheduled') {
diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js
index 4a6d11ace..51f28cf5c 100644
--- a/web/app/assets/javascripts/session.js
+++ b/web/app/assets/javascripts/session.js
@@ -315,6 +315,12 @@
                             null,
                             true);
                     }
+                    else if(xhr.status == 422) {
+                      var response = JSON.parse(jqXHR.responseText);
+                      if(response["errors"] && response["errors"]["tracks"] && response["errors"]["tracks"][0] == "Please select at least one track") {
+                        app.notifyAlert("No Inputs Configured", $('<span>You will need to reconfigure your audio device.</span>'));
+                      }
+                    }
                     else {
                         app.notifyServerError(xhr, 'Unable to Join Session');
                     }
diff --git a/web/app/assets/javascripts/sessionModel.js b/web/app/assets/javascripts/sessionModel.js
index 0adb1fdc9..d7fb0a424 100644
--- a/web/app/assets/javascripts/sessionModel.js
+++ b/web/app/assets/javascripts/sessionModel.js
@@ -87,17 +87,22 @@
             var deferred = joinSessionRest(sessionId);
 
             deferred
-                .done(function(){
+                .done(function(response){
                     logger.debug("calling jamClient.JoinSession");
+                    // on temporary disconnect scenarios, a user may already be in a session when they enter this path
+                    // so we avoid double counting
                     if(!alreadyInSession()) {
-                        // on temporary disconnect scenarios, a user may already be in a session when they enter this path
-                        // so we avoid double counting
+                      if(response.music_session.participant_count == 1) {
+                        context.JK.GA.trackSessionMusicians(context.JK.GA.SessionCreationTypes.create);
+                      }
+                      else {
                         context.JK.GA.trackSessionMusicians(context.JK.GA.SessionCreationTypes.join);
+                      }
                     }
 
                     recordingModel.reset();
                     client.JoinSession({ sessionID: sessionId });
-                    refreshCurrentSession();
+                    refreshCurrentSession(true);
                     server.registerMessageCallback(context.JK.MessageType.SESSION_JOIN, trackChanges);
                     server.registerMessageCallback(context.JK.MessageType.SESSION_DEPART, trackChanges);
                     server.registerMessageCallback(context.JK.MessageType.TRACKS_CHANGED, trackChanges);
diff --git a/web/app/views/api_music_sessions/participant_create.rabl b/web/app/views/api_music_sessions/participant_create.rabl
new file mode 100644
index 000000000..6d8c26c70
--- /dev/null
+++ b/web/app/views/api_music_sessions/participant_create.rabl
@@ -0,0 +1,11 @@
+object @connection
+
+extends "api_music_sessions/participant_show"
+
+child(:music_session => :music_session) {
+  attributes :id
+
+  node :participant_count do |music_session|
+    music_session.connections.length
+  end
+}
\ No newline at end of file
diff --git a/web/app/views/api_music_sessions/participant_show.rabl b/web/app/views/api_music_sessions/participant_show.rabl
index cbbf29c87..1805cf45d 100644
--- a/web/app/views/api_music_sessions/participant_show.rabl
+++ b/web/app/views/api_music_sessions/participant_show.rabl
@@ -1,11 +1,8 @@
 object @connection
 
-attributes :ip_address, :client_id
+attributes :ip_address, :client_id, :user_id
 attribute :aasm_state => :connection_state
 
-node(:user_id, :if => lambda { |connection| connection.user.friends?(current_user) }) do |connection|
-    connection.user_id
-end
 child(:tracks => :tracks) {
     attributes :id, :instrument_id, :sound
 }
\ No newline at end of file

From 1f19c9a4c3b7d46a060a13382be7d920ab52c7ef Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Thu, 31 Jul 2014 15:30:42 -0500
Subject: [PATCH 44/55] * fix test

---
 web/app/views/api_music_sessions/participant_create.rabl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/app/views/api_music_sessions/participant_create.rabl b/web/app/views/api_music_sessions/participant_create.rabl
index 6d8c26c70..5c8fa8ea7 100644
--- a/web/app/views/api_music_sessions/participant_create.rabl
+++ b/web/app/views/api_music_sessions/participant_create.rabl
@@ -2,6 +2,8 @@ object @connection
 
 extends "api_music_sessions/participant_show"
 
+attributes :music_session_id
+
 child(:music_session => :music_session) {
   attributes :id
 

From 00dee99e1718c657cb064a3069985b81b4c60684 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Thu, 31 Jul 2014 20:16:38 -0500
Subject: [PATCH 45/55] * wip

---
 .../scheduled_session_daily.html.erb          |  97 +++++++++++++----
 .../scheduled_session_daily.text.erb          |  11 +-
 .../views/layouts/from_user_mailer.html.erb   |   1 -
 ruby/lib/jam_ruby/models/connection.rb        |   2 +-
 .../models/email_batch_scheduled_sessions.rb  | 103 +++++++++++-------
 ruby/lib/jam_ruby/models/score.rb             |   2 +-
 ruby/spec/mailers/render_emails_spec.rb       |  64 +++++++++++
 ruby/spec/support/utilities.rb                |  13 +++
 .../javascripts/dialog/textMessageDialog.js   |   4 +-
 web/config/application.rb                     |   5 +
 web/spec/support/app_config.rb                |  12 ++
 11 files changed, 242 insertions(+), 72 deletions(-)

diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.html.erb
index 0d6ba9a6b..26d7cf716 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.html.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.html.erb
@@ -3,35 +3,90 @@
 <p>Hello <%= @user.first_name %> --
 </p>
 
-<p>The following new sessions that that have been posted during the last 24 hours:
-</p>
-<ol>
-<li>Need someone who plays an instrument that you play</li>
-<li>Were posted by someone to whom you have either a good or medium latency connection</li>
-</ol>
+<p>The following new sessions have been posted within the last 24 hours, and you have good or acceptable latency to the organizer of each session below. If a session looks interesting, click the Details link to see the session page. You can RSVP to a session from the session page, and you'll be notified if/when the session organizer approves your RSVP.</p>
 
-<p>Take a look through these new sessions below, and just click the RSVP button on the far right side of the row for any session in which you'd like to play. This will let the session organizer know you're interested, and you'll be notified if the session organizer accepts your request to play in that session!
-</p>
+<style>
+  #scheduled-sessions {
+    margin-top:15px;
+    width:98%;
+    font-size:11px;
+    color:#fff;
+    background-color:#262626;
+    border-color:#cccccc;
+    border-width:1px 0;
+    border-style:solid;
+  }
 
-<table style="margin-top:6px; width:98%; font-size:11px; color:#fff; background-color:#262626; border:solid 1px #4d4d4d;" cellspacing="0" cellpadding="0" border="0">
+  #scheduled-sessions td {
+    padding:10px 2px;
+  }
+
+  #scheduled-sessions th {
+    padding:2px;
+  }
+
+  #scheduled-sessions thead {
+    margin-bottom: 5px;
+  }
+
+
+  #scheduled-sessions thead th {
+
+    border-width:0 0 1px 0;
+    border-style:solid;
+    border-color:#cccccc;
+  }
+  #scheduled-sessions tbody td {
+
+    border-width:1px 0 0 0;
+    border-style:solid;
+    border-color:#4d4d4d;
+    vertical-align:top;
+  }
+
+  #scheduled-sessions span.latency img {
+    margin-top:2px;
+  }
+
+
+</style>
+
+<table id="scheduled-sessions" cellspacing="0" cellpadding="0" border="0">
     <!-- header -->
+  <thead>
     <tr>
-        <th align="left" width="20%">GENRE</th>
-        <th align="left" width="60%">DESCRIPTION</th>
+        <th align="left" width="15%">GENRE</th>
+        <th align="left" width="20%">NAME</th>
+        <th align="left" width="45%">DESCRIPTION</th>
         <th width="20%" style="text-align:center">LATENCY</th>
     </tr>
-    <!-- session row goes here -->
-<% @sessions_and_latency.each do |sess| %>
-<tr>
-<td><%= sess.genre.description %></td>
-<td><%= sess.description %></td>
-<td style="text-align:center"><%= sess.latency %></td>
-</tr>
-<% end %>
+  </thead>
+  <tbody>
+        <!-- session row goes here -->
+    <% @sessions_and_latency.each do |sess| %>
+      <tr>
+      <td><%= sess.genre.description %></td>
+      <td>
+        <%= sess.name %><br/>
+        <a href="<%= "http://www.jamkazam.com/sessions/#{sess.id}/details" %>">Details</a>
+      </td>
+      <td><%= sess.description %></td>
+      <td style="text-align:center">
+        <span class="latency">
+        <span class="latency-value"><%= sess.latency %> ms</span>
+        <% if sess.latency <= APP_CONFIG.max_good_full_score %>
+          <%= image_tag("http://www.jamkazam.com/assets/content/icon_green_score.png", alt: 'good score icon') %>
+        <% else %>
+          <%= image_tag("http://www.jamkazam.com/assets/content/icon_yellow_score.png", alt: 'fair score icon') %>
+        <% end %>
+        </span>
+      </td>
+      </tr>
+    <% end %>
+  </tbody>
 </table>
 
-<p>To see ALL the scheduled sessions that you might be interested in joining, view our Find Session page at: <a href="http://www.jamkazam.com/client#/findSession">http://www.jamkazam.com/client#/findSession</a>. 
-</p>
+<p>To see ALL the scheduled sessions that you might be interested in joining, view our <a href="http://www.jamkazam.com/client#/findSession">Find Session page</a>.</p>
 
 <p>Best Regards,</p>
 
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.text.erb
index 423c57f44..9720550d5 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.text.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.text.erb
@@ -2,16 +2,11 @@
 
 Hello <%= @user.first_name %> --
 
-The following new sessions that that have been posted during the last 24 hours:
+The following new sessions have been posted within the last 24 hours, and you have good or acceptable latency to the organizer of each session below. If a session looks interesting, click the Details link to see the session page. You can RSVP to a session from the session page, and you'll be notified if/when the session organizer approves your RSVP.
 
-1. Need someone who plays an instrument that you play
-2. Were posted by someone to whom you have either a good or medium latency connection
-
-Take a look through these new sessions below, and just click the RSVP button on the far right side of the row for any session in which you'd like to play. This will let the session organizer know you're interested, and you'll be notified if the session organizer accepts your request to play in that session!
-
-GENRE | DESCRIPTION | LATENCY
+GENRE | NAME | DESCRIPTION | LATENCY
 <% @sessions_and_latency.each do |sess| %>
-<%= sess.genre.description %> | <%= sess.description %> | <%= sess.latency %>
+<%= sess.genre.description %> | <%= sess.name %> | <%= sess.description %> | <%= sess.latency %> ms
 <% end %>
 
 To see ALL the scheduled sessions that you might be interested in joining, view our Find Session page at: http://www.jamkazam.com/client#/findSession. 
diff --git a/ruby/lib/jam_ruby/app/views/layouts/from_user_mailer.html.erb b/ruby/lib/jam_ruby/app/views/layouts/from_user_mailer.html.erb
index 3d03cec55..8ce59bc6b 100644
--- a/ruby/lib/jam_ruby/app/views/layouts/from_user_mailer.html.erb
+++ b/ruby/lib/jam_ruby/app/views/layouts/from_user_mailer.html.erb
@@ -9,7 +9,6 @@
           margin-bottom:0px;
           line-height:140%;
       }
-
   </style>
 
 </head>
diff --git a/ruby/lib/jam_ruby/models/connection.rb b/ruby/lib/jam_ruby/models/connection.rb
index 27d715238..186635bce 100644
--- a/ruby/lib/jam_ruby/models/connection.rb
+++ b/ruby/lib/jam_ruby/models/connection.rb
@@ -164,7 +164,7 @@ module JamRuby
       # if user joins the session as a musician, update their addr and location
       if as_musician
         user.update_addr_loc(self, User::JAM_REASON_JOIN)
-        user.update_audio_latency(self, audio_latency)
+        user.update_audio_latency(self, audio_latency) if audio_latency # try not to let a previously recorded value get nil'ed
       end
     end
 
diff --git a/ruby/lib/jam_ruby/models/email_batch_scheduled_sessions.rb b/ruby/lib/jam_ruby/models/email_batch_scheduled_sessions.rb
index 9bc6a742c..144099a24 100644
--- a/ruby/lib/jam_ruby/models/email_batch_scheduled_sessions.rb
+++ b/ruby/lib/jam_ruby/models/email_batch_scheduled_sessions.rb
@@ -19,16 +19,43 @@ module JamRuby
     def persisted?; false; end
   end
 
+  # Temporary Tables created by this class:
+
+  # tmp_candidate_sessions
+  # ----------------------
+  #
+  # These are 'open' sessions that have any open slots left, and fall within a certain start time.
+  # The session creator must also have a locidispid.
+  #
+  # session_id          - music_session.id
+  # creator_id          - music_session.user_id
+  # creator_score_idx   - this is the creator's users.last_jam_locidispid
+  # instrument_id       - instruments that are open as gleamed from the RSVP.  If this is NULL, it means 'ANY INSTRUMENT'
+  #
+  # tmp_candidate_recipients
+  # ------------------------
+  #
+  # These are musicians, that allow email notifications, that have an instrument which matches the session's open RSVP slot's instrument.
+  # The musician must also have a locidispid.
+  #
+  # receiver_id         - user ID that could be in the session
+  # receiver_score_idx  - the user's last_jam_locidispid
+  # instrument_id       - the user's matching instrument for a open session slot. If this is NULL, it means 'ANY INSTRUMENT'
+  #
+  # tmp_matches
+  # -----------
+  #
+  # These are 'candidate_recipients' that have a decent enough score with the creator of the music sessions in tmp_candidate_sessions
+  #
+  # receiver_id         - the user.id that should receive an Daily Session email
+  # session_id          - the music_session.id for the email
+  # latency             - the score.score between the creator and the candidate (needs to be full score soon)
   class EmailBatchScheduledSessions < EmailBatchPeriodic
 
     BATCH_SIZE = 500
     SINCE_DAYS = 2
     MIN_HOURS_START = 2
 
-    TMP_SESS = 'tmp_candidate_sessions'
-    TMP_RECIP = 'tmp_candidate_recipients'
-    TMP_MATCH = 'tmp_matches'
-
     ENV_MAX_LATENCY = 'env_max_latency'
     ENV_QUERY_LIMIT = 'env_query_limit'
     SNAPSHOT_QUERY_LIMIT = '500'
@@ -57,18 +84,18 @@ module JamRuby
     end
 
     def snapshot_eligible_sessions
-      rr = ActiveRecord::Base.connection.execute("SELECT COUNT(*) AS num FROM #{TMP_SESS}")
-      [0 < rr.count ? rr[0]['num'].to_i : 0, ResultStub.stubs("SELECT * FROM #{TMP_SESS}")]
+      rr = ActiveRecord::Base.connection.execute("SELECT COUNT(*) AS num FROM tmp_candidate_sessions")
+      [0 < rr.count ? rr[0]['num'].to_i : 0, ResultStub.stubs("SELECT * FROM tmp_candidate_sessions")]
     end
 
     def snapshot_eligible_recipients
-      rr = ActiveRecord::Base.connection.execute("SELECT COUNT(*) AS num FROM #{TMP_RECIP}")
-      [0 < rr.count ? rr[0]['num'].to_i : 0, ResultStub.stubs("SELECT * FROM #{TMP_RECIP}")]
+      rr = ActiveRecord::Base.connection.execute("SELECT COUNT(*) AS num FROM tmp_candidate_recipients")
+      [0 < rr.count ? rr[0]['num'].to_i : 0, ResultStub.stubs("SELECT * FROM tmp_candidate_recipients")]
     end
 
     def snapshot_scored_recipients
-      rr = ActiveRecord::Base.connection.execute("SELECT COUNT(*) AS num FROM #{TMP_MATCH}")
-      [0 < rr.count ? rr[0]['num'].to_i : 0, ResultStub.stubs("SELECT * FROM #{TMP_MATCH}")]
+      rr = ActiveRecord::Base.connection.execute("SELECT COUNT(*) AS num FROM tmp_matches")
+      [0 < rr.count ? rr[0]['num'].to_i : 0, ResultStub.stubs("SELECT * FROM tmp_matches")]
     end
 
     def take_snapshot
@@ -91,9 +118,9 @@ module JamRuby
         # now just get the sessions/latency for each distinct mail recipient
         _select_scored_recipients(offset).each do |result|
           receiver = User.find_by_id(result['receiver_id'])
-          sessions = MusicSession.select("music_sessions.*, #{TMP_MATCH}.latency")
-            .joins("INNER JOIN #{TMP_MATCH} ON #{TMP_MATCH}.session_id = music_sessions.id")
-            .where(["#{TMP_MATCH}.receiver_id = ?", receiver.id])
+          sessions = MusicSession.select("music_sessions.*, tmp_matches.latency")
+            .joins("INNER JOIN tmp_matches ON tmp_matches.session_id = music_sessions.id")
+            .where(["tmp_matches.receiver_id = ?", receiver.id])
             .includes([:genre, :creator])
           block_given? ? yield(receiver, sessions) : objs << [receiver, sessions]
         end
@@ -126,7 +153,7 @@ module JamRuby
 
     # inserts eligible sessions to temp table
     def _collect_eligible_sessions
-      ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS #{TMP_SESS}")
+      ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS tmp_candidate_sessions")
       limit_sql = (self.snapshot? && 0 < ENV[ENV_QUERY_LIMIT].to_i) ? "LIMIT #{ENV[ENV_QUERY_LIMIT]}" : ''
       sql =<<SQL
 SELECT 
@@ -134,7 +161,7 @@ SELECT
     msess.user_id AS creator_id,
     users.last_jam_locidispid AS creator_score_idx,
     rs.instrument_id
-INTO TEMP TABLE #{TMP_SESS} 
+INTO TEMP TABLE tmp_candidate_sessions 
 FROM music_sessions msess
 INNER JOIN users ON users.id = msess.user_id
 INNER JOIN rsvp_slots AS rs ON rs.music_session_id = msess.id
@@ -145,14 +172,14 @@ WHERE
     msess.created_at > '#{earliest_session_create_time}' AND
     msess.created_at < '#{latest_session_create_time}' AND
     scheduled_start >= '#{earliest_session_start_time}' AND
-    (rrrs.rsvp_slot_id IS NULL OR rrrs.chosen != 't')
+    (rrrs.rsvp_slot_id IS NULL OR rrrs.chosen != TRUE)
 #{limit_sql}
 SQL
       ActiveRecord::Base.connection.execute(sql)
     end
     
     def _collect_eligible_recipients
-      ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS #{TMP_RECIP}")
+      ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS tmp_candidate_recipients")
       limit_sql = (self.snapshot? && 0 < ENV[ENV_QUERY_LIMIT].to_i) ? "LIMIT #{ENV[ENV_QUERY_LIMIT]}" : ''
       # load eligible recipients into tmp table
       sql =<<SQL
@@ -160,40 +187,40 @@ SELECT
     users.id AS receiver_id, 
     users.last_jam_locidispid AS receiver_score_idx,
     mi.instrument_id
-INTO TEMP TABLE #{TMP_RECIP}
+INTO TEMP TABLE tmp_candidate_recipients
 FROM users
 INNER JOIN musicians_instruments AS mi ON mi.user_id = users.id
-INNER JOIN #{TMP_SESS} ON #{TMP_SESS}.instrument_id = mi.instrument_id
+LEFT JOIN tmp_candidate_sessions ON tmp_candidate_sessions.instrument_id = mi.instrument_id
 WHERE
     users.last_jam_locidispid IS NOT NULL AND
-    users.musician = 't' AND
-    users.subscribe_email = 't' 
+    users.musician = TRUE AND
+    users.subscribe_email = TRUE
 #{limit_sql}
 SQL
       ActiveRecord::Base.connection.execute(sql)
     end
 
     def _collect_scored_recipients
-      ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS #{TMP_MATCH}")
+      ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS tmp_matches")
       if !self.snapshot? || 0 == (max_score = ENV[ENV_MAX_LATENCY].to_i)
-        max_score = Score::MAX_YELLOW_LATENCY
+        max_score = APP_CONFIG.max_yellow_full_score * 2
       end
       limit_sql = (self.snapshot? && 0 < ENV[ENV_QUERY_LIMIT].to_i) ? "LIMIT #{ENV[ENV_QUERY_LIMIT]}" : ''
       sql =<<SQL
 SELECT 
-    DISTINCT #{TMP_RECIP}.receiver_id, 
-    #{TMP_SESS}.session_id,
+    DISTINCT tmp_candidate_recipients.receiver_id, 
+    tmp_candidate_sessions.session_id,
     scores.score AS latency
-INTO TEMP TABLE #{TMP_MATCH}
-FROM scores
-INNER JOIN #{TMP_SESS} ON #{TMP_SESS}.creator_score_idx = scores.alocidispid
-INNER JOIN #{TMP_RECIP} ON #{TMP_RECIP}.receiver_score_idx = scores.blocidispid
+INTO TEMP TABLE tmp_matches
+FROM current_scores
+INNER JOIN tmp_candidate_sessions ON tmp_candidate_sessions.creator_score_idx = current_scores.alocidispid
+INNER JOIN tmp_candidate_recipients ON tmp_candidate_recipients.receiver_score_idx = current_scores.blocidispid
 WHERE
-    scores.score < #{max_score} AND
-    #{TMP_RECIP}.receiver_id != #{TMP_SESS}.creator_id
+    current_scores.full_score < #{max_score} AND
+    tmp_candidate_recipients.receiver_id != tmp_candidate_sessions.creator_id
 GROUP BY 
-    #{TMP_RECIP}.receiver_id, 
-    #{TMP_SESS}.session_id, 
+    tmp_candidate_recipients.receiver_id, 
+    tmp_candidate_sessions.session_id, 
     latency
 #{limit_sql}
 SQL
@@ -203,13 +230,13 @@ SQL
     # select recipients whose score is below minimum threshold
     def _select_scored_recipients(offset=0)
       if 0 > offset
-        sql = "SELECT COUNT(DISTINCT receiver_id) AS num FROM #{TMP_MATCH}"
+        sql = "SELECT COUNT(DISTINCT receiver_id) AS num FROM tmp_matches"
         rr = ActiveRecord::Base.connection.execute(sql)
         return 0 < rr.count ? rr[0]['num'].to_i : 0
       else
         sql =<<SQL
 SELECT DISTINCT receiver_id 
-FROM #{TMP_MATCH} 
+FROM tmp_matches 
 ORDER BY receiver_id ASC
 LIMIT #{@per_page}
 OFFSET #{offset}
@@ -233,11 +260,11 @@ SQL
       return @counters if @counters || !self.snapshot?
       _load_recipients if load_tmp_tables
 
-      rr = ActiveRecord::Base.connection.execute("SELECT COUNT(*) AS num FROM #{TMP_SESS}")
+      rr = ActiveRecord::Base.connection.execute("SELECT COUNT(*) AS num FROM tmp_candidate_sessions")
       session_count = 0 < rr.count ? rr[0]['num'].to_i : 0
-      rr = ActiveRecord::Base.connection.execute("SELECT COUNT(*) AS num FROM #{TMP_RECIP}")
+      rr = ActiveRecord::Base.connection.execute("SELECT COUNT(*) AS num FROM tmp_candidate_recipients")
       receiver_candidate_count = 0 < rr.count ? rr[0]['num'].to_i : 0
-      rr = ActiveRecord::Base.connection.execute("SELECT COUNT(*) AS num FROM #{TMP_MATCH}")
+      rr = ActiveRecord::Base.connection.execute("SELECT COUNT(*) AS num FROM tmp_matches")
       receiver_match_count = 0 < rr.count ? rr[0]['num'].to_i : 0
 
       @counters = {
diff --git a/ruby/lib/jam_ruby/models/score.rb b/ruby/lib/jam_ruby/models/score.rb
index 7fbf595a2..da3c5d33c 100644
--- a/ruby/lib/jam_ruby/models/score.rb
+++ b/ruby/lib/jam_ruby/models/score.rb
@@ -3,7 +3,7 @@ require 'ipaddr'
 module JamRuby
   class Score < ActiveRecord::Base
 
-    MAX_YELLOW_LATENCY = 40
+    MAX_YELLOW_LATENCY = 40 # this round-trip internet latency, not full score
 
     self.table_name = 'scores'
 
diff --git a/ruby/spec/mailers/render_emails_spec.rb b/ruby/spec/mailers/render_emails_spec.rb
index 9e505d2d1..7119d5db2 100644
--- a/ruby/spec/mailers/render_emails_spec.rb
+++ b/ruby/spec/mailers/render_emails_spec.rb
@@ -63,6 +63,70 @@ describe "RenderMailers", :slow => true do
     it { @filename="welcome_betauser"; InvitedUserMailer.welcome_betauser(admin_invited_user).deliver }
   end
 
+  describe "Daily Scheduled Session emails" do
+    let (:scheduled_batch) { FactoryGirl.create(:email_batch_scheduled_session) }
+    let(:music_session) { FactoryGirl.create(:music_session) }
+    let (:drums) { FactoryGirl.create(:instrument, :description => 'drums') }
+    let (:guitar) { FactoryGirl.create(:instrument, :description => 'guitar') }
+    let (:bass) { FactoryGirl.create(:instrument, :description => 'bass') }
+    let (:vocals) { FactoryGirl.create(:instrument, :description => 'vocal') }
+
+    let (:drummer) { FactoryGirl.create(:user, :last_jam_locidispid => 1, :last_jam_addr => 1) }
+    let (:guitarist) { FactoryGirl.create(:user, :last_jam_locidispid => 1, :last_jam_addr => 1) }
+    let (:bassist) { FactoryGirl.create(:user, :last_jam_locidispid => 1, :last_jam_addr => 1) }
+    let (:vocalist) { FactoryGirl.create(:user, :last_jam_locidispid => 1, :last_jam_addr => 1) }
+
+    let (:session1) do
+      FactoryGirl.create(:music_session,
+                         :creator => drummer,
+                         :scheduled_start => Time.now() + 2.days,
+                         :musician_access => true,
+                         :approval_required => false,
+                         :created_at => Time.now - 1.hour)
+    end
+
+    let (:session2) do
+      FactoryGirl.create(:music_session,
+                         :creator => drummer,
+                         :scheduled_start => Time.now() + 2.days,
+                         :musician_access => true,
+                         :approval_required => false,
+                         :created_at => Time.now - 1.hour)
+    end
+
+    before(:each) do
+      BatchMailer.deliveries.clear
+      scheduled_batch.reset!
+
+      drummer.musician_instruments << FactoryGirl.build(:musician_instrument, user: drummer, instrument: drums, proficiency_level: 2)
+      drummer.musician_instruments << FactoryGirl.build(:musician_instrument, user: drummer, instrument: guitar, proficiency_level: 2)
+
+      guitarist.musician_instruments << FactoryGirl.build(:musician_instrument, user: guitarist, instrument: guitar, proficiency_level: 2)
+      guitarist.musician_instruments << FactoryGirl.build(:musician_instrument, user: guitarist, instrument: bass, proficiency_level: 2)
+
+      vocalist.musician_instruments << FactoryGirl.build(:musician_instrument, user: vocalist, instrument: vocals, proficiency_level: 2)
+
+      FactoryGirl.create(:rsvp_slot, :instrument => drums, :music_session => session1)
+      FactoryGirl.create(:rsvp_slot, :instrument => guitar, :music_session => session1)
+      FactoryGirl.create(:rsvp_slot, :instrument => bass, :music_session => session1)
+
+      FactoryGirl.create(:rsvp_slot, :instrument => drums, :music_session => session2)
+      FactoryGirl.create(:rsvp_slot, :instrument => guitar, :music_session => session2)
+      FactoryGirl.create(:rsvp_slot, :instrument => bass, :music_session => session2)
+
+      JamRuby::Score.createx(1, 'a', 1, 1, 'a', 1, 10)
+      JamRuby::Score.createx(1, 'a', 1, 2, 'a', 2, Score::MAX_YELLOW_LATENCY + 1)
+    end
+
+    after(:each) do
+      BatchMailer.deliveries.length.should == 1
+      mail =  BatchMailer.deliveries[0]
+      save_emails_to_disk(mail, @filename)
+    end
+
+    it "daily sessions" do @filename="daily_sessions"; scheduled_batch.deliver_batch end
+  end
+
 end
 
 def save_emails_to_disk(mail, filename)
diff --git a/ruby/spec/support/utilities.rb b/ruby/spec/support/utilities.rb
index 6305da2e7..fa7080d9b 100644
--- a/ruby/spec/support/utilities.rb
+++ b/ruby/spec/support/utilities.rb
@@ -109,6 +109,19 @@ def app_config
     def max_track_part_upload_failures
       3
     end
+
+    def max_good_full_score
+      20
+    end
+
+    def max_yellow_full_score
+      35
+    end
+
+    def max_red_full_score
+      50
+    end
+
     private
 
     def audiomixer_workspace_path
diff --git a/web/app/assets/javascripts/dialog/textMessageDialog.js b/web/app/assets/javascripts/dialog/textMessageDialog.js
index f2e67a0c0..78107a7f9 100644
--- a/web/app/assets/javascripts/dialog/textMessageDialog.js
+++ b/web/app/assets/javascripts/dialog/textMessageDialog.js
@@ -201,13 +201,13 @@
     }
 
     function renderNotConnected() {
-      console.log("RENDER NOT CONNECTED!!!!!!!!!")
+      logger.debug("text-message dialog: render not connected")
       $interactionBlocker.addClass('active');
       $disconnectedMsg.addClass('active');
     }
 
     function renderConnected() {
-      console.log("RENDER CONNECTED!!!!!!!!!")
+      logger.debug("text-message dialog: render connected")
       $interactionBlocker.removeClass('active');
       $disconnectedMsg.removeClass('active');
     }
diff --git a/web/config/application.rb b/web/config/application.rb
index 1acb6eda0..0630d497f 100644
--- a/web/config/application.rb
+++ b/web/config/application.rb
@@ -249,5 +249,10 @@ if defined?(Bundler)
     # recording upload/download configs
     config.max_track_upload_failures = 10
     config.max_track_part_upload_failures = 3
+
+    # scoring thresholds for 'full score', which is 1/2 your gear + 1/2 their gear + and 1/2 ping time
+    config.max_good_full_score = 20
+    config.max_yellow_full_score = 35
+    config.max_red_full_score = 50
   end
 end
diff --git a/web/spec/support/app_config.rb b/web/spec/support/app_config.rb
index 762168dde..505b930fb 100644
--- a/web/spec/support/app_config.rb
+++ b/web/spec/support/app_config.rb
@@ -58,6 +58,18 @@ def web_config
     def icecast_hardcoded_source_password
       'blueberryjam'
     end
+
+    def max_good_full_score
+      20
+    end
+
+    def max_yellow_full_score
+      35
+    end
+
+    def max_red_full_score
+      50
+    end
   end
   klass.new
 end

From 91399fd94e2cbba687e43840ce3ae78294803321 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Thu, 31 Jul 2014 20:21:49 -0500
Subject: [PATCH 46/55] * bumping max length

---
 admin/app/views/admin/batch_emails/_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/app/views/admin/batch_emails/_form.html.erb b/admin/app/views/admin/batch_emails/_form.html.erb
index a9c83f836..cda37c867 100644
--- a/admin/app/views/admin/batch_emails/_form.html.erb
+++ b/admin/app/views/admin/batch_emails/_form.html.erb
@@ -3,7 +3,7 @@
     <%= f.input(:from_email, :label => "From Email", :input_html => {:maxlength => 64}) %>
     <%= f.input(:subject, :label => "Subject", :input_html => {:maxlength => 128}) %>
     <%= f.input(:test_emails, :label => "Test Emails", :input_html => {:maxlength => 1024, :size => '3x3'}) %>
-    <%= f.input(:body, :label => "Body", :input_html => {:maxlength => 3096, :size => '10x20'}) %>
+    <%= f.input(:body, :label => "Body", :input_html => {:maxlength => 60000, :size => '10x20'}) %>
   <% end %>
   <%= f.actions %>
 <% end %>

From 8048c5012d97da042b7d14edb980bcd7c4cebb87 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Thu, 31 Jul 2014 21:06:06 -0500
Subject: [PATCH 47/55] * wip

---
 admin/app/views/admin/batch_emails/_form.html.erb    |  2 +-
 .../models/email_batch_scheduled_sessions.rb         | 12 ++++++++----
 .../models/email_batch_spec_scheduled_session.rb     |  3 +++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/admin/app/views/admin/batch_emails/_form.html.erb b/admin/app/views/admin/batch_emails/_form.html.erb
index a9c83f836..b04b7f0ef 100644
--- a/admin/app/views/admin/batch_emails/_form.html.erb
+++ b/admin/app/views/admin/batch_emails/_form.html.erb
@@ -1,4 +1,4 @@
-<%= semantic_form_for([:admin, resource], :url => resource.new_record? ? admin_batch_emails_path : "/admin/batch_emails/#{resource.id}") do |f| %>
+<%= semantic_form_for([:admin, resource], :url => resource.new_record? ? admin_batch_emails_path :  "#{Gon.Global.prefix}/admin/batch_emails/#{resource.id}") do |f| %>
   <%= f.inputs do %>
     <%= f.input(:from_email, :label => "From Email", :input_html => {:maxlength => 64}) %>
     <%= f.input(:subject, :label => "Subject", :input_html => {:maxlength => 128}) %>
diff --git a/ruby/lib/jam_ruby/models/email_batch_scheduled_sessions.rb b/ruby/lib/jam_ruby/models/email_batch_scheduled_sessions.rb
index 144099a24..0cded52ed 100644
--- a/ruby/lib/jam_ruby/models/email_batch_scheduled_sessions.rb
+++ b/ruby/lib/jam_ruby/models/email_batch_scheduled_sessions.rb
@@ -31,6 +31,7 @@ module JamRuby
   # creator_id          - music_session.user_id
   # creator_score_idx   - this is the creator's users.last_jam_locidispid
   # instrument_id       - instruments that are open as gleamed from the RSVP.  If this is NULL, it means 'ANY INSTRUMENT'
+  # invited_user_id     - the ID of a user who was invited. Can be NULL.
   #
   # tmp_candidate_recipients
   # ------------------------
@@ -160,12 +161,14 @@ SELECT
     msess.id AS session_id, 
     msess.user_id AS creator_id,
     users.last_jam_locidispid AS creator_score_idx,
-    rs.instrument_id
+    rs.instrument_id,
+    invitations.receiver_id AS invited_user_id
 INTO TEMP TABLE tmp_candidate_sessions 
 FROM music_sessions msess
 INNER JOIN users ON users.id = msess.user_id
 INNER JOIN rsvp_slots AS rs ON rs.music_session_id = msess.id
 LEFT JOIN rsvp_requests_rsvp_slots AS rrrs ON rrrs.rsvp_slot_id = rs.id
+LEFT JOIN invitations ON invitations.music_session_id = msess.id
 WHERE
     open_rsvps = TRUE AND
     users.last_jam_locidispid IS NOT NULL AND
@@ -190,7 +193,8 @@ SELECT
 INTO TEMP TABLE tmp_candidate_recipients
 FROM users
 INNER JOIN musicians_instruments AS mi ON mi.user_id = users.id
-LEFT JOIN tmp_candidate_sessions ON tmp_candidate_sessions.instrument_id = mi.instrument_id
+LEFT JOIN tmp_candidate_sessions ON tmp_candidate_sessions.instrument_id = mi.instrument_id OR
+                                    users.id = tmp_candidate_sessions.invited_user_id
 WHERE
     users.last_jam_locidispid IS NOT NULL AND
     users.musician = TRUE AND
@@ -207,10 +211,10 @@ SQL
       end
       limit_sql = (self.snapshot? && 0 < ENV[ENV_QUERY_LIMIT].to_i) ? "LIMIT #{ENV[ENV_QUERY_LIMIT]}" : ''
       sql =<<SQL
-SELECT 
+SELECT
     DISTINCT tmp_candidate_recipients.receiver_id, 
     tmp_candidate_sessions.session_id,
-    scores.score AS latency
+    current_scores.full_score AS latency
 INTO TEMP TABLE tmp_matches
 FROM current_scores
 INNER JOIN tmp_candidate_sessions ON tmp_candidate_sessions.creator_score_idx = current_scores.alocidispid
diff --git a/ruby/spec/jam_ruby/models/email_batch_spec_scheduled_session.rb b/ruby/spec/jam_ruby/models/email_batch_spec_scheduled_session.rb
index c23eca414..c4b951cd0 100644
--- a/ruby/spec/jam_ruby/models/email_batch_spec_scheduled_session.rb
+++ b/ruby/spec/jam_ruby/models/email_batch_spec_scheduled_session.rb
@@ -83,6 +83,9 @@ describe EmailBatchScheduledSessions do
       expect(drummer.instruments.include?(drums)).to eq(true)
       expect(drummer.instruments.include?(guitar)).to eq(true)
       obj = scheduled_batch.fetch_recipients
+      obj.each_with_index do |u, i|
+        puts obj[i][0].email
+      end
       expect(obj.count).to eq(2)
 
       scheduled_batch.deliver_batch

From 4ce9d5fd7c3310b79638c8b92a2891fb43bffd46 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Thu, 31 Jul 2014 21:08:53 -0500
Subject: [PATCH 48/55] * add prefix to form URL

---
 admin/app/views/admin/batch_emails/_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/app/views/admin/batch_emails/_form.html.erb b/admin/app/views/admin/batch_emails/_form.html.erb
index cda37c867..18fd10b82 100644
--- a/admin/app/views/admin/batch_emails/_form.html.erb
+++ b/admin/app/views/admin/batch_emails/_form.html.erb
@@ -1,4 +1,4 @@
-<%= semantic_form_for([:admin, resource], :url => resource.new_record? ? admin_batch_emails_path : "/admin/batch_emails/#{resource.id}") do |f| %>
+<%= semantic_form_for([:admin, resource], :url => resource.new_record? ? admin_batch_emails_path : "#{Gon.global.prefix}/admin/batch_emails/#{resource.id}") do |f| %>
   <%= f.inputs do %>
     <%= f.input(:from_email, :label => "From Email", :input_html => {:maxlength => 64}) %>
     <%= f.input(:subject, :label => "Subject", :input_html => {:maxlength => 128}) %>

From 34248474e78bb20f3f92c001df85236d8bbae628 Mon Sep 17 00:00:00 2001
From: Anthony Davis <anthony@jamkazam.com>
Date: Thu, 31 Jul 2014 21:48:52 -0500
Subject: [PATCH 49/55] This should fix the monitor job -- but it's about 4
 times slower now

---
 monitor/spec/spec_helper.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/monitor/spec/spec_helper.rb b/monitor/spec/spec_helper.rb
index 5b3882d80..93bd9cb49 100755
--- a/monitor/spec/spec_helper.rb
+++ b/monitor/spec/spec_helper.rb
@@ -34,11 +34,11 @@ RSpec.configure do |config|
   end
 end
 
-#Capybara.register_driver :poltergeist do |app|
-#  Capybara::Poltergeist::Driver.new(app, { phantomjs_logger: File.open('console.log', 'w') })
-#end
-Capybara.javascript_driver = :poltergeist
-Capybara.default_driver = :poltergeist
+Capybara.register_driver :poltergeist do |app|
+  Capybara::Poltergeist::Driver.new(app, { :timeout=>120, js_errors: false })
+end
+#Capybara.javascript_driver = :poltergeist
+#Capybara.default_driver = :poltergeist
 Capybara.run_server = false # since we're testing an app outside this project
 Capybara.default_wait_time = 15 # ^^ ditto
 

From 737b815fbe1a78969e2d05d35e00fcd09d68c079 Mon Sep 17 00:00:00 2001
From: Anthony Davis <anthony@jamkazam.com>
Date: Thu, 31 Jul 2014 22:48:44 -0500
Subject: [PATCH 50/55] help readability of console output

---
 monitor/spec/production_spec.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/monitor/spec/production_spec.rb b/monitor/spec/production_spec.rb
index 5236173a5..209d81de2 100755
--- a/monitor/spec/production_spec.rb
+++ b/monitor/spec/production_spec.rb
@@ -20,6 +20,9 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe
     Capybara.run_server = false
   end
 
+  before { puts '\n' }
+  after { puts '\n\n' }
+
   TestUser = Class.new do
     attr_accessor :email, :password, :first_name, :last_name, :id
 
@@ -46,6 +49,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe
 
   it "is possible for #{user1} to sign in and not get disconnected within 30 seconds" do
     in_client(user1) do
+      puts '\n  *** user1 client *** \n'
       sign_in_poltergeist user1
       repeat_for(30.seconds) do
         expect(page).to_not have_selector('.no-websocket-connection') #looks for reconnect dialog every 1 second
@@ -57,6 +61,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe
     # this example heavily based on text_message_spec.rb in 'web'
 
     in_client(user1) do
+      puts '\n  *** user1 client *** \n'
       sign_in_poltergeist(user1)
     end
 
@@ -65,6 +70,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe
     test_goodbye = "#{SecureRandom.uuid} - OK bye!"
 
     in_client(user2) do
+      puts '\n  *** user2 client *** \n'
       sign_in_poltergeist(user2)
       expect(page).to have_xpath(
                           "//div[@class='friend-name' and @user-id='#{user1.id}']/span[@class='friend-status']",
@@ -78,6 +84,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe
     end
 
     in_client(user1) do
+      puts '\n  *** user1 client *** \n'
       expect(page).to have_xpath(
                           "//div[@class='friend-name' and @user-id='#{user2.id}']/span[@class='friend-status']",
                           :text => "Available" )
@@ -88,6 +95,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe
     end
 
     in_client(user2) do
+      puts '\n  *** user2 client *** \n'
       find('.previous-message-text', text: test_response)
       send_text_message(test_goodbye, close_on_send: true)
     end

From 16587361085e9dc2ee8adfa31e3e982906311f03 Mon Sep 17 00:00:00 2001
From: Anthony Davis <anthony@jamkazam.com>
Date: Thu, 31 Jul 2014 23:03:34 -0500
Subject: [PATCH 51/55] Fixing console output

---
 monitor/spec/production_spec.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/monitor/spec/production_spec.rb b/monitor/spec/production_spec.rb
index 209d81de2..c239f3371 100755
--- a/monitor/spec/production_spec.rb
+++ b/monitor/spec/production_spec.rb
@@ -20,8 +20,8 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe
     Capybara.run_server = false
   end
 
-  before { puts '\n' }
-  after { puts '\n\n' }
+  before { puts "\n" }
+  after { puts "\n\n" }
 
   TestUser = Class.new do
     attr_accessor :email, :password, :first_name, :last_name, :id
@@ -49,7 +49,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe
 
   it "is possible for #{user1} to sign in and not get disconnected within 30 seconds" do
     in_client(user1) do
-      puts '\n  *** user1 client *** \n'
+      puts "\n  *** user1 client *** \n"
       sign_in_poltergeist user1
       repeat_for(30.seconds) do
         expect(page).to_not have_selector('.no-websocket-connection') #looks for reconnect dialog every 1 second
@@ -61,7 +61,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe
     # this example heavily based on text_message_spec.rb in 'web'
 
     in_client(user1) do
-      puts '\n  *** user1 client *** \n'
+      puts "\n  *** user1 client *** \n"
       sign_in_poltergeist(user1)
     end
 
@@ -70,7 +70,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe
     test_goodbye = "#{SecureRandom.uuid} - OK bye!"
 
     in_client(user2) do
-      puts '\n  *** user2 client *** \n'
+      puts "\n  *** user2 client *** \n"
       sign_in_poltergeist(user2)
       expect(page).to have_xpath(
                           "//div[@class='friend-name' and @user-id='#{user1.id}']/span[@class='friend-status']",
@@ -84,7 +84,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe
     end
 
     in_client(user1) do
-      puts '\n  *** user1 client *** \n'
+      puts "\n  *** user1 client *** \n"
       expect(page).to have_xpath(
                           "//div[@class='friend-name' and @user-id='#{user2.id}']/span[@class='friend-status']",
                           :text => "Available" )
@@ -95,7 +95,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe
     end
 
     in_client(user2) do
-      puts '\n  *** user2 client *** \n'
+      puts "\n  *** user2 client *** \n"
       find('.previous-message-text', text: test_response)
       send_text_message(test_goodbye, close_on_send: true)
     end

From e610e5f28287e5f59899929b6f338a81a538f0f6 Mon Sep 17 00:00:00 2001
From: Anthony Davis <anthony@jamkazam.com>
Date: Fri, 1 Aug 2014 11:06:14 -0500
Subject: [PATCH 52/55] Improve debug output

---
 monitor/spec/production_spec.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/monitor/spec/production_spec.rb b/monitor/spec/production_spec.rb
index c239f3371..ded20aec1 100755
--- a/monitor/spec/production_spec.rb
+++ b/monitor/spec/production_spec.rb
@@ -49,7 +49,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe
 
   it "is possible for #{user1} to sign in and not get disconnected within 30 seconds" do
     in_client(user1) do
-      puts "\n  *** user1 client *** \n"
+      puts "\n  *** #{user1}'s client *** \n"
       sign_in_poltergeist user1
       repeat_for(30.seconds) do
         expect(page).to_not have_selector('.no-websocket-connection') #looks for reconnect dialog every 1 second
@@ -61,7 +61,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe
     # this example heavily based on text_message_spec.rb in 'web'
 
     in_client(user1) do
-      puts "\n  *** user1 client *** \n"
+      puts "\n  *** #{user1}'s client *** \n"
       sign_in_poltergeist(user1)
     end
 
@@ -70,7 +70,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe
     test_goodbye = "#{SecureRandom.uuid} - OK bye!"
 
     in_client(user2) do
-      puts "\n  *** user2 client *** \n"
+      puts "\n  *** #{user2}'s client *** \n"
       sign_in_poltergeist(user2)
       expect(page).to have_xpath(
                           "//div[@class='friend-name' and @user-id='#{user1.id}']/span[@class='friend-status']",
@@ -84,7 +84,7 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe
     end
 
     in_client(user1) do
-      puts "\n  *** user1 client *** \n"
+      puts "\n  *** #{user1}'s client *** \n"
       expect(page).to have_xpath(
                           "//div[@class='friend-name' and @user-id='#{user2.id}']/span[@class='friend-status']",
                           :text => "Available" )
@@ -95,13 +95,13 @@ describe "Deployed site at #{www}", :js => true, :type => :feature, :capybara_fe
     end
 
     in_client(user2) do
-      puts "\n  *** user2 client *** \n"
+      puts "\n  *** #{user2}'s client *** \n"
       find('.previous-message-text', text: test_response)
       send_text_message(test_goodbye, close_on_send: true)
     end
 
-    in_client(user1) { sign_out_poltergeist }
-    in_client(user2) { sign_out_poltergeist }
+    in_client(user1) { puts "\n  *** #{user1}'s client *** \n"; sign_out_poltergeist }
+    in_client(user2) { puts "\n  *** #{user2}'s client *** \n"; sign_out_poltergeist }
   end
 
   let(:queue_limit) { 5 }

From aa863240b9b4b551b9935f62a9a7e7a951637000 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Fri, 1 Aug 2014 16:17:04 -0500
Subject: [PATCH 53/55] * VRFS-1992 finished (daily session email improvements)

---
 .../views/admin/batch_emails/_form.html.erb   |   2 +-
 ...ms_index_sms_index_use_user_instrument.sql |   2 +-
 ruby/lib/jam_ruby/database.rb                 |  30 +++
 .../models/email_batch_scheduled_sessions.rb  | 105 ++++++--
 ruby/spec/factories.rb                        |  14 +-
 .../email_batch_spec_scheduled_session.rb     | 253 ++++++++++++++----
 ruby/spec/support/utilities.rb                |   5 +
 web/spec/factories.rb                         |  15 +-
 8 files changed, 350 insertions(+), 76 deletions(-)

diff --git a/admin/app/views/admin/batch_emails/_form.html.erb b/admin/app/views/admin/batch_emails/_form.html.erb
index b04b7f0ef..d491ec0ab 100644
--- a/admin/app/views/admin/batch_emails/_form.html.erb
+++ b/admin/app/views/admin/batch_emails/_form.html.erb
@@ -1,4 +1,4 @@
-<%= semantic_form_for([:admin, resource], :url => resource.new_record? ? admin_batch_emails_path :  "#{Gon.Global.prefix}/admin/batch_emails/#{resource.id}") do |f| %>
+<%= semantic_form_for([:admin, resource], :url => resource.new_record? ? admin_batch_emails_path :  "#{Gon.global.prefix}/admin/batch_emails/#{resource.id}") do |f| %>
   <%= f.inputs do %>
     <%= f.input(:from_email, :label => "From Email", :input_html => {:maxlength => 64}) %>
     <%= f.input(:subject, :label => "Subject", :input_html => {:maxlength => 128}) %>
diff --git a/db/up/current_scores_ams_index_sms_index_use_user_instrument.sql b/db/up/current_scores_ams_index_sms_index_use_user_instrument.sql
index a3f7b7b10..3d8c2b5af 100644
--- a/db/up/current_scores_ams_index_sms_index_use_user_instrument.sql
+++ b/db/up/current_scores_ams_index_sms_index_use_user_instrument.sql
@@ -3,7 +3,7 @@
 DROP VIEW current_scores;
 CREATE OR REPLACE VIEW current_scores AS
 
-    SELECT * FROM (SELECT * , row_number() OVER (PARTITION BY alocidispid, blocidispid, scorer ORDER BY full_score DESC) AS pcnum FROM
+      SELECT * FROM (SELECT * , row_number() OVER (PARTITION BY alocidispid, blocidispid, scorer ORDER BY full_score DESC) AS pcnum FROM
       (SELECT * FROM
         (SELECT percent_rank() over (PARTITION BY alocidispid, blocidispid ORDER BY full_score ASC) AS pc, * FROM
           (SELECT tmp.*, (COALESCE(a_users.last_jam_audio_latency, 13) + COALESCE(b_users.last_jam_audio_latency, 13) + tmp.score) AS full_score, a_users.last_jam_audio_latency AS a_audio_latency, b_users.last_jam_audio_latency AS b_audio_latency FROM
diff --git a/ruby/lib/jam_ruby/database.rb b/ruby/lib/jam_ruby/database.rb
index 9b357405a..90a251a1f 100644
--- a/ruby/lib/jam_ruby/database.rb
+++ b/ruby/lib/jam_ruby/database.rb
@@ -54,5 +54,35 @@ module JamRuby
       GeoIpBlocks.connection.execute "CREATE TABLE #{copied_name} (LIKE #{table_name} INCLUDING DEFAULTS INCLUDING CONSTRAINTS INCLUDING COMMENTS INCLUDING STORAGE)"
       copied_name
     end
+
+    def self.dump(query)
+      result = ActiveRecord::Base.connection.execute(query)
+      fields = result.fields
+      header = ""
+      fields.each do |field|
+        header << field
+        header << ', '
+      end
+      header = header[0..header.length - 3]
+      puts header
+
+      result.each do |row|
+        row_out = ''
+        fields.each do |field|
+            if row[field].nil?
+              row_out << 'NULL'
+            else
+              if block_given?
+                row_out << yield(field, row[field]).to_s
+              else
+                row_out << row[field].to_s
+              end
+            end
+          row_out << ', '
+        end
+        row_out = row_out[0..row_out.length - 3]
+        puts row_out
+      end
+    end
   end
 end
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/models/email_batch_scheduled_sessions.rb b/ruby/lib/jam_ruby/models/email_batch_scheduled_sessions.rb
index 0cded52ed..017a22443 100644
--- a/ruby/lib/jam_ruby/models/email_batch_scheduled_sessions.rb
+++ b/ruby/lib/jam_ruby/models/email_batch_scheduled_sessions.rb
@@ -42,6 +42,7 @@ module JamRuby
   # receiver_id         - user ID that could be in the session
   # receiver_score_idx  - the user's last_jam_locidispid
   # instrument_id       - the user's matching instrument for a open session slot. If this is NULL, it means 'ANY INSTRUMENT'
+  # invited_user_id
   #
   # tmp_matches
   # -----------
@@ -105,6 +106,62 @@ module JamRuby
       self.update_attribute(:test_emails, @counters.inspect)
     end
 
+    def query
+      ActiveRecord::Base.connection.execute(<<SQL
+SELECT DISTINCT
+    users.id AS receiver_id,
+    music_sessions.id AS session_id,
+    current_scores.full_score AS latency
+FROM current_scores
+INNER JOIN
+    (SELECT
+        msess.id AS session_id,
+        msess.user_id AS creator_id,
+        users.last_jam_locidispid AS creator_score_idx,
+        rs.instrument_id,
+        invitations.receiver_id AS invited_user_id,
+        msess.is_unstructured_rsvp
+    FROM music_sessions msess
+    INNER JOIN users ON users.id = msess.user_id
+    INNER JOIN rsvp_slots AS rs ON rs.music_session_id = msess.id
+    LEFT JOIN rsvp_requests_rsvp_slots AS rrrs ON rrrs.rsvp_slot_id = rs.id
+    LEFT JOIN invitations ON invitations.music_session_id = msess.id
+    WHERE
+        open_rsvps = TRUE OR invitations.id IS NOT NULL AND
+        users.last_jam_locidispid IS NOT NULL AND
+        msess.created_at > '#{earliest_session_create_time}' AND
+        msess.created_at < '#{latest_session_create_time}' AND
+        scheduled_start >= '#{earliest_session_start_time}' AND
+        (rrrs.rsvp_slot_id IS NULL OR rrrs.chosen != TRUE)) AS tmp_candidate_sessions
+INNER JOIN
+    (SELECT
+        users.id AS receiver_id,
+        users.last_jam_locidispid AS receiver_score_idx,
+        mi.instrument_id
+    INTO TEMP TABLE tmp_candidate_recipients
+    FROM users
+    INNER JOIN musicians_instruments AS mi ON mi.user_id = users.id
+    INNER JOIN tmp_candidate_sessions ON tmp_candidate_sessions.instrument_id = mi.instrument_id OR
+                                        tmp_candidate_sessions.is_unstructured_rsvp = TRUE OR
+                                        tmp_candidate_sessions.invited_user_id = users.id
+
+    WHERE
+        users.last_jam_locidispid IS NOT NULL AND
+        users.musician = TRUE AND
+        users.subscribe_email = TRUE) AS tmp_candidate_recipients
+INNER JOIN tmp_candidate_sessions ON tmp_candidate_sessions.creator_score_idx = current_scores.alocidispid
+INNER JOIN tmp_candidate_recipients ON tmp_candidate_recipients.receiver_score_idx = current_scores.blocidispid
+WHERE
+    current_scores.full_score < #{max_score} AND
+    tmp_candidate_recipients.receiver_id != tmp_candidate_sessions.creator_id
+GROUP BY
+    tmp_candidate_recipients.receiver_id,
+    tmp_candidate_sessions.session_id,
+    latency
+SQL
+      )
+    end
+
     def fetch_recipients(per_page=BATCH_SIZE)
       objs = []
 
@@ -122,6 +179,8 @@ module JamRuby
           sessions = MusicSession.select("music_sessions.*, tmp_matches.latency")
             .joins("INNER JOIN tmp_matches ON tmp_matches.session_id = music_sessions.id")
             .where(["tmp_matches.receiver_id = ?", receiver.id])
+            .order('tmp_matches.latency')
+            .limit(20)
             .includes([:genre, :creator])
           block_given? ? yield(receiver, sessions) : objs << [receiver, sessions]
         end
@@ -162,43 +221,49 @@ SELECT
     msess.user_id AS creator_id,
     users.last_jam_locidispid AS creator_score_idx,
     rs.instrument_id,
-    invitations.receiver_id AS invited_user_id
+    invitations.receiver_id AS invited_user_id,
+    msess.is_unstructured_rsvp,
+    msess.open_rsvps
 INTO TEMP TABLE tmp_candidate_sessions 
 FROM music_sessions msess
 INNER JOIN users ON users.id = msess.user_id
 INNER JOIN rsvp_slots AS rs ON rs.music_session_id = msess.id
 LEFT JOIN rsvp_requests_rsvp_slots AS rrrs ON rrrs.rsvp_slot_id = rs.id
-LEFT JOIN invitations ON invitations.music_session_id = msess.id
+LEFT JOIN invitations ON open_rsvps = FALSE AND invitations.music_session_id = msess.id
 WHERE
-    open_rsvps = TRUE AND
+    (msess.is_unstructured_rsvp = TRUE OR (rrrs.id IS NULL OR rrrs.chosen != TRUE)) AND
     users.last_jam_locidispid IS NOT NULL AND
     msess.created_at > '#{earliest_session_create_time}' AND
     msess.created_at < '#{latest_session_create_time}' AND
-    scheduled_start >= '#{earliest_session_start_time}' AND
-    (rrrs.rsvp_slot_id IS NULL OR rrrs.chosen != TRUE)
+    scheduled_start >= '#{earliest_session_start_time}'
 #{limit_sql}
 SQL
       ActiveRecord::Base.connection.execute(sql)
     end
     
     def _collect_eligible_recipients
-      ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS tmp_candidate_recipients")
+      ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS tmp_candidate_recipients").check
       limit_sql = (self.snapshot? && 0 < ENV[ENV_QUERY_LIMIT].to_i) ? "LIMIT #{ENV[ENV_QUERY_LIMIT]}" : ''
       # load eligible recipients into tmp table
       sql =<<SQL
 SELECT 
     users.id AS receiver_id, 
     users.last_jam_locidispid AS receiver_score_idx,
-    mi.instrument_id
+    mi.instrument_id,
+    tmp_candidate_sessions.invited_user_id,
+    tmp_candidate_sessions.session_id AS session_id,
+    tmp_candidate_sessions.creator_score_idx AS creator_score_idx
 INTO TEMP TABLE tmp_candidate_recipients
 FROM users
 INNER JOIN musicians_instruments AS mi ON mi.user_id = users.id
-LEFT JOIN tmp_candidate_sessions ON tmp_candidate_sessions.instrument_id = mi.instrument_id OR
-                                    users.id = tmp_candidate_sessions.invited_user_id
+INNER JOIN tmp_candidate_sessions ON tmp_candidate_sessions.is_unstructured_rsvp = TRUE OR
+                                    (tmp_candidate_sessions.open_rsvps = TRUE AND tmp_candidate_sessions.instrument_id = mi.instrument_id) OR
+                                    tmp_candidate_sessions.invited_user_id = users.id
 WHERE
     users.last_jam_locidispid IS NOT NULL AND
     users.musician = TRUE AND
-    users.subscribe_email = TRUE
+    users.subscribe_email = TRUE AND
+    users.id != tmp_candidate_sessions.creator_id
 #{limit_sql}
 SQL
       ActiveRecord::Base.connection.execute(sql)
@@ -211,20 +276,20 @@ SQL
       end
       limit_sql = (self.snapshot? && 0 < ENV[ENV_QUERY_LIMIT].to_i) ? "LIMIT #{ENV[ENV_QUERY_LIMIT]}" : ''
       sql =<<SQL
-SELECT
-    DISTINCT tmp_candidate_recipients.receiver_id, 
-    tmp_candidate_sessions.session_id,
+SELECT DISTINCT
+    tmp_candidate_recipients.receiver_id,
+    tmp_candidate_recipients.session_id,
     current_scores.full_score AS latency
 INTO TEMP TABLE tmp_matches
 FROM current_scores
-INNER JOIN tmp_candidate_sessions ON tmp_candidate_sessions.creator_score_idx = current_scores.alocidispid
-INNER JOIN tmp_candidate_recipients ON tmp_candidate_recipients.receiver_score_idx = current_scores.blocidispid
+INNER JOIN tmp_candidate_recipients ON
+    tmp_candidate_recipients.creator_score_idx = current_scores.alocidispid AND
+    tmp_candidate_recipients.receiver_score_idx = current_scores.blocidispid
 WHERE
-    current_scores.full_score < #{max_score} AND
-    tmp_candidate_recipients.receiver_id != tmp_candidate_sessions.creator_id
-GROUP BY 
-    tmp_candidate_recipients.receiver_id, 
-    tmp_candidate_sessions.session_id, 
+    current_scores.full_score < #{max_score}
+GROUP BY
+    tmp_candidate_recipients.receiver_id,
+    tmp_candidate_recipients.session_id,
     latency
 #{limit_sql}
 SQL
diff --git a/ruby/spec/factories.rb b/ruby/spec/factories.rb
index 0d321db48..6f6e6f13c 100644
--- a/ruby/spec/factories.rb
+++ b/ruby/spec/factories.rb
@@ -2,6 +2,10 @@ require 'faker'
 
 FactoryGirl.define do
   factory :user, :class => JamRuby::User do
+    ignore do
+      specific_instruments nil
+    end
+
     sequence(:email) { |n| "person_#{n}@example.com"}
     sequence(:first_name)  { |n| "Person" }
     sequence(:last_name)  { |n| "#{n}" }
@@ -17,8 +21,14 @@ FactoryGirl.define do
 
     #u.association :musician_instrument, factory: :musician_instrument, user: u
 
-    before(:create) do |user|
-      user.musician_instruments << FactoryGirl.build(:musician_instrument, user: user)
+    before(:create) do |user, evaluator|
+      if evaluator.specific_instruments
+        evaluator.specific_instruments.each do |instrument|
+          user.musician_instruments << FactoryGirl.build(:musician_instrument, user: user, instrument: instrument)
+        end
+      else
+        user.musician_instruments << FactoryGirl.build(:musician_instrument, user: user)
+      end
     end
 
     factory :fan do
diff --git a/ruby/spec/jam_ruby/models/email_batch_spec_scheduled_session.rb b/ruby/spec/jam_ruby/models/email_batch_spec_scheduled_session.rb
index c4b951cd0..0d69c0619 100644
--- a/ruby/spec/jam_ruby/models/email_batch_spec_scheduled_session.rb
+++ b/ruby/spec/jam_ruby/models/email_batch_spec_scheduled_session.rb
@@ -10,36 +10,62 @@ describe EmailBatchScheduledSessions do
     UserMailer.deliveries.clear
   end
 
+  def find_user_sessions(obj, user)
+    found = obj.find{|item| item[0] == user}
+    found.should_not be_nil
+    found[1]
+  end
+
   describe 'daily scheduled' do
     # before { pending }
 
     let (:scheduled_batch) { FactoryGirl.create(:email_batch_scheduled_session) }
 
-    let (:drums) { FactoryGirl.create(:instrument, :description => 'drums') }
-    let (:guitar) { FactoryGirl.create(:instrument, :description => 'guitar') }
-    let (:bass) { FactoryGirl.create(:instrument, :description => 'bass') }
-    let (:vocals) { FactoryGirl.create(:instrument, :description => 'vocal') }
+    let (:drums) { Instrument.find('drums') }
+    let (:guitar) { Instrument.find('acoustic guitar') }
+    let (:bass) { Instrument.find('bass guitar') }
+    let (:vocals) { Instrument.find('voice') }
+    let (:electric_guitar) { Instrument.find('electric guitar')}
 
-    let (:drummer) { FactoryGirl.create(:user, :last_jam_locidispid => 1, :last_jam_addr => 1) }
-    let (:guitarist) { FactoryGirl.create(:user, :last_jam_locidispid => 1, :last_jam_addr => 1) }
-    let (:bassist) { FactoryGirl.create(:user, :last_jam_locidispid => 1, :last_jam_addr => 1) }
-    let (:vocalist) { FactoryGirl.create(:user, :last_jam_locidispid => 1, :last_jam_addr => 1) }
-    let (:loser) { FactoryGirl.create(:user, :last_jam_locidispid => 2, :last_jam_addr => 2) }
+    let (:drummer) { FactoryGirl.create(:user, first_name: 'drummer', :last_jam_locidispid => 1, :last_jam_addr => 1, specific_instruments: [drums, guitar]) }
+    let (:guitarist) { FactoryGirl.create(:user, first_name: 'guitarist', :last_jam_locidispid => 1, :last_jam_addr => 1, specific_instruments: [guitar, drums]) }
+    let (:bassist) { FactoryGirl.create(:user, first_name: 'bassist', :last_jam_locidispid => 1, :last_jam_addr => 1, specific_instruments: [bass]) }
+    let (:vocalist) { FactoryGirl.create(:user, first_name: 'vocalist', :last_jam_locidispid => 1, :last_jam_addr => 1, specific_instruments: [vocals, electric_guitar]) }
+    let (:loser) { FactoryGirl.create(:user, first_name: 'loser', :last_jam_locidispid => 2, :last_jam_addr => 2, specific_instruments: [vocals, drums]) }
+
+    let (:session3_creator) {FactoryGirl.create(:user, first_name: 'session3_creator', :last_jam_locidispid => 3, :last_jam_addr => 3, specific_instruments: [vocals]) }
+    let (:session4_creator) {FactoryGirl.create(:user, first_name: 'session4_creator', :last_jam_locidispid => 4, :last_jam_addr => 4, specific_instruments: [vocals]) }
 
     let (:session1) do 
       FactoryGirl.create(:music_session, 
                          :creator => drummer, 
                          :scheduled_start => Time.now() + 2.days,
-                         :musician_access => true,
-                         :approval_required => false,
+                         :open_rsvps=> true,
+                         :is_unstructured_rsvp => false,
                          :created_at => Time.now - 1.hour)
     end
     let (:session2) do 
       FactoryGirl.create(:music_session, 
                          :creator => drummer,
+                         :open_rsvps => false,
+                         :is_unstructured_rsvp => false,
+                         :scheduled_start => Time.now() + 2.days,
+                         :created_at => Time.now - 1.hour)
+    end
+    let (:session3) do
+      FactoryGirl.create(:music_session,
+                         :creator => session3_creator,
+                         :open_rsvps => true,
+                         :is_unstructured_rsvp => true,
+                         :scheduled_start => Time.now() + 2.days,
+                         :created_at => Time.now - 1.hour)
+    end
+    let (:session4) do
+      FactoryGirl.create(:music_session,
+                         :creator => session4_creator,
+                         :open_rsvps => true,
+                         :is_unstructured_rsvp => true,
                          :scheduled_start => Time.now() + 2.days,
-                         :musician_access => true,
-                         :approval_required => false,
                          :created_at => Time.now - 1.hour)
     end
 
@@ -49,23 +75,9 @@ describe EmailBatchScheduledSessions do
       JamRuby::Score.delete_all
       scheduled_batch.reset!
 
-      drummer.musician_instruments << FactoryGirl.build(:musician_instrument, user: drummer, instrument: drums, proficiency_level: 2)
-      drummer.musician_instruments << FactoryGirl.build(:musician_instrument, user: drummer, instrument: guitar, proficiency_level: 2)
-
-      guitarist.musician_instruments << FactoryGirl.build(:musician_instrument, user: guitarist, instrument: guitar, proficiency_level: 2)
-      guitarist.musician_instruments << FactoryGirl.build(:musician_instrument, user: guitarist, instrument: bass, proficiency_level: 2)
-      
-      bassist.musician_instruments << FactoryGirl.build(:musician_instrument, user: bassist, instrument: bass, proficiency_level: 2)
-      bassist.musician_instruments << FactoryGirl.build(:musician_instrument, user: bassist, instrument: guitar, proficiency_level: 2)
-      
-      vocalist.musician_instruments << FactoryGirl.build(:musician_instrument, user: vocalist, instrument: vocals, proficiency_level: 2)
-
-      loser.musician_instruments << FactoryGirl.build(:musician_instrument, user: loser, instrument: vocals, proficiency_level: 2)
-      loser.musician_instruments << FactoryGirl.build(:musician_instrument, user: loser, instrument: drums, proficiency_level: 2)
-
-      FactoryGirl.create(:rsvp_slot, :instrument => drums, :music_session => session1)
-      FactoryGirl.create(:rsvp_slot, :instrument => guitar, :music_session => session1)
-      FactoryGirl.create(:rsvp_slot, :instrument => bass, :music_session => session1)
+      @drums_rsvp_slot = FactoryGirl.create(:rsvp_slot, :instrument => drums, :music_session => session1)
+      @guitar_rsvp_slot = FactoryGirl.create(:rsvp_slot, :instrument => guitar, :music_session => session1)
+      @bass_rsvp_slot = FactoryGirl.create(:rsvp_slot, :instrument => bass, :music_session => session1)
       FactoryGirl.create(:rsvp_slot, :instrument => drums, :music_session => session2)
       FactoryGirl.create(:rsvp_slot, :instrument => guitar, :music_session => session2)
       FactoryGirl.create(:rsvp_slot, :instrument => bass, :music_session => session2)
@@ -73,34 +85,175 @@ describe EmailBatchScheduledSessions do
       # oo.rsvp_request_slot.update_attributes(chosen: true)
       # oo = FactoryGirl.create(:rsvp_request, :user => vocalist, :rsvp_slot => oo)
       # oo.rsvp_request_slot.update_attributes(chosen: true)
-      
-    end
-
-    it 'sets up data properly' do
-      JamRuby::Score.createx(1, 'a', 1, 1, 'a', 1, 10)
-      JamRuby::Score.createx(1, 'a', 1, 2, 'a', 2, Score::MAX_YELLOW_LATENCY + 1)
 
       expect(drummer.instruments.include?(drums)).to eq(true)
       expect(drummer.instruments.include?(guitar)).to eq(true)
-      obj = scheduled_batch.fetch_recipients
-      obj.each_with_index do |u, i|
-        puts obj[i][0].email
+    end
+
+    describe "everyone but loser has good enough scores" do
+
+      before(:each) do
+        JamRuby::Score.createx(1, 'a', 1, 1, 'a', 1, 10)
+        JamRuby::Score.createx(1, 'a', 1, 2, 'a', 2, (APP_CONFIG.max_yellow_full_score * 2) + 1)
+        @matching_instruments_users = [guitarist, bassist]
+        @good_score_users = [guitarist, bassist, vocalist] # not adding the drummer because he's the creator (he does have a good score to these others though)
+      end
+
+      describe "session1 is_unstructured" do
+        before(:each) do
+          session1.is_unstructured_rsvp = true
+          session1.save!
+        end
+
+        it 'finds anyone with good enough scores' do
+          obj = scheduled_batch.fetch_recipients
+          found_users = obj.map{ |user_and_sessions| user_and_sessions[0]}
+          @good_score_users.should =~ found_users
+
+          scheduled_batch.deliver_batch
+          expect(UserMailer.deliveries.length).to eq(@good_score_users.length)
+        end
+      end
+
+      it 'finds anyone with good enough scores and matching instruments' do
+        obj = scheduled_batch.fetch_recipients
+
+        #Database.dump("SELECT * FROM tmp_candidate_recipients") do |field, value|
+        #  if field == 'receiver_id'
+        #    User.find(value).first_name
+        #  else
+        #    value.to_s
+        #  end
+        #end
+
+        found_users = obj.map{ |user_and_sessions| user_and_sessions[0]}
+        @matching_instruments_users.should =~ found_users
+
+        scheduled_batch.deliver_batch
+        expect(UserMailer.deliveries.length).to eq(@matching_instruments_users.length)
+      end
+
+      describe "closes a RSVP slot in session1" do
+        before(:each) do
+          request = FactoryGirl.create(:rsvp_request, user: loser)
+          FactoryGirl.create(:rsvp_request_rsvp_slot, chosen: true, rsvp_request: request, rsvp_slot: @bass_rsvp_slot)
+        end
+
+        it "finds one less" do
+          # the bass slot is closed; so we should not longer find the bassist in the results
+          @matching_instruments_users.delete(bassist).should_not be_nil
+
+          obj = scheduled_batch.fetch_recipients
+          found_users = obj.map{ |user_and_sessions| user_and_sessions[0]}
+          @matching_instruments_users.should =~ found_users
+
+          scheduled_batch.deliver_batch
+          expect(UserMailer.deliveries.length).to eq(@matching_instruments_users.length)
+        end
+      end
+
+      describe "2 more open sessions" do
+        before(:each) do
+          JamRuby::Score.createx(1, 'a', 1, session3_creator.last_jam_locidispid, 'a', 1, 5)
+          JamRuby::Score.createx(1, 'a', 1, session4_creator.last_jam_locidispid, 'a', 2, 20)
+          session3.touch
+          session4.touch
+        end
+
+        it "sessions are sorted by latency" do
+            obj = scheduled_batch.fetch_recipients
+            obj.length.should == @matching_instruments_users.length + [drummer, vocalist].length
+
+            # verify that all 4 users have the right sessions, in the right order
+            @matching_instruments_users.each do |user|
+              user_sessions = find_user_sessions(obj, user)
+              user_sessions.should == [session3, session1, session4]
+            end
+
+            user_sessions = find_user_sessions(obj, drummer)
+            user_sessions.should == [session3, session4]
+
+            user_sessions = find_user_sessions(obj, vocalist)
+            user_sessions.should == [session3, session4]
+        end
+      end
+
+      describe "21 more sessions" do
+        before(:each) do
+          20.times do |i|
+            creator = FactoryGirl.create(:user, :last_jam_locidispid => 1, :last_jam_addr => 1)
+            FactoryGirl.create(:music_session,
+                                          :creator => creator,
+                                          :open_rsvps => true,
+                                          :is_unstructured_rsvp => true,
+                                          :scheduled_start => Time.now() + 2.days,
+                                          :created_at => Time.now - 1.hour)
+          end
+        end
+
+        it "prevents more than 20 sessions per user" do
+          obj = scheduled_batch.fetch_recipients
+          obj.length.should == 20 + 4 # 4 is vocalist, drummer, guitarist, and bassist.  20 is the users made in the before block
+
+
+          # the bassist should *potentially* the drummer's session, and these new 20 sessions. But we limit to 20.
+          user_sessions = find_user_sessions(obj, bassist)
+          user_sessions.length.should == 20
+        end
+      end
+
+      it 'finds anyone with good enough scores and matching instruments' do
+        obj = scheduled_batch.fetch_recipients
+
+        #Database.dump("SELECT * FROM tmp_candidate_recipients") do |field, value|
+        #  if field == 'receiver_id'
+        #    User.find(value).first_name
+        #  else
+        #    value.to_s
+        #  end
+        #end
+
+        found_users = obj.map{ |user_and_sessions| user_and_sessions[0]}
+        @matching_instruments_users.should =~ found_users
+
+        scheduled_batch.deliver_batch
+        expect(UserMailer.deliveries.length).to eq(@matching_instruments_users.length)
+      end
+
+      describe "open_rsvp=false" do
+        before(:each) do
+          session1.open_rsvps = false
+          session1.save!
+          session2.open_rsvps = false
+          session2.save!
+        end
+
+        it "won't find an open_rsvps=false session without an invitation" do
+          obj = scheduled_batch.fetch_recipients
+          expect(obj.count).to eq(0)
+        end
+
+        describe "with invitations" do
+          let(:invitation) {friend(drummer, guitarist); FactoryGirl.create(:invitation, sender: drummer, receiver:guitarist, music_session: session1)}
+
+          before(:each) do
+            invitation.touch
+          end
+
+          it "finds user with the invite" do
+            obj = scheduled_batch.fetch_recipients
+            found_users = obj.map{ |user_and_sessions| user_and_sessions[0]}
+            [guitarist].should =~ found_users
+
+            scheduled_batch.deliver_batch
+            expect(UserMailer.deliveries.length).to eq(1)
+          end
+        end
       end
-      expect(obj.count).to eq(2)
 
-      scheduled_batch.deliver_batch
-      expect(UserMailer.deliveries.length).to eq(2)
     end
 
-    it "won't find an open_rsvps=false session" do
-      session1.open_rsvps = false
-      session1.save!
-      session2.open_rsvps = false
-      session2.save!
 
-      obj = scheduled_batch.fetch_recipients
-      expect(obj.count).to eq(0)
-    end
 
     it 'handles large batches' do
       creators = []
diff --git a/ruby/spec/support/utilities.rb b/ruby/spec/support/utilities.rb
index fa7080d9b..b9db7f8ac 100644
--- a/ruby/spec/support/utilities.rb
+++ b/ruby/spec/support/utilities.rb
@@ -182,4 +182,9 @@ def fake_geo_124_zip(geoisp_csv)
   end
 
   zipfile
+end
+
+def friend(user1, user2)
+  FactoryGirl.create(:friendship, user: user1, friend: user2)
+  FactoryGirl.create(:friendship, user: user2, friend: user1)
 end
\ No newline at end of file
diff --git a/web/spec/factories.rb b/web/spec/factories.rb
index 117d2f85f..30f4fe32b 100644
--- a/web/spec/factories.rb
+++ b/web/spec/factories.rb
@@ -2,6 +2,10 @@ include ActionDispatch::TestProcess # added for artifact_update http://stackover
 
 FactoryGirl.define do
   factory :user, :class => JamRuby::User do
+    ignore do
+      specific_instruments nil
+    end
+
     sequence(:email) { |n| "person_#{n}@example.com"}   
     sequence(:first_name)  { |n| "Person" }
     sequence(:last_name)  { |n| "#{n}" }
@@ -33,8 +37,15 @@ FactoryGirl.define do
       end
     end
 
-    before(:create) do |user|
-      user.musician_instruments << FactoryGirl.build(:musician_instrument, user: user)
+    before(:create) do |user, evaluator|
+      if evaluator.specific_instruments
+        evaluator.specific_instruments.each do |instrument|
+          puts "burp: "
+          user.musician_instruments << FactoryGirl.build(:musician_instrument, user: user, instrument: instrument)
+        end
+      else
+        user.musician_instruments << FactoryGirl.build(:musician_instrument, user: user)
+      end
     end
 
     factory :user_two_instruments do

From f86d5aa495ff00e4eb9da488885e3291a3d1f2f5 Mon Sep 17 00:00:00 2001
From: root <zonk2world@gmail.com>
Date: Sat, 2 Aug 2014 18:37:29 +0200
Subject: [PATCH 54/55] fix #1977

---
 web/app/assets/stylesheets/client/sidebar.css.scss | 9 +++++++++
 web/app/views/clients/_sidebar.html.erb            | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/web/app/assets/stylesheets/client/sidebar.css.scss b/web/app/assets/stylesheets/client/sidebar.css.scss
index ff21873e4..f934b0cf3 100644
--- a/web/app/assets/stylesheets/client/sidebar.css.scss
+++ b/web/app/assets/stylesheets/client/sidebar.css.scss
@@ -312,5 +312,14 @@
      .more-text-available {
      }
    }
+   .wrapword{
+      white-space: -moz-pre-wrap !important;  /* Mozilla, since 1999 */
+      white-space: -pre-wrap;      /* Opera 4-6 */
+      white-space: -o-pre-wrap;    /* Opera 7 */
+      white-space: pre-wrap;       /* css-3 */
+      word-wrap: break-word;       /* Internet Explorer 5.5+ */
+      word-break: break-all;
+      white-space: normal;
+    }
 }
 
diff --git a/web/app/views/clients/_sidebar.html.erb b/web/app/views/clients/_sidebar.html.erb
index 22e525d56..a0b37fe1f 100644
--- a/web/app/views/clients/_sidebar.html.erb
+++ b/web/app/views/clients/_sidebar.html.erb
@@ -105,7 +105,7 @@
           <span>Chat is available when in session.</span>
         </div>
         <div class="chat-list-scroller">
-          <div class="previous-chat-list">
+          <div class="previous-chat-list wrapword">
           </div>
         </div>
         <div class="chat-sender">

From e871cc53904bd62c7a7f557f143f0c96ed665f35 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Sun, 3 Aug 2014 21:38:53 -0500
Subject: [PATCH 55/55]  fix latency presention - divide by 2 then round

---
 .../jam_ruby/user_mailer/scheduled_session_daily.html.erb     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.html.erb
index 26d7cf716..a7f70124b 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.html.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/scheduled_session_daily.html.erb
@@ -73,8 +73,8 @@
       <td><%= sess.description %></td>
       <td style="text-align:center">
         <span class="latency">
-        <span class="latency-value"><%= sess.latency %> ms</span>
-        <% if sess.latency <= APP_CONFIG.max_good_full_score %>
+        <span class="latency-value"><%= (sess.latency / 2).round %> ms</span>
+        <% if sess.latency <= (APP_CONFIG.max_good_full_score * 2) %>
           <%= image_tag("http://www.jamkazam.com/assets/content/icon_green_score.png", alt: 'good score icon') %>
         <% else %>
           <%= image_tag("http://www.jamkazam.com/assets/content/icon_yellow_score.png", alt: 'fair score icon') %>