Merge pull request 'fix curva S site' (#60) from dev-ibnu into staging

Reviewed-on: ordo/adw-backend#60

app/Helpers/MasterFunctionsHelper.php

@@ -225,7 +225,7 @@ class MasterFunctionsHelper {
 					// $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->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning;
+							$sumPercentageActual+=$keyActualM->bobot_planning;
 							// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual;
 						}else{
 							if($keyActualM->qty/$sumVolActual->ttl_qty_plan >= 1){
@@ -271,7 +271,7 @@ class MasterFunctionsHelper {
 					// 	$tempTtlPercentPlan = 100;
 
 					if($tempTtlPercentActual >= $keyGantt['progress'])
-					$tempTtlPercentActual = $keyGantt['progress'];
+						$tempTtlPercentActual = $keyGantt['progress'];
 					if($tempTtlPercentPlan >= 100)
 						$tempTtlPercentPlan = 100;
 					// $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual