|
|
|
@ -175,6 +175,7 @@ class ActivityController extends Controller
|
|
|
|
|
}else{ |
|
|
|
|
$data = Activity::select('id', 'parent_id', 'name', 'actual_end')->where('parent_id', $id)->get(); |
|
|
|
|
} |
|
|
|
|
$parent = Activity::findOrFail($id); |
|
|
|
|
$dataFinal=[]; |
|
|
|
|
foreach ($data as $val) { |
|
|
|
|
$activity = $this->getchildActivityForActual($val->id, $params); |
|
|
|
@ -187,11 +188,19 @@ class ActivityController extends Controller
|
|
|
|
|
return isset($item['actual_start']); |
|
|
|
|
}), 'actual_start'); |
|
|
|
|
$returnActualStartOrEnd = count($actualStartValues) == count($dataFinal) ? min($actualStartValues) : null; |
|
|
|
|
if (isset($parent)) { |
|
|
|
|
$parent->actual_start = $returnActualStartOrEnd; |
|
|
|
|
$parent->save(); |
|
|
|
|
} |
|
|
|
|
}else{ |
|
|
|
|
$actualEndValues = array_column(array_filter($dataFinal, function($item) { |
|
|
|
|
return isset($item['actual_end']); |
|
|
|
|
}), 'actual_end'); |
|
|
|
|
$returnActualStartOrEnd = count($actualEndValues) == count($dataFinal) ? max($actualEndValues) : null; |
|
|
|
|
if (isset($parent)) { |
|
|
|
|
$parent->actual_end = $returnActualStartOrEnd; |
|
|
|
|
$parent->save(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// return json_encode(["min"=>$minActualStart, "max"=>$maxActualStart]); |
|
|
|
|