Merge branch 'staging' of itcorp.primaya.id:rajif/aso into staging

Modules/Client/Transformers/ClaimReport/MemberResources.php

@@ -21,6 +21,7 @@ class MemberResources extends JsonResource
             'fullName' => $this->full_name,
             'division' => $this->division_name ?? '',
             'status' => $this->status,
+            'submissionDate' => $this->submission_date,
         ];
     }
 }

app/Services/CorporateMemberService.php

@@ -80,7 +80,7 @@ class CorporateMemberService
                     $query->getQuery()->orderBy('corporate_divisions.name', $request->order);
                 }
             })
-            ->select(['members.id', 'members.person_id', 'members.member_id', 'members.name', 'corporate_divisions.name AS division_name', 'claim_requests.status', 'claim_requests.code'])
+            ->select(['members.id', 'members.person_id', 'members.member_id', 'members.name', 'corporate_divisions.name AS division_name', 'claim_requests.status', 'claim_requests.code','claim_requests.submission_date'])
             ->paginate($limit);
     }
 

frontend/client-portal/src/pages/ClaimReport/List.tsx

@@ -14,6 +14,7 @@ import palette from '../../theme/palette';
 import { UserCurrentCorporateContext } from '../../contexts/UserCurrentCorporate';
 import { HeadCell, Order, PaginationTableProps } from '../../@types/table';
 import { useSearchParams, useNavigate } from 'react-router-dom';
+import { fDate } from '../../utils/formatTime';
 
 export default function List() {
   const navigate = useNavigate();
@@ -118,6 +119,12 @@ export default function List() {
       label: 'Code Request',
       isSort: true,
     },
+    {
+      id: 'submissionDate',
+      align: 'left',
+      label: 'Request Date',
+      isSort: true,
+    },
     {
       id: 'fullName',
       align: 'left',
@@ -212,6 +219,8 @@ export default function List() {
                 Ongoing
               </Button>
             ),
+            submissionDate:
+              obj.submissionDate ? fDate(obj.submissionDate) : ''
         }))
       );