update function sort di client portal
This commit is contained in:
@@ -188,15 +188,26 @@ class CorporateMemberController extends Controller
|
|||||||
public function showPerMember(Request $request, $corporate_id, $member_id)
|
public function showPerMember(Request $request, $corporate_id, $member_id)
|
||||||
{
|
{
|
||||||
$per_page = $request->has('per_page') ? $request->input('per_page') : 10;
|
$per_page = $request->has('per_page') ? $request->input('per_page') : 10;
|
||||||
|
$member = Member::query()
|
||||||
$data = Member::query()
|
|
||||||
->with(['requestLogs'])
|
|
||||||
->whereHas('currentCorporate', function ($query) use ($corporate_id) {
|
->whereHas('currentCorporate', function ($query) use ($corporate_id) {
|
||||||
$query->where('corporate_id', $corporate_id);
|
$query->where('corporate_id', $corporate_id);
|
||||||
})
|
})
|
||||||
->find($member_id);
|
->find($member_id);
|
||||||
|
$data = RequestLog::where([
|
||||||
return response()->json(['full_name' => $data->full_name ?? null, 'paginations' => Helper::paginateResources(DataListClaimMemberResource::collection($data->requestLogs()->paginate($per_page)))]);
|
'member_id' => $member->id,
|
||||||
|
'deleted_at' => null
|
||||||
|
])
|
||||||
|
->when($request->has('orderBy'), function ($query) use ($request) {
|
||||||
|
$orderBy = match ($request->input('orderBy')) {
|
||||||
|
'admission_date' => 'request_logs.submission_date',
|
||||||
|
'discharge_date' => 'request_logs.discharge_date',
|
||||||
|
'code' => 'request_logs.code',
|
||||||
|
default => ''
|
||||||
|
};
|
||||||
|
$query->getQuery()->orderBy($orderBy, $request->order);
|
||||||
|
})
|
||||||
|
->paginate($per_page);
|
||||||
|
return response()->json(['full_name' => $member->full_name?? null, 'paginations' => Helper::paginateResources(DataListClaimMemberResource::collection($data))]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function serviceMonitoring(int $corporate_id, int $request_log_id)
|
public function serviceMonitoring(int $corporate_id, int $request_log_id)
|
||||||
|
|||||||
Reference in New Issue
Block a user