feat(runners): Created_via filters can now be set via query params

This commit is contained in:
Nicolai Ort 2025-05-01 19:38:41 +02:00
parent c78bdfa5e2
commit 14501d3828
Signed by: niggl
GPG Key ID: 13AFA55AF62F269F
3 changed files with 326 additions and 321 deletions

View File

@ -126,8 +126,8 @@
<Route path="/:trackid" let:params /> <Route path="/:trackid" let:params />
</Route> </Route>
<Route path="/runners/*"> <Route path="/runners/*">
<Route path="/"> <Route path="/" let:meta>
<Runners created_via="all" /> <Runners created_via={meta.query.created_via} />
</Route> </Route>
<Route path="/:runnerid" let:params> <Route path="/:runnerid" let:params>
<RunnerDetail {params} /> <RunnerDetail {params} />

View File

@ -220,7 +220,7 @@
<StatCard <StatCard
title={$_("runner_via_selfservice")} title={$_("runner_via_selfservice")}
value={stats.runnersViaSelfservice} value={stats.runnersViaSelfservice}
href="/runners/" href="/runners/?created_via=selfservice"
> >
<svg <svg
height="24" height="24"
@ -237,7 +237,7 @@
<StatCard <StatCard
title={$_('runners_via_kiosk')} title={$_('runners_via_kiosk')}
value={stats.runnersViaKiosk} value={stats.runnersViaKiosk}
href="/runners/" href="/runners/?created_via=kiosk"
> >
<svg <svg
height="24" height="24"

View File

@ -1,337 +1,342 @@
<script> <script>
import { import {
RunnerOrganizationService, RunnerOrganizationService,
RunnerService, RunnerService,
RunnerTeamService, RunnerTeamService,
} from "@odit/lfk-client-js"; } from "@odit/lfk-client-js";
import { import {
createSvelteTable, createSvelteTable,
flexRender, flexRender,
getCoreRowModel, getCoreRowModel,
getFilteredRowModel, getFilteredRowModel,
getPaginationRowModel, getPaginationRowModel,
getSortedRowModel, getSortedRowModel,
renderComponent, renderComponent,
} from "@tanstack/svelte-table"; } from "@tanstack/svelte-table";
import { onMount } from "svelte"; import { onMount } from "svelte";
import { writable } from "svelte/store"; import { writable } from "svelte/store";
import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte"; import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte";
import GenerateRunnerCertificates from "../pdf_generation/GenerateRunnerCertificates.svelte"; import GenerateRunnerCertificates from "../pdf_generation/GenerateRunnerCertificates.svelte";
import GenerateSponsoringContracts from "../pdf_generation/GenerateSponsoringContracts.svelte"; import GenerateSponsoringContracts from "../pdf_generation/GenerateSponsoringContracts.svelte";
import InputElement from "../shared/InputElement.svelte"; import InputElement from "../shared/InputElement.svelte";
import TableActions from "../shared/TableActions.svelte"; import TableActions from "../shared/TableActions.svelte";
import { groupFilter } from "../shared/tablefilters"; import { groupFilter } from "../shared/tablefilters";
import DeleteRunnerModal from "./DeleteRunnerModal.svelte"; import DeleteRunnerModal from "./DeleteRunnerModal.svelte";
import TableBottom from "../shared/TableBottom.svelte"; import TableBottom from "../shared/TableBottom.svelte";
import TableHeader from "../shared/TableHeader.svelte"; import TableHeader from "../shared/TableHeader.svelte";
$: selectedRunners = $: selectedRunners =
$table?.getSelectedRowModel().rows.map((row) => row.original) || []; $table?.getSelectedRowModel().rows.map((row) => row.original) || [];
$: selected = $: selected =
$table?.getSelectedRowModel().rows.map((row) => row.index) || []; $table?.getSelectedRowModel().rows.map((row) => row.index) || [];
$: active_delete = undefined; $: active_delete = undefined;
let dataLoaded = false; let dataLoaded = false;
export let created_via = "all"; export let created_via = "all";
export let current_runners = []; export let current_runners = [];
$: sponsoring_contracts_show = selected.length > 0; $: sponsoring_contracts_show = selected.length > 0;
$: cards_show = selected.length > 0; $: cards_show = selected.length > 0;
$: certificates_show = selected.length > 0; $: certificates_show = selected.length > 0;
$: teams = []; $: teams = [];
$: orgs = []; $: orgs = [];
export const addRunners = (runners) => { export const addRunners = (runners) => {
current_runners = current_runners.concat(...runners); current_runners = current_runners.concat(...runners);
options.update((options) => ({ options.update((options) => ({
...options, ...options,
data: current_runners, data: current_runners,
})); }));
}; };
//Section table //Section table
const columns = [ const columns = [
{ {
accessorKey: "id", accessorKey: "id",
header: () => "id", header: () => "id",
filterFn: `equalsString`, filterFn: `equalsString`,
}, },
{ {
accessorKey: "firstname", accessorKey: "firstname",
header: () => $_("first-name"), header: () => $_("first-name"),
filterFn: `includesString`, filterFn: `includesString`,
}, },
{ {
accessorKey: "middlename", accessorKey: "middlename",
header: () => $_("middle-name"), header: () => $_("middle-name"),
cell: (info) => { cell: (info) => {
if (!info || !info.getValue()) { if (!info || !info.getValue()) {
return ""; return "";
} }
return info.getValue(); return info.getValue();
}, },
filterFn: `includesString`, filterFn: `includesString`,
}, },
{ {
accessorKey: "lastname", accessorKey: "lastname",
header: () => $_("last-name"), header: () => $_("last-name"),
filterFn: `includesString`, filterFn: `includesString`,
}, },
{ {
accessorKey: "created_via", accessorKey: "created_via",
header: () => "created_via", header: () => "created_via",
filterFn: `includesString`, filterFn: `includesString`,
}, },
{ {
accessorKey: "group", accessorKey: "group",
header: () => $_("group"), header: () => $_("group"),
cell: (info) => { cell: (info) => {
const group = info.getValue(); const group = info.getValue();
if (group.responseType === "RUNNERORGANIZATION") { if (group.responseType === "RUNNERORGANIZATION") {
return group.name; return group.name;
} }
return `${group.parentGroup.name} > ${group.name}`; return `${group.parentGroup.name} > ${group.name}`;
}, },
filterFn: `group`, filterFn: `group`,
sortingFn: (rowA, rowB, col) => { sortingFn: (rowA, rowB, col) => {
return rowA.original.group.name.localeCompare(rowB.original.group.name); return rowA.original.group.name.localeCompare(rowB.original.group.name);
}, },
}, },
{ {
accessorKey: "distance", accessorKey: "distance",
header: () => $_("distance"), header: () => $_("distance"),
sortingFn: (rowA, rowB, col) => { sortingFn: (rowA, rowB, col) => {
return rowA.original.distance > rowB.original.distance; return rowA.original.distance > rowB.original.distance;
}, },
cell: (info) => { cell: (info) => {
if (info.getValue() < 1000) { if (info.getValue() < 1000) {
return `${info.getValue()} m`; return `${info.getValue()} m`;
} }
return `${(info.getValue() / 1000).toFixed(1)} km`; return `${(info.getValue() / 1000).toFixed(1)} km`;
}, },
enableColumnFilter: false, enableColumnFilter: false,
}, },
{ {
accessorKey: "actions", accessorKey: "actions",
header: () => $_("action"), header: () => $_("action"),
cell: (info) => { cell: (info) => {
return renderComponent(TableActions, { return renderComponent(TableActions, {
detailsLink: `/runners/${info.row.original.id}`, detailsLink: `/runners/${info.row.original.id}`,
deleteAction: () => { deleteAction: () => {
active_delete = active_delete =
current_runners[ current_runners[
current_runners.findIndex((r) => r.id == info.row.original.id) current_runners.findIndex((r) => r.id == info.row.original.id)
]; ];
}, },
deleteEnabled: deleteEnabled:
store.state.jwtinfo.userdetails.permissions.includes( store.state.jwtinfo.userdetails.permissions.includes(
"RUNNER:DELETE" "RUNNER:DELETE"
), ),
}); });
}, },
enableColumnFilter: false, enableColumnFilter: false,
enableSorting: false, enableSorting: false,
}, },
]; ];
const options = writable({ const options = writable({
data: [], data: [],
columns: columns, columns: columns,
filterFns: { filterFns: {
group: groupFilter, group: groupFilter,
}, },
initialState: { initialState: {
pagination: { pagination: {
pageSize: 50, pageSize: 50,
}, },
}, },
enableRowSelection: true, enableRowSelection: true,
getCoreRowModel: getCoreRowModel(), getCoreRowModel: getCoreRowModel(),
getFilteredRowModel: getFilteredRowModel(), getFilteredRowModel: getFilteredRowModel(),
getPaginationRowModel: getPaginationRowModel(), getPaginationRowModel: getPaginationRowModel(),
getSortedRowModel: getSortedRowModel(), getSortedRowModel: getSortedRowModel(),
}); });
const table = createSvelteTable(options); const table = createSvelteTable(options);
async function deleteRunner(delete_runner_id) { async function deleteRunner(delete_runner_id) {
await RunnerService.runnerControllerRemove(delete_runner_id, true); await RunnerService.runnerControllerRemove(delete_runner_id, true);
current_runners = current_runners.filter((r) => r.id !== delete_runner_id); current_runners = current_runners.filter((r) => r.id !== delete_runner_id);
options.update((options) => ({ options.update((options) => ({
...options, ...options,
data: current_runners, data: current_runners,
})); }));
toast.success($_("runner-deleted")); toast.success($_("runner-deleted"));
} }
onMount(async () => { onMount(async () => {
RunnerTeamService.runnerTeamControllerGetAll().then((val) => { RunnerTeamService.runnerTeamControllerGetAll().then((val) => {
teams = val; teams = val;
}); });
RunnerOrganizationService.runnerOrganizationControllerGetAll().then( RunnerOrganizationService.runnerOrganizationControllerGetAll().then(
(val) => { (val) => {
orgs = val; orgs = val;
} }
); );
let page = 0; let page = 0;
while (page >= 0) { while (page >= 0) {
const runners = await RunnerService.runnerControllerGetAll( const runners = await RunnerService.runnerControllerGetAll(
page, page,
500, 500,
created_via );
); if (runners.length == 0) {
if (runners.length == 0) { page = -2;
page = -2; }
}
current_runners = current_runners.concat(...runners); current_runners = current_runners.concat(...runners);
options.update((options) => ({ options.update((options) => ({
...options, ...options,
data: current_runners, data: current_runners,
})); }));
dataLoaded = true; dataLoaded = true;
page++; page++;
} }
}); });
import { _ } from "svelte-i18n"; import { _ } from "svelte-i18n";
import store from "../../store"; import store from "../../store";
import AddRunnerModal from "./AddRunnerModal.svelte"; import AddRunnerModal from "./AddRunnerModal.svelte";
import ImportRunnerModal from "./ImportRunnerModal.svelte"; import ImportRunnerModal from "./ImportRunnerModal.svelte";
import toast from "svelte-french-toast"; import toast from "svelte-french-toast";
$: current_runners = []; $: current_runners = [];
export let modal_open = false; export let modal_open = false;
export let import_modal_open = false; export let import_modal_open = false;
if (created_via != "all") {
$table.setColumnFilters([
{
id: "created_via",
value: created_via,
},
]);
}
</script> </script>
<section class="container p-5"> <section class="container p-5">
<h4 class="mb-1 text-3xl font-extrabold leading-tight"> <h4 class="mb-1 text-3xl font-extrabold leading-tight">
{$_("runners")} {$_("runners")}
</h4> </h4>
{#if created_via !== "all"} {#if store.state.jwtinfo.userdetails.permissions.includes("RUNNER:CREATE")}
<p>created_via={created_via}</p> <button
{/if} on:click={() => {
{#if store.state.jwtinfo.userdetails.permissions.includes("RUNNER:CREATE")} modal_open = true;
<button }}
on:click={() => { type="button"
modal_open = true; class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0"
}} >
type="button" {$_("laeufer-hinzufuegen")}
class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0" </button>
> <button
{$_("laeufer-hinzufuegen")} on:click={() => {
</button> import_modal_open = true;
<button }}
on:click={() => { type="button"
import_modal_open = true; class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0"
}} >
type="button" {$_("import-runners")}
class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0" </button>
> {/if}
{$_("import-runners")} <DeleteRunnerModal
</button> delete_runner={active_delete}
{/if} modal_open={active_delete != undefined}
<DeleteRunnerModal on:delete={(event) => {
delete_runner={active_delete} deleteRunner(event.detail.id);
modal_open={active_delete != undefined} }}
on:delete={(event) => { />
deleteRunner(event.detail.id); {#if store.state.jwtinfo.userdetails.permissions.includes("RUNNER:GET")}
}} {#if !dataLoaded}
/> <div
{#if store.state.jwtinfo.userdetails.permissions.includes("RUNNER:GET")} class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
{#if !dataLoaded} role="alert"
<div >
class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2" <p class="font-bold">{$_("runners-are-being-loaded")}</p>
role="alert" <p class="text-sm">{$_("this-might-take-a-moment")}</p>
> </div>
<p class="font-bold">{$_("runners-are-being-loaded")}</p> {:else}
<p class="text-sm">{$_("this-might-take-a-moment")}</p> <GenerateSponsoringContracts
</div> bind:sponsoring_contracts_show
{:else} bind:generate_runners={selectedRunners}
<GenerateSponsoringContracts />
bind:sponsoring_contracts_show <GenerateRunnerCards
bind:generate_runners={selectedRunners} bind:cards_show
/> bind:generate_runners={selectedRunners}
<GenerateRunnerCards />
bind:cards_show <GenerateRunnerCertificates
bind:generate_runners={selectedRunners} bind:certificates_show
/> bind:generate_runners={selectedRunners}
<GenerateRunnerCertificates />
bind:certificates_show <div class="overflow-x-auto">
bind:generate_runners={selectedRunners} <table class="w-full">
/> <thead class="border-b border-gray-400">
<div class="overflow-x-auto"> {#each $table.getHeaderGroups() as headerGroup}
<table class="w-full"> <tr class="select-none">
<thead class="border-b border-gray-400"> <th class="inset-y-0 left-0 px-4 py-2 text-left w-px">
{#each $table.getHeaderGroups() as headerGroup} <InputElement
<tr class="select-none"> type="checkbox"
<th class="inset-y-0 left-0 px-4 py-2 text-left w-px"> checked={$table.getIsAllRowsSelected()}
<InputElement indeterminate={$table.getIsSomeRowsSelected()}
type="checkbox" on:change={() => $table.toggleAllRowsSelected()}
checked={$table.getIsAllRowsSelected()} />
indeterminate={$table.getIsSomeRowsSelected()} </th>
on:change={() => $table.toggleAllRowsSelected()} {#each headerGroup.headers as header}
/> <TableHeader {header} />
</th> {/each}
{#each headerGroup.headers as header} </tr>
<TableHeader {header} /> {/each}
{/each} </thead>
</tr> <tbody>
{/each} {#each $table.getRowModel().rows as row}
</thead> <tr class="odd:bg-white even:bg-gray-100">
<tbody> <td class="inset-y-0 left-0 px-4 py-2 text-center w-px">
{#each $table.getRowModel().rows as row} <InputElement
<tr class="odd:bg-white even:bg-gray-100"> type="checkbox"
<td class="inset-y-0 left-0 px-4 py-2 text-center w-px"> checked={row.getIsSelected()}
<InputElement on:change={() => row.toggleSelected()}
type="checkbox" />
checked={row.getIsSelected()} </td>
on:change={() => row.toggleSelected()} {#each row.getVisibleCells() as cell}
/> <td>
</td> <svelte:component
{#each row.getVisibleCells() as cell} this={flexRender(
<td> cell.column.columnDef.cell,
<svelte:component cell.getContext()
this={flexRender( )}
cell.column.columnDef.cell, />
cell.getContext() </td>
)} {/each}
/> </tr>
</td> {/each}
{/each} </tbody>
</tr> </table>
{/each} </div>
</tbody> <div class="h-2" />
</table> {/if}
</div> {/if}
<div class="h-2" /> <TableBottom {table} {selected} />
{/if}
{/if}
<TableBottom {table} {selected} />
</section> </section>
{#if store.state.jwtinfo.userdetails.permissions.includes("RUNNER:CREATE")} {#if store.state.jwtinfo.userdetails.permissions.includes("RUNNER:CREATE")}
<AddRunnerModal <AddRunnerModal
bind:modal_open bind:modal_open
on:created={(event) => { on:created={(event) => {
addRunners(event.detail.runners); addRunners(event.detail.runners);
}} }}
/> />
<ImportRunnerModal <ImportRunnerModal
on:cancelDelete={(event) => { on:cancelDelete={(event) => {
import_modal_open = false; import_modal_open = false;
}} }}
passed_team={{}} passed_team={{}}
passed_orgs={[]} passed_orgs={[]}
passed_org={{}} passed_org={{}}
opened_from="RunnerOverview" opened_from="RunnerOverview"
bind:import_modal_open bind:import_modal_open
on:created={(event) => { on:created={(event) => {
addRunners(event.detail.runners); addRunners(event.detail.runners);
}} }}
/> />
{/if} {/if}
<style> <style>
table tbody tr td:nth-child(2) { table tbody tr td:nth-child(2) {
font-family: monospace; font-family: monospace;
} }
</style> </style>