* VRFS-1876 - added details to the sesison info page

This commit is contained in:
Seth Call 2014-07-11 22:22:15 -05:00
parent 32baa4ad7d
commit b7683a1931
5 changed files with 30 additions and 7 deletions

View File

@ -15,7 +15,9 @@
var $screen = null;
var $cancelRsvpBtn = null;
var $inviteOthersBtn = null;
var $sessionPageBtn = null;
var $sessionDetail = null;
var $shareUrl = null;
var $templateOpenSlots = null;
var instrument_logo_map = context.JK.getInstrumentIconMap24();
var invitationDialog = null;
@ -57,6 +59,12 @@
});
}
function openSessionPage(e) {
context.JK.popExternalLink('/sessions/' + sessionId + '/details')
return false;
}
function buildRsvpRequestActionParams(request_id, action) {
var params = {};
@ -109,6 +117,7 @@
function events() {
$inviteOthersBtn.on('click', inviteMusicians);
$cancelRsvpBtn.on('click', cancelRsvpRequest);
$sessionPageBtn.on('click', openSessionPage);
$screen.find(".approveRsvpRequest").on('click', approveRsvpRequest);
$screen.find(".declineRsvpRequest").on('click', declineRsvpRequest);
@ -175,6 +184,8 @@
$cancelRsvpBtn.show();
}
$shareUrl.text(sessionData.share_url);
var pendingRsvpHtml = "";
if (isOwner) {
pendingRsvpHtml = generatePendingRsvps();
@ -376,10 +387,11 @@
app.bindScreen('account/sessionDetail', screenBindings);
$screen = $(".account-session-detail");
$inviteOthersBtn = $screen.find("#invite-others");
$cancelRsvpBtn = $screen.find("#cancel-rsvp");
$inviteOthersBtn.hide(); $cancelRsvpBtn.hide();
$inviteOthersBtn = $screen.find(".sessions-header .invite-others");
$cancelRsvpBtn = $screen.find(".sessions-header .cancel-rsvp");
$sessionPageBtn = $screen.find(".sessions-header .session-detail-page");
$sessionDetail = $screen.find("#account-session-detail-div");
$shareUrl = $screen.find('.share-url');
invitationDialog = invitationDlg;
$templateOpenSlots = $('#template-open-slots');
}

View File

@ -42,6 +42,11 @@
window.location = '/client#/account/sessionDetail/' + session_id;
}
function openSessionPage(e) {
context.JK.popExternalLink('/sessions/' + $(this).attr('session-id') + '/details')
return false;
}
function events() {
}
@ -49,6 +54,7 @@
$("#account-scheduled-sessions table tbody").replaceWith(template);
$sessions.find(".session-cancel-button").on('click', cancelSession);
$sessions.find(".session-detail-button").on('click', detailSession);
$sessions.find(".session-page-button").on('click', openSessionPage)
}
function populateSessions(sessionList) {

View File

@ -14,8 +14,9 @@
.left.sessions-caption
%h2 session details:
.right
%a.button-orange{href: "#", id: 'cancel-rsvp'} CANCEL RSVP
%a.button-orange{href: "#", id: 'invite-others'} INVITE OTHERS
%a.cancel-rsvp.button-orange{href: "#"} CANCEL RSVP
%a.session-detail-page.button-orange{href: "#", rel:'external'} SESSION PAGE
%a.invite-others.button-orange{href: "#"} INVITE OTHERS
.clearall
#account-session-detail-div
@ -143,9 +144,12 @@
.clearall.session-properties-left Access:
.session-properties-right
{{data.musician_access_description}} {{data.fan_access_description}}
.clearall.session-properties-left Legal
.clearall.session-properties-left Legal:
.session-properties-right
{{data.legal_policy}}
.clearall.session-properties-left Session URL:
.session-properties-right
{{data.share_url}}
.clearall

View File

@ -45,6 +45,7 @@
.session-left
.session-right
%a.button-orange.session-detail-button{href: '#', 'session-id' => "{{session.id}}"} DETAILS
%a.button-orange.session-page-button{href: '#', 'session-id' => "{{session.id}}", rel: 'external'} SESSION PAGE
= "{% if (data.current_user == session.user_id) { %}"
%a.button-orange.session-cancel-button{href: '#', 'session-id' => "{{session.id}}"} CANCEL SESSION
= "{% } %}"

View File

@ -30,7 +30,7 @@ describe "Session Detail", :js => true, :type => :feature, :capybara_feature =>
it "view pending requests on music session searcher side" do
fast_signin(searcher, Nav.session_detail(requested_rsvp_slot.music_session))
find('a#cancel-rsvp.button-orange')
find('.sessions-header a.cancel-rsvp.button-orange')
find('h2', text: 'RSVPs')
find('div.rsvp-help-notice', text: 'Your RSVP has not been processed by session organizer yet')
end