Merge pull request 'staging' (#12) from staging into master

Reviewed-on: #12

app/Console/Commands/ActualProgressProject.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Helpers\MasterFunctionsHelper;
+use App\Models\Project;
+use App\Models\VersionGantt;
+use Illuminate\Console\Command;
+
+class ActualProgressProject extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'calculate:ActualProgressProject';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'For show Actual Progress Project';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $projects = Project::join('m_type_proyek', 'm_proyek.type_proyek_id', '=', 'm_type_proyek.id')
+            ->select('m_proyek.*', 'm_type_proyek.is_multiLocation')
+            ->get();
+
+        foreach ($projects as $project) {
+            if ($project->is_multiLocation == 1) {
+                // untuk project multi location
+                $versionGantt = VersionGantt::join('m_proyek', 'm_version_gantt.proyek_id', 'm_proyek.id')
+                    ->select('m_version_gantt.*')
+                    ->where('m_version_gantt.proyek_id', $project->id)
+                    ->get();
+                foreach ($versionGantt as $key => $gantt) {
+                    $progress[$key] = $gantt->progress;
+                }
+                $actualProgress = round(array_sum($progress) / count($versionGantt), 2);
+            } else {
+                // untuk project single location
+                $gantt = MasterFunctionsHelper::getLatestGantt($project->id);
+                isset($gantt['last_gantt_id']) ? $lastGantt = $gantt['last_gantt_id'] : $lastGantt = 0;
+
+                $arr = [
+                    'project_id' => $project->id,
+                    'gantt_id' => $lastGantt,
+                    'periode' => 'week'
+                ];
+
+                $project->scurve = MasterFunctionsHelper::getSCurve(collect($arr));
+                $actualArray = $project->scurve[0]['data']['percentageReal'];
+                $actualProgress = !empty($actualArray) ? round(end($actualArray), 2) : 0;
+            }
+
+            Project::where('id', $project->id)->update(['persentase_progress' => $actualProgress]);
+        }
+    }
+}

app/Console/Commands/ScheduleHealth.php

@@ -45,7 +45,7 @@ class ScheduleHealth extends Command
         echo "\n------------------------------------------\n";
         echo "Command Start. \n";
         Log::info("Command Start.");
-        $projects = Project::where('company_id', 5)->get();
+        $projects = Project::get();
         $totalProjects = $projects->count();
         $updatedProjects = [];
         Log::info($totalProjects);

app/Console/Kernel.php

@@ -15,7 +15,8 @@ class Kernel extends ConsoleKernel
   protected $commands = [
     Commands\ScheduleHealth::class,
     Commands\CalculateSCurve::class,
-    Commands\CalculateProgressGantt::class
+    Commands\CalculateProgressGantt::class,
+    Commands\ActualProgressProject::class
   ];
 
   /**

app/Http/Controllers/ActivityController.php

@@ -649,7 +649,7 @@ class ActivityController extends Controller
 			DB::rollBack();
 			return response()->json(['status' => 'failed', 'action' => 'error', 'message' => 'Data activity failed deleted!', 'code' => 500], 500);
 		}
-		DB::rollBack();
+		DB::commit();
 		return response()->json(['status' => 'success', "action" => "deleted", 'message' => 'Data activity successfully deleted!', 'code' => 200], 200);
 	}
 

app/Http/Controllers/DashboardBoDController.php

@@ -32,49 +32,46 @@ class DashboardBoDController extends Controller
 	{
 		$totalExpenditure = $totalInvoice = $totalPaidInvoice = 0;
 
-		$totalBudgets = null;
+        $totalBudgets = [];
+        $projects = [];
         $role = urldecode($role_name);
-		if (!empty($all_project) || $role === "Super Admin") {
-			$totalBudgets = Project::sum(DB::raw('CAST("rencana_biaya" AS DOUBLE PRECISION)'));
-		} else {
-			$totalBudgets = Project::where('created_by_id', $hierarchy)
-			->sum(DB::raw('CAST("rencana_biaya" AS DOUBLE PRECISION)'));
-		}
-		$totalBudgets = Project::sum(DB::raw('CAST("rencana_biaya" AS DOUBLE PRECISION)'));
-		$projects = null;
 
-		if (!empty($all_project) || $role === "Super Admin") {
+        if ($all_project) {
+            $totalBudgets = Project::select(
+                DB::raw('SUM(CAST(COALESCE(NULLIF(REPLACE(rencana_biaya, \'.\', \'\'), \'\'), \'0\') AS DOUBLE PRECISION)) AS total_rencana_biaya'),
+                DB::raw('SUM(CAST(COALESCE(NULLIF(REPLACE(value_proyek, \'.\', \'\'), \'\'), \'0\') AS DOUBLE PRECISION)) AS total_value_proyek'),
+                DB::raw('SUM(CAST(COALESCE(NULLIF(REPLACE(income_year, \'.\', \'\'), \'\'), \'0\') AS DOUBLE PRECISION)) AS total_income_year')
+            )->first();
             $projects = Project::get();
+            Log::info(['dataTotal' => $totalBudgets]);
         } else {
-			$projects = Project::where('created_by_id', $hierarchy)
-				->get();
+            $totalBudgets = Project::where('created_by_id', $hierarchy)
+            ->select(
+                DB::raw('SUM(CAST(COALESCE(NULLIF(REPLACE(rencana_biaya, \'.\', \'\'), \'\'), \'0\') AS DOUBLE PRECISION)) AS total_rencana_biaya'),
+                DB::raw('SUM(CAST(COALESCE(NULLIF(REPLACE(value_proyek, \'.\', \'\'), \'\'), \'0\') AS DOUBLE PRECISION)) AS total_value_proyek'),
+                DB::raw('SUM(CAST(COALESCE(NULLIF(REPLACE(income_year, \'.\', \'\'), \'\'), \'0\') AS DOUBLE PRECISION)) AS total_income_year')
+            )->first();
+            $projects = Project::where('created_by_id', $hierarchy)->get();
         }
 
         foreach ($projects as $project) {
             $project->expenses = 0;
-			$resp = null;
             if ($project->kode_sortname != "") {
-
-				// $resp = $this->getInvoiceIntegration($project->kode_sortname);
-				// $cost = $resp->data->total_cost ?? 0;
-				// $cost = substr($cost, 0, strpos($cost, "."));
                 $cost = 0;
                 $totalExpenditure = 0;
                 $totalInvoice = 0;
                 $totalPaidInvoice = 0;
-
-				// $totalExpenditure += (int) $cost;
-				// $totalInvoice += $resp->data->total_invoice_amount ?? 0;
-				// $totalPaidInvoice += $resp->data->total_invoice_paid_amount ?? 0;
             }
         }
 
         return response()->json([
             'data' => [
-				'total_budget' => (int) $totalBudgets ?? 0,
+                'total_budget' => (int) ($totalBudgets->total_rencana_biaya ?? 0),
                 'total_expenditure' => $totalExpenditure,
                 'total_invoice' => $totalInvoice,
                 'total_paid_invoice' => $totalPaidInvoice,
+                'total_value_proyek' => $totalBudgets->total_value_proyek ?? 0,
+                'total_income_year' => $totalBudgets->total_income_year ?? 0
             ]
         ], 200);
 	}
@@ -275,7 +272,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);
@@ -460,8 +457,7 @@ class DashboardBoDController extends Controller
 
 	public function getDetailExpenditure($all_project, $hierarchy, $role_name)
 	{
-		// $year = $this->interpolateYear($year);
-		$projects = null;
+		$projects = [];
 		if ($all_project) {
 			$projects = Project::orderBy('id', 'desc')
 				->get();

app/Http/Controllers/ImageController.php

@@ -25,17 +25,7 @@ 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);
-                }
+            $destinationPath = $this->setCustomeDirectoryUpload();
             $data = [
                 'ref_id' => (int)$ref_id,
                 'image' => $name,
@@ -43,32 +33,6 @@ class ImageController extends Controller
             ];
 
             $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);
@@ -77,11 +41,6 @@ class ImageController extends Controller
                 unlink($destinationPath['pathImage'].$name);
                 return response()->json(['status' => 'failed','message' => 'image upload is failed!' ,'code' => 400], 400);
             }
-
-            } else {
-                DB::rollBack();
-                return response()->json(['status'=>'failed','message'=>'image upload is failed!','code'=>400], 400);
-            }
         } else {
             DB::rollBack();
             return response()->json(['status'=>'failed','message'=>'image is required!','code'=>400], 400);

app/Http/Controllers/ProjectController.php

@@ -292,7 +292,6 @@ class ProjectController extends Controller
 		$countBuilder = $dataBuilder['count'];
 		$dataGet = $builder->get();
 		$totalRecord = $countBuilder->count();
-
 		return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet, 'totalRecord' => $totalRecord], 200);
 	}
 
@@ -415,7 +414,22 @@ class ProjectController extends Controller
 	public function calculateSCurve(Request $request)
 	{
 		$sCurve = Project::select('scurve')->where('id', $request->project_id)->first();
-		return response()->json(['status' => 'success', 'code' => 200, 'data' => json_decode($sCurve->scurve)], 200);
+        $dcdScurve = json_decode($sCurve['scurve'],true);
+        $dataScurve = $dcdScurve[0]['data'];
+        $today = date('Y-m-d');
+        $progressPlanBar = 0;
+        foreach($dataScurve['date'] as $index => $dateArray) {
+            if (isset($dateArray[0])) {
+                $date = $dateArray[0];
+                if($date <= $today) {
+                    if (isset($dataScurve['percentagePlan'][$index])) {
+                        $progressPlanBar = round($dataScurve['percentagePlan'][$index], 2);
+                    }
+                }
+            }
+        }
+        $dcdScurve[0]['data']['progressPlanToDay'] = round($progressPlanBar,2);
+		return response()->json(['status' => 'success', 'code' => 200, 'data' => $dcdScurve], 200);
 	}
 
 	public function sCurveCommand(Request $request)
@@ -423,15 +437,10 @@ class ProjectController extends Controller
 		Artisan::call('calculate:scurve', [
 			'project_id' => $request->project_id
 		]);
-		// $project = Project::find($request->project_id);
-
-		// if ($project) {
-		//     dispatch(new ProcessSCurve($project));
-
-		//     return response()->json(['message' => 'S Curve calculation queued']);
-		// }
+	}
 
-		// return response()->json(['message' => 'Project not found'], 404);
+    public function ActualProgressProjectCommand() {
+        Artisan::call('calculate:ActualProgressProject');
     }
 
 	public function getLinearSCurve(Request $request)

routes/web.php

@@ -93,6 +93,7 @@ $router->group(['prefix' => 'api', 'middleware' => 'cors'], function () use ($ro
 		$router->post('/project/get-s-curve', 'ProjectController@getSCurve');
 		$router->post('/project/calculate-s-curve', 'ProjectController@calculateSCurve');
 		$router->post('/project/s-curve-command', 'ProjectController@sCurveCommand');
+        $router->get('/project/actual-progress-project-command', 'ProjectController@ActualProgressProjectCommand');
 		$router->post('/project/s-curve-command-test', 'ProjectController@calculateSCurvetest');
 		$router->post('/project/get-linear-s-curve', 'ProjectController@getLinearSCurve');
 		$router->post('/project/get-overdue-activities', 'ProjectController@getOverdueActivities');