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

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']),