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

update penjagaan edit log

Browse Source
This commit is contained in:
Tb Fajri
2024-01-29 10:46:05 +07:00
parent 2ce4a1efd1
commit c9d0e85449
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/Internal/Http/Controllers/Api/RequestLogController.php
View File

@@ -64,11 +64,11 @@ class RequestLogController extends Controller
}) })
->when($request->orderBy, function ($q, $orderBy) use ($request) { ->when($request->orderBy, function ($q, $orderBy) use ($request) {
if (in_array($orderBy, ['submission_date', 'code'])) { if (in_array($orderBy, ['submission_date', 'code'])) {
$q->orderBy($orderBy, $request->order); $q->orderBy($orderBy, $request->orderBy);
} }
}) })
->when(empty($request->orderBy), function ($q) { ->when(empty($request->orderBy), function ($q) {
$q->orderBy('created_at', 'desc'); $q->orderBy('submission_date', 'desc');
}) })
->when($request->service_code, function($q, $service_code) { ->when($request->service_code, function($q, $service_code) {
if ($service_code == 'IP'){ // Penjagaan sementara agar ini hanya muncul di inpatient monitoring if ($service_code == 'IP'){ // Penjagaan sementara agar ini hanya muncul di inpatient monitoring

3
frontend/dashboard/src/pages/CustomerService/FinalLog/Detail.tsx
View File

@@ -149,6 +149,7 @@ export default function Detail() {
Detail Detail
</Typography> </Typography>
</Grid> </Grid>
{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={
@@ -162,7 +163,7 @@ export default function Detail() {
</> </>
} }
/> />
</Grid> </Grid>) : null }
</Grid> </Grid>
<Stack direction='row' spacing={2} sx={marginBottom1}> <Stack direction='row' spacing={2} sx={marginBottom1}>

30
frontend/dashboard/src/pages/CustomerService/Request/Detail.tsx
View File

@@ -90,20 +90,22 @@ export default function Detail() {
Detail Detail
</Typography> </Typography>
</Grid> </Grid>
<Grid item xs={6} sx={{ display: 'flex', placeContent: 'end' }}> {requestLog?.status != 'requested' ? (
<MoreMenu <Grid item xs={6} sx={{ display: 'flex', placeContent: 'end' }}>
actions={ <MoreMenu
<> actions={
<MenuItem onClick={() => { <>
setOpenDialogEdit(true); <MenuItem onClick={() => {
}}> setOpenDialogEdit(true);
<EditOutlined /> }}>
Edit <EditOutlined />
</MenuItem> Edit
</> </MenuItem>
} </>
/> }
</Grid> />
</Grid>
) : null}
</Grid> </Grid>
<Stack direction='row' spacing={2} sx={marginBottom1}> <Stack direction='row' spacing={2} sx={marginBottom1}>