Format ActivityController

1 year ago · 96222016f0
2 changed files with 380 additions and 367 deletions
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@ -393,9 +393,14 @@ class ProjectController extends Controller

 	public function setBaseline($gantt_id)
 	{
-		$activities = Activity::where("version_gantt_id", $gantt_id)->get();
+		$activities = Activity::where("version_gantt_id", $gantt_id)->orderBy('id')->get();

 		foreach ($activities as $activity) {
+			$successor = Link::where('t_activity_id', $activity->id)->first();
+			if ($successor) {
+				$predecessor = Activity::find($successor->s_activity_id);
+				$activity->start_date = $predecessor->end_date;
+			}
 			$activity->update([
 				"planned_start"=>$activity->start_date,
 				"planned_end"=>$activity->end_date,