|
|
|
@ -88,7 +88,10 @@ class MasterFunctionsHelper {
|
|
|
|
|
|
|
|
|
|
$dataFinal=[]; |
|
|
|
|
$dataPayload = []; |
|
|
|
|
$dataPayload['period'] = 'week'; |
|
|
|
|
$dataPayload['period'] = 'week'; |
|
|
|
|
$totalACWP = 0; |
|
|
|
|
$totalBCWP = 0; |
|
|
|
|
$tempPercentage = []; |
|
|
|
|
|
|
|
|
|
$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(); |
|
|
|
@ -110,9 +113,9 @@ class MasterFunctionsHelper {
|
|
|
|
|
->join('m_activity as b', 'b.id', '=', 'a.activity_id') |
|
|
|
|
->where('b.version_gantt_id', '=', $keyGantt['id']) |
|
|
|
|
->exists(); |
|
|
|
|
|
|
|
|
|
if(!$alreadyHasReport) |
|
|
|
|
return $dataFinal; |
|
|
|
|
// note : delete this |
|
|
|
|
// if(!$alreadyHasReport) |
|
|
|
|
// return $dataFinal; |
|
|
|
|
|
|
|
|
|
$minDate = Activity::where('version_gantt_id', $keyGantt['id'])->whereNull('parent_id')->pluck('start_date')->first(); |
|
|
|
|
|
|
|
|
|