update list sucos
This commit is contained in:
@ -151,7 +151,10 @@ export const DataGridProvider = <TData extends object>(props: TDataGridProps<TDa
|
|||||||
enableRowSelection: mergedProps.rowSelection,
|
enableRowSelection: mergedProps.rowSelection,
|
||||||
onRowSelectionChange: handleRowSelectionChange,
|
onRowSelectionChange: handleRowSelectionChange,
|
||||||
onSortingChange: (newSorting) => !loading && setSorting(newSorting),
|
onSortingChange: (newSorting) => !loading && setSorting(newSorting),
|
||||||
onColumnFiltersChange: (newFilters) => !loading && setColumnFilters(newFilters),
|
onColumnFiltersChange: (newFilters) => {
|
||||||
|
console.log('New Filters:', newFilters); // Debugging
|
||||||
|
!loading && setColumnFilters(newFilters);
|
||||||
|
},
|
||||||
onColumnVisibilityChange: setColumnVisibility,
|
onColumnVisibilityChange: setColumnVisibility,
|
||||||
onPaginationChange: (newPagination) => !loading && setPagination(newPagination),
|
onPaginationChange: (newPagination) => !loading && setPagination(newPagination),
|
||||||
getCoreRowModel: getCoreRowModel(),
|
getCoreRowModel: getCoreRowModel(),
|
||||||
@ -165,6 +168,8 @@ export const DataGridProvider = <TData extends object>(props: TDataGridProps<TDa
|
|||||||
manualFiltering: mergedProps.serverSide
|
manualFiltering: mergedProps.serverSide
|
||||||
});
|
});
|
||||||
|
|
||||||
|
console.log('Filtered Rows:', table.getFilteredRowModel().rows);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<DataGridContext.Provider
|
<DataGridContext.Provider
|
||||||
value={{
|
value={{
|
||||||
|
|||||||
@ -9,7 +9,12 @@ const Footer = () => {
|
|||||||
<div className="flex flex-col md:flex-row justify-center md:justify-between items-center gap-3 py-5">
|
<div className="flex flex-col md:flex-row justify-center md:justify-between items-center gap-3 py-5">
|
||||||
<div className="flex order-2 md:order-1 gap-2 font-normal text-2sm">
|
<div className="flex order-2 md:order-1 gap-2 font-normal text-2sm">
|
||||||
<span className="text-gray-500">{currentYear}©</span>
|
<span className="text-gray-500">{currentYear}©</span>
|
||||||
<a href="https://" target="_blank" className="text-gray-600 hover:text-primary">
|
<a
|
||||||
|
href="https://t-pay.tl/"
|
||||||
|
target="_blank"
|
||||||
|
className="text-gray-600 hover:text-primary"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
>
|
||||||
Brillian Dev.
|
Brillian Dev.
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -45,7 +45,7 @@ const AddDialog = () => {
|
|||||||
});
|
});
|
||||||
const initialState = {
|
const initialState = {
|
||||||
name: '',
|
name: '',
|
||||||
posto_adm_id: 0,
|
postoId: 0,
|
||||||
created_by: '',
|
created_by: '',
|
||||||
created_at: ''
|
created_at: ''
|
||||||
};
|
};
|
||||||
@ -80,7 +80,7 @@ const AddDialog = () => {
|
|||||||
const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
|
const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|
||||||
if (formField.name.trim() === '' || formField.posto_adm_id === 0) {
|
if (formField.name.trim() === '' || formField.postoId === 0) {
|
||||||
setAlert({ show: true, message: 'Please fill in all required fields.' });
|
setAlert({ show: true, message: 'Please fill in all required fields.' });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -166,7 +166,7 @@ const AddDialog = () => {
|
|||||||
<Popover open={open} onOpenChange={setOpen}>
|
<Popover open={open} onOpenChange={setOpen}>
|
||||||
<PopoverTrigger asChild>
|
<PopoverTrigger asChild>
|
||||||
<button type="button" className="input col-span-5 text-left">
|
<button type="button" className="input col-span-5 text-left">
|
||||||
{posto_adms.find((posto) => posto.PostoAdms_id === formField.posto_adm_id)
|
{posto_adms.find((posto) => posto.PostoAdms_id === formField.postoId)
|
||||||
?.PostoAdms_name || 'Select Posto Administrativo'}
|
?.PostoAdms_name || 'Select Posto Administrativo'}
|
||||||
</button>
|
</button>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
@ -183,7 +183,7 @@ const AddDialog = () => {
|
|||||||
onSelect={() => {
|
onSelect={() => {
|
||||||
setFormField({
|
setFormField({
|
||||||
...formField,
|
...formField,
|
||||||
posto_adm_id: posto.PostoAdms_id
|
postoId: posto.PostoAdms_id
|
||||||
});
|
});
|
||||||
setOpen(false);
|
setOpen(false);
|
||||||
}}
|
}}
|
||||||
|
|||||||
@ -4,7 +4,14 @@ import { ChangeEvent, useCallback, useState } from 'react';
|
|||||||
import { useCallApi } from '@/hooks';
|
import { useCallApi } from '@/hooks';
|
||||||
import { Alert, useDataGrid } from '@/components';
|
import { Alert, useDataGrid } from '@/components';
|
||||||
import { toast } from 'sonner';
|
import { toast } from 'sonner';
|
||||||
import { Dialog, DialogContent, DialogFooter, DialogHeader } from '@/components/ui/dialog';
|
import {
|
||||||
|
Dialog,
|
||||||
|
DialogContent,
|
||||||
|
DialogDescription,
|
||||||
|
DialogFooter,
|
||||||
|
DialogHeader,
|
||||||
|
DialogTitle
|
||||||
|
} from '@/components/ui/dialog';
|
||||||
import { EnforceSwitch } from '@/components/switch';
|
import { EnforceSwitch } from '@/components/switch';
|
||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
|
|
||||||
@ -39,6 +46,8 @@ const DeleteDialog = () => {
|
|||||||
<Dialog open={showDeleteDialog} onOpenChange={(open) => handleDeleteDialog(open, null)}>
|
<Dialog open={showDeleteDialog} onOpenChange={(open) => handleDeleteDialog(open, null)}>
|
||||||
<DialogContent className="container-fixed max-w-md flex flex-col p-5 overflow-hidden [&>button]:hidden">
|
<DialogContent className="container-fixed max-w-md flex flex-col p-5 overflow-hidden [&>button]:hidden">
|
||||||
<DialogHeader className="p-0 border-0 block">
|
<DialogHeader className="p-0 border-0 block">
|
||||||
|
<DialogTitle></DialogTitle>
|
||||||
|
<DialogDescription></DialogDescription>
|
||||||
<Alert variant="warning">
|
<Alert variant="warning">
|
||||||
<h3 className="text-lg">Are you sure?</h3>
|
<h3 className="text-lg">Are you sure?</h3>
|
||||||
<span className="text-sm">you will delete this data!</span>
|
<span className="text-sm">you will delete this data!</span>
|
||||||
|
|||||||
@ -48,7 +48,7 @@ const EditDialog = () => {
|
|||||||
|
|
||||||
const initialState = {
|
const initialState = {
|
||||||
name: '',
|
name: '',
|
||||||
posto_adm_id: 0, // Pastikan ini sesuai dengan PostoAdms_id
|
postoId: 0, // Pastikan ini sesuai dengan PostoAdms_id
|
||||||
updated_by: '',
|
updated_by: '',
|
||||||
updated_at: ''
|
updated_at: ''
|
||||||
};
|
};
|
||||||
@ -110,7 +110,8 @@ const EditDialog = () => {
|
|||||||
setFormField((prev) => ({
|
setFormField((prev) => ({
|
||||||
...prev,
|
...prev,
|
||||||
name: response.data.name,
|
name: response.data.name,
|
||||||
posto_adm_id: response.data.posto.id // Pastikan ini sesuai dengan PostoAdms_id
|
postoId: response.data.posto?.id || ''
|
||||||
|
// Pastikan ini sesuai dengan PostoAdms_id
|
||||||
}));
|
}));
|
||||||
} else {
|
} else {
|
||||||
setFormField((prev) => ({
|
setFormField((prev) => ({
|
||||||
@ -123,7 +124,7 @@ const EditDialog = () => {
|
|||||||
const handleUpdate = (e: React.FormEvent<HTMLFormElement>) => {
|
const handleUpdate = (e: React.FormEvent<HTMLFormElement>) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|
||||||
if (formField.name.trim() === '' || formField.posto_adm_id === 0) {
|
if (formField.name.trim() === '' || formField.postoId === 0) {
|
||||||
setAlert({ show: true, message: 'Please fill in all required fields.' });
|
setAlert({ show: true, message: 'Please fill in all required fields.' });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -203,7 +204,7 @@ const EditDialog = () => {
|
|||||||
<Popover open={open} onOpenChange={setOpen}>
|
<Popover open={open} onOpenChange={setOpen}>
|
||||||
<PopoverTrigger asChild>
|
<PopoverTrigger asChild>
|
||||||
<button type="button" className="input col-span-5 text-left">
|
<button type="button" className="input col-span-5 text-left">
|
||||||
{postoadms.find((posto) => posto.PostoAdms_id === formField.posto_adm_id)
|
{postoadms.find((posto) => posto.PostoAdms_id === formField.postoId)
|
||||||
?.PostoAdms_name || 'Select Posto Adms'}
|
?.PostoAdms_name || 'Select Posto Adms'}
|
||||||
</button>
|
</button>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
@ -220,7 +221,7 @@ const EditDialog = () => {
|
|||||||
onSelect={() => {
|
onSelect={() => {
|
||||||
setFormField({
|
setFormField({
|
||||||
...formField,
|
...formField,
|
||||||
posto_adm_id: posto.PostoAdms_id // Gunakan PostoAdms_id
|
postoId: posto.PostoAdms_id // Gunakan PostoAdms_id
|
||||||
});
|
});
|
||||||
setOpen(false);
|
setOpen(false);
|
||||||
}}
|
}}
|
||||||
|
|||||||
@ -16,11 +16,19 @@ const ListToolbar = () => {
|
|||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
placeholder="Search Sucos"
|
placeholder="Search Sucos"
|
||||||
value={table.getColumn(`id`)?.getFilterValue() as string}
|
value={String(table.getColumn(`sucos_name`)?.getFilterValue() ?? '')}
|
||||||
onChange={(event) =>
|
onChange={(event) =>
|
||||||
table.getColumn('sucos_name')?.setFilterValue(event.target.value)
|
table.getColumn('sucos_name')?.setFilterValue(event.target.value)
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
placeholder="Search Posto Administrativo"
|
||||||
|
value={String(table.getColumn(`posto_name`)?.getFilterValue() ?? '')}
|
||||||
|
onChange={(event) =>
|
||||||
|
table.getColumn('posto_name')?.setFilterValue(event.target.value)
|
||||||
|
}
|
||||||
|
/>
|
||||||
</label>
|
</label>
|
||||||
<DefaultTooltip title={'Filter'} placement={'top'}>
|
<DefaultTooltip title={'Filter'} placement={'top'}>
|
||||||
<Button
|
<Button
|
||||||
|
|||||||
@ -87,7 +87,12 @@ const ManageSucosContextProvider = ({ children }: { children: React.ReactNode })
|
|||||||
() => [
|
() => [
|
||||||
{
|
{
|
||||||
accessorKey: 'sucos_id',
|
accessorKey: 'sucos_id',
|
||||||
id: 'id',
|
id: 'sucos_id',
|
||||||
|
filterFn: (row, columnId, filterValue) => {
|
||||||
|
const value = row.getValue<number>(columnId);
|
||||||
|
console.log('Filtering:', { value, filterValue });
|
||||||
|
return String(value).includes(String(filterValue));
|
||||||
|
},
|
||||||
header: ({ column }) => <DataGridColumnHeader title="ID" column={column} />,
|
header: ({ column }) => <DataGridColumnHeader title="ID" column={column} />,
|
||||||
enableSorting: true,
|
enableSorting: true,
|
||||||
enableHiding: false,
|
enableHiding: false,
|
||||||
@ -98,6 +103,10 @@ const ManageSucosContextProvider = ({ children }: { children: React.ReactNode })
|
|||||||
{
|
{
|
||||||
accessorFn: (row) => row.sucos_name,
|
accessorFn: (row) => row.sucos_name,
|
||||||
id: 'sucos_name',
|
id: 'sucos_name',
|
||||||
|
filterFn: (row, columnId, filterValue) => {
|
||||||
|
const value = row.getValue<string>(columnId);
|
||||||
|
return String(value).includes(String(filterValue));
|
||||||
|
},
|
||||||
header: ({ column }) => <DataGridColumnHeader title="Sucos Name" column={column} />,
|
header: ({ column }) => <DataGridColumnHeader title="Sucos Name" column={column} />,
|
||||||
enableSorting: true,
|
enableSorting: true,
|
||||||
enableHiding: false,
|
enableHiding: false,
|
||||||
@ -106,8 +115,12 @@ const ManageSucosContextProvider = ({ children }: { children: React.ReactNode })
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
accessorFn: (row) => row.posto_name,
|
accessorKey: 'posto_name',
|
||||||
id: 'posto_name',
|
id: 'posto_name',
|
||||||
|
filterFn: (row, columnId, filterValue) => {
|
||||||
|
const value = row.getValue<string>(columnId);
|
||||||
|
return String(value).includes(String(filterValue));
|
||||||
|
},
|
||||||
header: ({ column }) => <DataGridColumnHeader title="Posto Name" column={column} />,
|
header: ({ column }) => <DataGridColumnHeader title="Posto Name" column={column} />,
|
||||||
enableSorting: true,
|
enableSorting: true,
|
||||||
enableHiding: false,
|
enableHiding: false,
|
||||||
|
|||||||
Reference in New Issue
Block a user