lfk/frontend
2
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Releases Wiki Activity

Added status filter function

Browse Source
This commit is contained in:
Nicolai Ort 2023-04-12 20:47:36 +02:00
parent 178dc93319
commit f6c1fea17c
Signed by: niggl
GPG Key ID: 13AFA55AF62F269F
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/cards/CardsOverview.svelte
View File

@ -23,7 +23,7 @@
import CardStatus from "./CardStatus.svelte"; import CardStatus from "./CardStatus.svelte";
import CardRunner from "./CardRunner.svelte"; import CardRunner from "./CardRunner.svelte";
import { onMount } from "svelte"; import { onMount } from "svelte";
import { runnerFilter } from "../shared/tablefilters"; import { runnerFilter, statusFilter } from "../shared/tablefilters";
import DeleteCardModal from "./DeleteCardModal.svelte"; import DeleteCardModal from "./DeleteCardModal.svelte";
export let edit_modal_open = false; export let edit_modal_open = false;
@ -61,7 +61,7 @@
return renderComponent(CardStatus, { enabled: info.getValue() }); return renderComponent(CardStatus, { enabled: info.getValue() });
}, },
header: () => $_("status"), header: () => $_("status"),
filterFn: `includesString`, filterFn: `status`,
}, },
{ {
accessorKey: "actions", accessorKey: "actions",
@ -100,6 +100,7 @@
}, },
filterFns: { filterFns: {
runner: runnerFilter, runner: runnerFilter,
status: statusFilter,
}, },
enableRowSelection: true, enableRowSelection: true,
getCoreRowModel: getCoreRowModel(), getCoreRowModel: getCoreRowModel(),

5
src/components/scans/ScansOverview.svelte
View File

@ -19,7 +19,7 @@
import ScansEmptyState from "./ScansEmptyState.svelte"; import ScansEmptyState from "./ScansEmptyState.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 { runnerFilter } from "../shared/tablefilters"; import { runnerFilter, statusFilter } from "../shared/tablefilters";
import CardRunner from "../cards/CardRunner.svelte"; import CardRunner from "../cards/CardRunner.svelte";
import ScanValid from "./ScanValid.svelte"; import ScanValid from "./ScanValid.svelte";
@ -113,7 +113,7 @@
return renderComponent(ScanValid, { valid: info.getValue() }); return renderComponent(ScanValid, { valid: info.getValue() });
}, },
header: () => $_("status"), header: () => $_("status"),
filterFn: `includesString`, filterFn: `status`,
}, },
{ {
accessorKey: "actions", accessorKey: "actions",
@ -145,6 +145,7 @@
}, },
filterFns: { filterFns: {
runner: runnerFilter, runner: runnerFilter,
status: statusFilter,
}, },
enableRowSelection: true, enableRowSelection: true,
getCoreRowModel: getCoreRowModel(), getCoreRowModel: getCoreRowModel(),

5
src/components/shared/tablefilters.js
View File

@ -26,4 +26,9 @@ export const runnerFilter = (row, columnId, value) => {
return `${runner.firstname} ${runner.middlename} ${runner.lastname}`.toLowerCase().includes(value.toLowerCase()) return `${runner.firstname} ${runner.middlename} ${runner.lastname}`.toLowerCase().includes(value.toLowerCase())
} }
return `${runner.firstname} ${runner.lastname}`.toLowerCase().includes(value.toLowerCase()) return `${runner.firstname} ${runner.lastname}`.toLowerCase().includes(value.toLowerCase())
};
export const statusFilter = (row, columnId, value) => {
const status = row.getValue(columnId);
return status.toString().includes(value);
}; };