Merge branch 'staging' of https://dev.sismedika.online/febio/aso into staging

This commit is contained in:
2024-02-27 15:22:36 +07:00
2 changed files with 5 additions and 5 deletions

View File

@@ -198,7 +198,7 @@ export default function Detail() {
Detail Detail
</Typography> </Typography>
</Grid> </Grid>
{requestLog?.status_final_log != 'requested' ? ( {/* {requestLog?.status_final_log != 'requested' ? (
<Grid item xs={6} sx={{ display: 'flex', placeContent: 'end' }}> <Grid item xs={6} sx={{ display: 'flex', placeContent: 'end' }}>
<MoreMenu <MoreMenu
actions={ actions={
@@ -212,7 +212,7 @@ export default function Detail() {
</> </>
} }
/> />
</Grid>) : null } </Grid>) : null } */}
</Grid> </Grid>
<Stack direction='row' spacing={2} sx={marginBottom1}> <Stack direction='row' spacing={2} sx={marginBottom1}>
@@ -614,7 +614,7 @@ export default function Detail() {
</Card> </Card>
</Grid> </Grid>
{statusClaim == 'requested' ? ( {statusClaim == 'received' ? (
<Grid container justifyContent="flex-end" sx={{marginRight: '20px'}} padding={2}> <Grid container justifyContent="flex-end" sx={{marginRight: '20px'}} padding={2}>
<Grid item xs={12} md={2}> <Grid item xs={12} md={2}>
<Stack direction="row" padding={4} sx={{ justifyContent: 'space-between' }}> <Stack direction="row" padding={4} sx={{ justifyContent: 'space-between' }}>

View File

@@ -97,7 +97,7 @@ const dummyServices = [
setSelectAll(!selectAll); setSelectAll(!selectAll);
if (!selectAll) { if (!selectAll) {
const requestedIds = dataTableData.data const requestedIds = dataTableData.data
.filter(row => row.status === 'requested') // Memfilter baris dengan status 'requested' .filter(row => row.status === 'received') // Memfilter baris dengan status 'requested'
.map(row => row.id); // Mengambil hanya ID dari baris-baris yang memenuhi kondisi .map(row => row.id); // Mengambil hanya ID dari baris-baris yang memenuhi kondisi
setSelectedRows(requestedIds); setSelectedRows(requestedIds);
} else { } else {
@@ -519,7 +519,7 @@ const dummyServices = [
</IconButton> </IconButton>
</TableCell> */} </TableCell> */}
<TableCell align="left"> <TableCell align="left">
{row?.status == 'requested' ? ( {row?.status == 'received' ? (
<Checkbox checked={isSelected} onChange={handleRowCheckboxChange} /> <Checkbox checked={isSelected} onChange={handleRowCheckboxChange} />
):''} ):''}
</TableCell> </TableCell>