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

Marietje-queue changes

Browse Source
This commit is contained in:
oslomp
2018-12-21 12:44:17 +01:00
parent 3319732775
commit 31efdd97f4
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -196,7 +196,8 @@ function renderQueue(playNextAt, now)
var canDeletePrevious = false; var canDeletePrevious = false;
$.each(queue, function (id, song) { $.each(queue, function (id, song) {
var requestedBy = song.requested_by; var requestedBy = song.requested_by;
var requestCurr = requestedBy != 'Marietje'; 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. //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){ if(id === queue.length-1){
@ -208,20 +209,28 @@ function renderQueue(playNextAt, now)
if(id === 0){ if(id === 0){
var requestPrev = false var requestPrev = false
} else { } else {
var requestPrev = !((queue[id-1].requested_by !== 'Marietje') && (requestedBy === 'Marietje'))
var prevItem = queue[id-1].id 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 canDelete = song.can_move_down || canMoveSongs;
var canMoveUp = canMoveSongs && requestPrev || canDeletePrevious && requestCurr && requestPrev; var canMoveUp = canMoveSongs && requestPrev || canDeletePrevious && reqMarietje && requestPrev;
var canMoveDown = canMoveSongs && requestNext || canDelete && requestCurr && requestNext; var canMoveDown = canMoveSongs && requestNext || canDelete && reqMarietje && requestNext;
var artist = song.song.artist.trim() === '' ? '?' : song.song.artist; var artist = song.song.artist.trim() === '' ? '?' : song.song.artist;
var title = song.song.title.trim() === '' ? '?' : song.song.title; var title = song.song.title.trim() === '' ? '?' : song.song.title;
var marietjeclass = reqMarietje ? '' : ' class="marietjequeue"';
var marietjestartclass = startMarietje ? ' class="marietjequeuestart"' : '';
showTime = showTimeToPlay ? (timeToPlay < 0 ? '' : timeToPlay.secondsToMMSS()) : (playNextAt < now ? '' : playNextAt.timestampToHHMMSS()) 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="title">' + title + '</td><td class="hidden-xs requested-by">' + requestedBy
+ '</td><td class="hidden-xs plays-at" style="text-align: right;">' + showTime + '</td><td class="hidden-xs plays-at" style="text-align: right;">' + showTime
+ '</td><td>' + '<a href="#" class="glyphicon glyphicon-arrow-up' + '</td><td>' + '<a href="#" class="glyphicon glyphicon-arrow-up'