From f86800f3d15e0f0e8c8eb9217269d05d7933fdee Mon Sep 17 00:00:00 2001
From: wahyun <wahyumind01@gmail.com>
Date: Mon, 22 Jul 2024 08:42:05 +0700
Subject: [PATCH 1/2] fix: upload report image

---
 app/Http/Controllers/ImageController.php | 69 +++++-------------------
 1 file changed, 14 insertions(+), 55 deletions(-)

diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php
index ece127e..8b8cdd4 100644
--- a/app/Http/Controllers/ImageController.php
+++ b/app/Http/Controllers/ImageController.php
@@ -25,62 +25,21 @@ class ImageController extends Controller
             $extension  = $dokumen->extension();
             $category   = $request->category;
             $name       = $ref_id.date("YmdHis").".".$extension;
-            // Limited Storage
-            $company = Company::where('company_name', $request->company_name)->first();
-            if($company) {
-                $destinationPath = $this->setCustomeDirectoryUpload($company['company_name']);
-                $getLimitStorage = $this->setLimitsStorage($company, $dokumen, $destinationPath['pathImage'], $destinationPath);
-            }
-            if(isset($getLimitStorage)) {
-                if($getLimitStorage === false) {
-                    DB::rollBack();
-                    return response()->json(['status' => 'failed', 'message' => 'Limited storage maximum!', 'code' => 500], 500);
-                }
-                $data = [
-                    'ref_id' => (int)$ref_id,
-                    'image' => $name,
-                    'category' => $category
-                ];
-
-                $result = Image::create($data);
-
-                $company = Company::find((int)$ref_id);
-                if($company && $category === 'company_logo_login') {
-                    $dataArray = json_decode($company['logo_login'], true);
-                    if(isset($dataArray['slider'])) {
-                        $jsonImageSlider['login'] = $name;
-                        $jsonImageSlider['slider'] = $dataArray['slider'];
-                    } else {
-                        $jsonImageSlider['login'] = $name;
-                    }
-                    $company->update([
-                        'logo_login' => $jsonImageSlider
-                    ]);
-                }
-
-                if($company && $category === 'company_logo_header') {
-                    $company->update([
-                        'logo_header' => array('content' => $name)
-                    ]);
-                }
-
-                if($company && $category === 'company_favicon') {
-                    $company->update([
-                        'favicon_image' => array('content' => $name)
-                    ]);
-                }
-                if($dokumen->move($destinationPath['pathImage'], $name) && $result) {
-                    DB::commit();
-                    return response()->json(['status' => 'success', "name_image" => $name,'message' => 'image upload is successfully!','code' => 200], 200);
-                } else {
-                    DB::rollBack();
-                    unlink($destinationPath['pathImage'].$name);
-                    return response()->json(['status' => 'failed','message' => 'image upload is failed!' ,'code' => 400], 400);
-                }
-
+            $destinationPath = $this->setCustomeDirectoryUpload();
+            $data = [
+                'ref_id' => (int)$ref_id,
+                'image' => $name,
+                'category' => $category
+            ];
+
+            $result = Image::create($data);
+            if($dokumen->move($destinationPath['pathImage'], $name) && $result) {
+                DB::commit();
+                return response()->json(['status' => 'success', "name_image" => $name,'message' => 'image upload is successfully!','code' => 200], 200);
             } else {
                 DB::rollBack();
-                return response()->json(['status'=>'failed','message'=>'image upload is failed!','code'=>400], 400);
+                unlink($destinationPath['pathImage'].$name);
+                return response()->json(['status' => 'failed','message' => 'image upload is failed!' ,'code' => 400], 400);
             }
         } else {
             DB::rollBack();
@@ -123,7 +82,7 @@ class ImageController extends Controller
                         $totalSize += filesize($folderPath . '/' . $file);
                     }
                 }
-                $totalSize += $sizeFile;                
+                $totalSize += $sizeFile;
             }
             foreach ($dokumen as $file) {
                 $extension = $file->extension();
-- 
2.25.1


From c0a7841b4184ba83c99d0f73f79e9cc41844c842 Mon Sep 17 00:00:00 2001
From: wahyun <wahyumind01@gmail.com>
Date: Mon, 22 Jul 2024 16:00:03 +0700
Subject: [PATCH 2/2] fix: parameter dashboard bod

---
 app/Http/Controllers/DashboardBoDController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/DashboardBoDController.php b/app/Http/Controllers/DashboardBoDController.php
index 931e685..4c32b41 100644
--- a/app/Http/Controllers/DashboardBoDController.php
+++ b/app/Http/Controllers/DashboardBoDController.php
@@ -275,7 +275,7 @@ class DashboardBoDController extends Controller
 		return response()->json(['data' => $divisions], 200);
 	}
 
-	public function getTotalProjectPerBudgetHealth($role_name, $all_project, $hierarchy)
+	public function getTotalProjectPerBudgetHealth($all_project, $hierarchy, $role_name)
 	{
 		$role = urldecode($role_name);
 		$replaceHierarchy = preg_replace('/[\[\]]/', '', $hierarchy);
-- 
2.25.1