IBCornelsen/online-energieausweis
1
0
Fork 0
Code Issues 272 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Moritz Utcke
2025-04-21 18:18:31 -03:00
parent d7a862e061
commit 64eb0d4e15
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/Dashboard/DashboardAufnahmeModule.svelte
View File

@@ -79,16 +79,21 @@
<DashboardAusweis {benutzer} {ausweis} aufnahme={ausweis.aufnahme} objekt={ausweis.aufnahme.objekt} rechnung={ausweis.rechnung}></DashboardAusweis> <DashboardAusweis {benutzer} {ausweis} aufnahme={ausweis.aufnahme} objekt={ausweis.aufnahme.objekt} rechnung={ausweis.rechnung}></DashboardAusweis>
</div> </div>
<div class="flex ites-center" class:justify-end={page === 0} class:justify-between={page > 0}> <div class="flex items-center justify-between">
{#if page > 0} {#if page > 1}
<a class="p-2 rounded-lg hover:bg-gray-200 cursor-pointer" href="/dashboard/objekte/{page - 1}"> <a class="p-2 rounded-lg hover:bg-gray-200 cursor-pointer" href="/dashboard/objekte/{page - 1}">
<CaretLeft size={24}></CaretLeft> <CaretLeft size={24}></CaretLeft>
</a> </a>
{:else}
<div></div>
{/if} {/if}
<div>{page} / {totalPageCount}</div>
{#if totalPageCount > page} {#if totalPageCount > page}
<a class="p-2 rounded-lg hover:bg-gray-200 cursor-pointer" href="/dashboard/objekte/{page + 1}"> <a class="p-2 rounded-lg hover:bg-gray-200 cursor-pointer" href="/dashboard/objekte/{page + 1}">
<CaretRight size={24}></CaretRight> <CaretRight size={24}></CaretRight>
</a> </a>
{:else}
<div></div>
{/if} {/if}
</div> </div>

13
src/pages/dashboard/objekte/[page].astro
View File

@@ -28,8 +28,8 @@ const totalPageCount = await prisma.aufnahme.count({
: {}, : {},
}); });
if (page < 0 || page > totalPageCount) { if (page < 1 || page > totalPageCount) {
return Astro.redirect("/dashboard/objekte/0"); return Astro.redirect("/dashboard/objekte/1");
} }
let ausweis, 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 "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 "GEGNachweisWohnen" WHERE benutzer_id = ${user.id} UNION ALL
SELECT id, updated_at FROM "GEGNachweisGewerbe" WHERE benutzer_id = ${user.id} 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 { } else {
if (id) { 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 "BedarfsausweisGewerbe" UNION ALL
SELECT id, updated_at FROM "GEGNachweisWohnen" UNION ALL SELECT id, updated_at FROM "GEGNachweisWohnen" UNION ALL
SELECT id, updated_at FROM "GEGNachweisGewerbe" 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")
}
--- ---
<UserLayout title="Objekte" {user}> <UserLayout title="Objekte" {user}>