Merge remote-tracking branch 'origin/staging' into origin/production

Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php

@@ -51,6 +51,8 @@ class DataServiceMonitoring extends JsonResource
             $admissionDate =  $historyCareHospital->admission_date;
             $dischargeDate =  $historyCareHospital->discharge_date;
             $serviceCode =  $historyCareHospital->service_code;
+            $symptoms = $historyCareHospital->symptoms;
+            $sign = $historyCareHospital->sign;
         } else {
             $hospital = '-';
             $mainDianosis = '-';
@@ -60,6 +62,8 @@ class DataServiceMonitoring extends JsonResource
             $admissionDate = '-';
             $dischargeDate = '-';
             $serviceCode = '-';
+            $symptoms = '-';
+            $sign = '-';
         }
 
 
@@ -125,8 +129,8 @@ class DataServiceMonitoring extends JsonResource
             "phone" => $member->person->phone,
             "email" => $member->email,
             "birth_date" => $member->birth_date,
-            "symptoms"  => $historyCareHospital->symptoms ? $historyCareHospital->symptoms : '-' ,
-            "sign" => $historyCareHospital->sign ? $historyCareHospital->sign : '-',
+            "symptoms"  =>  $symptoms,
+            "sign" => $sign,
             "main_diagnose" => $mainDianosis,
             "main_diagnose_code" => $mainDianosisCode,
             "comparative_diagnosis" => $comporatationDiagnosisName,

Modules/Client/Transformers/Dashboard/MemberAlarmCenterResources.php

@@ -19,8 +19,8 @@ class MemberAlarmCenterResources extends JsonResource
             'memberId' => $this->member_id,
             'fullName' => $this->full_name,
             'service' => $this->service_code,
-            'start_date' => $this->start_date,
-            'end_date' => $this->end_date,
+            'start_date' => $this->members_effective_date,
+            'end_date' => $this->members_expire_date,
             'status' => $this->active,
         ];
     }

app/Services/CorporateMemberService.php

@@ -165,10 +165,10 @@ class CorporateMemberService
                 });
             })
             ->when($request->input('start_date'), function (Builder $query, $start) {
-                $query->where('member_plans.start', '>=', $start);
+                $query->where('members_effective_date.start', '>=', $start);
             })
             ->when($request->input('end_date'), function (Builder $query, $end) {
-                $query->where('member_plans.end', '<', $end);
+                $query->where('members_expire_date.end', '<', $end);
             })
             ->when($request->input('division'), function (Builder $query, $value) {
                 $query->where('corporate_employees.division_id', $value);
@@ -190,7 +190,16 @@ class CorporateMemberService
 
                 $query->getQuery()->orderBy($orderBy, $request->order);
             })
-            ->select(['members.id', 'members.person_id', 'members.member_id', 'members.name', 'members.members_effective_date AS start_date',  'members.members_expire_date AS end_date', 'plans.active', 'plans.service_code'])
+            ->select([
+                'members.id',
+                'members.person_id',
+                'members.member_id',
+                'members.name',
+                'members.members_effective_date', // Use the actual property name
+                'members.members_expire_date',      // Use the actual property name
+                'plans.active',
+                'plans.service_code'
+            ])
             ->selectRaw("(select sum(`claims`.`total_claim`) from `claims` where `members`.`id` = `claims`.`member_id` AND `claims`.`deleted_at` IS NULL) AS `claims_sum_total_claim`")
             ->paginate($limit);
     }

frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx

@@ -187,7 +187,7 @@ export default function ServiceMonitoring() {
   useEffect(() => {
     (async () => {
 
-      await new Promise((resolve) => setTimeout(resolve, 250));
+      // await new Promise((resolve) => setTimeout(resolve, 250));
 
       const response = await axios.get(`${corporateValue}/service-monitoring/${id}`);
       setData(response.data.data);
@@ -400,7 +400,7 @@ export default function ServiceMonitoring() {
                             <TimelineConnector sx={{border: '0.5px dashed rgba(145, 158, 171, 0.32)', backgrounSize: '4px 4px'  }} />
                           </TimelineSeparator>
                           <TimelineContent>
-                            <Typography variant='h5' sx={{marginBottom: 2}}> {fDateSuffix(row.date)}</Typography>
+                            <Typography variant='h5' sx={{marginBottom: 2}}> {row.date ? fDateSuffix(row.date) : '-'}</Typography>
                             <Card sx={{paddinX:2, paddingY:2}} >
                               <Stack direction={'row'} sx={{ alignItems: 'center', padding: 2, justifyContent: 'space-between' }}>
                                 <Label> {row.time} </Label>
@@ -530,7 +530,7 @@ export default function ServiceMonitoring() {
                                       <TableBody>
                                         <TableRow>
                                           <TableCell>
-                                            <Label> {fDateTime(list.datetime)}</Label>
+                                            <Label> {list.datetime ? fDateTime(list.datetime) : '-'}</Label>
                                           </TableCell>
                                           <TableCell>{list.examination}</TableCell>
                                           <TableCell>{list.location}</TableCell>