|
|
@ -123,7 +123,8 @@ class ProjectController extends Controller |
|
|
|
'phase_id', |
|
|
|
'phase_id', |
|
|
|
'calculation_status', |
|
|
|
'calculation_status', |
|
|
|
'md.name as divisi_name', |
|
|
|
'md.name as divisi_name', |
|
|
|
'nickname' |
|
|
|
'nickname', |
|
|
|
|
|
|
|
'sponsor' |
|
|
|
) |
|
|
|
) |
|
|
|
->join('m_divisi as md', 'md.id', '=', 'm_proyek.divisi_id') |
|
|
|
->join('m_divisi as md', 'md.id', '=', 'm_proyek.divisi_id') |
|
|
|
->where('m_proyek.id', $id) |
|
|
|
->where('m_proyek.id', $id) |
|
|
@ -322,7 +323,8 @@ class ProjectController extends Controller |
|
|
|
'created_at', |
|
|
|
'created_at', |
|
|
|
'created_by', |
|
|
|
'created_by', |
|
|
|
'updated_at', |
|
|
|
'updated_at', |
|
|
|
'updated_by' |
|
|
|
'updated_by', |
|
|
|
|
|
|
|
'sponsor' |
|
|
|
)->orderBy('id', 'desc') |
|
|
|
)->orderBy('id', 'desc') |
|
|
|
// ->where("created_by",$this->currentName) |
|
|
|
// ->where("created_by",$this->currentName) |
|
|
|
->get(); |
|
|
|
->get(); |
|
|
@ -620,19 +622,19 @@ class ProjectController extends Controller |
|
|
|
|
|
|
|
|
|
|
|
// } |
|
|
|
// } |
|
|
|
|
|
|
|
|
|
|
|
$plannedStart = Activity::where('version_gantt_id', $ganttId) |
|
|
|
$plannedStart = Activity::where('version_gantt_id', $ganttId) |
|
|
|
->orderBy('planned_start') |
|
|
|
->orderBy('planned_start') |
|
|
|
->value('planned_start'); |
|
|
|
->value('planned_start'); |
|
|
|
$plannedEnd = Activity::where('version_gantt_id', $ganttId) |
|
|
|
$plannedEnd = Activity::where('version_gantt_id', $ganttId) |
|
|
|
->orderByDesc('planned_end') |
|
|
|
->orderByDesc('planned_end') |
|
|
|
->value('planned_end'); |
|
|
|
->value('planned_end'); |
|
|
|
if (isset($result->header)) { |
|
|
|
if (isset($result->header)) { |
|
|
|
$result->header->start_date = $startDate; |
|
|
|
$result->header->start_date = $startDate; |
|
|
|
$result->header->end_date = $maxEndDate->end_date; |
|
|
|
$result->header->end_date = $maxEndDate->end_date; |
|
|
|
$result->header->planned_start = $plannedStart; |
|
|
|
$result->header->planned_start = $plannedStart; |
|
|
|
$result->header->planned_end = $plannedEnd; |
|
|
|
$result->header->planned_end = $plannedEnd; |
|
|
|
} |
|
|
|
} |
|
|
|
return response()->json(['status'=>'success','code'=> 200,'data'=>$result, 'gantt'=>$ganttId], 200); |
|
|
|
return response()->json(['status' => 'success', 'code' => 200, 'data' => $result, 'gantt' => $ganttId], 200); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public function getOverdueActivities(Request $request) |
|
|
|
public function getOverdueActivities(Request $request) |
|
|
|