Merge remote-tracking branch 'origin/staging' into origin/production

Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php

@@ -1,7 +1,7 @@
 <?php
 
 namespace Modules\Internal\Http\Controllers\Api;
-
+use App\Helpers\Helper;
 use App\Models\DailyMonitoring;
 use App\Models\RequestDailyMonitoring;
 use App\Models\MedicalPlan;
@@ -10,8 +10,10 @@ use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Validator;
+use Modules\Internal\Transformers\DailyMonitoringResource;
 use App\Models\File;
 
+
 /**
  * Bagaskoro BSD 27-10-2023
  *
@@ -36,7 +38,7 @@ class DailyMonitoringController extends Controller
     /**
      * Member List
      */
-    public function GetMemberList()
+    public function GetMemberList(Request $request)
     {
         $memberList = DB::table('request_logs')
             ->leftJoin('members', 'request_logs.member_id', '=', 'members.id')
@@ -45,18 +47,18 @@ class DailyMonitoringController extends Controller
             ->select('members.member_id','members.name','members.members_effective_date AS startdate','members.members_expire_date AS enddate', 'request_logs.submission_date as addmision_date', 'organizations.name as provider' )
             ->where('request_logs.service_code', 'IP')
             ->where('request_logs.deleted_at', null)
+            ->when($request->search, function ($q, $search) {
+                $q->where('members.member_id', 'LIKE', "%".$search."%");
+                $q->orWhere('members.name','LIKE',"%".$search."%");
+            })
             // ->where('request_logs.status_final_log', 'approved')
             ->groupBy('request_logs.member_id')
             ->orderBy('request_logs.created_at', 'desc')
-            ->get();
+            // ->get()
+            ->paginate();
 
-        return response()->json([
-            'error'   => false,
-            'message' => "success",
-            'data'    => [
-                'member_list'=> $memberList,
-            ]
-        ],200);
+        
+        return Helper::paginateResources(DailyMonitoringResource::collection($memberList));
     }
 
     /**
@@ -76,8 +78,12 @@ class DailyMonitoringController extends Controller
             ->where('request_logs.service_code', 'IP')
             ->where('request_logs.status_final_log', 'approved')
             ->where("request_logs.member_id", "=", $memberDetail->id)
+            ->when($request->search, function ($q, $search) {
+                $q->where('request_logs.code', 'LIKE', "%".$search."%");
+            })
             ->orderBy("request_logs.created_at", "desc")
-            ->get();
+            // ->get()
+            ->paginate();
 
         return response()->json([
             'error'   => false,

Modules/Internal/Transformers/DailyMonitoringResource.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\Internal\Transformers;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class DailyMonitoringResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request
+     * @return array
+     */
+    public function toArray($request)
+    {
+
+        $data = [
+            'member_id' => $this->member_id,
+            'name' => $this->name,
+            'start_date' => $this->startdate,
+            'end_date' => $this->enddate,
+            'addmision_date' => $this->addmision_date,
+            'provider' => $this->provider,
+        ];
+
+        return $data;
+    }
+}

Modules/Internal/Transformers/RequestLogResource.php

@@ -24,8 +24,8 @@ class RequestLogResource extends JsonResource
         $data = [
             'id' => $this->id,
             'code' => $this->code,
-            'created_at' => $this->created_at,
-            'submission_date' => $this->submission_date,
+            'submission_date' => $this->created_at, // submsion_date diambil dari kolom created_at
+            'admission_date' => $this->submission_date, // admission_date diambil dari kolom submission
             'submission_date_fgl' => $this->approved_final_log_at,
             'member_name' => $this->member->name,
             'status' => $this->status ?? 'unknown',

Modules/Internal/Transformers/RequestLogShowResource.php

@@ -106,8 +106,8 @@ class RequestLogShowResource extends JsonResource
             'principal_id' => $requestLog['member']['principal_id'] ? $requestLog['member']['principal_id'] : '-',
             'principal_name' => $requestLog['member']['principal_id'] ? Helper::principalName($requestLog['member']['principal_id']) : '-',
             'relation_with_principal' => Helper::relationWithPrincipal($requestLog['member']['relation_with_principal']),
-            'admission_date' => $requestLog['submission_date'], // admission mengacu pada tanggal submit
-            'submission_date' => $requestLog['created_at'], // submission mengacu pada tanggal buat
+            'submission_date' => $requestLog['created_at'],
+            'admission_date' => $requestLog['submission_date'],
             'approved_final_log_at' => $requestLog['approved_final_log_at'], // submission final log
             'discharge_date' => $requestLog['discharge_date'],
             'service_type' => Helper::serviceName($requestLog['service_code']),