From 3e2ae677fe67e1ec97e44b8100246f491be50472 Mon Sep 17 00:00:00 2001
From: Jonathan Kolyer <jonathan@jamkazam.com>
Date: Mon, 13 Jan 2014 19:00:42 -0600
Subject: [PATCH] vrfs1008:  integration with active session

---
 web/app/assets/javascripts/inviteMusicians.js        |  1 +
 web/app/assets/javascripts/session.js                | 10 ++++++++--
 web/app/controllers/api_music_sessions_controller.rb |  1 +
 web/app/views/clients/_session.html.erb              |  4 ++--
 web/app/views/clients/index.html.erb                 |  2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/web/app/assets/javascripts/inviteMusicians.js b/web/app/assets/javascripts/inviteMusicians.js
index 89a60aab3..b9b253bd8 100644
--- a/web/app/assets/javascripts/inviteMusicians.js
+++ b/web/app/assets/javascripts/inviteMusicians.js
@@ -151,6 +151,7 @@
         }
 
         function showDialog(ids) {
+            //alert('showDialog');
         }
 
         this.friendSelectorHTML = function() {
diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js
index 311134271..d6bd28b2e 100644
--- a/web/app/assets/javascripts/session.js
+++ b/web/app/assets/javascripts/session.js
@@ -15,7 +15,7 @@
         var localRecordingsDialog = null;
         var recordingFinishedDialog = null;
         var friendSelectorDialog = null;
-        var inviteMusicianDialog = null;
+        var inviteMusiciansDialog = null;
         var screenActive = false;
         var currentMixerRangeMin = null;
         var currentMixerRangeMax = null;
@@ -1304,12 +1304,17 @@
             }
         }
 
+        function inviteMusicians() {
+            inviteMusiciansDialog.showDialog();
+        }
+
         function events() {
             $('#session-resync').on('click', sessionResync);
             $('#session-contents').on("click", '[action="delete"]', deleteSession);
             $('#tracks').on('click', 'div[control="mute"]', toggleMute);
             $('#recording-start-stop').on('click', startStopRecording);
             $('#open-a-recording').on('click', openRecording);
+            $('#session-invite-musicians').on('click', inviteMusicians);
             $('#track-settings').click(function() {
                 configureTrackDialog.showVoiceChatPanel(true);
                 configureTrackDialog.showMusicAudioPanel(true);
@@ -1321,9 +1326,10 @@
                 .on('change-position', onChangePlayPosition);
         }
 
-        this.initialize = function(localRecordingsDialogInstance, recordingFinishedDialogInstance) {
+        this.initialize = function(localRecordingsDialogInstance, recordingFinishedDialogInstance, inviteMusiciansDialogInstance) {
             localRecordingsDialog = localRecordingsDialogInstance;
             recordingFinishedDialog = recordingFinishedDialogInstance;
+            inviteMusiciansDialog = inviteMusiciansDialogInstance;
             context.jamClient.SetVURefreshRate(150);
             playbackControls = new context.JK.PlaybackControls($('.session-recordings .recording-controls'));
             events();
diff --git a/web/app/controllers/api_music_sessions_controller.rb b/web/app/controllers/api_music_sessions_controller.rb
index 79b8cfe84..f24ed56ee 100644
--- a/web/app/controllers/api_music_sessions_controller.rb
+++ b/web/app/controllers/api_music_sessions_controller.rb
@@ -45,6 +45,7 @@ class ApiMusicSessionsController < ApiController
       params[:legal_terms])
 
     if @music_session.errors.any?
+      byebug
       # we have to do this because api_session_detail_url will fail with a bad @music_session
       response.status = :unprocessable_entity
       respond_with @music_session
diff --git a/web/app/views/clients/_session.html.erb b/web/app/views/clients/_session.html.erb
index f4f90c341..308178ef1 100644
--- a/web/app/views/clients/_session.html.erb
+++ b/web/app/views/clients/_session.html.erb
@@ -69,8 +69,8 @@
                     <!-- live tracks -->
                     <div class="session-livetracks">
                         <h2>live tracks</h2>
-                        <div class="session-add">
-                            <a class="">
+                        <div class="session-add" layout-link="select-invites">
+                            <a href="#" id="session-invite-musicians">
                                 <%= image_tag "content/icon_add.png", {:width => 19, :height => 19, :align => "texttop"} %>&nbsp;&nbsp;Invite Musicians
                             </a>
                         </div>
diff --git a/web/app/views/clients/index.html.erb b/web/app/views/clients/index.html.erb
index 56cee55ab..42586fd45 100644
--- a/web/app/views/clients/index.html.erb
+++ b/web/app/views/clients/index.html.erb
@@ -174,7 +174,7 @@
             findBandScreen.initialize();
 
             var sessionScreen = new JK.SessionScreen(JK.app);
-            sessionScreen.initialize(localRecordingsDialog, recordingFinishedDialog);
+            sessionScreen.initialize(localRecordingsDialog, recordingFinishedDialog, inviteMusiciansDialog);
 
             var sessionSettingsDialog = new JK.SessionSettingsDialog(JK.app, sessionScreen);
             sessionSettingsDialog.initialize();