From 13d4fac65c96fd812c1e88063db604f69a9ba200 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 26 Jul 2023 17:38:33 +0700 Subject: [PATCH 1/7] Update --- .../Http/Controllers/Api/CorporateMemberController.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php index 2b3032b2..0fb62b40 100644 --- a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php +++ b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php @@ -36,9 +36,7 @@ class CorporateMemberController extends Controller ->filter($request->all()) // ->where('corporate_id', $corporate_id) ->leftJoin('files_mcu', 'members.id', '=', 'files_mcu.memberid') - ->select( - 'members.*, GROUP_CONCAT(files_mcu.original_name) AS file_mcu_names' - ) + ->selectRaw('members.*, GROUP_CONCAT(files_mcu.original_name) AS original_names') ->with([ 'employeds', 'currentPolicy', From 8ea3a1d2e5ff41e7e9f22e97f7a0f3f3eeb88e47 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 26 Jul 2023 17:40:40 +0700 Subject: [PATCH 2/7] Update --- .../Http/Controllers/Api/CorporateMemberController.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php index 0fb62b40..aeed6085 100644 --- a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php +++ b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php @@ -35,8 +35,13 @@ class CorporateMemberController extends Controller $members = Member::query() ->filter($request->all()) // ->where('corporate_id', $corporate_id) + ->select('members.*') + ->selectSub(function ($query) { + $query->selectRaw('GROUP_CONCAT(files_mcu.original_name)')->from('files_mcu') + ->whereRaw('files_mcu.memberid = members.id'); + }, 'original_names') ->leftJoin('files_mcu', 'members.id', '=', 'files_mcu.memberid') - ->selectRaw('members.*, GROUP_CONCAT(files_mcu.original_name) AS original_names') + ->groupBy('members.id') ->with([ 'employeds', 'currentPolicy', @@ -54,7 +59,6 @@ class CorporateMemberController extends Controller ]); } ]) - ->groupBy('members.id') ->paginate() ->appends($request->all()); return Helper::paginateResources(MemberDataTableResource::collection($members)); From ec5ef5eb876ec55d45b8d04f16920262bc824054 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 26 Jul 2023 17:42:44 +0700 Subject: [PATCH 3/7] Update --- .../Http/Controllers/Api/CorporateMemberController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php index aeed6085..cc6a1be1 100644 --- a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php +++ b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php @@ -37,8 +37,9 @@ class CorporateMemberController extends Controller // ->where('corporate_id', $corporate_id) ->select('members.*') ->selectSub(function ($query) { - $query->selectRaw('GROUP_CONCAT(files_mcu.original_name)')->from('files_mcu') - ->whereRaw('files_mcu.memberid = members.id'); + $query->selectRaw('GROUP_CONCAT(files_mcu.original_name SEPARATOR ", ")') + ->from('files_mcu') + ->whereRaw('files_mcu.memberid = members.id'); }, 'original_names') ->leftJoin('files_mcu', 'members.id', '=', 'files_mcu.memberid') ->groupBy('members.id') From 2c3e720c83e3d6e46c66b420b87418e97ed11547 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 26 Jul 2023 17:43:49 +0700 Subject: [PATCH 4/7] update --- .../Internal/Http/Controllers/Api/CorporateMemberController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php index cc6a1be1..0b9140d0 100644 --- a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php +++ b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php @@ -42,7 +42,6 @@ class CorporateMemberController extends Controller ->whereRaw('files_mcu.memberid = members.id'); }, 'original_names') ->leftJoin('files_mcu', 'members.id', '=', 'files_mcu.memberid') - ->groupBy('members.id') ->with([ 'employeds', 'currentPolicy', From 5127d8a73b1fcdd18eafc237a9d9cceb044c5e51 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 26 Jul 2023 17:47:28 +0700 Subject: [PATCH 5/7] Update --- .../Internal/Http/Controllers/Api/CorporateMemberController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php index 0b9140d0..af1c6229 100644 --- a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php +++ b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php @@ -40,7 +40,7 @@ class CorporateMemberController extends Controller $query->selectRaw('GROUP_CONCAT(files_mcu.original_name SEPARATOR ", ")') ->from('files_mcu') ->whereRaw('files_mcu.memberid = members.id'); - }, 'original_names') + }, 'file_mcu_names') ->leftJoin('files_mcu', 'members.id', '=', 'files_mcu.memberid') ->with([ 'employeds', From bc949dcea7c177d86055c9a8b69479348061eac5 Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 27 Jul 2023 09:11:34 +0700 Subject: [PATCH 6/7] Update where corporat_id yang terkomen --- .../Internal/Http/Controllers/Api/CorporateMemberController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php index af1c6229..c4d74616 100644 --- a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php +++ b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php @@ -34,7 +34,7 @@ class CorporateMemberController extends Controller { $members = Member::query() ->filter($request->all()) - // ->where('corporate_id', $corporate_id) + ->where('corporate_id', $corporate_id) ->select('members.*') ->selectSub(function ($query) { $query->selectRaw('GROUP_CONCAT(files_mcu.original_name SEPARATOR ", ")') From cb7e0bb484ad580d4ab0191353544087620d7fdd Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Thu, 27 Jul 2023 09:32:17 +0700 Subject: [PATCH 7/7] update bugs listing member --- .../Http/Controllers/Api/CorporateMemberController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php index c4d74616..3b360ce5 100644 --- a/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php +++ b/Modules/Internal/Http/Controllers/Api/CorporateMemberController.php @@ -34,7 +34,7 @@ class CorporateMemberController extends Controller { $members = Member::query() ->filter($request->all()) - ->where('corporate_id', $corporate_id) + ->where('corporate_employees.corporate_id', $corporate_id) ->select('members.*') ->selectSub(function ($query) { $query->selectRaw('GROUP_CONCAT(files_mcu.original_name SEPARATOR ", ")') @@ -42,6 +42,7 @@ class CorporateMemberController extends Controller ->whereRaw('files_mcu.memberid = members.id'); }, 'file_mcu_names') ->leftJoin('files_mcu', 'members.id', '=', 'files_mcu.memberid') + ->leftJoin('corporate_employees', 'members.id', '=', 'corporate_employees.member_id') ->with([ 'employeds', 'currentPolicy',