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

Merge branch 'wkuijltjes/fixtimer' into 'marietje-zuid'

Browse Source 
Fix dynamic times that should be static and vice versa if logged in user has queued

Closes #66

See merge request technicie/MarietjeDjango!94
This commit is contained in:
Kees van Kempen
2024-04-23 17:44:22 +02:00
parent 6901d913c0 2b2e0a0275
commit 82dc7c0193
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
marietje/queues/templates/queues/queue.html
View File

@ -367,7 +367,9 @@
const current_song = this.queue[i];
if (i === 0) {
const current_song_remaining_seconds = current_song.song.duration - this.queue[1].time_until_song_seconds;
infoBar['length_personal_queue'] -= current_song_remaining_seconds;
if (current_song.user !== null && current_song.user.id === this.user_data.id) {
infoBar['length_personal_queue'] -= current_song_remaining_seconds;
}
infoBar['length_total_queue'] -= current_song_remaining_seconds;
}
infoBar['length_total_queue'] += current_song.song.duration;
@ -375,7 +377,7 @@
infoBar['length_personal_queue'] += current_song.song.duration;
infoBar['end_personal_queue'] = infoBar['length_total_queue'];
if (infoBar['start_personal_queue'] === null) {
infoBar['start_personal_queue'] = infoBar['length_total_queue'] - current_song.song.duration - this.queue[1].time_until_song_seconds;
infoBar['start_personal_queue'] = infoBar['length_total_queue'] - current_song.song.duration;
}
}
}