|
|
|
@ -402,8 +402,9 @@ class MasterFunctionsHelper
|
|
|
|
|
|
|
|
|
|
// if($tempTtlPercentActual >= $keyGantt['progress']) |
|
|
|
|
// $tempTtlPercentActual = $keyGantt['progress']; |
|
|
|
|
if ($tempTtlPercentPlan >= 100) |
|
|
|
|
$tempTtlPercentPlan = 100; |
|
|
|
|
// todo |
|
|
|
|
// if ($tempTtlPercentPlan >= 100) |
|
|
|
|
// $tempTtlPercentPlan = 100; |
|
|
|
|
// $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual |
|
|
|
|
|
|
|
|
|
// } |
|
|
|
@ -707,9 +708,9 @@ class MasterFunctionsHelper
|
|
|
|
|
if (isset($dataPayload['period']) && $dataPayload['period'] == 'week') { |
|
|
|
|
$tempTtlPercentPlan += $sumPercentagePlan; |
|
|
|
|
$tempTtlPercentActual += $sumPercentageActual; |
|
|
|
|
|
|
|
|
|
if ($tempTtlPercentPlan >= 100) |
|
|
|
|
$tempTtlPercentPlan = 100; |
|
|
|
|
// todo |
|
|
|
|
// if ($tempTtlPercentPlan >= 100) |
|
|
|
|
// $tempTtlPercentPlan = 100; |
|
|
|
|
|
|
|
|
|
$currentACWP += $totalACWP; |
|
|
|
|
$currentBCWP += $totalBCWP; |
|
|
|
|