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

[Client Portal] Penyesuaian get data alarm center

Browse Source
This commit is contained in:
Linksehat Staging Server
2024-01-13 18:19:12 +07:00
parent 30cfcce4af
commit 0bda72da48
4 changed files with 92 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
app/Services/CorporateMemberService.php
View File

@@ -5,6 +5,7 @@ namespace App\Services;
use App\Models\CorporateEmployee;
use App\Models\Member;
use App\Models\Encounter;
use App\Models\RequestLog;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
@@ -152,8 +153,61 @@ class CorporateMemberService
// $end_date = date('Y-m-d', strtotime($request->input('end_date') . ' +1 day'));
// dd($request);
return Member::query()
// ->joinCorporateEmployees('left')
// return Member::query()
// // ->joinCorporateEmployees('left')
// // ->joinMemberPlans('left')
// // ->joinPlans('left')
// // ->with(['currentPlan', 'person'])
// // ->where('corporate_employees.corporate_id', $corporateId)
// ->when($request->input('search'), function (Builder $query, $search) {
// $query->where(function (Builder $query) use ($search) {
// $query->orWhere('members.member_id', 'like', "%" . $search . "%")
// ->orWhere('members.name', 'like', "%" . $search . "%");
// });
// })
// ->when($request->input('start_date'), function (Builder $query, $start_date) {
// $query->where('members.members_effective_date', '>=', $start_date);
// })
// ->when($request->input('end_date'), function (Builder $query, $end_date) {
// $query->where('members.members_expire_date', '<', $end_date);
// })
// ->when($request->input('division'), function (Builder $query, $value) {
// $query->where('corporate_employees.division_id', $value);
// })
// ->when($request->input('status'), function (Builder $query, $value) {
// $query->where('plans.active', $value);
// })
// ->when($request->has('orderBy'), function (Builder $query) use ($request) {
// $orderBy = match ($request->input('orderBy')) {
// 'memberId' => 'member_id',
// 'fullName' => 'name',
// // 'status' => 'active',
// 'start_date' => 'member_plans.members_effective_date',
// 'end_date' => 'member_plans.members_expire_date',
// // 'service' => 'plans.service_code',
// default => ''
// };
// $query->getQuery()->orderBy($orderBy, $request->order);
// })
// ->select([
// 'members.id',
// 'members.person_id',
// 'members.member_id',
// 'members.name',
// 'members.members_effective_date', // Use the actual property name
// 'members.members_expire_date', // Use the actual property name
// // 'plans.active',
// // 'plans.service_code'
// ])
// // ->selectRaw("(select sum(`claims`.`total_claim`) from `claims` where `members`.`id` = `claims`.`member_id` AND `claims`.`deleted_at` IS NULL) AS `claims_sum_total_claim`")
// // ->groupBy('member_id')
// ->paginate($limit);
return RequestLog::query()
->leftJoin('members', 'request_logs.member_id', '=', 'members.id')
// ->joinMemberPlans('left')
// ->joinPlans('left')
// ->with(['currentPlan', 'person'])
@@ -180,10 +234,10 @@ class CorporateMemberService
$orderBy = match ($request->input('orderBy')) {
'memberId' => 'member_id',
'fullName' => 'name',
// 'status' => 'active',
'status' => 'active',
'start_date' => 'member_plans.members_effective_date',
'end_date' => 'member_plans.members_expire_date',
// 'service' => 'plans.service_code',
'request_date' => 'request_logs.submission_date',
default => ''
};
@@ -194,15 +248,17 @@ class CorporateMemberService
'members.id',
'members.person_id',
'members.member_id',
'members.name',
'members.name as full_name',
'members.members_effective_date', // Use the actual property name
'members.members_expire_date', // Use the actual property name
// 'plans.active',
// 'plans.service_code'
'members.active',
'request_logs.service_code',
])
// ->selectRaw("(select sum(`claims`.`total_claim`) from `claims` where `members`.`id` = `claims`.`member_id` AND `claims`.`deleted_at` IS NULL) AS `claims_sum_total_claim`")
// ->groupBy('member_id')
->groupBy('member_id')
->paginate($limit);
}
public function getAllMemberEmployeeData(int $corporateId, Request $request)