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

Compare commits

base: technicie:marietje-zuid
Branches Tags
technicie:marietje-zuid technicie:feature/marietje-4.1-in-header technicie:feature/log-api-endpoints technicie:fix/poetry-install technicie:feature/player-endpoints technicie:feature/docker-build technicie:fix/sort-title-artist technicie:tosti-information technicie:oslomp/quickfix_artists technicie:oslomp/artists technicie:search
...
compare: technicie:c38aba047c6ffeac4e9c1484269be69a5ec072d4
Branches Tags
technicie:marietje-zuid technicie:feature/marietje-4.1-in-header technicie:feature/log-api-endpoints technicie:fix/poetry-install technicie:feature/player-endpoints technicie:feature/docker-build technicie:fix/sort-title-artist technicie:tosti-information technicie:oslomp/quickfix_artists technicie:oslomp/artists technicie:search

5 Commits
marietje-z ... c38aba047c

Author SHA1 Message Date
William Kuijltjes
c38aba047c Merge branch 'wkuijltjes/playsinat' into 'marietje-zuid' 
Fix toggling of Plays In/Plays At in mobile view

Closes #86

See merge request technicie/MarietjeDjango!93
 2024-04-23 18:12:25 +02:00
Kees van Kempen
82dc7c0193 Merge branch 'wkuijltjes/fixtimer' into 'marietje-zuid' 
Fix dynamic times that should be static and vice versa if logged in user has queued

Closes #66

See merge request technicie/MarietjeDjango!94
 2024-04-23 17:44:22 +02:00
Kees van Kempen
6901d913c0 Merge branch 'wkuijltjes/aesthetics' into 'marietje-zuid' 
Brush up some details: reduce breakpoints on small screens, Requested by --> Requested By

See merge request technicie/MarietjeDjango!95
 2024-04-23 17:31:35 +02:00
William Kuijltjes
0f85727c5d Brush up some details: reduce breakpoints on small screens, Requested by --> Requested By 2024-03-18 18:02:25 +01:00
William Kuijltjes
2b2e0a0275 Fix dynamic times that should be static and vice versa if logged in user has queued 2024-03-18 16:51:34 +01:00
1 changed files with 9 additions and 5 deletions
Expand all files Collapse all files

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

@ -58,14 +58,16 @@
</p> </p>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<p class="navbar-text mb-0 duration-queue" v-bind:class="{danger: infobar.length_personal_queue > infobar.max_length * 60}">(${ infobar.length_personal_queue.secondsToMMSS() }$)</p> <p class="navbar-text mb-0 duration-queue" v-bind:class="{danger: infobar.length_personal_queue > infobar.max_length * 60}">
(${ infobar.length_personal_queue.secondsToMMSS() }$)
</p>
</li> </li>
</template> </template>
</ul> </ul>
</div> </div>
</nav> </nav>
<div class="container-lg"> <div class="container-lg">
<br><br> <div class="d-none d-lg-block"><br></div>
<div class="alert-location"> <div class="alert-location">
</div> </div>
<div class="tab-content"> <div class="tab-content">
@ -99,7 +101,7 @@
<td> <td>
<span class="artist">${ song.song.artist }$</span> <span class="artist">${ song.song.artist }$</span>
<span v-if="show_details(song)" class="requested-by d-sm-none d-block small mt-3 fw-normal"> <span v-if="show_details(song)" class="requested-by d-sm-none d-block small mt-3 fw-normal">
Requested by:<br> Requested By:<br>
<template v-if="song.user === null"> <template v-if="song.user === null">
Marietje Marietje
</template> </template>
@ -365,7 +367,9 @@
const current_song = this.queue[i]; const current_song = this.queue[i];
if (i === 0) { if (i === 0) {
const current_song_remaining_seconds = current_song.song.duration - this.queue[1].time_until_song_seconds; 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_remaining_seconds;
} }
infoBar['length_total_queue'] += current_song.song.duration; infoBar['length_total_queue'] += current_song.song.duration;
@ -373,7 +377,7 @@
infoBar['length_personal_queue'] += current_song.song.duration; infoBar['length_personal_queue'] += current_song.song.duration;
infoBar['end_personal_queue'] = infoBar['length_total_queue']; infoBar['end_personal_queue'] = infoBar['length_total_queue'];
if (infoBar['start_personal_queue'] === null) { 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;
} }
} }
} }