|
|
@ -484,11 +484,14 @@ class ProjectController extends Controller |
|
|
|
if(!$result) |
|
|
|
if(!$result) |
|
|
|
return response()->json(['status'=>'failed','message'=> 'Project not found!','code'=> 404], 404); |
|
|
|
return response()->json(['status'=>'failed','message'=> 'Project not found!','code'=> 404], 404); |
|
|
|
//TODO possible overdue bug |
|
|
|
//TODO possible overdue bug |
|
|
|
|
|
|
|
$endDate = Activity::where('proyek_id', $payload['id']) |
|
|
|
|
|
|
|
->orderByDesc('end_date') |
|
|
|
|
|
|
|
->value('end_date'); |
|
|
|
if(isset($payload['till_date'])) { |
|
|
|
if(isset($payload['till_date'])) { |
|
|
|
if (isset($payload['scurve'])) { |
|
|
|
if (isset($payload['scurve'])) { |
|
|
|
$overdueActivities = Activity::where('proyek_id', $payload['id'])->whereNotNull('parent_id')->where('persentase_progress', '!=', 100)->whereDate('end_date','<=',$payload['till_date'])->orderBy('end_date', 'asc')->get(); |
|
|
|
$overdueActivities = Activity::where('proyek_id', $payload['id'])->whereNotNull('parent_id')->where('persentase_progress', '!=', 100)->whereDate('end_date','<=',$endDate)->orderBy('end_date', 'asc')->get(); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
$overdueActivities = Activity::where('version_gantt_id', $payload['gantt'])->whereNotNull('parent_id')->where('persentase_progress', '!=', 100)->whereDate('end_date','<=',$payload['till_date'])->orderBy('end_date', 'asc')->get(); |
|
|
|
$overdueActivities = Activity::where('version_gantt_id', $payload['gantt'])->whereNotNull('parent_id')->where('persentase_progress', '!=', 100)->whereDate('end_date','<=',$endDate)->orderBy('end_date', 'asc')->get(); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
else { |
|
|
|
else { |
|
|
|