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

update

Browse Source
This commit is contained in:
wayanrivan
2025-05-21 16:43:00 +07:00
parent a0fe50164f 882fb840f3
commit c2df876489
4 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/disbursement/history-transaction/HistoryTransaction.tsx
View File

@ -23,7 +23,7 @@ const HistoryTransactionDisbursement = () => {
</Link>
<Link underline="none" color="inherit">
<span className="text-sm">History Disbursement</span>
<span className="text-sm">Disbursement</span>
</Link>
</Breadcrumbs>
<div className="grid gap-5 lg:gap-7.5">

2
src/pages/disbursement/history-transaction/hooks/TransactionContext.tsx
View File

@ -285,7 +285,7 @@ const TransactionProvider = ({ children }: { children: React.ReactNode }) => {
pagination={{ size: 10 }}
toolbar={<ListToolbar />}
layout={{ card: true }}
sorting={[{ id: 'execution_date', desc: false }]}
sorting={[{ id: 'execution_date', desc: true }]}
serverSide={true}
onFetchData={({ pageIndex, pageSize, sorting, columnFilters }) =>
getTransactionLists(pageIndex, pageSize, sorting, columnFilters)

86
src/pages/members/manage-members/blocks/ListToolBar.tsx
View File

@ -29,25 +29,26 @@ const ListToolbar = ({ createMember, onReload, isReloading, groups }: ListToolba
const [typeSearchValue, setSearchTypeValue] = useState<string>();
const handleSearch = (e: React.ChangeEvent<HTMLInputElement>) => {
setSearchValue(e.target.value)
e.preventDefault()
// setSearchValue(e.target.value)
if (typeSearchValue === 'username') {
table.getColumn('username')?.setFilterValue(e.target.value);
table.getColumn('username')?.setFilterValue(searchValue);
table.getColumn('msisdn')?.setFilterValue('');
}
if (typeSearchValue === 'msisdn') {
table.getColumn('msisdn')?.setFilterValue(e.target.value);
table.getColumn('msisdn')?.setFilterValue(searchValue);
table.getColumn('username')?.setFilterValue('');
}
if (groupFilter) table.getColumn('group_name')?.setFilterValue(groupFilter);
table.getColumn('group_name')?.setFilterValue(groupFilter);
};
const handleGroupChange = (e: any) => {
let value = e.target.value;
if (value === '__all__') value = '';
setGroupFilter(value);
if (typeSearchValue === 'username') table.getColumn('username')?.setFilterValue(searchValue);
if (typeSearchValue === 'msisdn') table.getColumn('msisdn')?.setFilterValue(searchValue);
table.getColumn('group_name')?.setFilterValue(value);
// if (typeSearchValue === 'username') table.getColumn('username')?.setFilterValue(searchValue);
// if (typeSearchValue === 'msisdn') table.getColumn('msisdn')?.setFilterValue(searchValue);
// table.getColumn('group_name')?.setFilterValue(value);
};
const generateExportFilters = (groupFilter: string, typeSearchValue: any, searchValue: any): { id: string; value: string }[] => {
@ -83,43 +84,48 @@ const ListToolbar = ({ createMember, onReload, isReloading, groups }: ListToolba
<div className="card-header flex-wrap gap-2 border-b-0 px-5">
<div className="flex flex-wrap gap-2 lg:gap-5 w-full">
<div className="flex justify-between w-full items-center">
<div className="flex gap-3 items-center">
<Select value={groupFilter} onValueChange={(e) => (handleGroupChange({ target : { value: e }}))}>
<SelectTrigger className="input input-sm w-[250px] h-[31px]">
<SelectValue placeholder="Select Group" />
</SelectTrigger>
<SelectContent>
<SelectItem value={"__all__"}>All Group</SelectItem>
{groups.map((el: any, idx: any) => (
<SelectItem key={idx} value={el.name}>
{el.name}
</SelectItem>
))}
</SelectContent>
</Select>
<form onSubmit={(e:any) => handleSearch(e)}>
<div className="flex gap-3 items-center">
<Select value={groupFilter} onValueChange={(e) => (handleGroupChange({ target : { value: e }}))}>
<SelectTrigger className="input input-sm w-[250px] h-[31px]">
<SelectValue placeholder="Select Group" />
</SelectTrigger>
<SelectContent>
<SelectItem value={"__all__"}>All Group</SelectItem>
{groups.map((el: any, idx: any) => (
<SelectItem key={idx} value={el.name}>
{el.name}
</SelectItem>
))}
</SelectContent>
</Select>
<Select value={typeSearchValue} onValueChange={(value) => {setSearchTypeValue(value)}}>
<SelectTrigger className="input input-sm w-[250px] h-[31px]">
<SelectValue placeholder="Select Search Type" />
</SelectTrigger>
<SelectContent>
<SelectItem value="username">Username</SelectItem>
<SelectItem value="msisdn">Phone Number</SelectItem>
</SelectContent>
</Select>
<Select value={typeSearchValue} onValueChange={(value) => {setSearchTypeValue(value)}}>
<SelectTrigger className="input input-sm w-[250px] h-[31px]">
<SelectValue placeholder="Select Search Type" />
</SelectTrigger>
<SelectContent>
<SelectItem value="username">Username</SelectItem>
<SelectItem value="msisdn">Phone Number</SelectItem>
</SelectContent>
</Select>
<label className="input input-sm w-1/3">
<KeenIcon icon="magnifier" />
<input
type="text"
placeholder={`Search ${typeSearchValue || ''}`} // Use typeSearchValue if it's set, else fallback to an empty string
value={searchValue}
onChange={(e:any) => handleSearch(e)}
/>
</label>
<label className="input input-sm w-1/3">
{/* <KeenIcon icon="magnifier" /> */}
<input
type="text"
placeholder={`Search ${typeSearchValue || ''}`} // Use typeSearchValue if it's set, else fallback to an empty string
value={searchValue}
onChange={(e:any) => setSearchValue(e.target.value)}
/>
</label>
<Button variant="outline" className="h-7.5">
<KeenIcon icon="magnifier" />
</Button>
</div>
</form>
</div>
<div className="flex gap-3 items-center">
<Button
variant="outline"