|
|
|
@ -9,17 +9,19 @@ use App\Models\HierarchyFtth;
|
|
|
|
|
use Illuminate\Support\Facades\DB; |
|
|
|
|
use Illuminate\Support\Facades\Log; |
|
|
|
|
|
|
|
|
|
class MasterFunctionsHelper { |
|
|
|
|
class MasterFunctionsHelper |
|
|
|
|
{ |
|
|
|
|
|
|
|
|
|
public static function curlReq($url, $token = ""){ |
|
|
|
|
if(!$token) |
|
|
|
|
public static function curlReq($url, $token = "") |
|
|
|
|
{ |
|
|
|
|
if (!$token) |
|
|
|
|
$token = config('api.adw_token'); |
|
|
|
|
|
|
|
|
|
$ch = curl_init(); |
|
|
|
|
|
|
|
|
|
curl_setopt($ch, CURLOPT_URL, $url); |
|
|
|
|
$headers = [ |
|
|
|
|
'Authorization: '.$token |
|
|
|
|
'Authorization: ' . $token |
|
|
|
|
]; |
|
|
|
|
|
|
|
|
|
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); |
|
|
|
@ -34,9 +36,10 @@ class MasterFunctionsHelper {
|
|
|
|
|
return json_decode($output); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public function getLatestGantt($id){ |
|
|
|
|
public function getLatestGantt($id) |
|
|
|
|
{ |
|
|
|
|
$maxGanttId = VersionGantt::where("proyek_id", $id)->max("id"); |
|
|
|
|
if(!$maxGanttId){ |
|
|
|
|
if (!$maxGanttId) { |
|
|
|
|
$data = array( |
|
|
|
|
"proyek_id" => $id |
|
|
|
|
); |
|
|
|
@ -50,19 +53,20 @@ class MasterFunctionsHelper {
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// dipake di dashboard project & bod |
|
|
|
|
public function getSCurve($request){ |
|
|
|
|
public function getSCurve($request) |
|
|
|
|
{ |
|
|
|
|
$allGantt = []; |
|
|
|
|
if(!is_int($request)){ |
|
|
|
|
if (!is_int($request)) { |
|
|
|
|
$dataPayload = $request->all(); |
|
|
|
|
if(isset($dataPayload['gantt_id'])){ |
|
|
|
|
if (isset($dataPayload['gantt_id'])) { |
|
|
|
|
$allGantt[] = $dataPayload['gantt_id']; |
|
|
|
|
}else{ |
|
|
|
|
} else { |
|
|
|
|
$allGantt[] = MasterFunctionsHelper::getLatestGantt($dataPayload['project_id']); |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
$allGantt[] = MasterFunctionsHelper::getLatestGantt($request); |
|
|
|
|
} |
|
|
|
|
foreach($allGantt as $gantt){ |
|
|
|
|
foreach ($allGantt as $gantt) { |
|
|
|
|
if (!isset($gantt['last_gantt_id'])) { |
|
|
|
|
$ganttId = $gantt; |
|
|
|
|
} else { |
|
|
|
@ -73,7 +77,7 @@ class MasterFunctionsHelper {
|
|
|
|
|
// Log::info('gantt '.$value.' index '.$key); |
|
|
|
|
// } |
|
|
|
|
if (isset($gantt['calculation_type'])) { |
|
|
|
|
if($gantt['calculation_type'] == 'simple') { |
|
|
|
|
if ($gantt['calculation_type'] == 'simple') { |
|
|
|
|
// to do |
|
|
|
|
return MasterFunctionsHelper::calculateProgressBasedOnSimple($gantt); |
|
|
|
|
} else { |
|
|
|
@ -83,7 +87,8 @@ class MasterFunctionsHelper {
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public function getLinearSCurve($request){ |
|
|
|
|
public function getLinearSCurve($request) |
|
|
|
|
{ |
|
|
|
|
$ftths = HierarchyFtth::where('project_id', $request->project_id)->get(); |
|
|
|
|
$ttlProgress = 0; |
|
|
|
|
$ttlPlanning = 0; |
|
|
|
@ -98,9 +103,9 @@ class MasterFunctionsHelper {
|
|
|
|
|
$minDate = Project::select('mulai_proyek')->where('id', $request->project_id)->first(); |
|
|
|
|
$maxDate = Project::select('akhir_proyek')->where('id', $request->project_id)->first(); |
|
|
|
|
|
|
|
|
|
$begin = new \DateTime($minDate->mulai_proyek. ' Monday'); |
|
|
|
|
$begin = new \DateTime($minDate->mulai_proyek . ' Monday'); |
|
|
|
|
|
|
|
|
|
$end = new \DateTime($maxDate->akhir_proyek. ' Friday'); |
|
|
|
|
$end = new \DateTime($maxDate->akhir_proyek . ' Friday'); |
|
|
|
|
|
|
|
|
|
$interval = new \DateInterval('P7D'); |
|
|
|
|
|
|
|
|
@ -108,8 +113,8 @@ class MasterFunctionsHelper {
|
|
|
|
|
$dates = iterator_to_array($period); |
|
|
|
|
$count = count($dates); |
|
|
|
|
|
|
|
|
|
$avgProgress = $ttlProgress/$ttlPlanning/$count*100; |
|
|
|
|
$avgPlanning = $ttlPlanning/$ttlPlanning/$count*100; |
|
|
|
|
$avgProgress = $ttlProgress / $ttlPlanning / $count * 100; |
|
|
|
|
$avgPlanning = $ttlPlanning / $ttlPlanning / $count * 100; |
|
|
|
|
$progressData = []; |
|
|
|
|
$planningData = []; |
|
|
|
|
$dates = []; |
|
|
|
@ -117,7 +122,7 @@ class MasterFunctionsHelper {
|
|
|
|
|
$tempPlanning = 0; |
|
|
|
|
array_push($progressData, round($tempProgress, 2)); |
|
|
|
|
array_push($planningData, round($tempPlanning, 2)); |
|
|
|
|
foreach($period as $p){ |
|
|
|
|
foreach ($period as $p) { |
|
|
|
|
$tempProgress += $avgProgress; |
|
|
|
|
$tempPlanning += $avgPlanning; |
|
|
|
|
array_push($progressData, round($tempProgress, 2)); |
|
|
|
@ -132,7 +137,7 @@ class MasterFunctionsHelper {
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
$dataFinal[] = array( |
|
|
|
|
"data"=>$dataResponse, |
|
|
|
|
"data" => $dataResponse, |
|
|
|
|
); |
|
|
|
|
return $dataFinal; |
|
|
|
|
} |
|
|
|
@ -141,7 +146,7 @@ class MasterFunctionsHelper {
|
|
|
|
|
{ |
|
|
|
|
DB::enableQueryLog(); |
|
|
|
|
|
|
|
|
|
$dataFinal=[]; |
|
|
|
|
$dataFinal = []; |
|
|
|
|
$dataPayload = []; |
|
|
|
|
$dataPayload['period'] = 'week'; |
|
|
|
|
$totalACWP = 0; |
|
|
|
@ -150,17 +155,17 @@ class MasterFunctionsHelper {
|
|
|
|
|
|
|
|
|
|
$dataProject = Project::find($keyGantt['proyek_id']); |
|
|
|
|
$dataHeader = Activity::where('type_activity', 'header')->where("proyek_id", $keyGantt['proyek_id'])->where("version_gantt_id", $keyGantt['id'])->first(); |
|
|
|
|
if(isset($dataPayload['end_date']) && $dataPayload['end_date'] > $dataProject->akhir_proyek){ |
|
|
|
|
if (isset($dataPayload['end_date']) && $dataPayload['end_date'] > $dataProject->akhir_proyek) { |
|
|
|
|
$dataPayload['end_date'] = $dataProject->akhir_proyek; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if($dataHeader){ |
|
|
|
|
if ($dataHeader) { |
|
|
|
|
$totalRencanaBudget = Activity::where('parent_id', $dataHeader->id)->where("proyek_id", $keyGantt['proyek_id'])->where("version_gantt_id", $keyGantt['id'])->sum("rencana_biaya"); |
|
|
|
|
}else{ |
|
|
|
|
} else { |
|
|
|
|
$totalRencanaBudget = Activity::whereNull('parent_id')->where("proyek_id", $keyGantt['proyek_id'])->where("version_gantt_id", $keyGantt['id'])->sum("rencana_biaya"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(!Activity::where("version_gantt_id", $keyGantt['id'])->first()) |
|
|
|
|
if (!Activity::where("version_gantt_id", $keyGantt['id'])->first()) |
|
|
|
|
return $dataFinal; |
|
|
|
|
|
|
|
|
|
$alreadyHasReport = DB::table('report_activity_material as a') |
|
|
|
@ -174,14 +179,14 @@ class MasterFunctionsHelper {
|
|
|
|
|
|
|
|
|
|
$minDate = Activity::where('version_gantt_id', $keyGantt['id'])->whereNull('parent_id')->pluck('start_date')->first(); |
|
|
|
|
|
|
|
|
|
$begin = new \DateTime($minDate.' Monday'); |
|
|
|
|
$begin = new \DateTime($minDate . ' Monday'); |
|
|
|
|
$begin->modify('last Monday'); |
|
|
|
|
if(isset($dataPayload['end_date'])){ |
|
|
|
|
if (isset($dataPayload['end_date'])) { |
|
|
|
|
$maxDate = $dataPayload['end_date']; |
|
|
|
|
$end = new \DateTime($maxDate. ' Friday'); |
|
|
|
|
$end = new \DateTime($maxDate . ' Friday'); |
|
|
|
|
$end->modify('next Friday'); |
|
|
|
|
$end->modify('next Friday'); |
|
|
|
|
/* $interval = \DateInterval::createFromDateString('1 day'); */ // should be using this but its bugged |
|
|
|
|
/* $interval = \DateInterval::createFromDateString('1 day'); */// should be using this but its bugged |
|
|
|
|
$interval = new \DateInterval('P7D'); |
|
|
|
|
} else { |
|
|
|
|
$maxDate = DB::table('assign_material_to_activity as ama') |
|
|
|
@ -189,7 +194,7 @@ class MasterFunctionsHelper {
|
|
|
|
|
->join('m_activity as a', 'a.id', '=', 'ama.activity_id') |
|
|
|
|
->where('a.version_gantt_id', '=', $keyGantt['id']) |
|
|
|
|
->max("plan_date"); // plan date overlapped with assign_material_to_activity's, it should be m_activity's |
|
|
|
|
$end = new \DateTime($maxDate. ' Friday'); |
|
|
|
|
$end = new \DateTime($maxDate . ' Friday'); |
|
|
|
|
$end->modify('next Friday'); |
|
|
|
|
$end->modify('next Friday'); |
|
|
|
|
$interval = new \DateInterval('P7D'); |
|
|
|
@ -201,8 +206,8 @@ class MasterFunctionsHelper {
|
|
|
|
|
$tempPercentagePlan = []; |
|
|
|
|
$tempPercentagePlanWhr = []; |
|
|
|
|
$tempPercentageReal = []; |
|
|
|
|
$tempTtlPercentPlan=0; |
|
|
|
|
$tempTtlPercentActual=0; |
|
|
|
|
$tempTtlPercentPlan = 0; |
|
|
|
|
$tempTtlPercentActual = 0; |
|
|
|
|
|
|
|
|
|
$currentACWP = 0; |
|
|
|
|
$currentBCWP = 0; |
|
|
|
@ -210,6 +215,7 @@ class MasterFunctionsHelper {
|
|
|
|
|
foreach ($period as $dt) { |
|
|
|
|
$minSevenDays = new \Datetime($dt->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') |
|
|
|
|
// ->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') |
|
|
|
@ -224,7 +230,7 @@ class MasterFunctionsHelper {
|
|
|
|
|
->where('a.type_activity', 'task') |
|
|
|
|
->where('a.bobot_planning', '>', 0) |
|
|
|
|
->where('a.version_gantt_id', $keyGantt['id']) |
|
|
|
|
->whereDate('amta.plan_date', '<=',$dt->format("Y-m-d")) |
|
|
|
|
->whereDate('amta.plan_date', '<=', $dt->format("Y-m-d")) |
|
|
|
|
->whereDate('amta.plan_date', '>', $minSevenDays) |
|
|
|
|
->select('a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress', 'a.id'); |
|
|
|
|
|
|
|
|
@ -233,7 +239,7 @@ class MasterFunctionsHelper {
|
|
|
|
|
->where('a.type_activity', 'task') |
|
|
|
|
->where('a.bobot_planning', '>', 0) |
|
|
|
|
->where('a.version_gantt_id', $keyGantt['id']) |
|
|
|
|
->whereDate('a.start_date', '<=',$dt->format("Y-m-d")) |
|
|
|
|
->whereDate('a.start_date', '<=', $dt->format("Y-m-d")) |
|
|
|
|
->whereDate('a.start_date', '>', $minSevenDays) |
|
|
|
|
->select('a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress', 'a.id') |
|
|
|
|
->union($activities) |
|
|
|
@ -244,12 +250,12 @@ class MasterFunctionsHelper {
|
|
|
|
|
->join('m_activity as a', 'a.id', '=', 'ram.activity_id') |
|
|
|
|
->where('a.version_gantt_id', '=', $keyGantt['id']) |
|
|
|
|
->where('a.proyek_id', '=', $keyGantt['proyek_id']) |
|
|
|
|
->whereDate('ram.report_date', '<=',$dt->format("Y-m-d")) |
|
|
|
|
->whereDate('ram.report_date', '>',$minSevenDays) |
|
|
|
|
->whereDate('ram.report_date', '<=', $dt->format("Y-m-d")) |
|
|
|
|
->whereDate('ram.report_date', '>', $minSevenDays) |
|
|
|
|
->get(); |
|
|
|
|
$dataTempPlan = []; |
|
|
|
|
$x = 0; |
|
|
|
|
$sumPercentagePlan=0; |
|
|
|
|
$sumPercentagePlan = 0; |
|
|
|
|
$totalACWP = isset($totalACWP) ? $totalACWP : 0; |
|
|
|
|
$totalBCWP = isset($totalBCWP) ? $totalBCWP : 0; |
|
|
|
|
|
|
|
|
@ -261,7 +267,7 @@ class MasterFunctionsHelper {
|
|
|
|
|
->where('a.type_activity', 'task') |
|
|
|
|
->where('a.bobot_planning', '>', 0) |
|
|
|
|
->where('a.version_gantt_id', $keyGantt['id']) |
|
|
|
|
->unionAll(function ($query) use ($keyGantt){ |
|
|
|
|
->unionAll(function ($query) use ($keyGantt) { |
|
|
|
|
$query->select('a.*') |
|
|
|
|
->from('m_activity AS a') |
|
|
|
|
->join('assign_hr_to_activity as ahta', 'ahta.activity_id', '=', 'a.id') |
|
|
|
@ -272,20 +278,20 @@ class MasterFunctionsHelper {
|
|
|
|
|
->orderBy('id', 'asc'); |
|
|
|
|
}, 'subquery') |
|
|
|
|
->sum('bobot_planning'); |
|
|
|
|
$dataTempPlan [$x]['activity_id'] = $keyPlanM->id; |
|
|
|
|
$dataTempPlan [$x]['bobot_planning'] = $keyPlanM->bobot_planning; |
|
|
|
|
$dataTempPlan [$x]['ttl_plan'] = $sumVolPlan; |
|
|
|
|
$dataTempPlan [$x]['biaya_actual'] = $keyPlanM->biaya_actual; |
|
|
|
|
$dataTempPlan [$x]['duration'] = $keyPlanM->duration; |
|
|
|
|
$dataTempPlan [$x]['persentase_progress'] = $keyPlanM->persentase_progress; |
|
|
|
|
$dataTempPlan[$x]['activity_id'] = $keyPlanM->id; |
|
|
|
|
$dataTempPlan[$x]['bobot_planning'] = $keyPlanM->bobot_planning; |
|
|
|
|
$dataTempPlan[$x]['ttl_plan'] = $sumVolPlan; |
|
|
|
|
$dataTempPlan[$x]['biaya_actual'] = $keyPlanM->biaya_actual; |
|
|
|
|
$dataTempPlan[$x]['duration'] = $keyPlanM->duration; |
|
|
|
|
$dataTempPlan[$x]['persentase_progress'] = $keyPlanM->persentase_progress; |
|
|
|
|
try { |
|
|
|
|
$dataTempPlan [$x]['percentage'] = $keyPlanM->bobot_planning; |
|
|
|
|
$sumPercentagePlan+= $keyPlanM->bobot_planning; |
|
|
|
|
if(isset($keyPlanM->duration) && $keyPlanM->duration > 0) |
|
|
|
|
$totalBCWP += (((($keyPlanM->persentase_progress*$keyPlanM->bobot_planning)/100)/$keyPlanM->duration)* $totalRencanaBudget)/100; |
|
|
|
|
$dataTempPlan[$x]['percentage'] = $keyPlanM->bobot_planning; |
|
|
|
|
$sumPercentagePlan += $keyPlanM->bobot_planning; |
|
|
|
|
if (isset($keyPlanM->duration) && $keyPlanM->duration > 0) |
|
|
|
|
$totalBCWP += (((($keyPlanM->persentase_progress * $keyPlanM->bobot_planning) / 100) / $keyPlanM->duration) * $totalRencanaBudget) / 100; |
|
|
|
|
else |
|
|
|
|
$totalBCWP = 0; |
|
|
|
|
$dataTempPlan [$x]['totalBCWP'] = $totalBCWP; |
|
|
|
|
$dataTempPlan[$x]['totalBCWP'] = $totalBCWP; |
|
|
|
|
} catch (\DivisionByZeroError $e) { |
|
|
|
|
return response()->json(['message' => $e->getMessage()]); |
|
|
|
|
} |
|
|
|
@ -294,7 +300,7 @@ class MasterFunctionsHelper {
|
|
|
|
|
|
|
|
|
|
$w = 0; |
|
|
|
|
$dataTempReport = []; |
|
|
|
|
$sumPercentageActual=0; |
|
|
|
|
$sumPercentageActual = 0; |
|
|
|
|
foreach ($dataActualM as $keyActualM) { |
|
|
|
|
$sumVolActual = DB::table('assign_material_to_activity') |
|
|
|
|
->select('activity_id', DB::raw('SUM(qty_planning) as ttl_qty_plan')) |
|
|
|
@ -305,14 +311,14 @@ class MasterFunctionsHelper {
|
|
|
|
|
->where('activity_id', $keyActualM->activity_id) |
|
|
|
|
->sum('qty'); |
|
|
|
|
$reportCount = DB::table('report_activity_material')->where('activity_id', '=', $keyActualM->activity_id)->count(); |
|
|
|
|
$dataTempReport [$w]['activity_id'] = $keyActualM->activity_id; |
|
|
|
|
$dataTempReport [$w]['qty'] = $keyActualM->qty; |
|
|
|
|
$dataTempReport [$w]['report_date'] = $keyActualM->report_date; |
|
|
|
|
$dataTempReport [$w]['bobot_planning'] = $keyActualM->bobot_planning; |
|
|
|
|
$dataTempReport [$w]['ttl_plan'] = $sumVolActual->ttl_qty_plan; |
|
|
|
|
$dataTempReport [$w]['biaya_actual'] = $keyActualM->biaya_actual; |
|
|
|
|
$dataTempReport [$w]['duration'] = $keyActualM->duration; |
|
|
|
|
$dataTempReport [$w]['persentase_progress'] = $keyActualM->persentase_progress; |
|
|
|
|
$dataTempReport[$w]['activity_id'] = $keyActualM->activity_id; |
|
|
|
|
$dataTempReport[$w]['qty'] = $keyActualM->qty; |
|
|
|
|
$dataTempReport[$w]['report_date'] = $keyActualM->report_date; |
|
|
|
|
$dataTempReport[$w]['bobot_planning'] = $keyActualM->bobot_planning; |
|
|
|
|
$dataTempReport[$w]['ttl_plan'] = $sumVolActual->ttl_qty_plan; |
|
|
|
|
$dataTempReport[$w]['biaya_actual'] = $keyActualM->biaya_actual; |
|
|
|
|
$dataTempReport[$w]['duration'] = $keyActualM->duration; |
|
|
|
|
$dataTempReport[$w]['persentase_progress'] = $keyActualM->persentase_progress; |
|
|
|
|
try { |
|
|
|
|
// assign_material_to_activity |
|
|
|
|
$checkStatusActivity = DB::table('assign_material_to_activity') |
|
|
|
@ -320,18 +326,18 @@ class MasterFunctionsHelper {
|
|
|
|
|
->where('activity_id', '=', $keyActualM->activity_id) |
|
|
|
|
->orderBy('status_activity', 'ASC') |
|
|
|
|
->first(); |
|
|
|
|
$dataTempReport [$w]['percentage'] = ($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning; |
|
|
|
|
$dataTempReport[$w]['percentage'] = ($keyActualM->qty / $sumVolActual->ttl_qty_plan) * $keyActualM->bobot_planning; |
|
|
|
|
// $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->bobot_planning/$reportCount; |
|
|
|
|
if ($checkStatusActivity->status_activity == 'done') { |
|
|
|
|
$sumPercentageActual += $keyActualM->bobot_planning / $reportCount; |
|
|
|
|
// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual; |
|
|
|
|
}else{ |
|
|
|
|
if($keyActualM->qty/$sumVolActual->ttl_qty_plan >= 1 || (int)$sumVolActual->ttl_qty_plan == (int)$sumReportActual){ |
|
|
|
|
$sumPercentageActual+=(($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning)*(95/100); |
|
|
|
|
} else { |
|
|
|
|
if ($keyActualM->qty / $sumVolActual->ttl_qty_plan >= 1 || (int) $sumVolActual->ttl_qty_plan == (int) $sumReportActual) { |
|
|
|
|
$sumPercentageActual += (($keyActualM->qty / $sumVolActual->ttl_qty_plan) * $keyActualM->bobot_planning) * (95 / 100); |
|
|
|
|
// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual; |
|
|
|
|
}else{ |
|
|
|
|
$sumPercentageActual+=($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning; |
|
|
|
|
} else { |
|
|
|
|
$sumPercentageActual += ($keyActualM->qty / $sumVolActual->ttl_qty_plan) * $keyActualM->bobot_planning; |
|
|
|
|
// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
@ -344,24 +350,24 @@ class MasterFunctionsHelper {
|
|
|
|
|
// } |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$totalACWP += $keyActualM->biaya_actual/$keyActualM->duration; |
|
|
|
|
$totalACWP += $keyActualM->biaya_actual / $keyActualM->duration; |
|
|
|
|
} catch (\DivisionByZeroError $e) { |
|
|
|
|
return response()->json(['message' => $e->getMessage()]); |
|
|
|
|
} |
|
|
|
|
$dataTempReport [$w]['totalacwp'] = $totalACWP; |
|
|
|
|
$dataTempReport[$w]['totalacwp'] = $totalACWP; |
|
|
|
|
$w++; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$arr_ActualM[] = array( |
|
|
|
|
'date'=>$dt->format("Y-m-d"), |
|
|
|
|
'percentPlan'=>$sumPercentagePlan, |
|
|
|
|
'percentActual'=> $sumPercentageActual, |
|
|
|
|
'plan'=>$dataTempPlan, |
|
|
|
|
'actual'=>$dataTempReport, |
|
|
|
|
'date' => $dt->format("Y-m-d"), |
|
|
|
|
'percentPlan' => $sumPercentagePlan, |
|
|
|
|
'percentActual' => $sumPercentageActual, |
|
|
|
|
'plan' => $dataTempPlan, |
|
|
|
|
'actual' => $dataTempReport, |
|
|
|
|
); |
|
|
|
|
if(isset($dataPayload['period']) && $dataPayload['period'] == 'week'){ |
|
|
|
|
$tempTtlPercentPlan+= $sumPercentagePlan; |
|
|
|
|
$tempTtlPercentActual+= $sumPercentageActual; |
|
|
|
|
if (isset($dataPayload['period']) && $dataPayload['period'] == 'week') { |
|
|
|
|
$tempTtlPercentPlan += $sumPercentagePlan; |
|
|
|
|
$tempTtlPercentActual += $sumPercentageActual; |
|
|
|
|
|
|
|
|
|
// if($tempTtlPercentPlan >= 100 || $tempTtlPercentActual >= $keyGantt['progress'];){ |
|
|
|
|
// if($tempTtlPercentActual >= 100) |
|
|
|
@ -371,7 +377,7 @@ class MasterFunctionsHelper {
|
|
|
|
|
|
|
|
|
|
// if($tempTtlPercentActual >= $keyGantt['progress']) |
|
|
|
|
// $tempTtlPercentActual = $keyGantt['progress']; |
|
|
|
|
if($tempTtlPercentPlan >= 100) |
|
|
|
|
if ($tempTtlPercentPlan >= 100) |
|
|
|
|
$tempTtlPercentPlan = 100; |
|
|
|
|
// $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual |
|
|
|
|
|
|
|
|
@ -380,26 +386,25 @@ class MasterFunctionsHelper {
|
|
|
|
|
$currentACWP += $totalACWP; |
|
|
|
|
$currentBCWP += $totalBCWP; |
|
|
|
|
|
|
|
|
|
$tempPercentage[] = array(round($tempTtlPercentPlan,2), round($tempTtlPercentActual,2)); |
|
|
|
|
$tempPercentage[] = array(round($tempTtlPercentPlan, 2), round($tempTtlPercentActual, 2)); |
|
|
|
|
$tempPercentagePlan[] = round($tempTtlPercentPlan, 2); |
|
|
|
|
$tempPercentagePlanWhr[] = ["weekly period", $tempPercentagePlan]; |
|
|
|
|
$tempPercentageReal[] = round($tempTtlPercentActual, 2); |
|
|
|
|
if($tempTtlPercentPlan >= 100 && $tempTtlPercentActual >= 100){ |
|
|
|
|
if ($tempTtlPercentPlan >= 100 && $tempTtlPercentActual >= 100) { |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
}else{ |
|
|
|
|
$tempPercentage[] = array(round($sumPercentagePlan,2), round($sumPercentageActual,2)); |
|
|
|
|
} else { |
|
|
|
|
$tempPercentage[] = array(round($sumPercentagePlan, 2), round($sumPercentageActual, 2)); |
|
|
|
|
$tempPercentagePlan[] = round($sumPercentagePlan, 2); |
|
|
|
|
$tempPercentageReal[] = round($sumPercentageActual, 2); |
|
|
|
|
} |
|
|
|
|
$tempDate[] = array($dt->format("Y-m-d")); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
try { |
|
|
|
|
if(round($totalACWP,0) > $totalRencanaBudget){ |
|
|
|
|
$estimatedCost = round($totalACWP,0)+0; |
|
|
|
|
}else{ |
|
|
|
|
$estimatedCost = ($totalRencanaBudget+0); |
|
|
|
|
if (round($totalACWP, 0) > $totalRencanaBudget) { |
|
|
|
|
$estimatedCost = round($totalACWP, 0) + 0; |
|
|
|
|
} else { |
|
|
|
|
$estimatedCost = ($totalRencanaBudget + 0); |
|
|
|
|
} |
|
|
|
|
} catch (\DivisionByZeroError $e) { |
|
|
|
|
return response()->json([ |
|
|
|
@ -411,22 +416,23 @@ class MasterFunctionsHelper {
|
|
|
|
|
$estimatedCost = $totalACWP > $totalRencanaBudget ? $totalACWP : $totalRencanaBudget; |
|
|
|
|
|
|
|
|
|
$costDeviation = $totalRencanaBudget - $estimatedCost; |
|
|
|
|
if($costDeviation > 0){ |
|
|
|
|
if ($costDeviation > 0) { |
|
|
|
|
$potential = "SAVING"; |
|
|
|
|
} else { |
|
|
|
|
$potential = $costDeviation == 0 ? "ON BUDGET" : "OVERRUN"; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$dataResponse = array( |
|
|
|
|
"date" =>$tempDate, |
|
|
|
|
"percentage" =>$tempPercentage, |
|
|
|
|
"date" => $tempDate, |
|
|
|
|
"percentage" => $tempPercentage, |
|
|
|
|
"percentagePlan" => $tempPercentagePlan, |
|
|
|
|
"percentageReal" => $tempPercentageReal, |
|
|
|
|
"data_details" =>$arr_ActualM, |
|
|
|
|
"budget_control" =>array("current_budget"=> $totalRencanaBudget, |
|
|
|
|
"acwp" => round($totalACWP,0), |
|
|
|
|
"bcwp" => round($totalBCWP,0), |
|
|
|
|
"rem_to_complete" => ($totalRencanaBudget - round($totalACWP,0)), |
|
|
|
|
"data_details" => $arr_ActualM, |
|
|
|
|
"budget_control" => array( |
|
|
|
|
"current_budget" => $totalRencanaBudget, |
|
|
|
|
"acwp" => round($totalACWP, 0), |
|
|
|
|
"bcwp" => round($totalBCWP, 0), |
|
|
|
|
"rem_to_complete" => ($totalRencanaBudget - round($totalACWP, 0)), |
|
|
|
|
"add_cost_to_complete" => 0, |
|
|
|
|
"estimated_at_completion" => $estimatedCost, |
|
|
|
|
"cost_deviation" => $costDeviation, |
|
|
|
@ -435,9 +441,9 @@ class MasterFunctionsHelper {
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
$dataFinal[] = array( |
|
|
|
|
"proyek_name"=> $dataProject->nama, |
|
|
|
|
"data"=>$dataResponse, |
|
|
|
|
"gantt"=>$keyGantt |
|
|
|
|
"proyek_name" => $dataProject->nama, |
|
|
|
|
"data" => $dataResponse, |
|
|
|
|
"gantt" => $keyGantt |
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
return $dataFinal; |
|
|
|
@ -447,7 +453,7 @@ class MasterFunctionsHelper {
|
|
|
|
|
{ |
|
|
|
|
DB::enableQueryLog(); |
|
|
|
|
|
|
|
|
|
$dataFinal=[]; |
|
|
|
|
$dataFinal = []; |
|
|
|
|
$dataPayload = []; |
|
|
|
|
$dataPayload['period'] = 'week'; |
|
|
|
|
$totalACWP = 0; |
|
|
|
@ -456,13 +462,13 @@ class MasterFunctionsHelper {
|
|
|
|
|
|
|
|
|
|
$dataProject = Project::find($projectId); |
|
|
|
|
$dataHeader = Activity::where('type_activity', 'header')->where("proyek_id", $projectId)->first(); |
|
|
|
|
if(isset($dataPayload['end_date']) && $dataPayload['end_date'] > $dataProject->akhir_proyek){ |
|
|
|
|
if (isset($dataPayload['end_date']) && $dataPayload['end_date'] > $dataProject->akhir_proyek) { |
|
|
|
|
$dataPayload['end_date'] = $dataProject->akhir_proyek; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if($dataHeader){ |
|
|
|
|
if ($dataHeader) { |
|
|
|
|
$totalRencanaBudget = Activity::where('parent_id', $dataHeader->id)->where("proyek_id", $projectId)->sum("rencana_biaya"); |
|
|
|
|
}else{ |
|
|
|
|
} else { |
|
|
|
|
$totalRencanaBudget = Activity::whereNull('parent_id')->where("proyek_id", $projectId)->sum("rencana_biaya"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -475,12 +481,12 @@ class MasterFunctionsHelper {
|
|
|
|
|
|
|
|
|
|
$begin = new \DateTime($minDate); |
|
|
|
|
$begin->modify('last Monday'); |
|
|
|
|
if(isset($dataPayload['end_date'])){ |
|
|
|
|
if (isset($dataPayload['end_date'])) { |
|
|
|
|
$maxDate = $dataPayload['end_date']; |
|
|
|
|
$end = new \DateTime($maxDate); |
|
|
|
|
$end->modify('next Friday'); |
|
|
|
|
$end->modify('next Friday'); |
|
|
|
|
/* $interval = \DateInterval::createFromDateString('1 day'); */ // should be using this but its bugged |
|
|
|
|
/* $interval = \DateInterval::createFromDateString('1 day'); */// should be using this but its bugged |
|
|
|
|
$interval = new \DateInterval('P7D'); |
|
|
|
|
} else { |
|
|
|
|
// $maxDate = DB::table('assign_material_to_activity as ama') |
|
|
|
@ -500,8 +506,8 @@ class MasterFunctionsHelper {
|
|
|
|
|
$tempPercentagePlan = []; |
|
|
|
|
$tempPercentagePlanWhr = []; |
|
|
|
|
$tempPercentageReal = []; |
|
|
|
|
$tempTtlPercentPlan=0; |
|
|
|
|
$tempTtlPercentActual=0; |
|
|
|
|
$tempTtlPercentPlan = 0; |
|
|
|
|
$tempTtlPercentActual = 0; |
|
|
|
|
|
|
|
|
|
$currentACWP = 0; |
|
|
|
|
$currentBCWP = 0; |
|
|
|
@ -522,7 +528,7 @@ class MasterFunctionsHelper {
|
|
|
|
|
->join('assign_material_to_activity AS amta', 'amta.activity_id', '=', 'a.id') |
|
|
|
|
->where('a.type_activity', 'task') |
|
|
|
|
->where('a.bobot_planning', '>', 0) |
|
|
|
|
->whereDate('amta.plan_date', '<=',$dt->format("Y-m-d")) |
|
|
|
|
->whereDate('amta.plan_date', '<=', $dt->format("Y-m-d")) |
|
|
|
|
->whereDate('amta.plan_date', '>', $minSevenDays) |
|
|
|
|
->select('a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress', 'a.id'); |
|
|
|
|
|
|
|
|
@ -530,7 +536,7 @@ class MasterFunctionsHelper {
|
|
|
|
|
->join('assign_hr_to_activity AS ahta', 'ahta.activity_id', '=', 'a.id') |
|
|
|
|
->where('a.type_activity', 'task') |
|
|
|
|
->where('a.bobot_planning', '>', 0) |
|
|
|
|
->whereDate('a.start_date', '<=',$dt->format("Y-m-d")) |
|
|
|
|
->whereDate('a.start_date', '<=', $dt->format("Y-m-d")) |
|
|
|
|
->whereDate('a.start_date', '>', $minSevenDays) |
|
|
|
|
->select('a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress', 'a.id') |
|
|
|
|
->union($activities) |
|
|
|
@ -540,23 +546,23 @@ class MasterFunctionsHelper {
|
|
|
|
|
->select('ram.activity_id', 'ram.qty', 'ram.report_date', 'a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress') |
|
|
|
|
->join('m_activity as a', 'a.id', '=', 'ram.activity_id') |
|
|
|
|
->where('a.proyek_id', '=', $projectId) |
|
|
|
|
->whereDate('ram.report_date', '<=',$dt->format("Y-m-d")) |
|
|
|
|
->whereDate('ram.report_date', '>',$minSevenDays) |
|
|
|
|
->whereDate('ram.report_date', '<=', $dt->format("Y-m-d")) |
|
|
|
|
->whereDate('ram.report_date', '>', $minSevenDays) |
|
|
|
|
->get(); |
|
|
|
|
$dataTempPlan = []; |
|
|
|
|
$x = 0; |
|
|
|
|
$sumPercentagePlan=0; |
|
|
|
|
$sumPercentagePlan = 0; |
|
|
|
|
$totalACWP = isset($totalACWP) ? $totalACWP : 0; |
|
|
|
|
$totalBCWP = isset($totalBCWP) ? $totalBCWP : 0; |
|
|
|
|
|
|
|
|
|
foreach ($dataPlanM as $keyPlanM) { |
|
|
|
|
$sumVolPlan = DB::table(function ($query){ |
|
|
|
|
$sumVolPlan = DB::table(function ($query) { |
|
|
|
|
$query->select('a.*') |
|
|
|
|
->from('m_activity AS a') |
|
|
|
|
->join('assign_material_to_activity as amta', 'amta.activity_id', '=', 'a.id') |
|
|
|
|
->where('a.type_activity', 'task') |
|
|
|
|
->where('a.bobot_planning', '>', 0) |
|
|
|
|
->unionAll(function ($query){ |
|
|
|
|
->unionAll(function ($query) { |
|
|
|
|
$query->select('a.*') |
|
|
|
|
->from('m_activity AS a') |
|
|
|
|
->join('assign_hr_to_activity as ahta', 'ahta.activity_id', '=', 'a.id') |
|
|
|
@ -565,20 +571,20 @@ class MasterFunctionsHelper {
|
|
|
|
|
})->orderBy('id', 'asc'); |
|
|
|
|
}, 'subquery') |
|
|
|
|
->sum('bobot_planning'); |
|
|
|
|
$dataTempPlan [$x]['activity_id'] = $keyPlanM->id; |
|
|
|
|
$dataTempPlan [$x]['bobot_planning'] = $keyPlanM->bobot_planning; |
|
|
|
|
$dataTempPlan [$x]['ttl_plan'] = $sumVolPlan; |
|
|
|
|
$dataTempPlan [$x]['biaya_actual'] = $keyPlanM->biaya_actual; |
|
|
|
|
$dataTempPlan [$x]['duration'] = $keyPlanM->duration; |
|
|
|
|
$dataTempPlan [$x]['persentase_progress'] = $keyPlanM->persentase_progress; |
|
|
|
|
$dataTempPlan[$x]['activity_id'] = $keyPlanM->id; |
|
|
|
|
$dataTempPlan[$x]['bobot_planning'] = $keyPlanM->bobot_planning; |
|
|
|
|
$dataTempPlan[$x]['ttl_plan'] = $sumVolPlan; |
|
|
|
|
$dataTempPlan[$x]['biaya_actual'] = $keyPlanM->biaya_actual; |
|
|
|
|
$dataTempPlan[$x]['duration'] = $keyPlanM->duration; |
|
|
|
|
$dataTempPlan[$x]['persentase_progress'] = $keyPlanM->persentase_progress; |
|
|
|
|
try { |
|
|
|
|
$dataTempPlan [$x]['percentage'] = $keyPlanM->bobot_planning; |
|
|
|
|
$sumPercentagePlan+= $keyPlanM->bobot_planning; |
|
|
|
|
if(isset($keyPlanM->duration) && $keyPlanM->duration > 0) |
|
|
|
|
$totalBCWP += (((($keyPlanM->persentase_progress*$keyPlanM->bobot_planning)/100)/$keyPlanM->duration)* $totalRencanaBudget)/100; |
|
|
|
|
$dataTempPlan[$x]['percentage'] = $keyPlanM->bobot_planning; |
|
|
|
|
$sumPercentagePlan += $keyPlanM->bobot_planning; |
|
|
|
|
if (isset($keyPlanM->duration) && $keyPlanM->duration > 0) |
|
|
|
|
$totalBCWP += (((($keyPlanM->persentase_progress * $keyPlanM->bobot_planning) / 100) / $keyPlanM->duration) * $totalRencanaBudget) / 100; |
|
|
|
|
else |
|
|
|
|
$totalBCWP = 0; |
|
|
|
|
$dataTempPlan [$x]['totalBCWP'] = $totalBCWP; |
|
|
|
|
$dataTempPlan[$x]['totalBCWP'] = $totalBCWP; |
|
|
|
|
} catch (\DivisionByZeroError $e) { |
|
|
|
|
return response()->json(['message' => $e->getMessage()]); |
|
|
|
|
} |
|
|
|
@ -587,7 +593,7 @@ class MasterFunctionsHelper {
|
|
|
|
|
|
|
|
|
|
$w = 0; |
|
|
|
|
$dataTempReport = []; |
|
|
|
|
$sumPercentageActual=0; |
|
|
|
|
$sumPercentageActual = 0; |
|
|
|
|
foreach ($dataActualM as $keyActualM) { |
|
|
|
|
$sumVolActual = DB::table('assign_material_to_activity') |
|
|
|
|
->select('activity_id', DB::raw('SUM(qty_planning) as ttl_qty_plan')) |
|
|
|
@ -598,14 +604,14 @@ class MasterFunctionsHelper {
|
|
|
|
|
->where('activity_id', $keyActualM->activity_id) |
|
|
|
|
->sum('qty'); |
|
|
|
|
$reportCount = DB::table('report_activity_material')->where('activity_id', '=', $keyActualM->activity_id)->count(); |
|
|
|
|
$dataTempReport [$w]['activity_id'] = $keyActualM->activity_id; |
|
|
|
|
$dataTempReport [$w]['qty'] = $keyActualM->qty; |
|
|
|
|
$dataTempReport [$w]['report_date'] = $keyActualM->report_date; |
|
|
|
|
$dataTempReport [$w]['bobot_planning'] = $keyActualM->bobot_planning; |
|
|
|
|
$dataTempReport [$w]['ttl_plan'] = $sumVolActual->ttl_qty_plan; |
|
|
|
|
$dataTempReport [$w]['biaya_actual'] = $keyActualM->biaya_actual; |
|
|
|
|
$dataTempReport [$w]['duration'] = $keyActualM->duration; |
|
|
|
|
$dataTempReport [$w]['persentase_progress'] = $keyActualM->persentase_progress; |
|
|
|
|
$dataTempReport[$w]['activity_id'] = $keyActualM->activity_id; |
|
|
|
|
$dataTempReport[$w]['qty'] = $keyActualM->qty; |
|
|
|
|
$dataTempReport[$w]['report_date'] = $keyActualM->report_date; |
|
|
|
|
$dataTempReport[$w]['bobot_planning'] = $keyActualM->bobot_planning; |
|
|
|
|
$dataTempReport[$w]['ttl_plan'] = $sumVolActual->ttl_qty_plan; |
|
|
|
|
$dataTempReport[$w]['biaya_actual'] = $keyActualM->biaya_actual; |
|
|
|
|
$dataTempReport[$w]['duration'] = $keyActualM->duration; |
|
|
|
|
$dataTempReport[$w]['persentase_progress'] = $keyActualM->persentase_progress; |
|
|
|
|
try { |
|
|
|
|
// assign_material_to_activity |
|
|
|
|
$checkStatusActivity = DB::table('assign_material_to_activity') |
|
|
|
@ -613,18 +619,18 @@ class MasterFunctionsHelper {
|
|
|
|
|
->where('activity_id', '=', $keyActualM->activity_id) |
|
|
|
|
->orderBy('status_activity', 'ASC') |
|
|
|
|
->first(); |
|
|
|
|
$dataTempReport [$w]['percentage'] = ($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning; |
|
|
|
|
$dataTempReport[$w]['percentage'] = ($keyActualM->qty / $sumVolActual->ttl_qty_plan) * $keyActualM->bobot_planning; |
|
|
|
|
// $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->bobot_planning/$reportCount; |
|
|
|
|
if ($checkStatusActivity->status_activity == 'done') { |
|
|
|
|
$sumPercentageActual += $keyActualM->bobot_planning / $reportCount; |
|
|
|
|
// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual; |
|
|
|
|
}else{ |
|
|
|
|
if($keyActualM->qty/$sumVolActual->ttl_qty_plan >= 1 || (int)$sumVolActual->ttl_qty_plan == (int)$sumReportActual){ |
|
|
|
|
$sumPercentageActual+=(($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning)*(95/100); |
|
|
|
|
} else { |
|
|
|
|
if ($keyActualM->qty / $sumVolActual->ttl_qty_plan >= 1 || (int) $sumVolActual->ttl_qty_plan == (int) $sumReportActual) { |
|
|
|
|
$sumPercentageActual += (($keyActualM->qty / $sumVolActual->ttl_qty_plan) * $keyActualM->bobot_planning) * (95 / 100); |
|
|
|
|
// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual; |
|
|
|
|
}else{ |
|
|
|
|
$sumPercentageActual+=($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning; |
|
|
|
|
} else { |
|
|
|
|
$sumPercentageActual += ($keyActualM->qty / $sumVolActual->ttl_qty_plan) * $keyActualM->bobot_planning; |
|
|
|
|
// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
@ -637,34 +643,34 @@ class MasterFunctionsHelper {
|
|
|
|
|
// } |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$totalACWP += $keyActualM->biaya_actual/$keyActualM->duration; |
|
|
|
|
$totalACWP += $keyActualM->biaya_actual / $keyActualM->duration; |
|
|
|
|
} catch (\DivisionByZeroError $e) { |
|
|
|
|
return response()->json(['message' => $e->getMessage()]); |
|
|
|
|
} |
|
|
|
|
$dataTempReport [$w]['totalacwp'] = $totalACWP; |
|
|
|
|
$dataTempReport[$w]['totalacwp'] = $totalACWP; |
|
|
|
|
$w++; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$arr_ActualM[] = array( |
|
|
|
|
'date'=>$dt->format("Y-m-d"), |
|
|
|
|
'percentPlan'=>$sumPercentagePlan, |
|
|
|
|
'percentActual'=> $sumPercentageActual, |
|
|
|
|
'plan'=>$dataTempPlan, |
|
|
|
|
'actual'=>$dataTempReport, |
|
|
|
|
'date' => $dt->format("Y-m-d"), |
|
|
|
|
'percentPlan' => $sumPercentagePlan, |
|
|
|
|
'percentActual' => $sumPercentageActual, |
|
|
|
|
'plan' => $dataTempPlan, |
|
|
|
|
'actual' => $dataTempReport, |
|
|
|
|
); |
|
|
|
|
if(isset($dataPayload['period']) && $dataPayload['period'] == 'week'){ |
|
|
|
|
$tempTtlPercentPlan+= $sumPercentagePlan; |
|
|
|
|
$tempTtlPercentActual+= $sumPercentageActual; |
|
|
|
|
if (isset($dataPayload['period']) && $dataPayload['period'] == 'week') { |
|
|
|
|
$tempTtlPercentPlan += $sumPercentagePlan; |
|
|
|
|
$tempTtlPercentActual += $sumPercentageActual; |
|
|
|
|
|
|
|
|
|
$currentACWP += $totalACWP; |
|
|
|
|
$currentBCWP += $totalBCWP; |
|
|
|
|
|
|
|
|
|
$tempPercentage[] = array(round($tempTtlPercentPlan,2), round($tempTtlPercentActual,2)); |
|
|
|
|
$tempPercentage[] = array(round($tempTtlPercentPlan, 2), round($tempTtlPercentActual, 2)); |
|
|
|
|
$tempPercentagePlan[] = round($tempTtlPercentPlan, 2); |
|
|
|
|
$tempPercentagePlanWhr[] = ["weekly period", $tempPercentagePlan]; |
|
|
|
|
$tempPercentageReal[] = round($tempTtlPercentActual, 2); |
|
|
|
|
}else{ |
|
|
|
|
$tempPercentage[] = array(round($sumPercentagePlan,2), round($sumPercentageActual,2)); |
|
|
|
|
} else { |
|
|
|
|
$tempPercentage[] = array(round($sumPercentagePlan, 2), round($sumPercentageActual, 2)); |
|
|
|
|
$tempPercentagePlan[] = round($sumPercentagePlan, 2); |
|
|
|
|
$tempPercentageReal[] = round($sumPercentageActual, 2); |
|
|
|
|
} |
|
|
|
@ -672,10 +678,10 @@ class MasterFunctionsHelper {
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
try { |
|
|
|
|
if(round($totalACWP,0) > $totalRencanaBudget){ |
|
|
|
|
$estimatedCost = round($totalACWP,0)+0; |
|
|
|
|
}else{ |
|
|
|
|
$estimatedCost = ($totalRencanaBudget+0); |
|
|
|
|
if (round($totalACWP, 0) > $totalRencanaBudget) { |
|
|
|
|
$estimatedCost = round($totalACWP, 0) + 0; |
|
|
|
|
} else { |
|
|
|
|
$estimatedCost = ($totalRencanaBudget + 0); |
|
|
|
|
} |
|
|
|
|
} catch (\DivisionByZeroError $e) { |
|
|
|
|
return response()->json([ |
|
|
|
@ -686,22 +692,23 @@ class MasterFunctionsHelper {
|
|
|
|
|
$estimatedCost = $totalACWP > $totalRencanaBudget ? $totalACWP : $totalRencanaBudget; |
|
|
|
|
|
|
|
|
|
$costDeviation = $totalRencanaBudget - $estimatedCost; |
|
|
|
|
if($costDeviation > 0){ |
|
|
|
|
if ($costDeviation > 0) { |
|
|
|
|
$potential = "SAVING"; |
|
|
|
|
} else { |
|
|
|
|
$potential = $costDeviation == 0 ? "ON BUDGET" : "OVERRUN"; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$dataResponse = array( |
|
|
|
|
"date" =>$tempDate, |
|
|
|
|
"percentage" =>$tempPercentage, |
|
|
|
|
"date" => $tempDate, |
|
|
|
|
"percentage" => $tempPercentage, |
|
|
|
|
"percentagePlan" => $tempPercentagePlan, |
|
|
|
|
"percentageReal" => $tempPercentageReal, |
|
|
|
|
"data_details" =>$arr_ActualM, |
|
|
|
|
"budget_control" =>array("current_budget"=> $totalRencanaBudget, |
|
|
|
|
"acwp" => round($totalACWP,0), |
|
|
|
|
"bcwp" => round($totalBCWP,0), |
|
|
|
|
"rem_to_complete" => ($totalRencanaBudget - round($totalACWP,0)), |
|
|
|
|
"data_details" => $arr_ActualM, |
|
|
|
|
"budget_control" => array( |
|
|
|
|
"current_budget" => $totalRencanaBudget, |
|
|
|
|
"acwp" => round($totalACWP, 0), |
|
|
|
|
"bcwp" => round($totalBCWP, 0), |
|
|
|
|
"rem_to_complete" => ($totalRencanaBudget - round($totalACWP, 0)), |
|
|
|
|
"add_cost_to_complete" => 0, |
|
|
|
|
"estimated_at_completion" => $estimatedCost, |
|
|
|
|
"cost_deviation" => $costDeviation, |
|
|
|
@ -710,33 +717,34 @@ class MasterFunctionsHelper {
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
$dataFinal[] = array( |
|
|
|
|
"proyek_name"=> $dataProject->nama, |
|
|
|
|
"data"=>$dataResponse, |
|
|
|
|
"proyek_name" => $dataProject->nama, |
|
|
|
|
"data" => $dataResponse, |
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
return $dataFinal; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public function calculateProgressBasedOnSimple($keyGantt){ |
|
|
|
|
public function calculateProgressBasedOnSimple($keyGantt) |
|
|
|
|
{ |
|
|
|
|
DB::enableQueryLog(); |
|
|
|
|
|
|
|
|
|
$dataFinal=[]; |
|
|
|
|
$dataFinal = []; |
|
|
|
|
$dataPayload = []; |
|
|
|
|
$dataPayload['period'] = 'week'; |
|
|
|
|
|
|
|
|
|
$dataProject = Project::find($keyGantt['proyek_id']); |
|
|
|
|
$dataHeader = Activity::where('type_activity', 'header')->where("proyek_id", $keyGantt['proyek_id'])->where("version_gantt_id", $keyGantt['id'])->first(); |
|
|
|
|
if(isset($dataPayload['end_date']) && $dataPayload['end_date'] > $dataProject->akhir_proyek){ |
|
|
|
|
if (isset($dataPayload['end_date']) && $dataPayload['end_date'] > $dataProject->akhir_proyek) { |
|
|
|
|
$dataPayload['end_date'] = $dataProject->akhir_proyek; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if($dataHeader){ |
|
|
|
|
if ($dataHeader) { |
|
|
|
|
$totalRencanaBudget = Activity::where('parent_id', $dataHeader->id)->where("proyek_id", $keyGantt['proyek_id'])->where("version_gantt_id", $keyGantt['id'])->sum("rencana_biaya"); |
|
|
|
|
}else{ |
|
|
|
|
} else { |
|
|
|
|
$totalRencanaBudget = Activity::whereNull('parent_id')->where("proyek_id", $keyGantt['proyek_id'])->where("version_gantt_id", $keyGantt['id'])->sum("rencana_biaya"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(!Activity::where("version_gantt_id", $keyGantt['id'])->first()) |
|
|
|
|
if (!Activity::where("version_gantt_id", $keyGantt['id'])->first()) |
|
|
|
|
return $dataFinal; |
|
|
|
|
|
|
|
|
|
// $alreadyHasReport = DB::table('report_activity_material as a') |
|
|
|
@ -750,11 +758,11 @@ class MasterFunctionsHelper {
|
|
|
|
|
|
|
|
|
|
$minDate = Activity::where('version_gantt_id', $keyGantt['id'])->whereNull('parent_id')->pluck('start_date')->first(); |
|
|
|
|
|
|
|
|
|
$begin = new \DateTime($minDate.' Monday'); |
|
|
|
|
if(isset($dataPayload['end_date'])){ |
|
|
|
|
$begin = new \DateTime($minDate . ' Monday'); |
|
|
|
|
if (isset($dataPayload['end_date'])) { |
|
|
|
|
$maxDate = $dataPayload['end_date']; |
|
|
|
|
$end = new \DateTime($maxDate); |
|
|
|
|
/* $interval = \DateInterval::createFromDateString('1 day'); */ // should be using this but its bugged |
|
|
|
|
/* $interval = \DateInterval::createFromDateString('1 day'); */// should be using this but its bugged |
|
|
|
|
$interval = new \DateInterval('P7D'); |
|
|
|
|
} else { |
|
|
|
|
// $maxDate = DB::table('assign_material_to_activity as ama') |
|
|
|
@ -763,7 +771,7 @@ class MasterFunctionsHelper {
|
|
|
|
|
// ->where('a.version_gantt_id', '=', $keyGantt['id']) |
|
|
|
|
// ->max("plan_date"); // plan date overlapped with assign_material_to_activity's, it should be m_activity's |
|
|
|
|
$maxDate = Activity::where('version_gantt_id', $keyGantt['id'])->whereNull('parent_id')->pluck('end_date')->first(); |
|
|
|
|
$end = new \DateTime($maxDate. ' Friday'); |
|
|
|
|
$end = new \DateTime($maxDate . ' Friday'); |
|
|
|
|
$interval = new \DateInterval('P7D'); |
|
|
|
|
} |
|
|
|
|
$period = new \DatePeriod($begin, $interval, $end); |
|
|
|
@ -773,8 +781,8 @@ class MasterFunctionsHelper {
|
|
|
|
|
$tempPercentagePlan = []; |
|
|
|
|
$tempPercentagePlanWhr = []; |
|
|
|
|
$tempPercentageReal = []; |
|
|
|
|
$tempTtlPercentPlan=0; |
|
|
|
|
$tempTtlPercentActual=0; |
|
|
|
|
$tempTtlPercentPlan = 0; |
|
|
|
|
$tempTtlPercentActual = 0; |
|
|
|
|
|
|
|
|
|
$currentACWP = 0; |
|
|
|
|
$currentBCWP = 0; |
|
|
|
@ -789,7 +797,7 @@ class MasterFunctionsHelper {
|
|
|
|
|
->where('proyek_id', '=', $keyGantt['proyek_id']) |
|
|
|
|
->where('type_activity', '=', 'task') |
|
|
|
|
->where('version_gantt_id', '=', $keyGantt['id']) |
|
|
|
|
->whereDate('start_date', '<=',$dt->format("Y-m-d")) |
|
|
|
|
->whereDate('start_date', '<=', $dt->format("Y-m-d")) |
|
|
|
|
->whereDate('start_date', '>', $minSevenDays) |
|
|
|
|
->get(); |
|
|
|
|
|
|
|
|
@ -800,31 +808,31 @@ class MasterFunctionsHelper {
|
|
|
|
|
->where('a.type_activity', '=', 'task') |
|
|
|
|
->where('mapl.variance', '>', 0) |
|
|
|
|
->where('a.proyek_id', '=', $keyGantt['proyek_id']) |
|
|
|
|
->whereDate('mapl.created_at', '<=',$dt->format("Y-m-d")) |
|
|
|
|
->whereDate('mapl.created_at', '>',$minSevenDays) |
|
|
|
|
->whereDate('mapl.created_at', '<=', $dt->format("Y-m-d")) |
|
|
|
|
->whereDate('mapl.created_at', '>', $minSevenDays) |
|
|
|
|
->get(); |
|
|
|
|
$dataTempPlan = []; |
|
|
|
|
$x = 0; |
|
|
|
|
$sumPercentagePlan=0; |
|
|
|
|
$sumPercentagePlan = 0; |
|
|
|
|
$totalACWP = isset($totalACWP) ? $totalACWP : 0; |
|
|
|
|
$totalBCWP = isset($totalBCWP) ? $totalBCWP : 0; |
|
|
|
|
|
|
|
|
|
foreach ($dataPlanM as $keyPlanM) { |
|
|
|
|
|
|
|
|
|
$dataTempPlan [$x]['activity_id'] = $keyPlanM->activity_id; |
|
|
|
|
$dataTempPlan [$x]['qty_plan'] = $keyPlanM->bobot_planning; |
|
|
|
|
$dataTempPlan [$x]['plan_date'] = $keyPlanM->start_date; |
|
|
|
|
$dataTempPlan [$x]['start_activity'] = $keyPlanM->start_date; |
|
|
|
|
$dataTempPlan [$x]['bobot_planning'] = $keyPlanM->bobot_planning; |
|
|
|
|
$dataTempPlan [$x]['ttl_plan'] = $keyPlanM->bobot_planning; |
|
|
|
|
$dataTempPlan [$x]['biaya_actual'] = $keyPlanM->biaya_actual; |
|
|
|
|
$dataTempPlan [$x]['duration'] = $keyPlanM->duration; |
|
|
|
|
$dataTempPlan [$x]['persentase_progress'] = $keyPlanM->persentase_progress; |
|
|
|
|
$dataTempPlan[$x]['activity_id'] = $keyPlanM->activity_id; |
|
|
|
|
$dataTempPlan[$x]['qty_plan'] = $keyPlanM->bobot_planning; |
|
|
|
|
$dataTempPlan[$x]['plan_date'] = $keyPlanM->start_date; |
|
|
|
|
$dataTempPlan[$x]['start_activity'] = $keyPlanM->start_date; |
|
|
|
|
$dataTempPlan[$x]['bobot_planning'] = $keyPlanM->bobot_planning; |
|
|
|
|
$dataTempPlan[$x]['ttl_plan'] = $keyPlanM->bobot_planning; |
|
|
|
|
$dataTempPlan[$x]['biaya_actual'] = $keyPlanM->biaya_actual; |
|
|
|
|
$dataTempPlan[$x]['duration'] = $keyPlanM->duration; |
|
|
|
|
$dataTempPlan[$x]['persentase_progress'] = $keyPlanM->persentase_progress; |
|
|
|
|
try { |
|
|
|
|
$dataTempPlan [$x]['percentage'] = $keyPlanM->bobot_planning; |
|
|
|
|
$sumPercentagePlan+=$keyPlanM->bobot_planning; |
|
|
|
|
$dataTempPlan[$x]['percentage'] = $keyPlanM->bobot_planning; |
|
|
|
|
$sumPercentagePlan += $keyPlanM->bobot_planning; |
|
|
|
|
$totalBCWP += 0; |
|
|
|
|
$dataTempPlan [$x]['totalBCWP'] = $totalBCWP; |
|
|
|
|
$dataTempPlan[$x]['totalBCWP'] = $totalBCWP; |
|
|
|
|
} catch (\DivisionByZeroError $e) { |
|
|
|
|
return response()->json(['message' => $e->getMessage()]); |
|
|
|
|
} |
|
|
|
@ -833,62 +841,62 @@ class MasterFunctionsHelper {
|
|
|
|
|
|
|
|
|
|
$w = 0; |
|
|
|
|
$dataTempReport = []; |
|
|
|
|
$sumPercentageActual=0; |
|
|
|
|
$sumPercentageActual = 0; |
|
|
|
|
foreach ($dataActualM as $keyActualM) { |
|
|
|
|
$sumVolActual = DB::table('m_activity_progress_log') |
|
|
|
|
->select('id', DB::raw('SUM(variance) as ttl_percen_act')) |
|
|
|
|
->where('id', '=', $keyActualM->id_progress_log) |
|
|
|
|
->groupBy('id') |
|
|
|
|
->first(); |
|
|
|
|
$dataTempReport [$w]['id_progress_log'] = $keyActualM->id_progress_log; |
|
|
|
|
$dataTempReport[$w]['id_progress_log'] = $keyActualM->id_progress_log; |
|
|
|
|
// $dataTempReport [$w]['qty'] = $keyActualM->qty; |
|
|
|
|
$dataTempReport [$w]['report_date'] = $keyActualM->created_at; |
|
|
|
|
$dataTempReport [$w]['bobot_planning'] = $keyActualM->bobot_planning; |
|
|
|
|
$dataTempReport[$w]['report_date'] = $keyActualM->created_at; |
|
|
|
|
$dataTempReport[$w]['bobot_planning'] = $keyActualM->bobot_planning; |
|
|
|
|
// $dataTempReport [$w]['ttl_plan'] = $sumVolActual->ttl_percen_act ? $sumVolActual->ttl_percen_act : 0; |
|
|
|
|
$dataTempReport [$w]['biaya_actual'] = $keyActualM->biaya_actual; |
|
|
|
|
$dataTempReport [$w]['duration'] = $keyActualM->duration; |
|
|
|
|
$dataTempReport [$w]['persentase_progress'] = $keyActualM->persentase_progress; |
|
|
|
|
$dataTempReport[$w]['biaya_actual'] = $keyActualM->biaya_actual; |
|
|
|
|
$dataTempReport[$w]['duration'] = $keyActualM->duration; |
|
|
|
|
$dataTempReport[$w]['persentase_progress'] = $keyActualM->persentase_progress; |
|
|
|
|
try { |
|
|
|
|
$dataTempReport [$w]['percentage'] = $sumVolActual->ttl_percen_act ? ($sumVolActual->ttl_percen_act/100)*$keyActualM->bobot_planning : 0; |
|
|
|
|
$sumPercentageActual+=$sumVolActual->ttl_percen_act ? ($sumVolActual->ttl_percen_act/100)*$keyActualM->bobot_planning : 0; |
|
|
|
|
$totalACWP += $keyActualM->biaya_actual/$keyActualM->duration; |
|
|
|
|
$dataTempReport[$w]['percentage'] = $sumVolActual->ttl_percen_act ? ($sumVolActual->ttl_percen_act / 100) * $keyActualM->bobot_planning : 0; |
|
|
|
|
$sumPercentageActual += $sumVolActual->ttl_percen_act ? ($sumVolActual->ttl_percen_act / 100) * $keyActualM->bobot_planning : 0; |
|
|
|
|
$totalACWP += $keyActualM->biaya_actual / $keyActualM->duration; |
|
|
|
|
} catch (\DivisionByZeroError $e) { |
|
|
|
|
return response()->json(['message' => $e->getMessage()]); |
|
|
|
|
} |
|
|
|
|
$dataTempReport [$w]['totalacwp'] = $totalACWP; |
|
|
|
|
$dataTempReport[$w]['totalacwp'] = $totalACWP; |
|
|
|
|
$w++; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$arr_ActualM[] = array( |
|
|
|
|
'date'=>$dt->format("Y-m-d"), |
|
|
|
|
'percentPlan'=>$sumPercentagePlan, |
|
|
|
|
'percentActual'=>$sumPercentageActual, |
|
|
|
|
'plan'=>$dataTempPlan, |
|
|
|
|
'actual'=>$dataTempReport, |
|
|
|
|
'date' => $dt->format("Y-m-d"), |
|
|
|
|
'percentPlan' => $sumPercentagePlan, |
|
|
|
|
'percentActual' => $sumPercentageActual, |
|
|
|
|
'plan' => $dataTempPlan, |
|
|
|
|
'actual' => $dataTempReport, |
|
|
|
|
); |
|
|
|
|
if(isset($dataPayload['period']) && $dataPayload['period'] == 'week'){ |
|
|
|
|
$tempTtlPercentPlan+= $sumPercentagePlan; |
|
|
|
|
$tempTtlPercentActual+= $sumPercentageActual; |
|
|
|
|
if (isset($dataPayload['period']) && $dataPayload['period'] == 'week') { |
|
|
|
|
$tempTtlPercentPlan += $sumPercentagePlan; |
|
|
|
|
$tempTtlPercentActual += $sumPercentageActual; |
|
|
|
|
|
|
|
|
|
if($tempTtlPercentPlan >= 100 || $tempTtlPercentActual >= 100){ |
|
|
|
|
if($tempTtlPercentActual >= 100) |
|
|
|
|
if ($tempTtlPercentPlan >= 100 || $tempTtlPercentActual >= 100) { |
|
|
|
|
if ($tempTtlPercentActual >= 100) |
|
|
|
|
$tempTtlPercentActual = 100; |
|
|
|
|
if($tempTtlPercentPlan >= 100) |
|
|
|
|
if ($tempTtlPercentPlan >= 100) |
|
|
|
|
$tempTtlPercentPlan = 100; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$currentACWP += $totalACWP; |
|
|
|
|
$currentBCWP += $totalBCWP; |
|
|
|
|
|
|
|
|
|
$tempPercentage[] = array(round($tempTtlPercentPlan,2), round($tempTtlPercentActual,2)); |
|
|
|
|
$tempPercentage[] = array(round($tempTtlPercentPlan, 2), round($tempTtlPercentActual, 2)); |
|
|
|
|
$tempPercentagePlan[] = round($tempTtlPercentPlan, 2); |
|
|
|
|
$tempPercentagePlanWhr[] = ["weekly period", $tempPercentagePlan]; |
|
|
|
|
$tempPercentageReal[] = round($tempTtlPercentActual, 2); |
|
|
|
|
if($tempTtlPercentPlan >= 100 && $tempTtlPercentActual >= 100){ |
|
|
|
|
if ($tempTtlPercentPlan >= 100 && $tempTtlPercentActual >= 100) { |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
}else{ |
|
|
|
|
$tempPercentage[] = array(round($sumPercentagePlan,2), round($sumPercentageActual,2)); |
|
|
|
|
} else { |
|
|
|
|
$tempPercentage[] = array(round($sumPercentagePlan, 2), round($sumPercentageActual, 2)); |
|
|
|
|
$tempPercentagePlan[] = round($sumPercentagePlan, 2); |
|
|
|
|
$tempPercentageReal[] = round($sumPercentageActual, 2); |
|
|
|
|
} |
|
|
|
@ -896,10 +904,10 @@ class MasterFunctionsHelper {
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
try { |
|
|
|
|
if(round($totalACWP,0) > $totalRencanaBudget){ |
|
|
|
|
$estimatedCost = round($totalACWP,0)+0; |
|
|
|
|
}else{ |
|
|
|
|
$estimatedCost = ($totalRencanaBudget+0); |
|
|
|
|
if (round($totalACWP, 0) > $totalRencanaBudget) { |
|
|
|
|
$estimatedCost = round($totalACWP, 0) + 0; |
|
|
|
|
} else { |
|
|
|
|
$estimatedCost = ($totalRencanaBudget + 0); |
|
|
|
|
} |
|
|
|
|
} catch (\DivisionByZeroError $e) { |
|
|
|
|
return response()->json([ |
|
|
|
@ -911,22 +919,23 @@ class MasterFunctionsHelper {
|
|
|
|
|
$estimatedCost = $totalACWP > $totalRencanaBudget ? $totalACWP : $totalRencanaBudget; |
|
|
|
|
|
|
|
|
|
$costDeviation = $totalRencanaBudget - $estimatedCost; |
|
|
|
|
if($costDeviation > 0){ |
|
|
|
|
if ($costDeviation > 0) { |
|
|
|
|
$potential = "SAVING"; |
|
|
|
|
} else { |
|
|
|
|
$potential = $costDeviation == 0 ? "ON BUDGET" : "OVERRUN"; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$dataResponse = array( |
|
|
|
|
"date" =>$tempDate, |
|
|
|
|
"percentage" =>$tempPercentage, |
|
|
|
|
"date" => $tempDate, |
|
|
|
|
"percentage" => $tempPercentage, |
|
|
|
|
"percentagePlan" => $tempPercentagePlan, |
|
|
|
|
"percentageReal" => $tempPercentageReal, |
|
|
|
|
"data_details" =>$arr_ActualM, |
|
|
|
|
"budget_control" =>array("current_budget"=> $totalRencanaBudget, |
|
|
|
|
"acwp" => round($totalACWP,0), |
|
|
|
|
"bcwp" => round($totalBCWP,0), |
|
|
|
|
"rem_to_complete" => ($totalRencanaBudget - round($totalACWP,0)), |
|
|
|
|
"data_details" => $arr_ActualM, |
|
|
|
|
"budget_control" => array( |
|
|
|
|
"current_budget" => $totalRencanaBudget, |
|
|
|
|
"acwp" => round($totalACWP, 0), |
|
|
|
|
"bcwp" => round($totalBCWP, 0), |
|
|
|
|
"rem_to_complete" => ($totalRencanaBudget - round($totalACWP, 0)), |
|
|
|
|
"add_cost_to_complete" => 0, |
|
|
|
|
"estimated_at_completion" => $estimatedCost, |
|
|
|
|
"cost_deviation" => $costDeviation, |
|
|
|
@ -935,9 +944,9 @@ class MasterFunctionsHelper {
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
$dataFinal[] = array( |
|
|
|
|
"proyek_name"=> $dataProject->nama, |
|
|
|
|
"data"=>$dataResponse, |
|
|
|
|
"gantt"=>$keyGantt, |
|
|
|
|
"proyek_name" => $dataProject->nama, |
|
|
|
|
"data" => $dataResponse, |
|
|
|
|
"gantt" => $keyGantt, |
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
return $dataFinal; |
|
|
|
|