udpate
This commit is contained in:
@ -43,12 +43,12 @@ const LogActivityContextProvider = ({ children }: { children: React.ReactNode })
|
||||
const columns = useMemo<ColumnDef<any>[]>(
|
||||
() => [
|
||||
{
|
||||
accessorFn: (row) => row.created_at,
|
||||
id: 'created_at',
|
||||
accessorFn: (row) => row.createdAt,
|
||||
id: 'createdAt',
|
||||
header: ({ column }) => <DataGridColumnHeader title="Timestamp" column={column} />,
|
||||
enableSorting: true,
|
||||
enableHiding: false,
|
||||
cell: ({ row }) => moment(row.original.created_at).format('YYYY-MM-DD HH:mm:ss')
|
||||
cell: ({ row }) => moment(row.original.createdAt).format('YYYY-MM-DD HH:mm:ss')
|
||||
},
|
||||
{
|
||||
accessorFn: (row) => row.user.username,
|
||||
@ -116,11 +116,15 @@ const LogActivityContextProvider = ({ children }: { children: React.ReactNode })
|
||||
all_user = auth.role_name === 'Super Admin';
|
||||
}
|
||||
|
||||
const user = localStorage.getItem('brillian-bri-tl-auth-v1=9.1.1');
|
||||
console.log('filter :', filter);
|
||||
|
||||
const user = localStorage.getItem(
|
||||
`${import.meta.env.VITE_APP_NAME}-auth-v${import.meta.env.VITE_APP_VERSION}`
|
||||
);
|
||||
const parsedUser = user ? JSON.parse(user) : null;
|
||||
const desc = sorting.length > 0 ? sorting[0].desc : false;
|
||||
|
||||
sorting = [{ id: 'user_activity.created_at', desc }];
|
||||
sorting = [{ id: 'UserActivities.createdAt', desc }];
|
||||
|
||||
let dataFilter: any = {};
|
||||
|
||||
@ -128,17 +132,17 @@ const LogActivityContextProvider = ({ children }: { children: React.ReactNode })
|
||||
filter.forEach((f: any) => {
|
||||
if (f.id === 'username') {
|
||||
dataFilter['username'] = { like: f.value };
|
||||
} else if (f.id === 'user_activity.created_at') {
|
||||
dataFilter['user_activity.created_at'] = f.value;
|
||||
} else if (f.id === 'UserActivities.createdAt') {
|
||||
dataFilter['UserActivities.createdAt'] = f.value;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
if (!dataFilter['user_activity.created_at']) {
|
||||
if (!dataFilter['UserActivities.createdAt']) {
|
||||
const defaultFrom = date?.from || new Date(new Date().setMonth(new Date().getMonth() - 1));
|
||||
const defaultTo = date?.to || new Date();
|
||||
|
||||
dataFilter['user_activity.created_at'] = {
|
||||
dataFilter['UserActivities.createdAt'] = {
|
||||
from: `${format(defaultFrom, 'yyyy-MM-dd')} 00:00:00`,
|
||||
to: `${format(defaultTo, 'yyyy-MM-dd')} 23:59:59`
|
||||
};
|
||||
@ -151,7 +155,7 @@ const LogActivityContextProvider = ({ children }: { children: React.ReactNode })
|
||||
order_field: sorting[0].id,
|
||||
order_direction: sorting[0].desc === false ? 'ASC' : 'DESC',
|
||||
filter: JSON.stringify(dataFilter),
|
||||
all_user: all_user
|
||||
all_user
|
||||
});
|
||||
|
||||
return { data: response?.data.list, totalCount: response?.data.total_count };
|
||||
@ -160,39 +164,36 @@ const LogActivityContextProvider = ({ children }: { children: React.ReactNode })
|
||||
);
|
||||
|
||||
const doExportData = async (sorting: any, filter: any) => {
|
||||
const AUTH_LOCAL_STORAGE_KEY = `${import.meta.env.VITE_APP_NAME}-auth-v${import.meta.env.VITE_APP_VERSION}`;
|
||||
const user = localStorage.getItem(
|
||||
`${import.meta.env.VITE_APP_NAME}-auth-v${import.meta.env.VITE_APP_VERSION}`
|
||||
);
|
||||
|
||||
const user = localStorage.getItem(AUTH_LOCAL_STORAGE_KEY);
|
||||
const parsedUser = user ? JSON.parse(user) : null;
|
||||
sorting = sorting.length === 0 ? [{ id: 'user_activity.created_at', desc: false }] : sorting;
|
||||
sorting = sorting.length === 0 ? [{ id: 'UserActivities.createdAt', desc: false }] : sorting;
|
||||
filter = filter && filter.length > 0 ? filter : [];
|
||||
const auth = getAuth();
|
||||
let all_user = false;
|
||||
if (auth) {
|
||||
all_user = auth.role_name === 'Super Admin';
|
||||
}
|
||||
|
||||
let dataFilter: any = {};
|
||||
|
||||
if (filter && filter.length > 0) {
|
||||
filter.forEach((f: any) => {
|
||||
if (f.id === 'username') {
|
||||
dataFilter['username'] = { like: f.value };
|
||||
} else if (f.id === 'user_activity.created_at') {
|
||||
dataFilter['user_activity.created_at'] = f.value;
|
||||
} else if (f.id === 'UserActivities.createdAt') {
|
||||
dataFilter['UserActivities.createdAt'] = f.value;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
if (!dataFilter['user_activity.created_at']) {
|
||||
if (!dataFilter['UserActivities.createdAt']) {
|
||||
const defaultFrom = new Date(new Date().setMonth(new Date().getMonth() - 1));
|
||||
const defaultTo = new Date();
|
||||
|
||||
dataFilter['user_activity.created_at'] = {
|
||||
dataFilter['UserActivities.createdAt'] = {
|
||||
from: `${format(defaultFrom, 'yyyy-MM-dd')} 00:00:00`,
|
||||
to: `${format(defaultTo, 'yyyy-MM-dd')} 23:59:59`
|
||||
};
|
||||
}
|
||||
let order = 'user_activity.created_at';
|
||||
let order = 'UserActivities.createdAt';
|
||||
let param = {
|
||||
all_user: false,
|
||||
// order_field: sorting[0].id,
|
||||
@ -208,8 +209,8 @@ const LogActivityContextProvider = ({ children }: { children: React.ReactNode })
|
||||
GetExportData(url, param, 'user_activity_export_');
|
||||
|
||||
const createActivity = {
|
||||
module: 'Update Pengajuan Kredit',
|
||||
description: `Export Pengajuan Kredit => Log Activity`,
|
||||
module: 'Log Activity',
|
||||
description: `Export => Log Activity`,
|
||||
action: 'E'
|
||||
};
|
||||
doSaveLogActivity(createActivity);
|
||||
@ -230,7 +231,7 @@ const LogActivityContextProvider = ({ children }: { children: React.ReactNode })
|
||||
pagination={{ size: 10 }}
|
||||
toolbar={<ListToolBar />}
|
||||
layout={{ card: true }}
|
||||
sorting={[{ id: 'UserActivity.created_at', desc: true }]}
|
||||
sorting={[{ id: 'UserActivity.createdAt', desc: true }]}
|
||||
serverSide={true}
|
||||
onFetchData={({ pageIndex, pageSize, sorting, columnFilters }) =>
|
||||
doGetListData(pageIndex, pageSize, sorting, columnFilters)
|
||||
|
||||
Reference in New Issue
Block a user