diff --git a/Modules/Internal/Http/Controllers/Api/ReportLogController.php b/Modules/Internal/Http/Controllers/Api/ReportLogController.php index bd6cebc0..1be8de6e 100644 --- a/Modules/Internal/Http/Controllers/Api/ReportLogController.php +++ b/Modules/Internal/Http/Controllers/Api/ReportLogController.php @@ -154,7 +154,8 @@ class ReportLogController extends Controller $writer->openToFile(public_path('files/Report-Request-Final-LOG.xlsx')); $headerArray = [ 'Code', - 'Member', + 'Member Name', + 'Member Code', 'GL Create Time', 'GL Submit Time', 'GL Create By', @@ -218,6 +219,7 @@ class ReportLogController extends Controller $rowData = [ $row['code'], // code $row['member'] ? $row['member']['name'] : '', // name + $row['member'] ? $row['member']['member_id'] : '', // member id $formattedDateTime ? $formattedDateTime : "-" , // created at $row['submission_date'], // submission date Helper::userName($row['approved_by']), // created by diff --git a/Modules/Internal/Transformers/ReportLogResource.php b/Modules/Internal/Transformers/ReportLogResource.php index 4d0fc117..57e55092 100644 --- a/Modules/Internal/Transformers/ReportLogResource.php +++ b/Modules/Internal/Transformers/ReportLogResource.php @@ -64,6 +64,7 @@ class ReportLogResource extends JsonResource 'status' => $this->status ?? '-', 'status_final_log' => $this->status_final_log ?? '-', 'member_name' => $this->member->name, + 'member_code' => $this->member->member_id, 'payment_type' => $this->payment_type, 'payment_type_name' => $this->payment_type_name, 'duration_gl' => $durationGl, diff --git a/frontend/dashboard/src/pages/Report/Log/List.tsx b/frontend/dashboard/src/pages/Report/Log/List.tsx index 7e08842b..a2c6e648 100644 --- a/frontend/dashboard/src/pages/Report/Log/List.tsx +++ b/frontend/dashboard/src/pages/Report/Log/List.tsx @@ -46,6 +46,7 @@ import TableMoreMenu from '@/components/table/TableMoreMenu'; import { Import } from '@/@types/claims'; // import DialogDeleteRequestLOG from '../Request/Components/DialogDeleteRequestLOG'; import { HeadCell, Order } from '@/@types/table'; +import { ReportLog } from './Model/Type'; // import LoadingButton from '@/theme/overrides/LoadingButton'; export default function List() { @@ -300,7 +301,7 @@ export default function List() { }; // Called on every row to map the data to the columns - function createData(data: any): any { + function createData(data: ReportLog){ return { ...data, }; @@ -319,6 +320,7 @@ export default function List() { *': { borderBottom: 'unset' } }}> {row.code} {row.member_name} + {row.member_code} {row.approved_by} @@ -386,7 +388,13 @@ export default function List() { { id: 'name', align: 'left', - label: 'Member', + label: 'Member Name', + isSort: false, + }, + { + id: 'code', + align: 'left', + label: 'Member Code', isSort: false, }, { diff --git a/frontend/dashboard/src/pages/Report/Log/Model/Type.tsx b/frontend/dashboard/src/pages/Report/Log/Model/Type.tsx new file mode 100644 index 00000000..290a3482 --- /dev/null +++ b/frontend/dashboard/src/pages/Report/Log/Model/Type.tsx @@ -0,0 +1,20 @@ +export type ReportLog = { + id : number, + code : string, + member_name : string, + member_code : string, + submission_date : string, + service_name : string, + payment_type_name : string, + status_final_log : string, + provider : string, + status : string, + created_at : string, + approved_by : string, + approved_final_log_at : string, + created_final_at : string, + approved_final_log_by : string, + document_qty : string, + duration_gl : string, + duration_final_gl : string, +}