technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2025-12-15 09:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Visually separate regular and Marietje's queue

Browse Source 
Original commit message:
Arrows and marietje part of queue updates
This commit is contained in:
oslomp
2019-01-11 13:11:25 +01:00
committed by Daan Sprenkels
parent d1bf9a1b90
commit 585485b130
5 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
marietje/marietje/static/css/custom.css
View File

@ -21,3 +21,11 @@
footer {
text-align: center;
}
.marietjequeue {
color: #777777;
}
.marietjequeue-start {
border-top: 4px double #777777;
}

37
marietje/marietje/static/js/queue.js
View File

@ -194,27 +194,56 @@ function renderQueue(playNextAt, now)
{
$('.queuebody').empty();
var timeToPlay = playNextAt - now;
var canDeletePrevious = false;
$.each(queue, function (id, song) {
var requestedBy = song.requested_by;
var reqMarietje = requestedBy != 'Marietje';
var startMarietje = false
//checks if id is the last item and returns false if the next song is Marietje, while the current song is not.
if(id === queue.length-1){
var requestNext = false
} else {
var requestNext = !((queue[id+1].requested_by === 'Marietje') && (requestedBy !== 'Marietje'))
}
//checks if id is the first item and returns false if the previous song is not Marietje, while the current song is.
if(id === 0){
var requestPrev = false
} else {
var prevItem = queue[id-1].id
if(queue[id-1].requested_by !== 'Marietje'){
var requestPrev = false
if (requestedBy == 'Marietje'){
var startMarietje = true
} else {
var requestPrev = true
}
} else {var requestPrev = true}
}
var canDelete = song.can_move_down || canMoveSongs;
var canMoveDown = canDelete && id < queue.length - 1;
var canMoveUp = canMoveSongs && requestPrev || canDeletePrevious && reqMarietje && requestPrev;
var canMoveDown = canMoveSongs && requestNext || canDelete && reqMarietje && requestNext;
var artist = song.song.artist.trim() === '' ? '?' : song.song.artist;
var title = song.song.title.trim() === '' ? '?' : song.song.title;
var marietjeclass = reqMarietje ? '' : ' class="marietjequeue"';
var marietjestartclass = startMarietje ? ' class="marietjequeue marietjequeue-start"' : '';
showTime = showTimeToPlay ? (timeToPlay < 0 ? '' : timeToPlay.secondsToMMSS()) : (playNextAt < now ? '' : playNextAt.timestampToHHMMSS())
$('.queuebody:last-child').append('<tr><td class="artist">' + artist
$('.queuebody:last-child').append('<tr' + marietjestartclass + marietjeclass + '>' + '<td class="artist">' + artist
+ '</td><td class="title">' + title + '</td><td class="hidden-xs requested-by">' + requestedBy
+ '</td><td class="hidden-xs plays-at" style="text-align: right;">' + showTime
+ '</td><td>' + '<a href="#" class="glyphicon glyphicon-arrow-up'
+ (canMoveSongs && id !== 0 ? '' : ' invisible')
+ '" onclick="return moveUp(' + song.id
+ (canMoveUp && id !== 0 ? '' : ' invisible')
+ '" onclick=" return moveDown(' + prevItem
+ ')"></a>&nbsp;&nbsp;&nbsp;&nbsp;<a href="#" class="glyphicon glyphicon-arrow-down'
+ (canMoveDown ? '' : ' invisible') + '" onclick="return moveDown('
+ song.id + ')"></a>&nbsp;&nbsp;&nbsp;&nbsp;<a href="#" class="glyphicon glyphicon-trash'
+ (canDelete ? '' : ' invisible') + '" onclick="return cancelSong('
+ song.id + ')"></a></td></tr>');
timeToPlay += parseInt(song.song.duration);
canDeletePrevious = canDelete
if(playNextAt >= now)
{
playNextAt += parseInt(song.song.duration);