seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

VRFS-1985 VRFS-2252 only show start button for RSVP / invited user if there is less than 15 minutes left to sesession start time

This commit is contained in:
Brian Smith 2015-01-09 03:08:03 -05:00
parent 9643fe1187
commit aeabfcafc8
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
web/app/assets/javascripts/sessionList.js
View File

@ -19,6 +19,7 @@
var $musicianTemplate = $('#template-musician-info');
var showJoinLink = true;
var showListenLink = true;
var MAX_MINUTES_SHOW_START = 15;
// related to listen
function stateChange(e, data) {
@ -360,6 +361,13 @@
var noLinkText = '';
$('.rsvp-link-text', $parentRow).hide();
function showStartSessionButton(scheduledStart) {
var now = new Date();
var scheduledDate = new Date(scheduledStart);
var minutesFromStart = (scheduledDate.getTime() - now.getTime()) / (1000 * 60);
return minutesFromStart <= MAX_MINUTES_SHOW_START;
};
if (session.creator.id === context.JK.currentUserId) {
showRsvpLink = false;
noLinkText = $('<span class="text"><a href="#" style="color: #fc0">Start session now?</a></span>');
@ -370,13 +378,17 @@
}
else if (approvedRsvpId) {
showRsvpLink = false;
noLinkText = $('<span class="text"><a class="start" style="color: #fc0">Start session now?</a>&nbsp;|&nbsp;<a class="cancel" style="color: #fc0">Cancel RSVP</a></span>');
// wire start link
noLinkText.find('a.start').click(function() {
ui.launchSessionStartDialog(session);
return false;
});
if (showStartSessionButton(session.scheduled_start)) {
noLinkText = $('<span class="text"><a class="start" style="color: #fc0">Start session now?</a>&nbsp;|&nbsp;<a class="cancel" style="color: #fc0">Cancel RSVP</a></span>');
noLinkText.find('a.start').click(function() {
ui.launchSessionStartDialog(session);
return false;
});
}
else {
noLinkText = $('<span class="text"><a class="cancel" style="color: #fc0">Cancel RSVP</a></span>');
}
// wire cancel link
noLinkText.find('a.cancel').click(function() {
@ -395,11 +407,14 @@
}
else if (hasInvitation) {
showRsvpLink = false;
noLinkText = $('<span class="text"><a href="#" style="color: #fc0">Start session now?</a></span>');
noLinkText.find('a').click(function() {
ui.launchSessionStartDialog(session);
return false;
});
if (showStartSessionButton(session.scheduled_start)) {
noLinkText = $('<span class="text"><a href="#" style="color: #fc0">Start session now?</a></span>');
noLinkText.find('a').click(function() {
ui.launchSessionStartDialog(session);
return false;
});
}
}
else if (pendingRsvpId) {
showRsvpLink = false;

2
web/app/views/dialogs/_sessionStartDialog.html.slim
View File

@ -25,7 +25,7 @@
h3.mt20 What instruments/parts do you need?
.left.ib.w20.mt5 Me:
#session-instruments-me-disp.left.ib.w75.mt5
.clearall.left.ib.w20 Others:
.clearall.left.ib.w20.mt5 Others:
#session-instruments-rsvp-disp.left.ib.w75.mt5
br clear='all'