TIMOR-TELECOM/revenue-fe
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update list sucos

Browse Source
This commit is contained in:
Raja Oktafrianto
2025-03-22 14:19:48 +07:00
parent d6807468d4
commit 41f96416b3
7 changed files with 56 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/data-grid/DataGridContext.tsx
View File

@ -151,7 +151,10 @@ export const DataGridProvider = <TData extends object>(props: TDataGridProps<TDa
enableRowSelection: mergedProps.rowSelection,
onRowSelectionChange: handleRowSelectionChange,
onSortingChange: (newSorting) => !loading && setSorting(newSorting),
onColumnFiltersChange: (newFilters) => !loading && setColumnFilters(newFilters),
onColumnFiltersChange: (newFilters) => {
console.log('New Filters:', newFilters); // Debugging
!loading && setColumnFilters(newFilters);
},
onColumnVisibilityChange: setColumnVisibility,
onPaginationChange: (newPagination) => !loading && setPagination(newPagination),
getCoreRowModel: getCoreRowModel(),
@ -165,6 +168,8 @@ export const DataGridProvider = <TData extends object>(props: TDataGridProps<TDa
manualFiltering: mergedProps.serverSide
});
console.log('Filtered Rows:', table.getFilteredRowModel().rows);
return (
<DataGridContext.Provider
value={{

7
src/layouts/demo2/footer/Footer.tsx
View File

@ -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 order-2 md:order-1 gap-2 font-normal text-2sm">
<span className="text-gray-500">{currentYear}&copy;</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.
</a>
</div>

8
src/pages/master/sucos/blocks/AddDialog.tsx
View File

@ -45,7 +45,7 @@ const AddDialog = () => {
});
const initialState = {
name: '',
posto_adm_id: 0,
postoId: 0,
created_by: '',
created_at: ''
};
@ -80,7 +80,7 @@ const AddDialog = () => {
const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
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.' });
return;
}
@ -166,7 +166,7 @@ const AddDialog = () => {
<Popover open={open} onOpenChange={setOpen}>
<PopoverTrigger asChild>
<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'}
</button>
</PopoverTrigger>
@ -183,7 +183,7 @@ const AddDialog = () => {
onSelect={() => {
setFormField({
...formField,
posto_adm_id: posto.PostoAdms_id
postoId: posto.PostoAdms_id
});
setOpen(false);
}}

11
src/pages/master/sucos/blocks/DeleteDialog.tsx
View File

@ -4,7 +4,14 @@ import { ChangeEvent, useCallback, useState } from 'react';
import { useCallApi } from '@/hooks';
import { Alert, useDataGrid } from '@/components';
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 { Button } from '@/components/ui/button';
@ -39,6 +46,8 @@ const DeleteDialog = () => {
<Dialog open={showDeleteDialog} onOpenChange={(open) => handleDeleteDialog(open, null)}>
<DialogContent className="container-fixed max-w-md flex flex-col p-5 overflow-hidden [&>button]:hidden">
<DialogHeader className="p-0 border-0 block">
<DialogTitle></DialogTitle>
<DialogDescription></DialogDescription>
<Alert variant="warning">
<h3 className="text-lg">Are you sure?</h3>
<span className="text-sm">you will delete this data!</span>

11
src/pages/master/sucos/blocks/EditDialog.tsx
View File

@ -48,7 +48,7 @@ const EditDialog = () => {
const initialState = {
name: '',
posto_adm_id: 0, // Pastikan ini sesuai dengan PostoAdms_id
postoId: 0, // Pastikan ini sesuai dengan PostoAdms_id
updated_by: '',
updated_at: ''
};
@ -110,7 +110,8 @@ const EditDialog = () => {
setFormField((prev) => ({
...prev,
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 {
setFormField((prev) => ({
@ -123,7 +124,7 @@ const EditDialog = () => {
const handleUpdate = (e: React.FormEvent<HTMLFormElement>) => {
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.' });
return;
}
@ -203,7 +204,7 @@ const EditDialog = () => {
<Popover open={open} onOpenChange={setOpen}>
<PopoverTrigger asChild>
<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'}
</button>
</PopoverTrigger>
@ -220,7 +221,7 @@ const EditDialog = () => {
onSelect={() => {
setFormField({
...formField,
posto_adm_id: posto.PostoAdms_id // Gunakan PostoAdms_id
postoId: posto.PostoAdms_id // Gunakan PostoAdms_id
});
setOpen(false);
}}

10
src/pages/master/sucos/blocks/ListToolbar.tsx
View File

@ -16,11 +16,19 @@ const ListToolbar = () => {
<input
type="text"
placeholder="Search Sucos"
value={table.getColumn(`id`)?.getFilterValue() as string}
value={String(table.getColumn(`sucos_name`)?.getFilterValue() ?? '')}
onChange={(event) =>
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>
<DefaultTooltip title={'Filter'} placement={'top'}>
<Button

17
src/pages/master/sucos/hooks/ManageSucosContext.tsx
View File

@ -87,7 +87,12 @@ const ManageSucosContextProvider = ({ children }: { children: React.ReactNode })
() => [
{
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} />,
enableSorting: true,
enableHiding: false,
@ -98,6 +103,10 @@ const ManageSucosContextProvider = ({ children }: { children: React.ReactNode })
{
accessorFn: (row) => row.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} />,
enableSorting: true,
enableHiding: false,
@ -106,8 +115,12 @@ const ManageSucosContextProvider = ({ children }: { children: React.ReactNode })
}
},
{
accessorFn: (row) => row.posto_name,
accessorKey: '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} />,
enableSorting: true,
enableHiding: false,