fix employee data export

Modules/Client/Http/Controllers/Api/CorporateMemberController.php

@@ -27,6 +27,8 @@ use Modules\Internal\Services\MemberEnrollmentService;
 
 class CorporateMemberController extends Controller
 {
+    public $memberEnrollmentService;
+
     public function __construct(public CorporateMemberService $corporateMemberService, MemberEnrollmentService $memberEnrollmentService)
     {
         $this->memberEnrollmentService = $memberEnrollmentService;
@@ -107,11 +109,10 @@ class CorporateMemberController extends Controller
         $data->claim_history = $data_claim_history;
 
         return response()->json(DataMemberResource::make($data));
-        
-       
     }
 
-    public function generateMemberList($corporate_id){
+    public function generateMemberList($corporate_id)
+    {
         // Mendapatkan data yang akan diekspor (misalnya, dari database)
         $data = Member::with(['currentPlan', 'currentCorporate', 'division', 'employeds', 'currentPolicy'])
             // ->filter($request->all())
@@ -129,11 +130,12 @@ class CorporateMemberController extends Controller
         $headerRow = WriterEntityFactory::createRowFromArray($headers_map_to_table_fields);
 
         $writer->addRow($headerRow);
-       // dd('test');
+
         // Menulis data
         if (!empty($data)) {
             foreach ($data as $item) {
-               $rowData = [    $item['record_mode'], // Recode Mode
+                $rowData = [
+                    $item['record_mode'], // Recode Mode
                     $item['record_type'], // Recode Type
                     $item['payor_id'], // Payor ID
                     $item['member_id'], // Member ID
@@ -150,8 +152,8 @@ class CorporateMemberController extends Controller
                     $item['current_policy']['code'] ?? null, // Policy Number
                     $item['marital_status'], // Marital Status
                     $item['relation_with_principal'], // Relationship
-                               str_replace('-', '',$item['members_effective_date']), // Member effective date
+                    str_replace('-', '', $item['members_effective_date']), // Member effective date
-                               str_replace('-', '',$item['members_expire_date']), // Member expiry date
+                    str_replace('-', '', $item['members_expire_date']), // Member expiry date
                     NULL, // Faskes FKTP  (First Level Provider) or Individual preferred provider
                     NULL, // Faskes FKRTL (Next Level Provider) or Individual group preferred provider
                     $item['bpjs_class'], // The Right Classes Room of  BPJS Participants
@@ -181,18 +183,18 @@ class CorporateMemberController extends Controller
                     NULL, // Employment-Status
                     NULL, // Internal Use
                     NULL, // Internal Use
-                               NULL,// Internal Use
+                    NULL, // Internal Use
-                               str_replace('-', '',$item['terminated_date']), // Date Terminated
+                    str_replace('-', '', $item['terminated_date']), // Date Terminated
                     $item['pre_existing'], // Pre Existing
                     $item['bpjs_id'], // BPJS ID
                     $item['endorsement_date'], // Endorsement Date
                     $item['remarks'], // Remarks
                     NULL, // Internal Use
-                               NULL,// Member Since
+                    NULL, // Member Since
-                               NULL,// Internal Use
+                    NULL, // Internal Use
                     $item['policy_in_force'], // Policy Inforce
                     NULL, // Member Suspended
-                               str_replace('-', '',$item['activation_date']), // Activation Date
+                    str_replace('-', '', $item['activation_date']), // Activation Date
                     NULL, // Internal Use
                     $item['start_no_claim'], // StartNoClaim
                     $item['end_no_claim'], // EndNoClaim
@@ -216,7 +218,8 @@ class CorporateMemberController extends Controller
         ]);
     }
 
-    public function showPerMember($corporate_id, $member_id){
+    public function showPerMember($corporate_id, $member_id)
+    {
         $data = ClaimRequest::where(['member_id' => $member_id])
             ->whereNotNull('claim_id')
             ->paginate(10);
@@ -228,7 +231,4 @@ class CorporateMemberController extends Controller
         $data = Claim::where('id', $claim_id)->first();
         return Helper::responseJson(DataServiceMonitoring::make($data));
     }
-
-    
 }
-

frontend/client-portal/src/components/Table.tsx

@@ -288,11 +288,7 @@ export default function Table<T>({
           {exportReport && exportReport.useExport ? (
             <Grid item xs={12} lg={2} xl={2}>
               <FormControl fullWidth>
-                <Button
+                <Button variant="contained" sx={{ p: 2 }} onClick={exportReport.handleExportReport}>
-                  variant="contained"
-                  sx={{ p: 2 }}
-                  onClick={() => exportReport.handleExportReport}
-                >
                   <Download />
                   <Typography variant="inherit" sx={{ marginLeft: 1 }}>
                     Export

frontend/client-portal/src/pages/Dashboard/Index.tsx

@@ -280,8 +280,7 @@ export default function Index() {
       });
       setDivisionData(corporateDivision.data);
       setMemberData(
-        corporateMembers.data.data.map((obj: any) => {
+        corporateMembers.data.data.map((obj: any) => ({
-          return {
           ...obj,
           // limit: (
           //   <Stack>
@@ -330,8 +329,7 @@ export default function Index() {
                 <MoreVertIcon />
               </IconButton>
             ), */
-          };
+        }))
-        })
       );
       setPaginationTable(corporateMembers.data);
       setRowsPerPage(corporateMembers.data.per_page);
@@ -351,7 +349,7 @@ export default function Index() {
         anchorOrigin: { horizontal: 'right', vertical: 'bottom' },
       });
     })();
-  }, [appliedParams, searchParams, order, orderBy, setSearchParams, corporateValue]);
+  }, [appliedParams, searchParams, order, orderBy, pathname, setSearchParams, corporateValue]);
 
   return (
     <Page title="Dashboard">

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

@@ -108,27 +108,23 @@ export default function List() {
     setSearchText: setSearchText,
     handleSearchSubmit: handleSearchSubmit,
   };
-  const [startDateValue, setStartDateValue] = useState('');
-  const [endDateValue, setEndDateValue] = useState('');
-  const [statusValue, setStatusValue] = useState('all');
 
-  const handleExportReport = async (appliedFilter = null) => {
+  const handleExportReport = async () => {
     axios.get(corporateValue + '/export-members/list').then((response) => {
       const link = document.createElement('a');
       link.href = response.data.data.file_url;
       link.setAttribute('download', response.data.data.file_name);
       document.body.appendChild(link);
       link.click();
-      // handleClose();
     });
-}
+  };
   const exportReport = {
     useExport: true,
-    startDate: startDateValue,
+    startDate: '',
-    endDate: endDateValue,
+    endDate: '',
-    status: statusValue,
+    status: 'all',
-    handleExportReport: handleExportReport
+    handleExportReport: handleExportReport,
-  }
+  };
 
   /* -------------------------------- headCell -------------------------------- */
   const headCells: HeadCell<never>[] = [