From eee37a595469f4db2b8820d342ea5a9c19efa154 Mon Sep 17 00:00:00 2001
From: Bert Owen <bert@jamkazam.com>
Date: Sat, 5 Jul 2014 17:21:55 +0200
Subject: [PATCH] fix account session detail page

---
 .../javascripts/accounts_session_detail.js    | 42 +++++++++++--------
 .../accounts_session_properties.js            |  1 -
 .../assets/javascripts/accounts_sessions.js   |  8 ++--
 .../clients/_account_session_detail.html.haml |  2 +-
 4 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/web/app/assets/javascripts/accounts_session_detail.js b/web/app/assets/javascripts/accounts_session_detail.js
index f8d18255e..5a116b2f7 100644
--- a/web/app/assets/javascripts/accounts_session_detail.js
+++ b/web/app/assets/javascripts/accounts_session_detail.js
@@ -38,8 +38,10 @@
       invitationDialog.showEmailDialog();
     }
 
-    function cancelRsvpRequest(rsvpId) {
-      var rsvpCancelDlg = new context.JK.RsvpCancelDialog(app, sessionData.id, rsvpId);
+    function cancelRsvpRequest(e) {
+      e.preventDefault();
+
+      var rsvpCancelDlg = new context.JK.RsvpCancelDialog(app, sessionData.id, sessionData.rsvpId);
       rsvpCancelDlg.initialize();
       context.JK.app.layout.showDialog('rsvp-cancel-dialog');
     }
@@ -50,19 +52,15 @@
       var rsvpId = $(e.target).attr('request-id');
     }
 
+    function declineRsvpRequest(e) {
+      e.preventDefault();
+    }
+
     function events() {
       $inviteOthersBtn.on('click', inviteMusicians);
-      $cancelRsvpBtn.on('click', function(e) {
-        e.preventDefault();
-
-        cancelRsvpRequest(sessionData.rsvpId);
-      });
+      $cancelRsvpBtn.on('click', cancelRsvpRequest);
       $screen.find(".approveRsvpRequest").on('click', approveRsvpRequest);
-      $screen.find(".declineRsvpRequest").on('click', function(e){
-        e.preventDefault();
-        var rsvpId = $(e.target).attr('request-id');
-        cancelRsvpRequest(rsvpId);
-      });
+      $screen.find(".declineRsvpRequest").on('click', declineRsvpRequest);
     }
 
     function loadSessionData() {
@@ -109,7 +107,10 @@
         $cancelRsvpBtn.show();
       }
 
-      var pendingRsvpHtml = generatePendingRsvps();
+      var pendingRsvpHtml = "";
+      if (isOwner) {
+        pendingRsvpHtml = generatePendingRsvps();
+      }
       var sessionRsvpsHtml = generateSessionRsvps();
       var sessionNeededHtml = generateSessionNeeded();
       var sessionInvitedHtml = generateSessionInvited();
@@ -182,15 +183,20 @@
             })
           }
 
-          latencyHtml = context._.template($("#template-account-session-latency"),
-            createLatency(request.user), {variable: 'data'});
+          latencyHtml = context._.template(
+            $("#template-account-session-latency").html(),
+            createLatency(request.user),
+            {variable: 'data'}
+          );
+
+          var avatar_url = context.JK.resolveAvatarUrl(request.user.photo_url);
 
           rsvpHtml = context._.template(
-            $("#template-account-pending-rsvp",
-            {user_id: request.user_id, avatar_url: request.user.avatar_url,
+            $("#template-account-pending-rsvp").html(),
+            {user_id: request.user_id, avatar_url: avatar_url,
               user_name: request.user.name, instruments: instrumentLogoHtml,
               latency: latencyHtml, request_id: request.id},
-            {variable: 'data'})
+            {variable: 'data'}
           );
 
           resultHtml += rsvpHtml;
diff --git a/web/app/assets/javascripts/accounts_session_properties.js b/web/app/assets/javascripts/accounts_session_properties.js
index 3bbf6fd54..d0e0df211 100644
--- a/web/app/assets/javascripts/accounts_session_properties.js
+++ b/web/app/assets/javascripts/accounts_session_properties.js
@@ -317,7 +317,6 @@
     }
 
     function renderSession(data) {
-      console.log(data);
       sessionData = data;
 
       $screen.find('#session-prop-start-date').val(sessionData.scheduled_start_time);
diff --git a/web/app/assets/javascripts/accounts_sessions.js b/web/app/assets/javascripts/accounts_sessions.js
index 672e792db..ed5e15263 100644
--- a/web/app/assets/javascripts/accounts_sessions.js
+++ b/web/app/assets/javascripts/accounts_sessions.js
@@ -21,8 +21,9 @@
 
     function resetForm() {
       // remove all display errors
-      $('#account-sessions-content-scroller form .error-text').remove()
-      $('#account-sessions-content-scroller form .error').removeClass("error")
+      $('#account-sessions-content-scroller form .error-text').remove();
+      $('#account-sessions-content-scroller form .error').removeClass("error");
+      $("#account-scheduled-sessions table tbody").html("");
     }
 
     function cancelSession(e) {
@@ -111,7 +112,8 @@
     this.afterShow = afterShow;
 
     $(document).on("sessionCancelEvent", function() {
-      location.reload();
+      resetForm();
+      renderAccountIdentity();
     });
 
     return this;
diff --git a/web/app/views/clients/_account_session_detail.html.haml b/web/app/views/clients/_account_session_detail.html.haml
index 0d3c195b9..f0a89ac81 100644
--- a/web/app/views/clients/_account_session_detail.html.haml
+++ b/web/app/views/clients/_account_session_detail.html.haml
@@ -88,7 +88,7 @@
         %td
           {{data.latency}}
   .right
-    %a{href: "/client#/profile/{{data.user_id}}", class: 'button-orange left', 'user-id' => "{{data.user_id}}"} PROFILE
+    %a{href: "/client#/profile/{{data.user_id}}", class: 'button-orange left', 'user-id' => "{{data.user_id}}", target: "_blank"} 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