Merge branch 'staging' of itcorp.primaya.id:rajif/aso into staging

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

@@ -146,17 +146,19 @@ class ClaimRequestController extends Controller
     {
         $request->validate([
             'id' => 'required',
-            'member_id' => 'required'
+            'memberid' => 'required'
         ]);
         if ($request->hasFile('result_files')) {
             $pathFile = File::storeFile('claim-result', $request->id, $request->result_files);
             $data = [
-                'member_id' => $request->id,
+                'memberid' => $request->id,
+                'original_name' => $request->result_files->getClientOriginalName(),
                 'path' => $pathFile,
-                'created_by' => auth()->user()->id
+                'created_by' => auth()->user()->id,
+                'updated_by' => auth()->user()->id
             ];
             FilesMcu::create($data);
-            return Helper::responseJson(data: $request->toArray(), message: 'Berhasil tambah file member '.$request->member_id.', silahkan lihat dilaporan');
+            return Helper::responseJson(data: $request->toArray(), message: 'Berhasil tambah file MemberID '.$request->memberid.', silahkan lihat dilaporan');
         }
         else
         {

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

@@ -18,6 +18,7 @@ use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Storage;
 use Modules\Internal\Services\MemberEnrollmentService;
 use PDF;
+use Illuminate\Support\Facades\DB;
 
 class CorporateMemberController extends Controller
 {
@@ -34,6 +35,11 @@ class CorporateMemberController extends Controller
         $members = Member::query()
             ->filter($request->all())
             // ->where('corporate_id', $corporate_id)
+            ->leftJoin('files_mcu', 'members.id', '=', 'files_mcu.memberid')
+            ->select(
+                'members.*', // Select all columns from the members table
+                DB::raw('GROUP_CONCAT(files_mcu.original_name) AS file_mcu_names')
+            )
             ->whereHas('employeds', function ($employeds) use ($corporate_id) {
                 $employeds->where('corporate_id', $corporate_id);
             })
@@ -54,6 +60,7 @@ class CorporateMemberController extends Controller
                     ]);
                 }
             ])
+            ->groupBy('members.id')
             ->paginate()
             ->appends($request->all());
         return Helper::paginateResources(MemberDataTableResource::collection($members));

app/Models/FilesMcu.php

@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Model;
 class FilesMcu extends Model
 {
     use HasFactory;
-    protected $table = 'filesmcu';
+    protected $table = 'files_mcu';
     protected $primaryKey = 'id';
-    protected $fillable = ['member_id', 'path', 'created_by', 'created_at'];
+    protected $fillable = ['memberid', 'original_name', 'path', 'created_by','updated_by', 'created_at', 'updated_at'];
 }

database/migrations/2023_07_18_104511_create_filesmcu_table.php

@@ -13,12 +13,13 @@ return new class extends Migration
      */
     public function up()
     {
-        Schema::create('filesmcu', function (Blueprint $table) {
+        Schema::create('files_mcu', function (Blueprint $table) {
             $table->increments('id');
-            $table->integer('member_id');
-            $table->string('path');
-            $table->integer('created_by');
-            $table->integer('updated_by')->default(0);
+            $table->bigInteger('memberid');
+            $table->string('original_name', 255);
+            $table->string('path', 255);
+            $table->bigInteger('created_by');
+            $table->bigInteger('updated_by');
             $table->timestamps();
         });
     }
@@ -30,6 +31,6 @@ return new class extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('filesmcu');
+        Schema::dropIfExists('files_mcu');
     }
 };

frontend/dashboard/src/pages/Corporates/Member/List.tsx

@@ -184,7 +184,7 @@ export default function CorporatePlanList({handleSubmitSuccess}) {
       if (fileWithId) {
         const formData = makeFormData({
           id: id,
-          member_id: member_id,
+          memberid: member_id,
           result_files: fileWithId.file,
         });
         axios
@@ -193,7 +193,10 @@ export default function CorporatePlanList({handleSubmitSuccess}) {
           const responseData = response?.data;
           if(responseData)
           {
-            enqueueSnackbar(responseData.message ?? 'Berhasil tambah file member '+member_id+', silahkan lihat dilaporan', { variant: 'success' });
+            setTimeout(() => {
+              loadDataTableData();
+            }, 2000);
+            enqueueSnackbar(responseData.message ?? 'Berhasil tambah file MemberID '+member_id+', silahkan lihat dilaporan', { variant: 'success' });
             handleSubmitSuccess();
           }
           
@@ -641,6 +644,20 @@ export default function CorporatePlanList({handleSubmitSuccess}) {
                     </Grid>
                   </Grid>
                 </Grid>
+                <Typography sx={{ fontWeight: '600', mb: 1 }}>File History</Typography>
+                <Grid container sx={{ pb: 2, mb: 2, borderBottom: 1 }}>
+                  <Grid item xs={12}>
+                    <Grid container>
+                      <Grid item xs={12}>
+                        {row.file_mcu_names
+                          ? row.file_mcu_names.split(',').map((fileName, index) => (
+                              <div key={index}>{fileName}</div>
+                            ))
+                          : '-'}
+                      </Grid>
+                    </Grid>
+                  </Grid>
+                </Grid>
 
                 <Grid spacing={1}>
                     <Stack sx={{ marginTop: 1}}>

frontend/hospital-portal/.env.staging

@@ -1 +1 @@
-VITE_API_URL="https://aso-api.linksehat.dev/api/hospitalportal"
+VITE_API_URL="https://aso-api.linksehat.dev/api/v1/hospitalportal"