Update

Modules/HospitalPortal/Http/Controllers/ApotekController.php

@@ -65,6 +65,15 @@ class ApotekController extends Controller
                         'tx_prescription_orders.nIDApotek',
                         'tx_prescription_orders.sStatus as status',
                         'tx_prescription_orders.sStatus',
+                        DB::raw('
+                            CASE
+                                WHEN TIMESTAMPDIFF(HOUR, tx_prescriptions.dTanggalResep, NOW()) > 72 THEN ""
+                                WHEN TIMESTAMPDIFF(HOUR, tx_prescriptions.dTanggalResep, NOW()) > 1 AND tx_prescription_orders.sStatus = "waiting_pharmacy" THEN "1"
+                                WHEN TIMESTAMPDIFF(HOUR, tx_prescriptions.dTanggalResep, NOW()) > 2 AND tx_prescription_orders.sStatus = "order_prepared" THEN "2"
+                                WHEN TIMESTAMPDIFF(HOUR, tx_prescriptions.dTanggalResep, NOW()) > 3 AND tx_prescription_orders.sStatus = "ready" THEN "3"
+                                ELSE ""
+                            END AS alert
+                        '),
                         DB::raw('
                         CASE
                             WHEN tx_prescription_orders.sStatus = "waiting_pharmacy" THEN "Diterima"
@@ -234,6 +243,14 @@ class ApotekController extends Controller
                         $item->apotek = $organizations->get($item->nIDApotek, '-'); // Default to 'Unknown' if not found
                         return $item;
                     });
+                    $apotek_phone = DB::connection('mysql')->table('organizations')
+                        ->leftJoin('addresses', 'addresses.id','=', 'organizations.main_address_id')
+                        ->whereIn('organizations.id', $apotekIds)
+                        ->pluck('addresses.phone', 'organizations.id');
+                    $results->getCollection()->transform(function ($item) use ($apotek_phone) {
+                        $item->phone_apotek = $apotek_phone->get($item->nIDApotek, '-'); // Default to 'Unknown' if not found
+                        return $item;
+                    });
                     // Transform results to include allergies
                     $results->getCollection()->transform(function ($item) use ($organizations) {
                         // Get the allergies for each user

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

@@ -28,7 +28,8 @@ import {
   Divider,
   IconButton,
   Modal,
-  CircularProgress
+  CircularProgress,
+  Container, Alert, AlertTitle
 } from '@mui/material';
 
 import { Dialog, DialogTitle, DialogContent, DialogActions } from '@mui/material';
@@ -339,6 +340,16 @@ const allowedStatusesForCSLMS = ['waiting_pharmacy', 'order_prepared', 'ready',
   return (
     // <Card>
       <Grid container>
+        {/* Check if any row has an alert and display a warning message */}
+        {rows.some(row => row.alert) && (
+            <Grid item xs={12} paddingX="24px" paddingY="20px">
+                <Alert severity="error">
+                    <AlertTitle>{localeData.txtAttention}</AlertTitle>
+                    {localeData.txtAttentionInfo}
+                </Alert>
+            </Grid>
+
+        )}
         {/* Field 1 */}
         <Grid item xs={12} paddingX="24px" paddingY="20px">
           <Grid container spacing={2}>
@@ -530,6 +541,7 @@ const allowedStatusesForCSLMS = ['waiting_pharmacy', 'order_prepared', 'ready',
           {/* Table */}
           <TableContainer component={Paper}>
             <TableContent aria-label="collapsible table" size="small">
+
               {/* Table Header */}
               <EnhancedTableHead />
               {/* End Table Header */}
@@ -544,7 +556,10 @@ const allowedStatusesForCSLMS = ['waiting_pharmacy', 'order_prepared', 'ready',
                 ) : rows && rows.length >= 1 ? (
                   rows.map((row, rowIndex) => (
                     <>
-                    <TableRow key={rowIndex}>
+                    <TableRow
+                        key={rowIndex}
+                        style={{ backgroundColor: row.alert ? '#fff3cd' : '#fff'}}
+                    >
                       {!selected.useSelected ? (
                          ''
                       ): (selected.useSelected && row.check_status === 'approved' && !row.check_claim ? (
@@ -651,6 +666,11 @@ const allowedStatusesForCSLMS = ['waiting_pharmacy', 'order_prepared', 'ready',
                         <TableCell colSpan={7}>
                             <Collapse in={openRowId === row.id} timeout="auto" unmountOnExit>
                                 <Card sx={{padding:2}}>
+                                    <Stack direction="row" alignItems="center" justifyContent="right">
+                                        <IconButton sx={{ color: 'black' }}  onClick={() => setOpenRowId(null)}>
+                                            <CloseIcon />
+                                        </IconButton>
+                                    </Stack>
                                     {/* Icon inside a Box for spacing and alignment */}
                                     <Stack direction="row" padding={2} justifyContent="space-between" alignItems="center">
                                         <Stack direction="row">
@@ -922,9 +942,9 @@ const allowedStatusesForCSLMS = ['waiting_pharmacy', 'order_prepared', 'ready',
 
                                     <Box sx={{ display: 'flex', justifyContent: 'space-between', padding: '20px', maxWidth: '1200px', margin: '0 auto' }}>
                                         {/* Close Button on the Left */}
-                                        <Button variant="outlined" color="inherit" onClick={() => setOpenRowId(null)}>
+                                        {/* <Button variant="outlined" color="inherit" onClick={() => setOpenRowId(null)}>
                                             {localeData.txtButtonClose}
-                                        </Button>
+                                        </Button> */}
                                         {/* Accept Button on the Right */}
                                         {/* {row.button_accept && formattedRoleName === 'admin-apotek' && allowedStatusesForApotek.includes(row.sStatus) ? (
                                             <Button variant="contained" color="primary" onClick={() => setDialogIDRow(row.id === dialogIDRow ? null : row.id)}>

frontend/hospital-portal/src/lang/en-US.json

@@ -83,6 +83,7 @@
   "txtPrescriptionDate" : "Date",
   "txtPrescriptionPatient" : "Patient",
   "txtPrescriptionPharmacy" : "Pharmacy",
+  "txtPrescriptionPharmacyPhone" : "Pharmacy Phone",
   "txtPrescriptionDetail" : "Detail",
   "txtPrescriptionDownload" : "Download Prescription",
   "txtProviderDoctorInformation" : "Provider & Doctor Information",
@@ -135,6 +136,9 @@
   "txtFindingDriver": "Finding a driver...",
   "txtDriverFound": "The driver’s been grabbed with the ID",
   "txtButtonClose": "Close",
-  "txtLabelFailed": "Failed"
+  "txtLabelFailed": "Failed",
+  "txtAttention": "Attention",
+  "txtAttentionInfo": "There are pending orders that require approval."
+
 
 }

frontend/hospital-portal/src/lang/id-ID.json

@@ -83,6 +83,7 @@
   "txtPrescriptionDate" : "Tanggal",
   "txtPrescriptionPatient" : "Pasien",
   "txtPrescriptionPharmacy" : "Apotek",
+  "txtPrescriptionPharmacyPhone" : "No. HP Apotek",
   "txtPrescriptionDetail" : "Detail",
   "txtPrescriptionDownload" : "Download Resep",
   "txtProviderDoctorInformation" : "Informasi Provider & Dokter",
@@ -135,5 +136,7 @@
   "txtFindingDriver" : "Sedang mencari driver...",
   "txtDriverFound" : "Driver sudah didapat dengan ID",
   "txtButtonClose": "Tutup",
-  "txtLabelFailed": "Gagal Pengiriman"
+  "txtLabelFailed": "Gagal Pengiriman",
+  "txtAttention": "Perhatian",
+  "txtAttentionInfo": "Terdapat pesanan pending mohon untuk segera di approve."
 }

frontend/hospital-portal/src/sections/dashboardApotek/TableList.tsx

@@ -289,6 +289,12 @@ export default function TableList() {
       label: localeData.txtPrescriptionPharmacy,
       isSort: true,
     },
+    {
+        id: 'phone_apotek',
+        align: 'center',
+        label: localeData.txtPrescriptionPharmacyPhone,
+        isSort: true,
+      },
     {
       id: 'status',
       align: 'center',
@@ -402,7 +408,7 @@ export default function TableList() {
             action:
                 <TableMoreMenu actions={
                   <>
-                    <MenuItem onClick={() => setOpenRowId(obj.id === openRowId ? null : obj.id)}>
+                    <MenuItem onClick={() => setOpenRowId(obj.id)}>
                         <Iconify icon="eva:eye-fill" />
                         {localeData.txtPrescriptionDetail}
                     </MenuItem>