|
|
@ -210,6 +210,7 @@ class MasterFunctionsHelper { |
|
|
|
foreach ($period as $dt) { |
|
|
|
foreach ($period as $dt) { |
|
|
|
$minSevenDays = new \Datetime($dt->format("Y-m-d")); |
|
|
|
$minSevenDays = new \Datetime($dt->format("Y-m-d")); |
|
|
|
$minSevenDays = $minSevenDays->modify('-7 day')->format("Y-m-d"); |
|
|
|
$minSevenDays = $minSevenDays->modify('-7 day')->format("Y-m-d"); |
|
|
|
|
|
|
|
$tempDate[] = array($dt->format("Y-m-d")); |
|
|
|
// $dataPlanM = DB::table('assign_material_to_activity as ama') |
|
|
|
// $dataPlanM = DB::table('assign_material_to_activity as ama') |
|
|
|
// ->select('ama.activity_id', 'ama.qty_planning', 'ama.plan_date', 'ama.start_activity', 'a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress') |
|
|
|
// ->select('ama.activity_id', 'ama.qty_planning', 'ama.plan_date', 'ama.start_activity', 'a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress') |
|
|
|
// ->join('m_activity as a', 'a.id', '=', 'ama.activity_id') |
|
|
|
// ->join('m_activity as a', 'a.id', '=', 'ama.activity_id') |
|
|
@ -392,7 +393,6 @@ class MasterFunctionsHelper { |
|
|
|
$tempPercentagePlan[] = round($sumPercentagePlan, 2); |
|
|
|
$tempPercentagePlan[] = round($sumPercentagePlan, 2); |
|
|
|
$tempPercentageReal[] = round($sumPercentageActual, 2); |
|
|
|
$tempPercentageReal[] = round($sumPercentageActual, 2); |
|
|
|
} |
|
|
|
} |
|
|
|
$tempDate[] = array($dt->format("Y-m-d")); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
try { |
|
|
|
try { |
|
|
|