|
|
|
@ -40,9 +40,9 @@ class ActivityController extends Controller
|
|
|
|
|
$dataHeader->type = "header"; |
|
|
|
|
$dataHeader->text = $dataHeader->name; |
|
|
|
|
$finalData[] = $dataHeader; |
|
|
|
|
$data = Activity::where('version_gantt_id', $id)->where('parent_id', $dataHeader->id)->orderBy('id', 'asc')->limit(100)->get(); |
|
|
|
|
$data = Activity::where('version_gantt_id', $id)->where('parent_id', $dataHeader->id)->orderBy('id', 'asc')->get(); |
|
|
|
|
}else{ |
|
|
|
|
$data = Activity::where('version_gantt_id', $id)->whereNull('parent_id')->orderBy('id', 'asc')->limit(100)->get(); |
|
|
|
|
$data = Activity::where('version_gantt_id', $id)->whereNull('parent_id')->orderBy('id', 'asc')->get(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
foreach($data as $objRow){ |
|
|
|
|