From e336828d22c5a60d811692c2b59f08ff9246f50b Mon Sep 17 00:00:00 2001
From: Bert Owen <bert@jamkazam.com>
Date: Sat, 14 Jun 2014 20:52:25 +0800
Subject: [PATCH 1/4] fix create session flow

---
 .../assets/javascripts/scheduled_session.js   | 101 ++++++++++--------
 .../views/clients/_scheduledSession.html.erb  |   2 +-
 2 files changed, 57 insertions(+), 46 deletions(-)

diff --git a/web/app/assets/javascripts/scheduled_session.js b/web/app/assets/javascripts/scheduled_session.js
index 91cfce508..87ea03731 100644
--- a/web/app/assets/javascripts/scheduled_session.js
+++ b/web/app/assets/javascripts/scheduled_session.js
@@ -374,47 +374,60 @@
 
     function startSession() {
       var data = {};
-      data.name = createSessionSettings.name;
-      data.description = createSessionSettings.description;
-      data.genres = createSessionSettings.genres;
-      if (createSessionSettings.musician_access.value == 'only-rsvp') {
-        data.musician_access = false;
-        data.approval_required = false;
-      }
-      else if (createSessionSettings.musician_access.value == 'musicians-approval') {
-        data.musician_access = true;
-        data.approval_required = true;
-      }
-      else if (createSessionSettings.musician_access.value == 'musicians') {
-        data.musician_access = true;
-        data.approval_required = false;
-      }
-
-      if (createSessionSettings.fans_access.value == 'no-listen-chat') {
-        data.fan_access = false; data.fan_chat = false;
-      }
-      else if (createSessionSettings.fans_access.value == 'listen-chat-each') {
-        data.fan_access = true; data.fan_chat = false;
-      }
-      else if (createSessionSettings.fans_access.value == 'listen-chat-band') {
-        data.fan_access = true; data.fan_chat = true;
-      }
-      data.legal_policy = createSessionSettings.session_policy;
-      data.legal_terms = true;
-      data.language = createSessionSettings.language.value;
-      if (createSessionSettings.createType == 'quick-start' || createSessionSettings.createType == 'immediately') {
-        data.start = new Date().toDateString() + ' ' + getFormattedTime(new Date(), false);
-      }
-      else {
-        data.start = createSessionSettings.startDate + ' ' + createSessionSettings.startTime;
-      }
-      data.invitations = inviteMusiciansUtil.getInvitedFriends();
-      data.recurring_mode = createSessionSettings.recurring_mode.value;
-      data.music_notations = createSessionSettings.music_notations;
 
       if (createSessionSettings.createType == 'start-scheduled') {
         data = scheduledSessions[createSessionSettings.selectedSessionId];
       }
+      else {
+        data.name = createSessionSettings.name;
+        data.description = createSessionSettings.description;
+        data.genres = createSessionSettings.genres;
+        if (createSessionSettings.musician_access.value == 'only-rsvp') {
+          data.musician_access = false;
+          data.approval_required = false;
+        }
+        else if (createSessionSettings.musician_access.value == 'musicians-approval') {
+          data.musician_access = true;
+          data.approval_required = true;
+        }
+        else if (createSessionSettings.musician_access.value == 'musicians') {
+          data.musician_access = true;
+          data.approval_required = false;
+        }
+
+        if (createSessionSettings.fans_access.value == 'no-listen-chat') {
+          data.fan_access = false; data.fan_chat = false;
+        }
+        else if (createSessionSettings.fans_access.value == 'listen-chat-each') {
+          data.fan_access = true; data.fan_chat = false;
+        }
+        else if (createSessionSettings.fans_access.value == 'listen-chat-band') {
+          data.fan_access = true; data.fan_chat = true;
+        }
+        data.legal_policy = createSessionSettings.session_policy;
+        data.legal_terms = true;
+        data.language = createSessionSettings.language.value;
+        if (createSessionSettings.createType == 'quick-start' || createSessionSettings.createType == 'immediately') {
+          data.start = new Date().toDateString() + ' ' + getFormattedTime(new Date(), false);
+        }
+        else {
+          data.start = createSessionSettings.startDate + ' ' + createSessionSettings.startTime;
+        }
+        data.invitations = inviteMusiciansUtil.getInvitedFriends();
+        data.recurring_mode = createSessionSettings.recurring_mode.value;
+        data.music_notations = createSessionSettings.music_notations;
+
+        data.rsvp_slots = []; 
+        $.each(instrumentSelector.getSelectedInstruments(), function(index, instrument) {
+          data.rsvp_slots.push({instrument: instrument.id, proficiency_level: instrument.level});
+        });
+
+        // var instruments_rsvp = [];
+        // $.each(instrumentRSVP.getSelectedInstruments(), function(index, instrument) {
+        //   instruments_rsvp.push(instrument.name + ' (' + instrument.count + ') (' + instrument.level + ')');
+        // });
+        // $('#session-instruments-rsvp-disp').html(instruments_rsvp.join(', '));
+      }
 
       var tracks = context.JK.TrackHelpers.getUserTracks(context.jamClient);
       if(tracks.length == 0) {
@@ -842,14 +855,12 @@
       if (createSessionSettings.createType == 'start-scheduled') {
         $('#start-scheduled-wrapper').show();
         $('#schedule-future-wrapper').hide();
-        createSessionSettings = {
-          createType: 'start-scheduled',
-          timezone: {},
-          recurring_mode: {},
-          language: {},
-          musician_access: {},
-          fans_access: {}
-        };
+        createSessionSettings.timezone = {};
+        createSessionSettings.recurring_mode = {};
+        createSessionSettings.timezone = {};
+        createSessionSettings.language = {};
+        createSessionSettings.musician_access = {};
+        createSessionSettings.fans_access = {};
       }
       else if (createSessionSettings.createType == 'schedule-future') {
         $('#start-scheduled-wrapper').hide();
diff --git a/web/app/views/clients/_scheduledSession.html.erb b/web/app/views/clients/_scheduledSession.html.erb
index 3a8a6d4b8..60fe269c2 100644
--- a/web/app/views/clients/_scheduledSession.html.erb
+++ b/web/app/views/clients/_scheduledSession.html.erb
@@ -438,7 +438,7 @@
 
 <script type="text/template" id="template-session-buttons">
   <div class="sessionbuttons-holder">
-    <a class="button-orange" href="#">HELP</a>
+    <a class="button-orange" href="http://jamkazam.desk.com/" target="_blank">HELP</a>
     <a class="button-orange btn-back" href="#">BACK</a>
     <a class="button-orange btn-next" href="#">NEXT</a>
   </div>

From d4b467fd4217c8304038e1ddd4e0923b7feb41e2 Mon Sep 17 00:00:00 2001
From: Bert Owen <bert@jamkazam.com>
Date: Sat, 14 Jun 2014 21:25:32 +0800
Subject: [PATCH 2/4] scheduled session - RSVP slot updated

---
 ruby/lib/jam_ruby/models/music_session.rb       | 16 ++++++++++++++++
 web/app/assets/javascripts/scheduled_session.js | 12 ++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb
index 9024597b1..4b32114d7 100644
--- a/ruby/lib/jam_ruby/models/music_session.rb
+++ b/ruby/lib/jam_ruby/models/music_session.rb
@@ -255,6 +255,8 @@ module JamRuby
       unless ms.errors.any?
         ms.reload
 
+        rsvp_slot_ids = []
+        self_rsvp_slot_ids = []
         options[:rsvp_slots].each do |rs|
           rsvp = RsvpSlot.new
           rsvp.instrument = Instrument.find(rs[:instrument_id])
@@ -263,7 +265,21 @@ module JamRuby
           rsvp.save
 
           ms.rsvp_slots << rsvp
+
+          if rs[:approved]
+            self_rsvp_slot_ids.push rsvp.id
+          else
+            rsvp_slot_ids.push rsvp.id
+          end
         end if options[:rsvp_slots]
+        RsvpRequest.create({session_id: ms.id, rsvp_slots: rsvp_slot_ids}, user)
+        rsvp_rq_ids = RsvpRequest.create({session_id: ms.id, rsvp_slots: self_rsvp_slot_ids}).map(&:id)
+
+        self_rsvp_rq = []
+        rsvp_rq_ids.each do |rsvp_rq|
+          self_rsvp_rq.push {request_slot_id: rsvp_rq, approved: true}
+        end
+        RsvpRequest.update({session_id: ms.id, rsvp_responses: self_rsvp_rq})
 
         options[:invitations].each do |invite_id|
           invitation = Invitation.new
diff --git a/web/app/assets/javascripts/scheduled_session.js b/web/app/assets/javascripts/scheduled_session.js
index 87ea03731..e541d2b79 100644
--- a/web/app/assets/javascripts/scheduled_session.js
+++ b/web/app/assets/javascripts/scheduled_session.js
@@ -419,14 +419,14 @@
 
         data.rsvp_slots = []; 
         $.each(instrumentSelector.getSelectedInstruments(), function(index, instrument) {
-          data.rsvp_slots.push({instrument: instrument.id, proficiency_level: instrument.level});
+          data.rsvp_slots.push({instrument: instrument.id, proficiency_level: instrument.level. approve: false});
         });
 
-        // var instruments_rsvp = [];
-        // $.each(instrumentRSVP.getSelectedInstruments(), function(index, instrument) {
-        //   instruments_rsvp.push(instrument.name + ' (' + instrument.count + ') (' + instrument.level + ')');
-        // });
-        // $('#session-instruments-rsvp-disp').html(instruments_rsvp.join(', '));
+        $.each(instrumentRSVP.getSelectedInstruments(), function(index, instrument) {
+          for (var i = 0; i < instrument.count; i++) {
+            data.rsvp_slots.push({instrument: instrument.id, proficiency_level: instruemnt.level, approve: true});
+          }
+        });
       }
 
       var tracks = context.JK.TrackHelpers.getUserTracks(context.jamClient);

From 03705547dd0a0e839813ac3fe44a8ab2b08ab0e0 Mon Sep 17 00:00:00 2001
From: Bert Owen <bert@jamkazam.com>
Date: Sat, 14 Jun 2014 21:42:46 +0800
Subject: [PATCH 3/4] fix music session - rsvp

---
 ruby/lib/jam_ruby/models/music_session.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb
index 4b32114d7..daa764e7d 100644
--- a/ruby/lib/jam_ruby/models/music_session.rb
+++ b/ruby/lib/jam_ruby/models/music_session.rb
@@ -277,7 +277,10 @@ module JamRuby
 
         self_rsvp_rq = []
         rsvp_rq_ids.each do |rsvp_rq|
-          self_rsvp_rq.push {request_slot_id: rsvp_rq, approved: true}
+          r = Hash.new
+          r[:request_slot_id] = rsvp_rq
+          r[:approved] = true
+          self_rsvp_rq.push r
         end
         RsvpRequest.update({session_id: ms.id, rsvp_responses: self_rsvp_rq})
 

From 07864a0f76c65c8a885eb846deb667bdb58fb431 Mon Sep 17 00:00:00 2001
From: Bert Owen <bert@jamkazam.com>
Date: Sat, 14 Jun 2014 23:03:39 +0800
Subject: [PATCH 4/4] fix scheduled session

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

diff --git a/web/app/assets/javascripts/scheduled_session.js b/web/app/assets/javascripts/scheduled_session.js
index e541d2b79..1a22134ad 100644
--- a/web/app/assets/javascripts/scheduled_session.js
+++ b/web/app/assets/javascripts/scheduled_session.js
@@ -419,12 +419,20 @@
 
         data.rsvp_slots = []; 
         $.each(instrumentSelector.getSelectedInstruments(), function(index, instrument) {
-          data.rsvp_slots.push({instrument: instrument.id, proficiency_level: instrument.level. approve: false});
+          var slot = {};
+          slot.instrument = instrument.id;
+          slot.proficiency_level = instrument.level;
+          slot.approve = false;
+          data.rsvp_slots.push(slot);
         });
 
         $.each(instrumentRSVP.getSelectedInstruments(), function(index, instrument) {
           for (var i = 0; i < instrument.count; i++) {
-            data.rsvp_slots.push({instrument: instrument.id, proficiency_level: instruemnt.level, approve: true});
+            var slot = {};
+            slot.instrument = instrument.id;
+            slot.proficiency_level = instrument.level;
+            slot.approve = true;
+            data.rsvp_slots.push(slot);
           }
         });
       }