From 64eb0d4e157f9292d11e6fa031e1cf839f36957c Mon Sep 17 00:00:00 2001 From: Moritz Utcke Date: Mon, 21 Apr 2025 18:18:31 -0300 Subject: [PATCH] Fix --- .../Dashboard/DashboardAufnahmeModule.svelte | 9 +++++++-- src/pages/dashboard/objekte/[page].astro | 13 +++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/modules/Dashboard/DashboardAufnahmeModule.svelte b/src/modules/Dashboard/DashboardAufnahmeModule.svelte index bd150294..85421106 100644 --- a/src/modules/Dashboard/DashboardAufnahmeModule.svelte +++ b/src/modules/Dashboard/DashboardAufnahmeModule.svelte @@ -79,16 +79,21 @@ -
0}> - {#if page > 0} +
+ {#if page > 1} + {:else} +
{/if} +
{page} / {totalPageCount}
{#if totalPageCount > page} + {:else} +
{/if}
diff --git a/src/pages/dashboard/objekte/[page].astro b/src/pages/dashboard/objekte/[page].astro index 918c354e..a376ab08 100644 --- a/src/pages/dashboard/objekte/[page].astro +++ b/src/pages/dashboard/objekte/[page].astro @@ -28,8 +28,8 @@ const totalPageCount = await prisma.aufnahme.count({ : {}, }); -if (page < 0 || page > totalPageCount) { - return Astro.redirect("/dashboard/objekte/0"); +if (page < 1 || page > totalPageCount) { + return Astro.redirect("/dashboard/objekte/1"); } let ausweis, @@ -63,7 +63,7 @@ if (user.rolle === Enums.BenutzerRolle.USER) { SELECT id, updated_at FROM "BedarfsausweisGewerbe" WHERE benutzer_id = ${user.id} UNION ALL SELECT id, updated_at FROM "GEGNachweisWohnen" WHERE benutzer_id = ${user.id} UNION ALL SELECT id, updated_at FROM "GEGNachweisGewerbe" WHERE benutzer_id = ${user.id} - ORDER BY updated_at DESC LIMIT 1 OFFSET ${page}`; + ORDER BY updated_at DESC LIMIT 1 OFFSET ${page - 1}`; } } else { if (id) { @@ -91,7 +91,7 @@ if (user.rolle === Enums.BenutzerRolle.USER) { SELECT id, updated_at FROM "BedarfsausweisGewerbe" UNION ALL SELECT id, updated_at FROM "GEGNachweisWohnen" UNION ALL SELECT id, updated_at FROM "GEGNachweisGewerbe" - ORDER BY updated_at DESC LIMIT 1 OFFSET ${page}`; + ORDER BY updated_at DESC LIMIT 1 OFFSET ${page - 1}`; } } @@ -114,6 +114,11 @@ if (result.length > 0) { }, }); } + +if (!ausweis) { + return Astro.redirect("/dashboard/objekte/1") +} + ---