tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Linksehat Staging Server
2023-09-10 19:12:55 +07:00
parent fdb382f90b 5e8bcab6ac
commit a64ed344ee
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Internal/Http/Controllers/Api/LivechatController.php
View File

@@ -164,7 +164,7 @@ class LivechatController extends Controller
$sheet->setCellValue('A' . $startFrom, $indexLiveChat + 1); $sheet->setCellValue('A' . $startFrom, $indexLiveChat + 1);
$sheet->setCellValue('B' . $startFrom, $liveChat->nID ?? '-'); $sheet->setCellValue('B' . $startFrom, $liveChat->nID ?? '-');
$sheet->setCellValue('C' . $startFrom, Carbon::parse($liveChat->dCreateOn)->format('d-m-Y')); $sheet->setCellValue('C' . $startFrom, Carbon::parse($liveChat->dCreateOn)->format('d-m-Y'));
$sheet->setCellValue('D' . $startFrom, Carbon::parse($liveChat->dCreateOn)->format('H:m:i')); $sheet->setCellValue('D' . $startFrom, Carbon::parse($liveChat->dCreateOn)->format('H:i:s'));
// $sheet->setCellValue('D' . $startFrom, Carbon::parse($liveChat->dRequestTime)->format('H:i:s')); // $sheet->setCellValue('D' . $startFrom, Carbon::parse($liveChat->dRequestTime)->format('H:i:s'));
$sheet->setCellValue('E' . $startFrom, $liveChat->healthCare->sHealthCare ?? '-'); $sheet->setCellValue('E' . $startFrom, $liveChat->healthCare->sHealthCare ?? '-');
$sheet->setCellValue('F' . $startFrom, $fullNameDoctor); $sheet->setCellValue('F' . $startFrom, $fullNameDoctor);

4
Modules/Internal/Transformers/LivechatResource.php
View File

@@ -29,8 +29,8 @@ class LivechatResource extends JsonResource
. ' ' . $this->appointment->appointmentDetail->tTimeAppointment : . ' ' . $this->appointment->appointmentDetail->tTimeAppointment :
null, null,
'status_appointment' => $this->appointment->paymentStatus ?? null, 'status_appointment' => $this->appointment->paymentStatus ?? null,
'date_created' => Carbon::parse($this->dRequestTime)->format('d-m-Y') ?? null, 'date_created' => Carbon::parse($this->dCreateOn)->format('d-m-Y') ?? null,
'time_request' => Carbon::parse($this->dRequestTime)->format('H:i:s') ?? null, 'time_request' => Carbon::parse($this->dCreateOn)->format('H:i:s') ?? null,
'patient_media' => $this->sMedia ?? null, 'patient_media' => $this->sMedia ?? null,
'doctor_media' => $this->sMediaDokter ?? null, 'doctor_media' => $this->sMediaDokter ?? null,
'appointment_media' => $this->appointment->sMedia ?? null, 'appointment_media' => $this->appointment->sMedia ?? null,

20
frontend/dashboard/src/pages/Report/Livechat/List.tsx
View File

@@ -262,12 +262,12 @@ export default function List() {
<TableCell align="left">{row.speciality ? row.speciality : '-'}</TableCell> <TableCell align="left">{row.speciality ? row.speciality : '-'}</TableCell>
<TableCell align="left">{row.pasien_name ? row.pasien_name : '-'}</TableCell> <TableCell align="left">{row.pasien_name ? row.pasien_name : '-'}</TableCell>
<TableCell align="left">{row.pasien_phone ? row.pasien_phone : '-'}</TableCell> <TableCell align="left">{row.pasien_phone ? row.pasien_phone : '-'}</TableCell>
<TableCell align="left">{row.appointment_media ? row.appointment_media : '-'}</TableCell> {/* <TableCell align="left">{row.appointment_media ? row.appointment_media : '-'}</TableCell> */}
<TableCell align="left">{row.patient_media ? row.patient_media : '-'}</TableCell> <TableCell align="left">{row.patient_media ? row.patient_media : '-'}</TableCell>
<TableCell align="left">{row.doctor_media ? row.doctor_media : '-'}</TableCell> <TableCell align="left">{row.doctor_media ? row.doctor_media : '-'}</TableCell>
<TableCell align="left"> {/* <TableCell align="left">
{row.status_appointment ? row.status_appointment : '-'} {row.status_appointment ? row.status_appointment : '-'}
</TableCell> </TableCell> */}
<TableCell align="left">{row.status_chat ? row.status_chat : '-'}</TableCell> <TableCell align="left">{row.status_chat ? row.status_chat : '-'}</TableCell>
<TableCell align="center"> <TableCell align="center">
<ButtonGroup variant="text" aria-label="text button group"> <ButtonGroup variant="text" aria-label="text button group">
@@ -477,10 +477,10 @@ export default function List() {
{/* <TableCell colSpan={8} rowSpan={1} align="center" /> */} {/* <TableCell colSpan={8} rowSpan={1} align="center" /> */}
<TableCell style={headStyle} align="left" /> <TableCell style={headStyle} align="left" />
<TableCell style={headStyle} rowSpan={2} align="left"> <TableCell style={headStyle} rowSpan={2} align="left">
Tanggal Request Tanggal
</TableCell> </TableCell>
<TableCell style={headStyle} rowSpan={2} align="left"> <TableCell style={headStyle} rowSpan={2} align="left">
Waktu Request Waktu
</TableCell> </TableCell>
<TableCell style={headStyle} rowSpan={2} align="left"> <TableCell style={headStyle} rowSpan={2} align="left">
Faskes Faskes
@@ -497,9 +497,9 @@ export default function List() {
<TableCell style={headStyle} rowSpan={2} align="left"> <TableCell style={headStyle} rowSpan={2} align="left">
No Telepon Pasien No Telepon Pasien
</TableCell> </TableCell>
<TableCell style={headStyle} rowSpan={2} align="left"> {/* <TableCell style={headStyle} rowSpan={2} align="left">
Appointment Via App/Website Appointment Via App/Website
</TableCell> </TableCell> */}
<TableCell <TableCell
colSpan={2} colSpan={2}
style={headStyle} style={headStyle}
@@ -508,11 +508,11 @@ export default function List() {
> >
Chat Via App/Website Chat Via App/Website
</TableCell> </TableCell>
<TableCell style={headStyle} rowSpan={2} align="left"> {/* <TableCell style={headStyle} rowSpan={2} align="left">
Status Appointment Status Appointment
</TableCell> </TableCell> */}
<TableCell style={headStyle} rowSpan={2} align="left"> <TableCell style={headStyle} rowSpan={2} align="left">
Status Chat Status
</TableCell> </TableCell>
</TableRow> </TableRow>
<TableRow> <TableRow>