From 0412aa3a211ff81921ee4864309c52f2ab572322 Mon Sep 17 00:00:00 2001 From: Sean Zeliq Urian Date: Mon, 31 May 2021 10:10:53 +0700 Subject: [PATCH 1/2] [REFACTOR] fix date precision --- .../ActivityLog/components/ActivityList/index.tsx | 14 +++++++++----- .../ActivityLog/components/ActivityTabel/index.tsx | 11 +++++++++-- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/scenes/ActivityLog/components/ActivityList/index.tsx b/src/scenes/ActivityLog/components/ActivityList/index.tsx index bcc4e09..c15cd89 100644 --- a/src/scenes/ActivityLog/components/ActivityList/index.tsx +++ b/src/scenes/ActivityLog/components/ActivityList/index.tsx @@ -53,9 +53,16 @@ export default function ActivityList() { ignoreDateFilterQuery: boolean ) => { let dateOnly = { - start_date: dateFilterQuery.start_date.toISOString().split('T')[0], - end_date: dateFilterQuery.end_date.toISOString().split('T')[0], + start_date: new Date( + dateFilterQuery.start_date.valueOf() + 1000 * 3600 * 24 + ) + .toISOString() + .split('T')[0], + end_date: new Date(dateFilterQuery.end_date.valueOf() + 1000 * 3600 * 24) + .toISOString() + .split('T')[0], }; + setIsLoading(true); const logResponse = await services.main.getLog( page, @@ -65,10 +72,7 @@ export default function ActivityList() { ignoreDateFilterQuery ); - console.log(logResponse); - let logs: Log[] = []; - console.log(logResponse.data.results); if ( logResponse.data.results !== undefined && logResponse.data.results.length > 0 diff --git a/src/scenes/ActivityLog/components/ActivityTabel/index.tsx b/src/scenes/ActivityLog/components/ActivityTabel/index.tsx index 1e37673..d766dd9 100644 --- a/src/scenes/ActivityLog/components/ActivityTabel/index.tsx +++ b/src/scenes/ActivityLog/components/ActivityTabel/index.tsx @@ -34,9 +34,16 @@ export default function ActivityTabel() { ignoreDateFilterQuery: boolean ) => { let dateOnly = { - start_date: dateFilterQuery.start_date.toISOString().split('T')[0], - end_date: dateFilterQuery.end_date.toISOString().split('T')[0], + start_date: new Date( + dateFilterQuery.start_date.valueOf() + 1000 * 3600 * 24 + ) + .toISOString() + .split('T')[0], + end_date: new Date(dateFilterQuery.end_date.valueOf() + 1000 * 3600 * 24) + .toISOString() + .split('T')[0], }; + const logResponse = await services.main.getLog( page, roleFilterQuery, -- GitLab From 90b71a873428381179d546d7ddc5a85323ad363b Mon Sep 17 00:00:00 2001 From: Sean Zeliq Urian Date: Mon, 31 May 2021 10:11:22 +0700 Subject: [PATCH 2/2] [CHORUS] add account info in log list --- src/scenes/ActivityLog/utilities/utils.tsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/scenes/ActivityLog/utilities/utils.tsx b/src/scenes/ActivityLog/utilities/utils.tsx index d3ec067..380c24b 100644 --- a/src/scenes/ActivityLog/utilities/utils.tsx +++ b/src/scenes/ActivityLog/utilities/utils.tsx @@ -70,6 +70,13 @@ const generateLogMessage = async (log: any, services: any) => { break; } } + + if (log.author.is_admin) { + message = '[Admin] ' + message; + } else { + message = '[Kader] ' + message; + } + return message; }; -- GitLab