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-1669 find session wip

This commit is contained in:
Brian Smith 2014-06-19 00:44:37 -04:00
parent b4151c27e9
commit 8baebfd105
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web/app/assets/javascripts/findSession.js
View File

@ -276,14 +276,11 @@
function renderSession(sessionId) {
// store session in the appropriate bucket and increment category counts
var session = sessions[sessionId];
if (containsInvitation(session)) {
activeSessionGroup[sessionId] = session;
sessionCounts[CATEGORY.ACTIVE.index]++;
}
else if (containsFriend(session)) {
scheduledSessionGroup[sessionId] = session;
sessionCounts[CATEGORY.SCHEDULED.index]++;
}
activeSessionGroup[sessionId] = session;
sessionCounts[CATEGORY.ACTIVE.index]++;
scheduledSessionGroup[sessionId] = session;
sessionCounts[CATEGORY.SCHEDULED.index]++;
// hack to prevent duplicate rows from being rendered when filtering
var sessionAlreadyRendered = false;

6
web/app/views/api_music_sessions/show_history.rabl
View File

@ -87,7 +87,11 @@ else
}
child({:open_slots => :open_slots}) {
attributes :id, :instrument_id, :proficiency_level, :proficiency_desc :music_session_id
attributes :id, :instrument_id, :proficiency_level, :proficiency_desc
}
child({:pending_invitations => :pending_invitations}) {
attributes :id, :email, :photo_url
}
child(:active_music_session => :active_music_session) {

2
web/app/views/clients/_sessionList.html.erb
View File

@ -6,7 +6,7 @@
<th align="left" width="20%">MUSICIANS</th>
<th width="60" style="text-align:center">LATENCY</th>
<th align="left" width="15%">POLICIES</th>
<th class="noborder" width="30" style="text-align:center">JOIN</th>
<th id="actionHeader" class="noborder" width="30" style="text-align:center">JOIN</th>
</tr>
<!-- session row goes here -->
</table>