|
|
|
@ -556,7 +556,6 @@ class MasterFunctionsHelper
|
|
|
|
|
// if (new \DateTime($loopDay) < $today) { |
|
|
|
|
// $statusCutOfDate = true; |
|
|
|
|
// } |
|
|
|
|
if (new \DateTime($loopDay) == new \DateTime($loopDay . ' Friday')){ |
|
|
|
|
|
|
|
|
|
$progressPlanKomulatifWeek[] += round($tmpProgressPlanWeek,2); |
|
|
|
|
if (new \DateTime($loopDay . ' Friday') <= new \DateTime($today . ' Friday')) { |
|
|
|
@ -564,7 +563,6 @@ class MasterFunctionsHelper
|
|
|
|
|
$progressActualKomulatifWeek[] += round($tmpProgressActualWeek,2); |
|
|
|
|
} |
|
|
|
|
$dateWeek[] = [$loopDay]; |
|
|
|
|
} |
|
|
|
|
// $progressPlanKomulatifWeek[] += $tmpProgressPlanWeek; |
|
|
|
|
foreach ($dataPlanM as $keyPlanM) { |
|
|
|
|
# hitung untuk persentase progress planning |
|
|
|
@ -1436,7 +1434,6 @@ class MasterFunctionsHelper
|
|
|
|
|
$dataActivityPlan = []; |
|
|
|
|
$dataActivityActual = []; |
|
|
|
|
$today = date('Y-m-d'); |
|
|
|
|
if (new \DateTime($loopDay) == new \DateTime($loopDay . ' Friday')){ |
|
|
|
|
|
|
|
|
|
$progressPlanKomulatifWeek[] += round($tmpProgressPlanWeek,2); |
|
|
|
|
if (new \DateTime($loopDay . ' Friday') <= new \DateTime($today . ' Friday')) { |
|
|
|
@ -1444,7 +1441,6 @@ class MasterFunctionsHelper
|
|
|
|
|
$progressActualKomulatifWeek[] += round($tmpProgressActualWeek,2); |
|
|
|
|
} |
|
|
|
|
$dateWeek[] = [$loopDay]; |
|
|
|
|
} |
|
|
|
|
// $progressPlanKomulatifWeek[] += $tmpProgressPlanWeek; |
|
|
|
|
// if (count($dataPlanM) > 0 && count($dataPlanM[0]) > 0) { |
|
|
|
|
foreach ($dataPlanM as $keyPlanM) { |
|
|
|
|