Browse Source

Merge pull request 'Dev-Farhan' (#229) from Dev-Farhan into general

Reviewed-on: ordo/adw-backend#229
pull/3/head
farhantock 1 year ago
parent
commit
85631b9866
  1. 7
      app/Helpers/MasterFunctionsHelper.php

7
app/Helpers/MasterFunctionsHelper.php

@ -36,7 +36,8 @@ class MasterFunctionsHelper
return json_decode($output); return json_decode($output);
} }
public static function countDays($ganttId, $start, $end){ public static function countDays($ganttId, $start, $end)
{
$dayOffs = VersionGantt::where('id', $ganttId)->first()->config_dayoff; $dayOffs = VersionGantt::where('id', $ganttId)->first()->config_dayoff;
$diff = date_diff($start, $end); $diff = date_diff($start, $end);
$endCount = clone $end; $endCount = clone $end;
@ -712,9 +713,6 @@ class MasterFunctionsHelper
// if ($tempTtlPercentPlan >= 100) // if ($tempTtlPercentPlan >= 100)
// $tempTtlPercentPlan = 100; // $tempTtlPercentPlan = 100;
if ($tempTtlPercentPlan >= 100)
$tempTtlPercentPlan = 100;
$currentACWP += $totalACWP; $currentACWP += $totalACWP;
$currentBCWP += $totalBCWP; $currentBCWP += $totalBCWP;
@ -1009,5 +1007,4 @@ class MasterFunctionsHelper
return $dataFinal; return $dataFinal;
} }
} }

Loading…
Cancel
Save