fix calculate scurve

app/Helpers/MasterFunctionsHelper.php

@@ -604,6 +604,12 @@ class MasterFunctionsHelper
 					->where('activity_id', '=', $keyActualM->activity_id)
 					->groupBy('activity_id')
 					->first();
+				if (!isset($sumVolActual)) {
+					$sumVolActual = (object) [
+						'activity_id' => $keyActualM->activity_id,
+						'ttl_qty_plan' => "0"
+					];
+				}
 				$sumReportActual = DB::table('report_activity_material')
 					->where('activity_id', $keyActualM->activity_id)
 					->sum('qty');
@@ -623,18 +629,29 @@ class MasterFunctionsHelper
 						->where('activity_id', '=', $keyActualM->activity_id)
 						->orderBy('status_activity', 'ASC')
 						->first();
-					$dataTempReport[$w]['percentage'] = ($keyActualM->qty / $sumVolActual->ttl_qty_plan) * $keyActualM->bobot_planning;
+						if (!isset($checkStatusActivity)) {
+							$checkStatusActivity = (object) [
+								'activity_id' => $keyActualM->activity_id,
+								'status_activity' => 'open'
+							];
+						}
+						if ($sumVolActual->ttl_qty_plan == "0") {
+							$actual = 0;
+						} else {
+							$actual = $keyActualM->qty / $sumVolActual->ttl_qty_plan;
+						}
+					$dataTempReport[$w]['percentage'] = $actual * $keyActualM->bobot_planning;
 					// $sumPercentageActual+=($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning;
 					// if($keyActualM->qty/$sumVolActual->ttl_qty_plan >= 1){
 					if ($checkStatusActivity->status_activity == 'done') {
 						$sumPercentageActual += $keyActualM->bobot_planning / $reportCount;
 						// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual;
 					} else {
-						if ($keyActualM->qty / $sumVolActual->ttl_qty_plan >= 1 || (int) $sumVolActual->ttl_qty_plan == (int) $sumReportActual) {
-							$sumPercentageActual += (($keyActualM->qty / $sumVolActual->ttl_qty_plan) * $keyActualM->bobot_planning) * (95 / 100);
+						if ( $actual >= 1 || (int) $sumVolActual->ttl_qty_plan == (int) $sumReportActual) {
+							$sumPercentageActual += ($actual * $keyActualM->bobot_planning) * (95 / 100);
 							// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual;
 						} else {
-							$sumPercentageActual += ($keyActualM->qty / $sumVolActual->ttl_qty_plan) * $keyActualM->bobot_planning;
+							$sumPercentageActual += $actual * $keyActualM->bobot_planning;
 							// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual;
 						}
 					}