diff --git a/Modules/Internal/Http/Controllers/Api/RequestLogController.php b/Modules/Internal/Http/Controllers/Api/RequestLogController.php
index 690d1564..1a7875f4 100644
--- a/Modules/Internal/Http/Controllers/Api/RequestLogController.php
+++ b/Modules/Internal/Http/Controllers/Api/RequestLogController.php
@@ -64,11 +64,11 @@ class RequestLogController extends Controller
})
->when($request->orderBy, function ($q, $orderBy) use ($request) {
if (in_array($orderBy, ['submission_date', 'code'])) {
- $q->orderBy($orderBy, $request->order);
+ $q->orderBy($orderBy, $request->orderBy);
}
})
->when(empty($request->orderBy), function ($q) {
- $q->orderBy('created_at', 'desc');
+ $q->orderBy('submission_date', 'desc');
})
->when($request->service_code, function($q, $service_code) {
if ($service_code == 'IP'){ // Penjagaan sementara agar ini hanya muncul di inpatient monitoring
diff --git a/frontend/dashboard/src/pages/CustomerService/FinalLog/Detail.tsx b/frontend/dashboard/src/pages/CustomerService/FinalLog/Detail.tsx
index a3f32953..15a3a77f 100644
--- a/frontend/dashboard/src/pages/CustomerService/FinalLog/Detail.tsx
+++ b/frontend/dashboard/src/pages/CustomerService/FinalLog/Detail.tsx
@@ -149,6 +149,7 @@ export default function Detail() {
Detail
+ {requestLog?.status_final_log != 'requested' ? (
}
/>
-
+ ) : null }
diff --git a/frontend/dashboard/src/pages/CustomerService/Request/Detail.tsx b/frontend/dashboard/src/pages/CustomerService/Request/Detail.tsx
index 27348c18..5f132a50 100644
--- a/frontend/dashboard/src/pages/CustomerService/Request/Detail.tsx
+++ b/frontend/dashboard/src/pages/CustomerService/Request/Detail.tsx
@@ -90,20 +90,22 @@ export default function Detail() {
Detail
-
-
-
- >
- }
- />
-
+ {requestLog?.status != 'requested' ? (
+
+
+
+ >
+ }
+ />
+
+ ) : null}