Compare commits
2 Commits
9c13b2f9e9
...
2c198cfde8
Author | SHA1 | Date | |
---|---|---|---|
2c198cfde8 | |||
7c6d39b5fa |
@ -23,6 +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";
|
||||||
|
|
||||||
export let edit_modal_open = false;
|
export let edit_modal_open = false;
|
||||||
export let runner = {};
|
export let runner = {};
|
||||||
@ -47,11 +48,11 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
accessorKey: "runner",
|
accessorKey: "runner",
|
||||||
header: () => $_("name"),
|
header: () => $_("runner"),
|
||||||
cell: (info) => {
|
cell: (info) => {
|
||||||
return renderComponent(CardRunner, { runner: info.getValue() });
|
return renderComponent(CardRunner, { runner: info.getValue() });
|
||||||
},
|
},
|
||||||
filterFn: `includesString`,
|
filterFn: `runner`,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
accessorKey: "enabled",
|
accessorKey: "enabled",
|
||||||
@ -96,6 +97,9 @@
|
|||||||
pageSize: 50,
|
pageSize: 50,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
filterFns: {
|
||||||
|
runner: runnerFilter,
|
||||||
|
},
|
||||||
enableRowSelection: true,
|
enableRowSelection: true,
|
||||||
getCoreRowModel: getCoreRowModel(),
|
getCoreRowModel: getCoreRowModel(),
|
||||||
getFilteredRowModel: getFilteredRowModel(),
|
getFilteredRowModel: getFilteredRowModel(),
|
||||||
|
@ -19,6 +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";
|
||||||
|
|
||||||
$: selectedScans =
|
$: selectedScans =
|
||||||
$table?.getSelectedRowModel().rows.map((row) => row.original) || [];
|
$table?.getSelectedRowModel().rows.map((row) => row.original) || [];
|
||||||
@ -75,6 +76,7 @@
|
|||||||
const runner = info.getValue();
|
const runner = info.getValue();
|
||||||
return `#${runner.id} - ${runner.firstname} ${runner.lastname}`;
|
return `#${runner.id} - ${runner.firstname} ${runner.lastname}`;
|
||||||
},
|
},
|
||||||
|
filterFn: `runner`,
|
||||||
enableColumnFilter: true,
|
enableColumnFilter: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -133,6 +135,9 @@
|
|||||||
pageSize: 50,
|
pageSize: 50,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
filterFns: {
|
||||||
|
runner: runnerFilter,
|
||||||
|
},
|
||||||
enableRowSelection: true,
|
enableRowSelection: true,
|
||||||
getCoreRowModel: getCoreRowModel(),
|
getCoreRowModel: getCoreRowModel(),
|
||||||
getFilteredRowModel: getFilteredRowModel(),
|
getFilteredRowModel: getFilteredRowModel(),
|
||||||
|
@ -13,3 +13,17 @@ export const groupFilter = (row, columnId, value) => {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
export const runnerFilter = (row, columnId, value) => {
|
||||||
|
const runner = row.getValue(columnId);
|
||||||
|
if(!runner && value == "blanko"){return true}
|
||||||
|
if(!runner){return false}
|
||||||
|
|
||||||
|
if(value.startsWith("#")){
|
||||||
|
return runner.id == value.replace("#","")
|
||||||
|
}
|
||||||
|
|
||||||
|
if(runner.middlename){
|
||||||
|
return `${runner.firstname} ${runner.middlename} ${runner.lastname}`.toLowerCase().includes(value.toLowerCase())
|
||||||
|
}
|
||||||
|
return `${runner.firstname} ${runner.lastname}`.toLowerCase().includes(value.toLowerCase())
|
||||||
|
};
|
Loading…
x
Reference in New Issue
Block a user