diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index 126fc02..15e6cb4 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -20,58 +20,59 @@ class ActivityController extends Controller
 {
 	public function getByGanttId($id, $proyek_id)
 	{
-    $gantt = VersionGantt::find($id);
-    if(Activity::where('proyek_id', $proyek_id)->where("version_gantt_id", $id)->count() == 0) {
-      if(!$gantt->hierarchy_ftth_id) {
-        $this->cloneTemplate($id, $proyek_id);
-      } else {
-        $this->cloneTemplate($id, $proyek_id, $gantt->hierarchy_ftth_id);
-      }
+		$gantt = VersionGantt::find($id);
+		if (Activity::where('proyek_id', $proyek_id)->where("version_gantt_id", $id)->count() == 0) {
+			if (!$gantt->hierarchy_ftth_id) {
+				$this->cloneTemplate($id, $proyek_id);
+			} else {
+				$this->cloneTemplate($id, $proyek_id, $gantt->hierarchy_ftth_id);
+			}
 		}
 
 		$dataGantt = $this->getDataActivity($id);
 
-		return response()->json(['status'=>'success','data'=> $dataGantt,'code'=>200], 200);
+		return response()->json(['status' => 'success', 'data' => $dataGantt, 'code' => 200], 200);
 	}
 
 	private function getDataActivity($id)
 	{
-		$checkHeader = Activity::where('version_gantt_id', $id)->where('type_activity', 'header')->count(); $finalData = [];
-		if($checkHeader > 0){
-		    $dataHeader = Activity::where('version_gantt_id', $id)->where('type_activity', 'header')->first();
-		    $startDate = date_create($dataHeader->start_date);
-		    $endDate = date_create($dataHeader->end_date);
-		    $dataHeader->start_date = date_format($startDate,"Y-m-d H:i:s");
-		    $dataHeader->end_date = date_format($endDate,"Y-m-d H:i:s");
-	 		$dataHeader->progress = $dataHeader->persentase_progress / 100;
-			$dataHeader->planned_start = isset($dataHeader->planned_start) ? date_format(date_create($dataHeader->planned_start),"Y-m-d H:i:s") : NULL;
-			$dataHeader->planned_end = isset($dataHeader->planned_end) ? date_format(date_create($dataHeader->planned_end),"Y-m-d H:i:s") : NULL;
-		    $dataHeader->type = "header";
-		    $dataHeader->text = $dataHeader->name;
-		    $finalData[] = $dataHeader;
-		    $data = Activity::where('version_gantt_id', $id)->where('parent_id', $dataHeader->id)->orderBy('sortorder', 'asc')->get();
-		}else{
-		    $data = Activity::where('version_gantt_id', $id)->whereNull('parent_id')->orderBy('sortorder', 'asc')->get();
+		$checkHeader = Activity::where('version_gantt_id', $id)->where('type_activity', 'header')->count();
+		$finalData = [];
+		if ($checkHeader > 0) {
+			$dataHeader = Activity::where('version_gantt_id', $id)->where('type_activity', 'header')->first();
+			$startDate = date_create($dataHeader->start_date);
+			$endDate = date_create($dataHeader->end_date);
+			$dataHeader->start_date = date_format($startDate, "Y-m-d H:i:s");
+			$dataHeader->end_date = date_format($endDate, "Y-m-d H:i:s");
+			$dataHeader->progress = $dataHeader->persentase_progress / 100;
+			$dataHeader->planned_start = isset($dataHeader->planned_start) ? date_format(date_create($dataHeader->planned_start), "Y-m-d H:i:s") : NULL;
+			$dataHeader->planned_end = isset($dataHeader->planned_end) ? date_format(date_create($dataHeader->planned_end), "Y-m-d H:i:s") : NULL;
+			$dataHeader->type = "header";
+			$dataHeader->text = $dataHeader->name;
+			$finalData[] = $dataHeader;
+			$data = Activity::where('version_gantt_id', $id)->where('parent_id', $dataHeader->id)->orderBy('sortorder', 'asc')->get();
+		} else {
+			$data = Activity::where('version_gantt_id', $id)->whereNull('parent_id')->orderBy('sortorder', 'asc')->get();
 		}
 
-		foreach($data as $objRow){
+		foreach ($data as $objRow) {
 			$type = "project";
 			$dataChildren = $this->getChildren($id, $objRow->id);
 			$startDate = date_create($objRow->start_date);
 			$endDate = date_create($objRow->end_date);
 
-			if($objRow->type_activity=="milestone")
+			if ($objRow->type_activity == "milestone")
 				$type = $objRow->type_activity;
-			if(empty($dataChildren))
+			if (empty($dataChildren))
 				$type = "task";
 
 			$objRow->text = $objRow->name;
 			$objRow->parent = $objRow->parent_id ? $objRow->parent_id : null;
-			$objRow->start_date = date_format($startDate,"Y-m-d H:i:s");
-			$objRow->end_date = date_format($endDate,"Y-m-d H:i:s");
-			$objRow->planned_start = isset($objRow->planned_start) ? date_format(date_create($objRow->planned_start),"Y-m-d H:i:s") : NULL;
-			$objRow->planned_end = isset($objRow->planned_end) ? date_format(date_create($objRow->planned_end),"Y-m-d H:i:s") : NULL;
-	 		$objRow->progress = $objRow->persentase_progress / 100;
+			$objRow->start_date = date_format($startDate, "Y-m-d H:i:s");
+			$objRow->end_date = date_format($endDate, "Y-m-d H:i:s");
+			$objRow->planned_start = isset($objRow->planned_start) ? date_format(date_create($objRow->planned_start), "Y-m-d H:i:s") : NULL;
+			$objRow->planned_end = isset($objRow->planned_end) ? date_format(date_create($objRow->planned_end), "Y-m-d H:i:s") : NULL;
+			$objRow->progress = $objRow->persentase_progress / 100;
 			$objRow->type = $type;
 			$finalData[] = $objRow;
 			$finalData = array_merge($finalData, $dataChildren);
@@ -79,23 +80,22 @@ class ActivityController extends Controller
 
 		$dataLink = Link::where('version_gantt_id', $id)->get();
 		$finalLink = [];
-		foreach($dataLink as  $objRow)
-		{
+		foreach ($dataLink as $objRow) {
 			$dataRow = array(
-				'id'=>$objRow->id,
-				'source'=>$objRow->s_activity_id,
-				'target'=>$objRow->t_activity_id,
-				'type'=>$objRow->type_link,
-				'code'=>$objRow->code_link
+				'id' => $objRow->id,
+				'source' => $objRow->s_activity_id,
+				'target' => $objRow->t_activity_id,
+				'type' => $objRow->type_link,
+				'code' => $objRow->code_link
 			);
-			if($objRow->lag)
+			if ($objRow->lag)
 				$dataRow['lag'] = $objRow->lag;
 			$finalLink[] = $dataRow;
 		}
 
 		$resultData = array(
-			"data"=>$finalData,
-			"links"=>$finalLink
+			"data" => $finalData,
+			"links" => $finalLink
 		);
 
 		return $resultData;
@@ -105,22 +105,22 @@ class ActivityController extends Controller
 	{
 		$finalData = [];
 		$data = Activity::where('version_gantt_id', $gantt_id)->where('parent_id', $parent_id)->orderBy('sortorder', 'asc')->get();
-		foreach($data as $objRow){
+		foreach ($data as $objRow) {
 			$objRow->parent = $parent_id;
 			$objRow->text = $objRow->name;
-			$objRow->progress = (float)$objRow->persentase_progress/100;
+			$objRow->progress = (float) $objRow->persentase_progress / 100;
 			$startDate = date_create($objRow->start_date);
 			$endDate = date_create($objRow->end_date);
-			$objRow->start_date = date_format($startDate,"Y-m-d H:i:s");
-			$objRow->end_date = date_format($endDate,"Y-m-d H:i:s");
-			$objRow->planned_start = isset($objRow->planned_start) ? date_format(date_create($objRow->planned_start),"Y-m-d H:i:s") : NULL;
-			$objRow->planned_end = isset($objRow->planned_end) ? date_format(date_create($objRow->planned_end),"Y-m-d H:i:s") : NULL;
+			$objRow->start_date = date_format($startDate, "Y-m-d H:i:s");
+			$objRow->end_date = date_format($endDate, "Y-m-d H:i:s");
+			$objRow->planned_start = isset($objRow->planned_start) ? date_format(date_create($objRow->planned_start), "Y-m-d H:i:s") : NULL;
+			$objRow->planned_end = isset($objRow->planned_end) ? date_format(date_create($objRow->planned_end), "Y-m-d H:i:s") : NULL;
 			$dataChildren = $this->getChildren($gantt_id, $objRow->id);
-			if($objRow->type_activity=="milestone"){
+			if ($objRow->type_activity == "milestone") {
 				$objRow->type = $objRow->type_activity;
-			}elseif(empty($dataChildren)){
+			} elseif (empty($dataChildren)) {
 				$objRow->type = "task";
-			}else{
+			} else {
 				$objRow->type = "project";
 			}
 			$finalData[] = $objRow;
@@ -129,54 +129,55 @@ class ActivityController extends Controller
 		return $finalData;
 	}
 
-	private function cloneTemplate($id, $proyek_id, $hierarchy_ftth_id = null) {
-    $project = Project::find($proyek_id);
-    if($hierarchy_ftth_id){
-      $gantt = VersionGantt::find($id);
-      $rootActivity = Activity::create([
-        'version_gantt_id'=>$id,
-        'proyek_id'=>$proyek_id,
-        'name'=> $gantt->name_version,
-        'start_date'=> $project->mulai_proyek,
-        'end_date'=> $project->akhir_proyek,
-        'rencana_biaya'=> $project->rencana_biaya,
-        'type_activity'=> 'project',
-        'created_by'=>$this->currentName,
-        'sortorder'=>1
-      ]);
-    } else {
-      $rootActivity = Activity::create([
-        'version_gantt_id'=>$id,
-        'proyek_id'=>$proyek_id,
-        'name'=> $project->nama,
-        'kode_sortname'=>$project->kode_sortname,
-        'start_date'=> $project->mulai_proyek,
-        'end_date'=> $project->akhir_proyek,
-        'rencana_biaya'=> $project->rencana_biaya,
-        'type_activity'=> 'project',
-        'created_by'=>$this->currentName,
-        'sortorder'=>1
-      ]);
-    }
+	private function cloneTemplate($id, $proyek_id, $hierarchy_ftth_id = null)
+	{
+		$project = Project::find($proyek_id);
+		if ($hierarchy_ftth_id) {
+			$gantt = VersionGantt::find($id);
+			$rootActivity = Activity::create([
+				'version_gantt_id' => $id,
+				'proyek_id' => $proyek_id,
+				'name' => $gantt->name_version,
+				'start_date' => $project->mulai_proyek,
+				'end_date' => $project->akhir_proyek,
+				'rencana_biaya' => $project->rencana_biaya,
+				'type_activity' => 'project',
+				'created_by' => $this->currentName,
+				'sortorder' => 1
+			]);
+		} else {
+			$rootActivity = Activity::create([
+				'version_gantt_id' => $id,
+				'proyek_id' => $proyek_id,
+				'name' => $project->nama,
+				'kode_sortname' => $project->kode_sortname,
+				'start_date' => $project->mulai_proyek,
+				'end_date' => $project->akhir_proyek,
+				'rencana_biaya' => $project->rencana_biaya,
+				'type_activity' => 'project',
+				'created_by' => $this->currentName,
+				'sortorder' => 1
+			]);
+		}
 
 		$resultTypeProject = TemplateGantt::where('proyek_type_id', $project->type_proyek_id)
 			->whereNull('parent_id')
 			->orderByRaw('id ASC')
 			->get();
 
-		foreach($resultTypeProject as $objRow){
+		foreach ($resultTypeProject as $objRow) {
 			$childActivities = TemplateGantt::where("parent_id", $objRow->id)->count();
-      $max = Activity::where('version_gantt_id', $id)->max('sortorder');
+			$max = Activity::where('version_gantt_id', $id)->max('sortorder');
 			$resultNew = Activity::create([
-				'type_activity'=> $childActivities > 0 ? "project" : "task",
-				'version_gantt_id'=>$id,
-				'parent_id'=>$rootActivity->id,
-				'proyek_id'=>$proyek_id,
-				'name'=> $objRow->name_activity,
-				'start_date'=>date("Y-m-d H:i:s"),
-				'end_date'=>date("Y-m-d H:i:s"),
-        'created_by'=>$this->currentName,
-        'sortorder'=>$max+1
+				'type_activity' => $childActivities > 0 ? "project" : "task",
+				'version_gantt_id' => $id,
+				'parent_id' => $rootActivity->id,
+				'proyek_id' => $proyek_id,
+				'name' => $objRow->name_activity,
+				'start_date' => date("Y-m-d H:i:s"),
+				'end_date' => date("Y-m-d H:i:s"),
+				'created_by' => $this->currentName,
+				'sortorder' => $max + 1
 			]);
 			$this->getChildrenTemplate($id, $objRow->id, $project->type_project_id, $proyek_id, $resultNew->id, $project->mulai_proyek);
 		}
@@ -185,19 +186,19 @@ class ActivityController extends Controller
 	private function getChildrenTemplate($id, $parent_id, $type_proyek_id, $proyek_id, $parent_new, $firstDay)
 	{
 		$data = TemplateGantt::where('parent_id', $parent_id)->orderByRaw('id ASC')->get();
-		foreach($data as $objRow){
+		foreach ($data as $objRow) {
 			$childActivities = TemplateGantt::where("parent_id", $objRow->id)->count();
-      $max = Activity::where('version_gantt_id', $id)->max('sortorder');
+			$max = Activity::where('version_gantt_id', $id)->max('sortorder');
 			$resultNew = Activity::create([
-				'type_activity'=> $childActivities > 0 ? "project" : "task",
-				'version_gantt_id'=>$id,
-				'parent_id'=>$parent_new,
-				'proyek_id'=>$proyek_id,
-				'name'=> $objRow->name_activity,
-				'start_date'=>$firstDay,
-				'end_date'=>$firstDay,
-				'created_by'=>$this->currentName,
-        'sortorder'=>$max+1
+				'type_activity' => $childActivities > 0 ? "project" : "task",
+				'version_gantt_id' => $id,
+				'parent_id' => $parent_new,
+				'proyek_id' => $proyek_id,
+				'name' => $objRow->name_activity,
+				'start_date' => $firstDay,
+				'end_date' => $firstDay,
+				'created_by' => $this->currentName,
+				'sortorder' => $max + 1
 			]);
 			$this->getChildrenTemplate($id, $objRow->id, $type_proyek_id, $proyek_id, $resultNew->id, $firstDay);
 		}
@@ -206,127 +207,130 @@ class ActivityController extends Controller
 	public function add(Request $request)
 	{
 		$this->validate($request, [
-			'version_gantt_id'=>'required'
+			'version_gantt_id' => 'required'
 		]);
 
 		$data = $request->all();
 		$data['name'] = $request->text;
 		$data['persentase_progress'] = $request->progress;
 		$data['created_by'] = $this->currentName;
-    $max = Activity::where('version_gantt_id', $request->version_gantt_id)->max('sortorder');
-    $data['sortorder'] = $max + 1;
+		$max = Activity::where('version_gantt_id', $request->version_gantt_id)->max('sortorder');
+		$data['sortorder'] = $max + 1;
 		$data['type_activity'] = "task";
 
 		$parent = $data['parent_id'] ?? null;
-		if($parent){
+		if ($parent) {
 			$parentData = Activity::find($parent);
-			if($parentData->parent_id) {
+			if ($parentData->parent_id) {
 				$parentData->update(["type_activity" => "project"]);
 			}
 			CommentActivity::where('activity_id', $parent)->delete();
 			UserToActivity::where('activity_id', $parent)->delete();
 		}
 
-		if(!$result = Activity::create($data))
-			return response()->json(['status'=>'failed','action'=>'error','code'=> 500], 500);
+		if (!$result = Activity::create($data))
+			return response()->json(['status' => 'failed', 'action' => 'error', 'code' => 500], 500);
 
-		return response()->json(['status'=>'success','action'=>'inserted', 'tid'=>$result->id,'code'=>200], 200);
+		return response()->json(['status' => 'success', 'action' => 'inserted', 'tid' => $result->id, 'code' => 200], 200);
 	}
 
-	public function edit($id){
-		if(empty($id) || !is_int((int)$id))
-			return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
+	public function edit($id)
+	{
+		if (empty($id) || !is_int((int) $id))
+			return response()->json(['status' => 'failed', 'message' => 'id is required!', 'code' => 400], 400);
 
-		if(!$result = Activity::find($id))
-			return response()->json(['status'=>'failed','message'=>'Data not found!','code'=> 404], 404);
+		if (!$result = Activity::find($id))
+			return response()->json(['status' => 'failed', 'message' => 'Data not found!', 'code' => 404], 404);
 
-		return response()->json(['status'=>'success','code'=>200,'data'=> $result], 200);
+		return response()->json(['status' => 'success', 'code' => 200, 'data' => $result], 200);
 	}
 
 	public function update(Request $request, $id)
 	{
-		if(empty($id) || !is_int((int)$id))
-			return response()->json(['status'=>'failed', 'action'=>'error','message'=>'id is required!','code'=>400], 400);
+		if (empty($id) || !is_int((int) $id))
+			return response()->json(['status' => 'failed', 'action' => 'error', 'message' => 'id is required!', 'code' => 400], 400);
 
 		$updateBobot = true;
-		if(!$data = Activity::find($id))
-			return response()->json(['status'=>'failed', 'action'=>'error','message'=>'Data not found!','code'=> 404], 404);
+		if (!$data = Activity::find($id))
+			return response()->json(['status' => 'failed', 'action' => 'error', 'message' => 'Data not found!', 'code' => 404], 404);
 		$dataUpdate = $request->all();
 
 		$dataUpdate['name'] = $request->text;
-		$dataUpdate['persentase_progress'] = $request->progress*100;
+		$dataUpdate['persentase_progress'] = $request->progress * 100;
 		$dataUpdate['updated_by'] = $this->currentName;
-    	unset($dataUpdate['sortorder']);
-		if($data->type_activity!='header')
+		unset($dataUpdate['sortorder']);
+		if ($data->type_activity != 'header')
 			$dataUpdate['type_activity'] = $request->type;
-    
-		if($request->has("target")){
-		$this->updateOrder($id, $request->target);    
+
+		if ($request->has("target")) {
+			$this->updateOrder($id, $request->target);
 		}
 
-		if(!$data->update($dataUpdate))
-			return response()->json(['status'=>'failed', 'action'=>'error','message'=>'data activity failed updated!','code'=>400], 400);
+		if (!$data->update($dataUpdate))
+			return response()->json(['status' => 'failed', 'action' => 'error', 'message' => 'data activity failed updated!', 'code' => 400], 400);
 
-		return response()->json(['status'=>'success','update_bobot'=> $updateBobot, 'data'=>$dataUpdate, 'action'=>'updated','message'=>'Activity updated!','code'=>200], 200);
+		return response()->json(['status' => 'success', 'update_bobot' => $updateBobot, 'data' => $dataUpdate, 'action' => 'updated', 'message' => 'Activity updated!', 'code' => 200], 200);
 	}
 
-  private function updateOrder($taskId, $target){
-    $nextTask = false;
-    $targetId = $target;
- 
-    if(strpos($target, "next:") === 0){
-        $targetId = substr($target, strlen("next:"));
-        $nextTask = true;
-    }
- 
-    if($targetId == "null")
-        return;
- 
-    $targetOrder = Activity::find($targetId)->sortorder;
-    if($nextTask)
-        $targetOrder++;
- 
-    Activity::where("sortorder", ">=", $targetOrder)->increment("sortorder");
- 
-    $updatedTask = Activity::find($taskId);
-    $updatedTask->sortorder = $targetOrder;
-    $updatedTask->save();
-  }
-
-	public function updateRegular(Request $request, $id){
-		if(empty($id) || !is_int((int)$id))
-			return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
+	private function updateOrder($taskId, $target)
+	{
+		$nextTask = false;
+		$targetId = $target;
+
+		if (strpos($target, "next:") === 0) {
+			$targetId = substr($target, strlen("next:"));
+			$nextTask = true;
+		}
+
+		if ($targetId == "null")
+			return;
+
+		$targetOrder = Activity::find($targetId)->sortorder;
+		if ($nextTask)
+			$targetOrder++;
+
+		Activity::where("sortorder", ">=", $targetOrder)->increment("sortorder");
+
+		$updatedTask = Activity::find($taskId);
+		$updatedTask->sortorder = $targetOrder;
+		$updatedTask->save();
+	}
+
+	public function updateRegular(Request $request, $id)
+	{
+		if (empty($id) || !is_int((int) $id))
+			return response()->json(['status' => 'failed', 'message' => 'id is required!', 'code' => 400], 400);
 
 		$data = Activity::find($id);
 
-		if(!$data = Activity::find($id))
-			return response()->json(['status'=>'failed','message'=>'Data not found!','code'=> 404], 404);
+		if (!$data = Activity::find($id))
+			return response()->json(['status' => 'failed', 'message' => 'Data not found!', 'code' => 404], 404);
 
-		if(!$data->update($request->all()))
-			return response()->json(['status'=>'failed','message'=>'Failed to update!','code'=> 500], 500);
+		if (!$data->update($request->all()))
+			return response()->json(['status' => 'failed', 'message' => 'Failed to update!', 'code' => 500], 500);
 
-		return response()->json(['status'=>'success','message'=>'Activity Updated!','code'=> 200], 200);
+		return response()->json(['status' => 'success', 'message' => 'Activity Updated!', 'code' => 200], 200);
 	}
 
 	public function delete($id)
 	{
-		if(!$data = Activity::find($id))
-			return response()->json(['status'=>'failed', 'action'=>'error','message'=> 'Data not found!','code'=> 404], 404);
+		if (!$data = Activity::find($id))
+			return response()->json(['status' => 'failed', 'action' => 'error', 'message' => 'Data not found!', 'code' => 404], 404);
 
-		if(!$data->delete())
-			return response()->json(['status'=>'failed', 'action'=>'error','message'=>'data activity failed deleted!','code'=> 500], 500);
+		if (!$data->delete())
+			return response()->json(['status' => 'failed', 'action' => 'error', 'message' => 'data activity failed deleted!', 'code' => 500], 500);
 
-		return response()->json(['status'=>'success', "action"=>"deleted",'message'=>'data activity successfully deleted!','code'=>200], 200);
+		return response()->json(['status' => 'success', "action" => "deleted", 'message' => 'data activity successfully deleted!', 'code' => 200], 200);
 	}
 
 	public function getUpdate($id)
 	{
-		if(!$data = Activity::find($id))
-			return response()->json(['status'=>'failed', 'action'=>'error','message'=> 'Data not found!','code'=>400], 400);
+		if (!$data = Activity::find($id))
+			return response()->json(['status' => 'failed', 'action' => 'error', 'message' => 'Data not found!', 'code' => 400], 400);
 
 		$data->progress = (float) $data->persentase_progress / 100;
 		$data->rencana_biaya = str_replace(".", ",", $data->rencana_biaya);
-		return response()->json(['status'=>'success', "data"=> $data,'code'=>200], 200);
+		return response()->json(['status' => 'success', "data" => $data, 'code' => 200], 200);
 	}
 
 	public function search(Request $request)
@@ -336,88 +340,89 @@ class ActivityController extends Controller
 		$countBuilder = $dataBuilder['count'];
 		$dataGet = $builder->get();
 		$totalRecord = $countBuilder->count();
-		return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200);
-  }
+		return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet, 'totalRecord' => $totalRecord], 200);
+	}
 
-  	// before upload file
-  	public function importOld(Request $request)
+	// before upload file
+	public function importOld(Request $request)
 	{
-    	$data = $request->all();
+		$data = $request->all();
 
 		$data['created_by'] = $this->currentName;
 
 		Activity::where('version_gantt_id', $data['ganttId'])->delete();
 
 		$projectId = VersionGantt::where('id', $data['ganttId'])->first()->proyek_id;
-    $dayOffs = VersionGantt::find($data['ganttId'])->first()->config_dayoff;
+		$dayOffs = VersionGantt::find($data['ganttId'])->first()->config_dayoff;
 
 		$activityStack = [];
 
-    $hasWeight = false;
-
-    foreach ($data['activities'] as $key => $value) {
-      if(isset($value['weight']) && $value['weight'] != null && $value['weight'] != 0){
-        $hasWeight = true;
-        break;
-      }
-    }
-
-    if(!$hasWeight){
-      foreach ($data['activities'] as $key => $value) {
-        if($key == 0){
-          $data['activities'][$key]['weight'] = 100;
-        } else {
-          $parentWeight = 0;
-          $siblingsCount = 1;
-
-          $i = $key;
-          while($i > 0){
-            if ($data['activities'][$i - 1]['level'] == $data['activities'][$key]['level']-1){
-              $parentWeight = $data['activities'][$i - 1]['weight'];
-              break;
-            }  
-            if ($data['activities'][$key]['level'] == $data['activities'][$i]['level']){
-              $siblingsCount++;
-            }
-            $i--;
-          }  
-        
-          $i = $key+1;
-          while($i < count($data['activities'])){
-            if ($data['activities'][$i]['level'] == $data['activities'][$key]['level']-1){
-              break;
-            }
-            // Log::info('level '.$data['activities'][$key]['level'].' i level '.$data['activities'][$i]['level']);
-            if ($data['activities'][$key]['level'] == $data['activities'][$i]['level']){
-              $siblingsCount++;
-            }
-            $i++;
-          }                   
-
-          $data['activities'][$key]['weight'] = $parentWeight / $siblingsCount;
-        }
-      };
-    }
-    $projectStart = Project::select('mulai_proyek')->where('id', $projectId)->first();
+		$hasWeight = false;
+
+		foreach ($data['activities'] as $key => $value) {
+			if (isset($value['weight']) && $value['weight'] != null && $value['weight'] != 0) {
+				$hasWeight = true;
+				break;
+			}
+		}
+
+		if (!$hasWeight) {
+			foreach ($data['activities'] as $key => $value) {
+				if ($key == 0) {
+					$data['activities'][$key]['weight'] = 100;
+				} else {
+					$parentWeight = 0;
+					$siblingsCount = 1;
+
+					$i = $key;
+					while ($i > 0) {
+						if ($data['activities'][$i - 1]['level'] == $data['activities'][$key]['level'] - 1) {
+							$parentWeight = $data['activities'][$i - 1]['weight'];
+							break;
+						}
+						if ($data['activities'][$key]['level'] == $data['activities'][$i]['level']) {
+							$siblingsCount++;
+						}
+						$i--;
+					}
+
+					$i = $key + 1;
+					while ($i < count($data['activities'])) {
+						if ($data['activities'][$i]['level'] == $data['activities'][$key]['level'] - 1) {
+							break;
+						}
+						// Log::info('level '.$data['activities'][$key]['level'].' i level '.$data['activities'][$i]['level']);
+						if ($data['activities'][$key]['level'] == $data['activities'][$i]['level']) {
+							$siblingsCount++;
+						}
+						$i++;
+					}
+
+					$data['activities'][$key]['weight'] = $parentWeight / $siblingsCount;
+				}
+			}
+			;
+		}
+		$projectStart = Project::select('mulai_proyek')->where('id', $projectId)->first();
 		foreach ($data['activities'] as $i => $activity_row) {
 			$startDate = new \DateTime($projectStart->mulai_proyek);
-      $endDate = clone $startDate;
-      $endDate->modify('-1 day');
-      $daysRemaining = $activity_row['duration'];
-
-      // Loop until the remaining days become zero
-      while ($daysRemaining > 0) {
-          $endDate->modify('+1 day');
-
-          // Check if the current day is a day off (Sunday or Saturday)
-          $currentDayOfWeek = (int)$endDate->format('w');
-          if (strpos($dayOffs, (string)$currentDayOfWeek) !== false) {
-              continue; // Skip the day off and continue to the next day
-          }
-
-          $daysRemaining--; // Decrease the remaining days by one
-      }
-      $endDate->setTime(23, 59, 59);
+			$endDate = clone $startDate;
+			$endDate->modify('-1 day');
+			$daysRemaining = $activity_row['duration'];
+
+			// Loop until the remaining days become zero
+			while ($daysRemaining > 0) {
+				$endDate->modify('+1 day');
+
+				// Check if the current day is a day off (Sunday or Saturday)
+				$currentDayOfWeek = (int) $endDate->format('w');
+				if (strpos($dayOffs, (string) $currentDayOfWeek) !== false) {
+					continue; // Skip the day off and continue to the next day
+				}
+
+				$daysRemaining--; // Decrease the remaining days by one
+			}
+			$endDate->setTime(23, 59, 59);
 			$input['name'] = $activity_row['name'];
 			$input['proyek_id'] = $projectId;
 			$input['version_gantt_id'] = $data['ganttId'];
@@ -428,8 +433,8 @@ class ActivityController extends Controller
 			$input['bobot_planning'] = $activity_row['weight'];
 			$input['persentase_progress'] = 0;
 			$input['type_activity'] = $i == 0 ? "header" : "task";
-      $input['created_by'] = $this->currentName;
-      $input['sortorder'] = $activity_row['no'];
+			$input['created_by'] = $this->currentName;
+			$input['sortorder'] = $activity_row['no'];
 
 			if (!$activity = Activity::create($input)) {
 				Activity::where('version_gantt_id', $data['ganttId'])->delete();
@@ -439,7 +444,7 @@ class ActivityController extends Controller
 			$data['activities'][$i]['activity_id'] = $activity->id;
 
 			if ($i == 0) {
-        $activity->type_activity = "project";
+				$activity->type_activity = "project";
 				$activity->save();
 				$activity->level = $activity_row['level'];
 				array_push($activityStack, $activity);
@@ -468,7 +473,7 @@ class ActivityController extends Controller
 			}
 
 			$activity->parent_id = $activityStack[count($activityStack) - 1]->id ?? null;
-      array_push($activityStack, $activity);
+			array_push($activityStack, $activity);
 			// there should be better way to except / filter attribute level before save because it's cause error
 			// cant use except() / filter() on $activity collection somehow
 			unset($activity->level);
@@ -484,23 +489,23 @@ class ActivityController extends Controller
 				$activity->type_activity = "project";
 				$activity->save();
 				$activity->level = $activity_row['level'];
-      }
-      if (isset($data['activities'][$i]['nik']) && $data['activities'][$i]['nik'] != '') {
-        $user = User::where("ktp_number", $data['activities'][$i]['nik'])->first();	
-        $userProyek = UserToProyek::where("user_id", $user->id)
-          ->where("proyek_id", $projectId)
-          ->first();
-  
-        $dataInsert = array(
-          "user_id"           => $user->id,
-          "activity_id"       => $activity->id,
-          "role_proyek_id"    => $userProyek->project_role,
-          "proyek_id"         => $projectId,
-          "created_by"        => $this->currentName,
-          "version_gantt_id"  => $data['ganttId']
-        );
-        UserToActivity::create($dataInsert);
-      }
+			}
+			if (isset($data['activities'][$i]['nik']) && $data['activities'][$i]['nik'] != '') {
+				$user = User::where("ktp_number", $data['activities'][$i]['nik'])->first();
+				$userProyek = UserToProyek::where("user_id", $user->id)
+					->where("proyek_id", $projectId)
+					->first();
+
+				$dataInsert = array(
+					"user_id" => $user->id,
+					"activity_id" => $activity->id,
+					"role_proyek_id" => $userProyek->project_role,
+					"proyek_id" => $projectId,
+					"created_by" => $this->currentName,
+					"version_gantt_id" => $data['ganttId']
+				);
+				UserToActivity::create($dataInsert);
+			}
 
 			if (!empty($activity_row['predecessor'])) {
 				$key = array_search($activity_row['predecessor'], array_column($data['activities'], 'no'));
@@ -525,35 +530,36 @@ class ActivityController extends Controller
 		}
 
 		return response()->json(['stack' => $activityStack, 'status' => 'success', 'message' => 'Data imported!', 'projectId' => $projectId, 'code' => 200], 200);
-  }
+	}
 
- 	private function getLatestGantt($id){
+	private function getLatestGantt($id)
+	{
 		$maxGanttId = VersionGantt::where("proyek_id", $id)->max("id");
-        $data = array(
-            "last_gantt_id" => $maxGanttId,
-            "proyek_id" => $id
-        );
-      return $data;
+		$data = array(
+			"last_gantt_id" => $maxGanttId,
+			"proyek_id" => $id
+		);
+		return $data;
 	}
 
 	public function getCalculateCurvaS(Request $request) // for adw (plan & actual == date)
 	{
 		$dataPayload = $request->all();
-		$allGantt  = [];
-		if(isset($dataPayload['gannt_id'])){
-			$allGantt  = $dataPayload['gannt_id'];
-		}else{
+		$allGantt = [];
+		if (isset($dataPayload['gannt_id'])) {
+			$allGantt = $dataPayload['gannt_id'];
+		} else {
 			foreach ($dataPayload['project_id'] as $val) {
 				$allGantt[] = $this->getLatestGantt($val);
 			}
 		}
-		$dataFinal=[];
+		$dataFinal = [];
 		foreach ($allGantt as $keyGantt) {
 			$dataProject = Project::find($keyGantt['proyek_id']);
 			$dataHeader = Activity::where('type_activity', 'header')->where("proyek_id", $keyGantt['proyek_id'])->where("version_gantt_id", $keyGantt['last_gantt_id'])->first();
-			if($dataHeader){
+			if ($dataHeader) {
 				$totalRencanaBudget = Activity::where('parent_id', $dataHeader->id)->where("proyek_id", $keyGantt['proyek_id'])->where("version_gantt_id", $keyGantt['last_gantt_id'])->sum("rencana_biaya");
-			}else{
+			} else {
 				$totalRencanaBudget = Activity::whereNull('parent_id')->where("proyek_id", $keyGantt['proyek_id'])->where("version_gantt_id", $keyGantt['last_gantt_id'])->sum("rencana_biaya");
 			}
 			$minDate = DB::table('assign_material_to_activity as ama')
@@ -574,8 +580,8 @@ class ActivityController extends Controller
 			$arr_ActualM = [];
 			$tempDate = [];
 			$tempPercentage = [];
-			$tempTtlPercentPlan=0;
-			$tempTtlPercentActual=0;
+			$tempTtlPercentPlan = 0;
+			$tempTtlPercentActual = 0;
 			$currentACWP = 0;
 			$budgetControlACWP = 0;
 			$currentProgressActivity = 0;
@@ -598,7 +604,7 @@ class ActivityController extends Controller
 					->get();
 				$dataTempPlan = [];
 				$x = 0;
-				$sumPercentagePlan=0;
+				$sumPercentagePlan = 0;
 				$totalACWP = isset($totalACWP) ? $totalACWP : 0;
 				$totalBCWP = isset($totalBCWP) ? $totalBCWP : 0;
 				foreach ($dataPlanM as $keyPlanM) {
@@ -607,117 +613,118 @@ class ActivityController extends Controller
 						->where('activity_id', '=', $keyPlanM->activity_id)
 						->groupBy('activity_id')
 						->first();
-					$dataTempPlan [$x]['activity_id'] = $keyPlanM->activity_id;
-					$dataTempPlan [$x]['qty_plan'] = $keyPlanM->qty_planning;
-					$dataTempPlan [$x]['plan_date'] = $keyPlanM->plan_date;
-					$dataTempPlan [$x]['start_activity'] = $keyPlanM->start_activity;
-					$dataTempPlan [$x]['bobot_planning'] = $keyPlanM->bobot_planning;
-					$dataTempPlan [$x]['ttl_plan'] = $sumVolPlan->ttl_qty_plan;
-					$dataTempPlan [$x]['biaya_actual'] = $keyPlanM->biaya_actual;
-					$dataTempPlan [$x]['duration'] = $keyPlanM->duration;
-					$dataTempPlan [$x]['persentase_progress'] = $keyPlanM->persentase_progress;
-					$dataTempPlan [$x]['percentage'] = ($keyPlanM->qty_planning/$sumVolPlan->ttl_qty_plan)*$keyPlanM->bobot_planning;
-					$sumPercentagePlan+=($keyPlanM->qty_planning/$sumVolPlan->ttl_qty_plan)*$keyPlanM->bobot_planning;
-					$totalBCWP += (((($keyPlanM->persentase_progress*$keyPlanM->bobot_planning)/100)/$keyPlanM->duration)* $totalRencanaBudget)/100;
-					$dataTempPlan [$x]['totalBCWP'] = $totalBCWP;
+					$dataTempPlan[$x]['activity_id'] = $keyPlanM->activity_id;
+					$dataTempPlan[$x]['qty_plan'] = $keyPlanM->qty_planning;
+					$dataTempPlan[$x]['plan_date'] = $keyPlanM->plan_date;
+					$dataTempPlan[$x]['start_activity'] = $keyPlanM->start_activity;
+					$dataTempPlan[$x]['bobot_planning'] = $keyPlanM->bobot_planning;
+					$dataTempPlan[$x]['ttl_plan'] = $sumVolPlan->ttl_qty_plan;
+					$dataTempPlan[$x]['biaya_actual'] = $keyPlanM->biaya_actual;
+					$dataTempPlan[$x]['duration'] = $keyPlanM->duration;
+					$dataTempPlan[$x]['persentase_progress'] = $keyPlanM->persentase_progress;
+					$dataTempPlan[$x]['percentage'] = ($keyPlanM->qty_planning / $sumVolPlan->ttl_qty_plan) * $keyPlanM->bobot_planning;
+					$sumPercentagePlan += ($keyPlanM->qty_planning / $sumVolPlan->ttl_qty_plan) * $keyPlanM->bobot_planning;
+					$totalBCWP += (((($keyPlanM->persentase_progress * $keyPlanM->bobot_planning) / 100) / $keyPlanM->duration) * $totalRencanaBudget) / 100;
+					$dataTempPlan[$x]['totalBCWP'] = $totalBCWP;
 					$x++;
 				}
 				$w = 0;
 				$dataTempReport = [];
-				$sumPercentageActual=0;
+				$sumPercentageActual = 0;
 				foreach ($dataActualM as $keyActualM) {
 					$sumVolActual = DB::table('assign_material_to_activity')
 						->select('activity_id', DB::raw('SUM(qty_planning) as ttl_qty_plan'))
 						->where('activity_id', '=', $keyActualM->activity_id)
 						->groupBy('activity_id')
 						->first();
-					$dataTempReport [$w]['activity_id'] = $keyActualM->activity_id;
-					$dataTempReport [$w]['qty'] = $keyActualM->qty;
-					$dataTempReport [$w]['report_date'] = $keyActualM->report_date;
-					$dataTempReport [$w]['bobot_planning'] = $keyActualM->bobot_planning;
-					$dataTempReport [$w]['ttl_plan'] = $sumVolActual->ttl_qty_plan;
-					$dataTempReport [$w]['biaya_actual'] = $keyActualM->biaya_actual;
-					$dataTempReport [$w]['duration'] = $keyActualM->duration;
-					$dataTempReport [$w]['persentase_progress'] = $keyActualM->persentase_progress;
-					$dataTempReport [$w]['percentage'] = ($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning;
-					$sumPercentageActual+=($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning;
-					$totalACWP += $keyActualM->biaya_actual/$keyActualM->duration;
-					$dataTempReport [$w]['totalacwp'] = $totalACWP;
+					$dataTempReport[$w]['activity_id'] = $keyActualM->activity_id;
+					$dataTempReport[$w]['qty'] = $keyActualM->qty;
+					$dataTempReport[$w]['report_date'] = $keyActualM->report_date;
+					$dataTempReport[$w]['bobot_planning'] = $keyActualM->bobot_planning;
+					$dataTempReport[$w]['ttl_plan'] = $sumVolActual->ttl_qty_plan;
+					$dataTempReport[$w]['biaya_actual'] = $keyActualM->biaya_actual;
+					$dataTempReport[$w]['duration'] = $keyActualM->duration;
+					$dataTempReport[$w]['persentase_progress'] = $keyActualM->persentase_progress;
+					$dataTempReport[$w]['percentage'] = ($keyActualM->qty / $sumVolActual->ttl_qty_plan) * $keyActualM->bobot_planning;
+					$sumPercentageActual += ($keyActualM->qty / $sumVolActual->ttl_qty_plan) * $keyActualM->bobot_planning;
+					$totalACWP += $keyActualM->biaya_actual / $keyActualM->duration;
+					$dataTempReport[$w]['totalacwp'] = $totalACWP;
 					$w++;
 				}
 				$arr_ActualM[] = array(
-					'date'=>$dt->format("Y-m-d"),
-					'percentPlan'=>$sumPercentagePlan,
-					'percentActual'=>$sumPercentageActual,
-					'plan'=>$dataTempPlan,
-					'actual'=>$dataTempReport,
+					'date' => $dt->format("Y-m-d"),
+					'percentPlan' => $sumPercentagePlan,
+					'percentActual' => $sumPercentageActual,
+					'plan' => $dataTempPlan,
+					'actual' => $dataTempReport,
 				);
-				if(isset($dataPayload['period']) && $dataPayload['period'] == 'week'){
-					if($dt->format("w")==1){
-						if($totalACWP > 0 ){
+				if (isset($dataPayload['period']) && $dataPayload['period'] == 'week') {
+					if ($dt->format("w") == 1) {
+						if ($totalACWP > 0) {
 							$budgetControlACWP = $currentACWP + $totalACWP;
 						}
-						if($totalBCWP > 0 ){
+						if ($totalBCWP > 0) {
 							$budgetControlBCWP = $currentBCWP + $totalBCWP;
 						}
-						$tempTtlPercentPlan+= $sumPercentagePlan;
-						$tempTtlPercentActual+= $sumPercentageActual;
+						$tempTtlPercentPlan += $sumPercentagePlan;
+						$tempTtlPercentActual += $sumPercentageActual;
 						$currentACWP += $totalACWP;
 						$currentBCWP += $totalBCWP;
-						$tempPercentage[] = array(round($tempTtlPercentPlan,2), round($tempTtlPercentActual,2));
+						$tempPercentage[] = array(round($tempTtlPercentPlan, 2), round($tempTtlPercentActual, 2));
 						$tempDate[] = array($dt->format("Y-m-d"), 0, 0);
-					}else if($dt->format("Y-m-d") == $end2->format("Y-m-d")) {
-						$tempTtlPercentPlan+= $sumPercentagePlan;
-						$tempTtlPercentActual+= $sumPercentageActual;
+					} else if ($dt->format("Y-m-d") == $end2->format("Y-m-d")) {
+						$tempTtlPercentPlan += $sumPercentagePlan;
+						$tempTtlPercentActual += $sumPercentageActual;
 						$currentACWP += $totalACWP;
 						$currentBCWP += $totalBCWP;
-						$tempPercentage[] = array(round($tempTtlPercentPlan,2), round($tempTtlPercentActual,2));
+						$tempPercentage[] = array(round($tempTtlPercentPlan, 2), round($tempTtlPercentActual, 2));
 						$tempDate[] = array($dt->format("Y-m-d"), 0, 0);
 						$tempTtlPercentPlan = 0;
 						$tempTtlPercentActual = 0;
 					}
-				}else{
-					$tempPercentage[] = array(round($sumPercentagePlan,2), round($sumPercentageActual,2));
+				} else {
+					$tempPercentage[] = array(round($sumPercentagePlan, 2), round($sumPercentageActual, 2));
 					$tempDate[] = array($dt->format("Y-m-d"), 0, 0);
 				}
 			}
-			if(round($totalACWP,0) > $totalRencanaBudget){
-				$estimatedCost = round($totalACWP,0)+0;
-			}else{
-				$estimatedCost = ($totalRencanaBudget+0);
+			if (round($totalACWP, 0) > $totalRencanaBudget) {
+				$estimatedCost = round($totalACWP, 0) + 0;
+			} else {
+				$estimatedCost = ($totalRencanaBudget + 0);
 			}
 			$costDeviation = $totalRencanaBudget - $estimatedCost;
-			if($costDeviation > 0){
+			if ($costDeviation > 0) {
 				$potential = "SAVING";
 			} else {
 				$potential = $costDeviation == 0 ? "ON BUDGET" : "OVERRUN";
 			}
 			$dataResponse = array(
-				"date"              =>$tempDate,
-				"percentage"        =>$tempPercentage,
-				"data_details"      =>$arr_ActualM,
-				"budget_control"    =>array("current_budget"=> $totalRencanaBudget,
-				"acwp" => round($totalACWP,0),
-				"bcwp" => round($totalBCWP,0),
-				"rem_to_complete" => ($totalRencanaBudget - round($totalACWP,0)),
-				"add_cost_to_complete" => 0,
-				"estimated_at_completion" => $estimatedCost,
-				"cost_deviation" => $costDeviation,
-				"potential" => $potential,
+				"date" => $tempDate,
+				"percentage" => $tempPercentage,
+				"data_details" => $arr_ActualM,
+				"budget_control" => array(
+					"current_budget" => $totalRencanaBudget,
+					"acwp" => round($totalACWP, 0),
+					"bcwp" => round($totalBCWP, 0),
+					"rem_to_complete" => ($totalRencanaBudget - round($totalACWP, 0)),
+					"add_cost_to_complete" => 0,
+					"estimated_at_completion" => $estimatedCost,
+					"cost_deviation" => $costDeviation,
+					"potential" => $potential,
 				)
 			);
 			$dataFinal[] = array(
-				"proyek_name"=> $dataProject->nama,
-				"data"=>$dataResponse,
-				"allGant"=>$allGantt
+				"proyek_name" => $dataProject->nama,
+				"data" => $dataResponse,
+				"allGant" => $allGantt
 			);
 		}
-		return response()->json(['status'=>'success','code'=>200, 'data' => $dataFinal], 200);
+		return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataFinal], 200);
 	}
-	
+
 	public function import(Request $request)
 	{
-    	$data = $request->all();
+		$data = $request->all();
 		$data['created_by'] = $this->currentName;
 		Activity::where('version_gantt_id', $data['gantt_id'])->delete();
 		$projectId = VersionGantt::where('id', $data['gantt_id'])->first()->proyek_id;
@@ -725,46 +732,47 @@ class ActivityController extends Controller
 		$excel = TmpImport::latest('id')->first();
 
 		return response()->json(['stack' => $excel, 'status' => 'success', 'message' => 'Data imported!', 'data' => $data, 'code' => 200], 200);
-	}  
+	}
 
 	public function uploadTmpImport(Request $request)
 	{
-		if($request->hasFile('dokumen')){
-			$document   = $request->file('dokumen');
-			$gantt_id 	= $request->gantt_id;
-			$name       = $document->getClientOriginalName();
+		if ($request->hasFile('dokumen')) {
+			$document = $request->file('dokumen');
+			$gantt_id = $request->gantt_id;
+			$name = $document->getClientOriginalName();
 
 			$result = $document->move($this->pathTmpImport, $name);
-			if($result){
+			if ($result) {
 				$data = [
-					'gantt_id' => (int)$gantt_id,
+					'gantt_id' => (int) $gantt_id,
 					'file' => $name,
 					'type_dokumen' => $request->type_dokumen
 				];
 
 				$result = TmpImport::create($data);
 
-				if(!$result){
-					unlink($this->pathTmpImport.$name);
-					return response()->json(['status'=>'failed','message'=>'Upload failed!','code'=> 500], 500);
+				if (!$result) {
+					unlink($this->pathTmpImport . $name);
+					return response()->json(['status' => 'failed', 'message' => 'Upload failed!', 'code' => 500], 500);
 				}
-				return response()->json(['status'=>'success','message'=>'Upload successful!','code'=>200], 200);
+				return response()->json(['status' => 'success', 'message' => 'Upload successful!', 'code' => 200], 200);
 
 			}
-			return response()->json(['status'=>'failed','message'=>'Upload failed!','code'=> 500], 500);
+			return response()->json(['status' => 'failed', 'message' => 'Upload failed!', 'code' => 500], 500);
 		}
-		return response()->json(['status'=>'failed','message'=>'File is required!','code'=>400], 400);
+		return response()->json(['status' => 'failed', 'message' => 'File is required!', 'code' => 400], 400);
 	}
 
-  public function importUpdate(Request $request) {
-    $data = $request->all();
-    foreach ($data as $value) {
-      $activity = Activity::find($value['id']);
-      $activity->duration = $value['duration'];
-      $activity->start_date = $value['start_date'];
-      $activity->end_date = $value['end_date'];
-      $activity->save();
-    }
-		return response()->json(['status'=>'success','data'=>$request,'message'=>'Update successful!','code'=>200], 200);
-  }
-}
+	public function importUpdate(Request $request)
+	{
+		$data = $request->all();
+		foreach ($data as $value) {
+			$activity = Activity::find($value['id']);
+			$activity->duration = $value['duration'];
+			$activity->start_date = $value['start_date'];
+			$activity->end_date = $value['end_date'];
+			$activity->save();
+		}
+		return response()->json(['status' => 'success', 'data' => $request, 'message' => 'Update successful!', 'code' => 200], 200);
+	}
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
index 6e8ca66..43dadf9 100644
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -349,6 +349,25 @@ class ProjectController extends Controller
 		return response()->json(['status'=>'success','code'=>200, 'data' => $data], 200);
 	}
 
+	public static function setSyncDate($activity_id, $activity, $report) {
+		$status = ReportActivityMaterial::select('description')->where('activity_id', $activity_id)->first();
+		if (isset($status) && $status != 'done') {
+			$minDate = date_create($report->report_date);
+			$maxDate = date_create($report->report_date);
+			date_add($maxDate, date_interval_create_from_date_string($activity->duration . " days"));
+		} else {
+			$material = AssignMaterial::where('activity_id', $activity_id)->first();
+			$minDate = $material->start_activity;
+			$maxDate = $material->finish_activity;
+		}
+		$reports = array(
+			'activity_id' => $activity_id,
+			'min_date' => $minDate,
+			'max_date' => $maxDate
+		);
+		return $reports;
+	}
+
   public function synchronizeReport($gantt_id)
 	{
 		$activities = Activity::where("version_gantt_id", $gantt_id)->get();
@@ -360,21 +379,12 @@ class ProjectController extends Controller
 			if ($countReports === 1) {
 				$dataReports = ReportActivityMaterial::where('activity_id', $activity_id)->orderBy('report_date')->get();
 				foreach($dataReports as $dr) {
-					$reports[] = array(
-						'activity_id'=>$activity_id,
-						'min_date'=>$dr->report_date,
-						'max_date'=>date_modify(date_create($dr->report_date), "1 days")
-					);
+					$reports[] = ProjectController::setSyncDate($activity_id, $activity, $dr);
 				}
 			}
 			if ($countReports > 1) {
 				$firstReport = ReportActivityMaterial::where('activity_id', $activity_id)->orderBy('report_date')->first();
-				$lastReport = ReportActivityMaterial::where('activity_id', $activity_id)->orderByDesc('report_date')->first();
-				$reports[] = array(
-					'activity_id'=>$activity_id,
-					'min_date'=>$firstReport->report_date,
-					'max_date'=>date_modify(date_create($lastReport->report_date), "1 days")
-				);
+				$reports[] = ProjectController::setSyncDate($activity_id, $activity, $firstReport);
 			}
 			$activity->reports = $reports;
 		}
@@ -383,8 +393,16 @@ class ProjectController extends Controller
 
 		for ($i=0; $i < count($reports); $i++) {
 			$activity = Activity::find($reports[$i]['activity_id']);
+			$successor = Link::where('t_activity_id', $activity->id)->first();
+			if ($successor) {
+				$predecessor = Activity::find($successor->s_activity_id);
+				$activity->start_date = $predecessor->end_date;
+				$reports[$i]['max_date']->modify('1 day');
+			} else {
+				$reports[$i]['max_date']->modify('-1 day');
+			}
 			$activity->start_date = $reports[$i]['min_date'];
-			$activity->end_date = $reports[$i]['max_date'];
+			$activity->end_date = $reports[$i]['max_date']->setTime(23,59,59);
 			$activity->save();
 		}