Fix page count

This commit is contained in:
Romein van Buren 2022-07-18 11:51:14 +02:00
parent cf4165ec96
commit 1fe7596962
Signed by: romein
GPG Key ID: 0EFF8478ADDF6C49

View File

@ -10,7 +10,6 @@
let placesLeft = size; let placesLeft = size;
let pageNum = -1; let pageNum = -1;
let pageCount = 1; let pageCount = 1;
let pageCountFreePlaces = 1;
let tiles = []; let tiles = [];
let time = ''; let time = '';
let globalData = {}; let globalData = {};
@ -50,12 +49,12 @@
servicesTemp = servicesDown.slice(0, size); servicesTemp = servicesDown.slice(0, size);
pageCount = Math.ceil(upOrUnknown.length / size); pageCount = Math.ceil(upOrUnknown.length / size);
placesLeft = size - servicesTemp.length; placesLeft = size - servicesTemp.length;
pageCountFreePlaces = Math.ceil(upOrUnknown.length / placesLeft); pageCount = Math.ceil(upOrUnknown.length / placesLeft);
if (pageNum === -1 || total >= size) { if (pageNum === -1 || total >= size) {
pageNum++; pageNum++;
if (pageNum > pageCount) { if (pageNum >= pageCount) {
pageNum = 0; pageNum = 0;
} }
} }
@ -132,9 +131,12 @@
<div class="footer"> <div class="footer">
<div class="time">{time}</div> <div class="time">{time}</div>
{#if pageCountFreePlaces > 1} {#if pageCount > 1}
<div>
{pageNum + 1}/{pageCount}
</div>
<div class="pagination"> <div class="pagination">
{#each Array(pageCountFreePlaces).fill('') as _, i} {#each Array(pageCount).fill('') as _, i}
<em class:active={pageNum === i}></em> <em class:active={pageNum === i}></em>
{/each} {/each}
</div> </div>
@ -190,6 +192,7 @@
justify-content: space-between; justify-content: space-between;
height: 50px; height: 50px;
font-size: 1.2em; font-size: 1.2em;
align-items: flex-end;
} }
.pagination em { .pagination em {