From 2304b12c1cca6a64573223906ab0561ba9050ec5 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 12 Apr 2023 18:28:48 +0200 Subject: [PATCH] Moved filter function to shared --- src/components/runners/RunnersOverview.svelte | 44 +++++-------------- src/components/shared/tablefilters.js | 20 +++++++++ 2 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 src/components/shared/tablefilters.js diff --git a/src/components/runners/RunnersOverview.svelte b/src/components/runners/RunnersOverview.svelte index 9f870897..f261ed7a 100644 --- a/src/components/runners/RunnersOverview.svelte +++ b/src/components/runners/RunnersOverview.svelte @@ -10,31 +10,22 @@ getPaginationRowModel, getSortedRowModel, } from "@tanstack/svelte-table"; + import { + RunnerService, + RunnerTeamService, + RunnerOrganizationService, + } from "@odit/lfk-client-js"; + import store from "../../store"; + import GenerateSponsoringContracts from "../pdf_generation/GenerateSponsoringContracts.svelte"; + import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte"; + import GenerateRunnerCertificates from "../pdf_generation/GenerateRunnerCertificates.svelte"; + import { onMount } from "svelte"; + import InputElement from "../shared/InputElement.svelte"; + import { groupFilter } from "../shared/tablefilters"; $: selected = $table?.getSelectedRowModel().rows.map((row) => row.index) || []; - const groupFilter = (row, columnId, value) => { - const group = row.getValue(columnId); - if (group.responseType === "RUNNERORGANIZATION") { - return group.name.toLowerCase().includes(value.toLowerCase()); - } else if (value.includes(">")) { - value = value.split(">")[1]; - if(value.length == 0){ - return group.name.toLowerCase().includes(value.toLowerCase()); - } - return ( - group.name.toLowerCase().includes(value.toLowerCase()) || - group.parentGroup.name.toLowerCase().includes(value.toLowerCase()) - ); - } else { - return ( - group.name.toLowerCase().includes(value.toLowerCase()) || - group.parentGroup.name.toLowerCase().includes(value.toLowerCase()) - ); - } - }; - const columns = [ { accessorKey: "id", @@ -78,17 +69,6 @@ // - import { - RunnerService, - RunnerTeamService, - RunnerOrganizationService, - } from "@odit/lfk-client-js"; - import store from "../../store"; - import GenerateSponsoringContracts from "../pdf_generation/GenerateSponsoringContracts.svelte"; - import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte"; - import GenerateRunnerCertificates from "../pdf_generation/GenerateRunnerCertificates.svelte"; - import { onMount } from "svelte"; - import InputElement from "../shared/InputElement.svelte"; $: active_deletes = []; let dataLoaded = false; export let current_runners = []; diff --git a/src/components/shared/tablefilters.js b/src/components/shared/tablefilters.js new file mode 100644 index 00000000..cbf2abdf --- /dev/null +++ b/src/components/shared/tablefilters.js @@ -0,0 +1,20 @@ +export const groupFilter = (row, columnId, value) => { + const group = row.getValue(columnId); + if (group.responseType === "RUNNERORGANIZATION") { + return group.name.toLowerCase().includes(value.toLowerCase()); + } else if (value.includes(">")) { + value = value.split(">")[1]; + if (value.length == 0) { + return group.name.toLowerCase().includes(value.toLowerCase()); + } + return ( + group.name.toLowerCase().includes(value.toLowerCase()) || + group.parentGroup.name.toLowerCase().includes(value.toLowerCase()) + ); + } else { + return ( + group.name.toLowerCase().includes(value.toLowerCase()) || + group.parentGroup.name.toLowerCase().includes(value.toLowerCase()) + ); + } +}; \ No newline at end of file