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

frontend/dashboard/src/pages/Report/Prescription/List.tsx

@@ -158,7 +158,6 @@ export default function List() {
       setSearchText(searchParams.get('search') ?? '');
     }, []);
 
-   
 
     return (
       <form style={{ width: '100%' }}>
@@ -337,6 +336,7 @@ export default function List() {
           <TableCell align="left">{row.date_consultation ? fDateTime(row.date_consultation) : '-'}</TableCell>
           <TableCell align="left">{row.patient_name ?? '-'}</TableCell>
           <TableCell align="left">{row.doctor_name ?? '-'}</TableCell>
+          <TableCell align="left">{row.status_prescription ?? '-'}</TableCell>
           {/* <TableCell align="center">
             <ButtonGroup variant="text" aria-label="text button group">
               <Link to={'/report/appointments/' + row.id + '/show'}>
@@ -390,7 +390,7 @@ export default function List() {
             </Collapse>
           </TableCell>
         </TableRow>
-  
+
         {/* END COLLAPSIBLE ROW */}
 
         <Dialog
@@ -542,6 +542,9 @@ export default function List() {
                 <TableCell style={headStyle} align="left">
                   Doctor
                 </TableCell>
+                <TableCell style={headStyle} align="left">
+                  Status
+                </TableCell>
                 {/* <TableCell style={headStyle} align="center">
                   Aksi
                 </TableCell> */}