fix claim report

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

@@ -3,7 +3,6 @@
 namespace Modules\Client\Http\Controllers\Api;
 
 use App\Helpers\Helper;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\ClaimRequest;
 

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

@@ -32,7 +32,7 @@ class CorporateMemberController extends Controller
                 $members = $this->corporateMemberService->getAllMemberClaimReports($corporate_id, $request);
                 return response()->json(Helper::paginateResources(ClaimReportMemberResources::collection($members)));
             case 'claim-submit':
-                $members = $this->corporateMemberService->getAllMemberClaimReports($corporate_id, $request);
+                $members = $this->corporateMemberService->getAllMemberClaimSubmits($corporate_id, $request);
                 return response()->json(Helper::paginateResources(ClaimSubmitMemberResources::collection($members)));
             case 'alarm-center':
                 $members = $this->corporateMemberService->getAllMemberAlarmCenter($corporate_id, $request);
@@ -65,8 +65,7 @@ class CorporateMemberController extends Controller
             ->select('members.*', 'persons.phone')
             ->where('principal_id', $data->member_id)
             ->get();
-        if($data_family->isEmpty())
+        if ($data_family->isEmpty()) {
-        {
             $principal_id = DB::table('members')
                 ->where('member_id', $data->member_id)
                 ->select('principal_id')

Modules/Client/Transformers/ClaimReport/MemberResources.php

@@ -19,8 +19,7 @@ class MemberResources extends JsonResource
             'memberId' => $this->member_id,
             'fullName' => $this->full_name,
             'division' => $this->division_name ?? '',
-            'submission_date' => '',
+            'status' => $this->status,
-            'status' => $this->active,
         ];
     }
 }

app/Services/CorporateMemberService.php

@@ -47,6 +47,46 @@ class CorporateMemberService
     {
         $limit = $request->has('perPage') ? $request->input('perPage') : 10;
 
+        return Member::query()
+            ->joinClaimRequests('right')
+            ->joinCorporateEmployees('left')
+            ->joinCorporateDivisions('left')
+            ->withSum('claims', 'total_claim')
+            ->whereHas('employeds', function (Builder $corporateEmployee) use ($corporateId) {
+                $corporateEmployee->where('corporate_id', $corporateId);
+            })
+            ->when($request->input('search'), function (Builder $query, $search) {
+                $query->where(function (Builder $query) use ($search) {
+                    $query->orWhere('members.member_id', 'like', "%" . $search . "%")
+                        ->orWhere('members.name', 'like', "%" . $search . "%");
+                });
+            })
+            ->when($request->input('division'), function (Builder $division, $value) {
+                $division->whereHas('division', function (Builder $corporateEmployee) use ($value) {
+                    $corporateEmployee->where('division_id', $value);
+                });
+            })
+            ->when($request->has('orderBy'), function (Builder $query) use ($request) {
+                $orderBy = match ($request->orderBy) {
+                    'memberId' => 'member_id',
+                    'fullName' => 'name',
+                    default => ''
+                };
+
+                if (in_array($orderBy, ['member_id', 'name', 'active'])) {
+                    $query->getQuery()->orderBy($orderBy, $request->order);
+                } elseif ($request->orderBy === 'division') {
+                    $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'])
+            ->paginate($limit);
+    }
+
+    public function getAllMemberClaimSubmits(int $corporateId, Request $request)
+    {
+        $limit = $request->has('perPage') ? $request->input('perPage') : 10;
+
         return Member::query()
             ->joinClaimRequests('right')
             ->joinCorporateEmployees('left')

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

@@ -47,7 +47,6 @@ import {
   // );
 
   return (
-      
     <>
       <Stack
         alignItems="center"
@@ -111,8 +110,8 @@ import {
                 startIcon={<Add />}
                 fullWidth
                 sx={{ typography: 'subtitle2', borderColor: '#F5F5F5' }}
+                // onClick={() => clickHandler('topUpLimit')}
               >
-                  onClick={() => clickHandler('topUpLimit')}
                 Hasil Pemeriksaan Laboratorium
               </Button>
             </Stack>
@@ -180,4 +179,3 @@ import {
 };
 
 export default DialogDetailClaim;
-  

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

@@ -1,22 +1,5 @@
 /* ---------------------------------- @mui ---------------------------------- */
-import {
+import { Stack, Button } from '@mui/material';
-  Paper,
-  Table,
-  TableBody,
-  TableCell,
-  TableContainer,
-  TableHead,
-  TableRow,
-  TextField,
-  Stack,
-  IconButton,
-  Button,
-  TableSortLabel,
-  Box,
-} from '@mui/material';
-import DialogDetailClaim from '../../sections/dashboard/DialogDetailClaim';
-import { visuallyHidden } from '@mui/utils';
-import { MoreVert as MoreVertIcon } from '@mui/icons-material';
 /* ---------------------------------- axios --------------------------------- */
 // import axios from 'axios';
 import axios from '../../utils/axios';
@@ -25,121 +8,13 @@ import { useContext, useEffect, useState } from 'react';
 
 /* -------------------------------- component ------------------------------- */
 import Iconify from '../../components/Iconify';
-import BaseTablePagination from '../../components/BaseTablePagination';
 import TableComponent from '../../components/Table';
-import { Navigate } from 'react-router-dom';
-
-/* ---------------------------------- hooks --------------------------------- */
-import useMap from '../../hooks/useMap';
 /* ---------------------------------- theme --------------------------------- */
 import palette from '../../theme/palette';
 import { UserCurrentCorporateContext } from '../../contexts/UserCurrentCorporate';
 import { HeadCell, Order, PaginationTableProps } from '../../@types/table';
 import { useSearchParams, useNavigate } from 'react-router-dom';
 
-/* ---------------------------------- types --------------------------------- */
-
-// type PaginationTableProps = {
-//   current_page: number;
-//   from: number;
-//   last_page: number;
-//   links: [];
-//   path: string;
-//   per_page: number;
-//   to: number;
-//   total: number;
-// };
-
-// type DataTableProps = {
-//   fullName: string;
-//   memberId: string;
-//   service: string;
-//   start_date: string;
-//   end_date: string;
-//   status: boolean | number;
-// };
-
-// /* -------------------------------------------------------------------------- */
-
-// /* -------------------------- enchanced table head -------------------------- */
-
-// type Order = 'asc' | 'desc';
-
-// interface HeadCell {
-//   id: string;
-//   label: string;
-// }
-
-// const headCells: readonly HeadCell[] = [
-//   {
-//     id: 'name',
-//     label: 'Name',
-//   },
-//   {
-//     id: 'member_id',
-//     label: 'Member ID',
-//   },
-//   {
-//     id: 'service',
-//     label: 'Service',
-//   },
-//   {
-//     id: 'start_date',
-//     label: 'Start Date',
-//   },
-//   {
-//     id: 'end_date',
-//     label: 'End Date',
-//   },
-//   {
-//     id: 'status',
-//     label: 'Status',
-//   },
-// ];
-
-// interface EnhancedTableProps {
-//   onRequestSort: (event: React.MouseEvent<unknown>, property: string) => void;
-//   order: Order;
-//   orderBy: string;
-// }
-
-// function EnhancedTableHead(props: EnhancedTableProps) {
-//   const { order, orderBy, onRequestSort } = props;
-//   const createSortHandler = (property: string) => (event: React.MouseEvent<unknown>) => {
-//     onRequestSort(event, property);
-//   };
-
-//   return (
-//     <TableHead>
-//       <TableRow>
-//         <TableCell align="center">No</TableCell>
-//         {headCells.map((headCell) => (
-//           <TableCell
-//             key={headCell.id}
-//             sortDirection={orderBy === headCell.id ? order : false}
-//             align="center"
-//           >
-//             <TableSortLabel
-//               active={orderBy === headCell.id}
-//               direction={orderBy === headCell.id ? order : 'asc'}
-//               onClick={createSortHandler(headCell.id)}
-//             >
-//               {headCell.label}
-//               {orderBy === headCell.id ? (
-//                 <Box component="span" sx={visuallyHidden}>
-//                   {order === 'desc' ? 'sorted descending' : 'sorted ascending'}
-//                 </Box>
-//               ) : null}
-//             </TableSortLabel>
-//           </TableCell>
-//         ))}
-//       </TableRow>
-//     </TableHead>
-//   );
-// }
-
-/* -------------------------------------------------------------------------- */
-
 export default function List() {
   const navigate = useNavigate();
 
@@ -250,12 +125,6 @@ export default function List() {
       label: 'Divisi',
       isSort: true,
     },
-    /* {
-        id: 'end_date',
-        align: 'center',
-        label: 'End Date',
-        isSort: false,
-      }, */
     {
       id: 'status',
       align: 'center',
@@ -270,31 +139,6 @@ export default function List() {
     },
   ];
 
-  const [open, setOpen] = useState<HTMLElement | null>(null);
-
-  const handleOpen = (event: React.MouseEvent<HTMLElement>) => {
-    setOpen(event.currentTarget);
-  };
-
-  const handleClose = () => {
-    setOpen(null);
-  };
-
-  /* const clickHandler = (isDialog: string) => {
-        switch (isDialog) {
-
-          case 'infoDetail':
-            setDialogTitle('Claim Details');
-            setIsDialog(isDialog);
-            setOpenDialog(true);
-            break;
-
-          default:
-            break;
-        }
-      }; */
-  /* -------------------------------------------------------------------------- */
-
   useEffect(() => {
     (async () => {
       setIsLoading(true);
@@ -313,13 +157,10 @@ export default function List() {
       setData(
         response.data.data.map((obj: any) => ({
           ...obj,
-
-          /* memberId: <Button onClick={() => navigate ('user-profile/:id')}>{obj.memberId}</Button>, */
           status:
-            obj.status === 1 ? (
+            obj.status === 'requested' ? (
               <Button
                 onClick={() => navigate('dialog-detail')}
-                /*  startIcon={<Iconify icon="ic:round-check" />} */
                 sx={{
                   backgroundColor: 'rgba(84, 214, 44, 0.16)',
                   color: palette.dark.success.dark,
@@ -333,6 +174,21 @@ export default function List() {
               >
                 Request
               </Button>
+            ) : obj.status === 'approved' ? (
+              <Button
+                sx={{
+                  backgroundColor: (theme) => theme.palette.secondary.main,
+                  color: '#FFFF',
+                  paddingX: 1.5,
+                  paddingY: 1,
+                  '&:hover': {
+                    backgroundColor: (theme) => theme.palette.secondary.dark,
+                    color: '#FFFF',
+                  },
+                }}
+              >
+                Aprroved
+              </Button>
             ) : (
               <Button
                 startIcon={<Iconify icon="fa6-solid:clock" />}
@@ -350,11 +206,6 @@ export default function List() {
                 Ongoing
               </Button>
             ),
-          /*  action: (
-                    <IconButton onClick={() => clickHandler('infoDetail')}>
-                      <MoreVertIcon />
-                    </IconButton>
-                  ), */
         }))
       );
 
@@ -383,7 +234,6 @@ export default function List() {
         loadings={loadings}
         params={params}
         searchs={searchs}
-        // filters={filters}
       />
     </Stack>
   );