Merge pull request 'dev-wahyun' (#15) from dev-wahyun into staging

Reviewed-on: #15

app/Http/Controllers/DashboardBoDController.php

@@ -66,11 +66,11 @@ class DashboardBoDController extends Controller
 
         return response()->json([
             'data' => [
-                'total_budget' => (int) ($totalBudgets->total_rencana_biaya ?? 0),
+                'total_budget' => $totalBudgets->total_value_proyek ?? 0,
                 'total_expenditure' => $totalExpenditure,
                 'total_invoice' => $totalInvoice,
                 'total_paid_invoice' => $totalPaidInvoice,
-                'total_value_proyek' => $totalBudgets->total_value_proyek ?? 0,
+                'total_value_proyek' => (int) ($totalBudgets->total_rencana_biaya ?? 0),
                 'total_income_year' => $totalBudgets->total_income_year ?? 0
             ]
         ], 200);

app/Http/Controllers/ProjectController.php

@@ -291,6 +291,23 @@ class ProjectController extends Controller
 		$builder = $dataBuilder['builder'];
 		$countBuilder = $dataBuilder['count'];
 		$dataGet = $builder->get();
+        foreach($dataGet as $p) {
+            $project = Project::find($p->id);
+            if (!$project) continue;
+
+            $act = Activity::select('persentase_progress as total_progress')
+                ->where([
+                    ['proyek_id', $p->id],
+                    ['parent_id', null]
+                ])
+                ->first();
+            if ($act) {
+                $project->persentase_progress = $act->total_progress;
+            } else {
+                $project->persentase_progress = 0;
+            }
+            $project->save();
+        }
 		$totalRecord = $countBuilder->count();
 		return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet, 'totalRecord' => $totalRecord], 200);
 	}