diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index 19c7182..b948351 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -3,14 +3,12 @@ namespace App\Http\Controllers;
 
 use App\Models\Activity;
 use App\Models\CommentActivity;
-use App\Models\Holiday;
 use App\Models\Link;
 use App\Models\Project;
-use App\Models\ReportActivity;
 use App\Models\TemplateGantt;
-use App\Models\UserToActivity;
 use App\Models\VersionGantt;
-use Illuminate\Support\Facades\DB;
+use App\Models\UserToActivity;
+use App\Models\TmpImport;
 use Illuminate\Http\Request;
 
 class ActivityController extends Controller
@@ -28,14 +26,17 @@ class ActivityController extends Controller
 
 	private function getDataActivity($id)
 	{
-	        $checkHeader = Activity::where('version_gantt_id', $id)->where('type_activity', 'header')->count(); $finalData = [];
+		$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->type = "project";
+	 		$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('id', 'asc')->get();
@@ -45,20 +46,22 @@ class ActivityController extends Controller
 
 		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")
 				$type = $objRow->type_activity;
 			if(empty($dataChildren))
 				$type = "task";
+
 			$objRow->text = $objRow->name;
 			$objRow->parent = $objRow->parent_id ? $objRow->parent_id : null;
-			$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->progress = (int) $objRow->persentase_progress / 100;
-			$dataChildren = $this->getChildren($id, $objRow->id);
+	 		$objRow->progress = $objRow->persentase_progress / 100;
 			$objRow->type = $type;
 			$finalData[] = $objRow;
 			$finalData = array_merge($finalData, $dataChildren);
@@ -186,7 +189,10 @@ class ActivityController extends Controller
 
 		$parent = $data['parent_id'] ?? null;
 		if($parent){
-			Activity::find($parent)->update(["type_activity"=>"project"]);
+			$parentData = Activity::find($parent);
+			if($parentData->parent_id) {
+				$parentData->update(["type_activity" => "project"]);
+			}
 			CommentActivity::where('activity_id', $parent)->delete();
 			UserToActivity::where('activity_id', $parent)->delete();
 		}
@@ -212,16 +218,11 @@ class ActivityController extends Controller
 		if(empty($id) || !is_int((int)$id))
 			return response()->json(['status'=>'failed', 'action'=>'error','message'=>'id is required!','code'=>400], 400);
 
-		$updateBobot = false;
+		$updateBobot = true;
 		if(!$data = Activity::find($id))
 			return response()->json(['status'=>'failed', 'action'=>'error','message'=>'Data not found!','code'=> 404], 404);
 		$dataUpdate = $request->all();
 
-		$oldRencanaBiaya = $data->rencana_biaya;
-		$newRencanaBiaya = str_replace(",",".",$request->rencana_biaya);
-		if($oldRencanaBiaya != $newRencanaBiaya)
-			$updateBobot = true;
-
 		$dataUpdate['name'] = $request->text;
 		$dataUpdate['persentase_progress'] = $request->progress*100;
 		$dataUpdate['updated_by'] = $this->currentName;
@@ -278,378 +279,141 @@ class ActivityController extends Controller
 		$dataGet = $builder->get();
 		$totalRecord = $countBuilder->count();
 		return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200);
-	}
+  	}
 
-	public function getPercentagePerDay(Request $request)
+  	public function import(Request $request)
 	{
-		$dataPayload = $request->all();
-		$allGantt  = [];
-		foreach ($dataPayload['project_id'] as $val) {
-			$allGantt[] = $this->getLatestGantt($val);
-		}
+    	$data = $request->all();
 
-		$dataFinal=[];
-		foreach ($allGantt as $val) {
-			$dataProject = Project::find($val['proyek_id']);
-			$holidays = Holiday::where("version_gantt_id", $val['last_gantt_id'])->where("proyek_id", $val['proyek_id'])->get();
-			$dateHoliday = []; //$holiday->all();
-			foreach ($holidays as $holiday) {
-				$startH = new \DateTime($holiday->date);
-				$endH = clone $startH;
-				$endH->modify('+'.$holiday->duration.' day');
-				$intervalH = \DateInterval::createFromDateString('1 day');
-				$periodH = new \DatePeriod($startH, $intervalH, $endH);
-				foreach ($periodH as $dt) {
-					$dateHoliday[] = $dt->format("Y-m-d");
-				}
-			}
-			$verGantt = VersionGantt::find($val['last_gantt_id']);
-			$configOff = $verGantt->config_dayoff;
-			if($configOff && $configOff!= ""){
-				$dayOff = explode(",", $verGantt->config_dayoff);
-				$dayOff = array_map(
-					function($value) { return (int)$value; },
-						$dayOff
-				);
-			}else{
-				$dayOff = [];
-			}
-			$checkHeader = Activity::where('type_activity', 'header')->where("proyek_id", $val['proyek_id'])->where("version_gantt_id", $val['last_gantt_id'])->count();
-			if($checkHeader > 0){
-				$dataHeader = Activity::where('type_activity', 'header')->where("proyek_id", $val['proyek_id'])->where("version_gantt_id", $val['last_gantt_id'])->first();
-				$minDate = Activity::where('parent_id', $dataHeader->id)->where("proyek_id", $val['proyek_id'])->where("version_gantt_id", $val['last_gantt_id'])->min("start_date");
-				$maxDate = Activity::where('parent_id', $dataHeader->id)->where("proyek_id", $val['proyek_id'])->where("version_gantt_id", $val['last_gantt_id'])->max("end_date");
-			}else{
-				$minDate = Activity::whereNull('parent_id')->where("proyek_id", $val['proyek_id'])->where("version_gantt_id", $val['last_gantt_id'])->min("start_date");
-				$maxDate = Activity::whereNull('parent_id')->where("proyek_id", $val['proyek_id'])->where("version_gantt_id", $val['last_gantt_id'])->max("end_date");
-			}
+		$data['created_by'] = $this->currentName;
 
-			$begin = new \DateTime($minDate);
-			$end = new \DateTime($maxDate);
-			$end = $end->modify( '+1 day' );
-			$interval = \DateInterval::createFromDateString('1 day');
-			$period = new \DatePeriod($begin, $interval, $end);
-			$checkHeader = Activity::where('type_activity', 'header')->where("proyek_id", $val['proyek_id'])->where("version_gantt_id", $val['last_gantt_id'])->count();
-			if($checkHeader > 0){
-				$dataHeader = Activity::where('type_activity', 'header')->where("proyek_id", $val['proyek_id'])->where("version_gantt_id", $val['last_gantt_id'])->first();
-				$totalRencanaBudget = Activity::select(DB::raw('sum(cast(rencana_biaya as integer))'))->where('parent_id', $dataHeader->id)->where("proyek_id", $val['proyek_id'])->where("version_gantt_id", $val['last_gantt_id'])->first();
-			}else{
-				$totalRencanaBudget = Activity::select(DB::raw('sum(cast(rencana_biaya as integer))'))->whereNull('parent_id')->where("proyek_id", $val['proyek_id'])->where("version_gantt_id", $val['last_gantt_id'])->first();
-			}
+		Activity::where('version_gantt_id', $data['ganttId'])->delete();
 
-			$totalRencanaBudget = $totalRencanaBudget->sum;
-			$currentPercentage = 0;
-			$dataDate = [];
-			$dataPercen = [];
-			foreach ($period as $dt) {
-				$weekDay = $dt->format("w");
-				$currentDate = $dt->format("Y-m-d");
-				if(!in_array($weekDay, $dayOff) && !in_array($currentDate, $dateHoliday))
-				{
-					$totalPercentage = 0;
-					$checkHeader = Activity::where('type_activity', 'header')->where("proyek_id", $val['proyek_id'])->where("version_gantt_id", $val['last_gantt_id'])->count();
-					if($checkHeader > 0){
-						$dataHeader = Activity::where('type_activity', 'header')->where("proyek_id", $val['proyek_id'])->where("version_gantt_id", $val['last_gantt_id'])->first();
-						$dataActivity = Activity::whereRaw("'".$currentDate."' BETWEEN DATE(m_activity.start_date) AND DATE(m_activity.end_date)")->where('parent_id', $dataHeader->id)->where("proyek_id", $val['proyek_id'])->where("version_gantt_id", $val['last_gantt_id'])->get();
-					}else{
-						$dataActivity = Activity::whereRaw("'".$currentDate."' BETWEEN DATE(m_activity.start_date) AND DATE(m_activity.end_date)")->whereNull('parent_id')->where("proyek_id", $val['proyek_id'])->where("version_gantt_id", $val['last_gantt_id'])->get();
-					}
-
-					foreach ($dataActivity as $activity) {
-						$duration = $activity->duration;
-						if($totalRencanaBudget > 0 && $duration > 0){
-							$totalPercentage = $totalPercentage + ((($activity->rencana_biaya/$totalRencanaBudget)*100)/$duration);
-						}
-					}
-					$currentPercentage = $currentPercentage + $totalPercentage;
-					$dataDate[] = $currentDate;
-					$dataPercen[] = $currentPercentage;
-				}else{
-					$dataDate[] = $currentDate;
-					$dataPercen[] = "dateOff";
-				}
-			}
-			$dataPercentage = array(
-				"date"=>$dataDate,
-				"percentage"=>$dataPercen
-			);
-			$dataFinal[] = array(
-				"proyek_name"=> $dataProject->nama,
-				"data"=>$dataPercentage
-			);
-		}
+		$projectId = VersionGantt::where('id', $data['ganttId'])->first()->proyek_id;
 
-		if($dataFinal){
-			return response()->json(['status'=>'success','code'=>200,'data'=>$dataFinal, 'totalRecord'=>1], 200);
-		}else{
-			return response()->json(['status'=>'failed','message'=>'failed get list percentage day, please try again later!','code'=>400], 400);
-		}
-	}
+		$activityStack = [];
 
+		foreach ($data['activities'] as $i => $activity_row) {
+			$startDate = \DateTime::createFromFormat('d-m-y', $activity_row['start_date']);
+			$endDate = \DateTime::createFromFormat('d-m-y', $activity_row['end_date']);
 
-	public function getCalculateCurvaS(Request $request) // for adw (plan & actual == date)
-	{
-		DB::enableQueryLog();
-		$dataPayload = $request->all();
-		$allGantt  = [];
-		if(isset($dataPayload['gannt_id'])){
-			$allGantt  = $dataPayload['gannt_id'];
-		}else{
-			foreach ($dataPayload['project_id'] as $val) {
-				$allGantt[] = $this->getLatestGantt($val);
+			$input['name'] = $activity_row['name'];
+			$input['proyek_id'] = $projectId;
+			$input['version_gantt_id'] = $data['ganttId'];
+			$input['parent_id'] = null;
+			$input['start_date'] = $startDate->format('Y-m-d');
+			$input['end_date'] = $endDate->format('Y-m-d');
+			$input['duration'] = $activity_row['duration'];
+			$input['bobot_planning'] = $activity_row['weight'];
+			$input['persentase_progress'] = 0;
+			$input['type_activity'] = $i == 0 ? "header" : "task";
+      $input['created_by'] = $this->currentName;
+
+			if (!$activity = Activity::create($input)) {
+				Activity::where('version_gantt_id', $data['ganttId'])->delete();
+				return response()->json(['status' => 'error', 'message' => 'Input failed on ' . $activity['name'], 'code' => 500], 500);
 			}
-		}
-		$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){
-				$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{
-				$totalRencanaBudget = Activity::whereNull('parent_id')->where("proyek_id", $keyGantt['proyek_id'])->where("version_gantt_id", $keyGantt['last_gantt_id'])->sum("rencana_biaya");
+			$data['activities'][$i]['activity_id'] = $activity->id;
+
+			if ($i == 0) {
+        $activity->type_activity = "project";
+				$activity->save();
+				$activity->level = $activity_row['level'];
+				array_push($activityStack, $activity);
+				continue;
 			}
 
-			if(!Activity::where("version_gantt_id", $keyGantt['last_gantt_id'])->first())
-			    continue;
-
-			$alreadyHasReport = DB::table('report_activity_material as a')
-			    ->select('a.id')
-				->join('m_activity as b', 'b.id', '=', 'a.activity_id')
-				->where('b.version_gantt_id', '=', $keyGantt['last_gantt_id'])
-				->exists();
-
-			if(!$alreadyHasReport)
-			    continue;
-
-			$minDate = DB::table('assign_material_to_activity as ama')
-				->where("ama.proyek_id", $keyGantt['proyek_id'])
-				->join('m_activity as a', 'a.id', '=', 'ama.activity_id')
-				->where('a.version_gantt_id', '=', $keyGantt['last_gantt_id'])
-				->min("plan_date");
-
-			$maxDate = DB::table('assign_material_to_activity as ama')
-				->where("ama.proyek_id", $keyGantt['proyek_id'])
-				->join('m_activity as a', 'a.id', '=', 'ama.activity_id')
-				->where('a.version_gantt_id', '=', $keyGantt['last_gantt_id'])
-				->max("plan_date");
-
-			$begin = new \DateTime($minDate);
-			$end = new \DateTime($maxDate);
-			$end2 = new \DateTime($maxDate);
-			$interval = \DateInterval::createFromDateString('1 day');
-			$period = new \DatePeriod($begin->modify('-1 days'), $interval, $end);
-			$arr_ActualM = [];
-			$tempDate = [];
-			$tempPercentage = [];
-			$tempTtlPercentPlan=0;
-			$tempTtlPercentActual=0;
-
-			$currentACWP = 0;
-			$currentBCWP = 0;
-
-			foreach ($period as $dt) {
-				$dataPlanM = DB::table('assign_material_to_activity as ama')
-					->select('ama.activity_id', 'ama.qty_planning', 'ama.plan_date', 'ama.start_activity', 'a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress')
-					->join('m_activity as a', 'a.id', '=', 'ama.activity_id')
-					->where('ama.proyek_id', '=', $keyGantt['proyek_id'])
-					->where('a.version_gantt_id', '=', $keyGantt['last_gantt_id'])
-					->whereDate('ama.plan_date', $dt->format("Y-m-d"))
-					->get();
-				$dataActualM = DB::table('report_activity_material as ram')
-					->select('ram.activity_id', 'ram.qty', 'ram.report_date', 'a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress')
-					->join('m_activity as a', 'a.id', '=', 'ram.activity_id')
-					->where('a.version_gantt_id', '=', $keyGantt['last_gantt_id'])
-					->where('a.proyek_id', '=', $keyGantt['proyek_id'])
-					->whereDate('ram.report_date', $dt->format("Y-m-d"))
-					->get();
-				$dataTempPlan = [];
-				$x = 0;
-				$sumPercentagePlan=0;
-				$totalACWP = isset($totalACWP) ? $totalACWP : 0;
-				$totalBCWP = isset($totalBCWP) ? $totalBCWP : 0;
-
-				foreach ($dataPlanM as $keyPlanM) {
-					$sumVolPlan = DB::table('assign_material_to_activity')
-						->select('activity_id', DB::raw('SUM(qty_planning) as ttl_qty_plan'))
-						->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;
-					$x++;
-				}
+			$activity->level = $activity_row['level'];
+
+			if ($lastStack = end($activityStack)) {
+				$levelLowerThanLastStack = $activity->level < $lastStack->level;
+				$levelEqualWithLastStack = $activity->level == $lastStack->level;
 
-				$w = 0;
-				$dataTempReport = [];
-				$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;
-                    try {
-                        $totalACWP += $keyActualM->biaya_actual/$keyActualM->duration;
-                    } catch (\Exception $e) {
-                        return response()->json(['message' => $e->getMessage()]);
-                    }
-					$dataTempReport [$w]['totalacwp'] = $totalACWP;
-					$w++;
+				if ($levelLowerThanLastStack) {
+					$lastStackIsNotRight = $levelLowerThanLastStack;
+					do {
+						array_pop($activityStack);
+						$lastStack = end($activityStack);
+						if ($activity->level > $lastStack->level)
+							$lastStackIsNotRight = false;
+					} while ($lastStackIsNotRight);
 				}
 
-				$arr_ActualM[] = array(
-					'date'=>$dt->format("Y-m-d"),
-					'percentPlan'=>$sumPercentagePlan,
-					'percentActual'=>$sumPercentageActual,
-					'plan'=>$dataTempPlan,
-					'actual'=>$dataTempReport,
-				);
-				if(isset($dataPayload['period']) && $dataPayload['period'] == 'week'){
-					$tempTtlPercentPlan+= $sumPercentagePlan;
-					$tempTtlPercentActual+= $sumPercentageActual;
-					$currentACWP += $totalACWP;
-					$currentBCWP += $totalBCWP;
-
-					$tempPercentage[] = array(round($tempTtlPercentPlan,2), round($tempTtlPercentActual,2));
-					$tempDate[] = array($dt->format("Y-m-d"), 0, 0);
-				}else{
-					$tempPercentage[] = array(round($sumPercentagePlan,2), round($sumPercentageActual,2));
-					$tempDate[] = array($dt->format("Y-m-d"), 0, 0);
+				if ($levelEqualWithLastStack) {
+					array_pop($activityStack);
 				}
 			}
 
+			$activity->parent_id = $activityStack[count($activityStack) - 1]->id ?? null;
+			// 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);
+			$activity->save();
+			$activity->level = $activity_row['level'];
 
-            try {
-    			if(round($totalACWP,0) > $totalRencanaBudget){
-    				$estimatedCost = round($totalACWP,0)+0;
-    			}else{
-    				$estimatedCost = ($totalRencanaBudget+0);
-    			}
-            } catch (\Exception $e) {
-                return response()->json([
-                    'message' => $e->getMessage(),
-                    "line" => 566,
-                    'gantt' => $keyGantt,
-                ]);
-            }
-			$estimatedCost = $totalACWP > $totalRencanaBudget ? $totalACWP : $totalRencanaBudget;
-
-			$costDeviation = $totalRencanaBudget - $estimatedCost;
-			if($costDeviation > 0){
-				$potential = "SAVING";
-			} else {
-				$potential = $costDeviation == 0 ? "ON BUDGET" : "OVERRUN";
+			if (@$activityStack[count($activityStack) - 1]->level != $activity->level && $activity->level != $data['activities'][$i - 1]['level']) {
+				array_push($activityStack, $activity);
 			}
 
-			$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,
-				)
-			);
-
-			$dataFinal[] = array(
-				"proyek_name"=> $dataProject->nama,
-				"data"=>$dataResponse,
-				"allGant"=>$allGantt
-			);
-		}
-
-
-		return response()->json(['status'=>'success','code'=>200, 'data' => $dataFinal], 200);
-
-	}
-
-	private function getLatestGantt($id){
-		$maxGanttId = VersionGantt::where("proyek_id", $id)->max("id");
-        $data = array(
-            "last_gantt_id" => $maxGanttId,
-            "proyek_id" => $id
-        );
-        return $data;
-	}
-
-	public function setBaseline($gantt_id)
-	{
-		$activities = Activity::where("version_gantt_id", $gantt_id)->get();
+			if ($activity->level < @$data['activities'][$i + 1]['level']) {
+				unset($activity->level);
+				$activity->type_activity = "project";
+				$activity->save();
+				$activity->level = $activity_row['level'];
+			}
 
-		foreach ($activities as $activity) {
-			$activity->update([
-				"planned_start"=>$activity->start_date,
-				"planned_end"=>$activity->end_date,
-			]);
+			if (!empty($activity_row['predecessor'])) {
+				$key = array_search($activity_row['predecessor'], array_column($data['activities'], 'no'));
+
+				if (!$predecessorActivity = Activity::find($data['activities'][$key]['activity_id']))
+					continue;
+
+				$predecessorFinishDate = new \DateTime($predecessorActivity->end_date);
+				$interval = $predecessorFinishDate->diff(new \DateTime($activity->start_date));
+				$diff = $interval->days;
+
+				Link::create([
+					'created_by' => $this->currentName,
+					's_activity_id' => $predecessorActivity->id,
+					't_activity_id' => $activity->id,
+					'type_link' => 0,
+					'code_link' => 'FS',
+					'version_gantt_id' => $data['ganttId'],
+					'lag' => $diff > 1 ? $diff : null,
+				]);
+			}
 		}
 
-		return response()->json(['status'=>'success','message'=>'Set baseline success!','code'=> 200], 200);
-	}
+		return response()->json(['stack' => $activityStack, 'status' => 'success', 'message' => 'Data imported!', 'projectId' => $projectId, 'code' => 200], 200);
+	}     
 
-	public function synchronizeReport($gantt_id)
+	public function uploadTmpImport(Request $request)
 	{
-		$activities = Activity::where("version_gantt_id", $gantt_id)->get();
-		$reports = [];
-
-		foreach($activities as $activity) {
-			$activity_id = $activity->id;
-			$countReports = ReportActivity::where('activity_id', $activity_id)->count();
-			if ($countReports === 1) {
-				$dataReports = ReportActivity::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")
-					);
+		if($request->hasFile('dokumen')){
+			$document    = $request->file('dokumen');
+			$ref_id     = $request->ref_id;
+			$name       = $document->getClientOriginalName();
+
+			$result = $document->move($this->pathDocument, $name);
+			if($result){
+				$data = [
+					'ref_id' => (int)$ref_id,
+					'file' => $name,
+					'type_dokumen' => $request->type_dokumen
+				];
+
+				$result = TmpImport::create($data);
+
+				if(!$result){
+					unlink($this->pathDocument.$name);
+					return response()->json(['status'=>'failed','message'=>'Upload failed!','code'=> 500], 500);
 				}
-			}
-			if ($countReports > 1) {
-				$firstReport = ReportActivity::where('activity_id', $activity_id)->orderBy('report_date')->first();
-				$lastReport = ReportActivity::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")
-				);
+				return response()->json(['status'=>'success','message'=>'Upload successful!','code'=>200], 200);
 
 			}
+			return response()->json(['status'=>'failed','message'=>'Upload failed!','code'=> 500], 500);
 		}
-
-		for ($i=0; $i < count($reports); $i++) {
-			$activity = Activity::find($reports[$i]['activity_id']);
-			$activity->start_date = $reports[$i]['min_date'];
-			$activity->end_date = $reports[$i]['max_date'];
-			$activity->save();
-		}
-
-		return response()->json(['status'=>'success','message'=>'Synchronize to report success!','code'=>200], 200);
+		return response()->json(['status'=>'failed','message'=>'File is required!','code'=>400], 400);
 	}
 }
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index f45ab75..a12208d 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -11,6 +11,7 @@ class Controller extends BaseController
 {
     protected $pathImage   = "assets/image/";
     protected $pathDocument   = "assets/file/project/";
+    protected $pathTmpImport = "assets/file/import/";
     protected $pathActivityDocument = "assets/file/activity/";
     protected $listJoinAll = ['first', 'second', 'third', 'fourth', 'fifth',
     'sixth', 'seventh', 'eighth', 'ninth', 'tenth'];
diff --git a/app/Http/Controllers/DivisiController.php b/app/Http/Controllers/DivisiController.php
index 22188ca..ea7c3d4 100644
--- a/app/Http/Controllers/DivisiController.php
+++ b/app/Http/Controllers/DivisiController.php
@@ -20,8 +20,8 @@ class DivisiController extends Controller
 	public function add(Request $request){
 		$this->validate($request, [
 			'name'          => 'required',
-			'description'   => 'string'
-			// 'parent'   		=> 'integer'
+			'description'   => 'string',
+			'parent'   => 'integer'
 		]);
 
 		$data = $request->all();
@@ -72,18 +72,8 @@ class DivisiController extends Controller
 
 	public function search()
 	{
-<<<<<<< HEAD
-		$payload = $request->all();
-        $dataBuilder = $this->setUpPayload($payload, 'm_divisi');
-        $builder = $dataBuilder['builder'];
-        $countBuilder = $dataBuilder['count'];
-        $dataGet = $builder->get();
-        $totalRecord = $countBuilder->count();
-        return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200);
-=======
 		return $this->list();
 		// cant use builder for this case
->>>>>>> 3f193ec38ec78bd3d323b4aa304c5e1ab52425b6
 	}
 
 	public function list()
diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
index 0394ff6..359e14a 100644
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -2,32 +2,30 @@
 
 namespace App\Http\Controllers;
 
-use App\Helpers\MasterFunctionsHelper;
+use Illuminate\Http\Request;
+use App\Models\Project;
+use App\Models\UserToProyek;
 use App\Models\Activity;
-use App\Models\ActivityDokumen;
+use App\Models\UserToActivity;
+use App\Models\User;
 use App\Models\AssignMaterial;
-use App\Models\CommentActivity;
 use App\Models\DokumenProject;
 use App\Models\FolderDocumentProyek;
-use App\Models\Holiday;
-use App\Models\Image;
-use App\Models\Link;
-use App\Models\OfficeHours;
-use App\Models\Project;
-use App\Models\ProjectApproval;
 use App\Models\ProjectCharter;
-use App\Models\ProjectMileStone;
-use App\Models\ProjectParticipants;
+use App\Models\ProjectApproval;
 use App\Models\ProjectPhase;
 use App\Models\ProjectType;
-use App\Models\ReportActivity;
-use App\Models\ReportActivityMaterial;
+use App\Models\ProjectMileStone;
+use App\Models\ProjectParticipants;
 use App\Models\ShowHideColumn;
-use App\Models\User;
-use App\Models\UserToActivity;
-use App\Models\UserToProyek;
 use App\Models\VersionGantt;
-use Illuminate\Http\Request;
+use App\Models\Image;
+use App\Models\CommentActivity;
+use App\Models\Link;
+use App\Models\ActivityDokumen;
+use App\Models\Holiday;
+use App\Models\ReportActivity;
+use App\Models\OfficeHours;
 use Illuminate\Support\Facades\DB;
 
 const API_GEOLOCATION = "https://nominatim.oslogdev.com/search/ADDR?format=json&addressdetails=1&limit=1";
@@ -215,20 +213,6 @@ class ProjectController extends Controller
 		return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200);
 	}
 
-	public function getManpower($proyek_id){
-		$manPower = UserToProyek::where('proyek_id', $proyek_id)->get();
-		$manCount = $manPower->count();
-		return response()->json(['data'=>$manPower, 'totalRecord'=>$manCount]);
-	}
-	
-	public function getAssignedHR($gantt_id){
-		$results = UserToActivity::select('assign_hr_to_activity.proyek_id', 'assign_hr_to_activity.user_id', 'm_activity.id', 'm_activity.name', 'm_activity.start_date', 'm_activity.end_date')
-			->join('m_activity', 'm_activity.id', '=', 'assign_hr_to_activity.activity_id')
-			->where('assign_hr_to_activity.version_gantt_id', $gantt_id)
-			->get();
-		return response()->json(['data'=>$results]);
-	}		
-
 	public function list()
 	{
 		$data = Project::orderBy('id', 'desc')->get();
@@ -245,7 +229,7 @@ class ProjectController extends Controller
 			$scheduleHealth = "on-track";
 			$rootActivity = Activity::whereNull('parent_id')->where('proyek_id', $d->id)->orderBy('version_gantt_id', 'desc')->first();
 			if($rootActivity){
-				$costVariance = (int)$d->rencana_biaya - $rootActivity->biaya_actual ?? 0;
+				$costVariance = $d->rencana_biaya - $rootActivity->biaya_actual;
 				$actualCost = $rootActivity->biaya_actual ?? 0;
 				$progress = $rootActivity->persentase_progress ?? 0;
 
@@ -263,7 +247,7 @@ class ProjectController extends Controller
 				$lastActivity = date("d/m/Y", strtotime($rootActivity->end_date));
 			}
 			$d->plannedInterval = date("d/m/Y", strtotime($d->mulai_proyek)) . " - " . date("d/m/Y", strtotime($d->akhir_proyek));
-			$d->plannedCost = (int)$d->rencana_biaya;
+			$d->plannedCost = $d->rencana_biaya;
 			$d->actualCost = $actualCost;
 			$d->lastActivity = $lastActivity ?? "-";
 			$d->costVariance = $costVariance;
@@ -272,18 +256,6 @@ class ProjectController extends Controller
 			$d->progress = $progress;
 			$d->lastGanttId = VersionGantt::where("proyek_id", $d->id)->orderBy('id', 'desc')->first()->id ?? null;
 			$d->manpower = UserToProyek::where("proyek_id", $d->id)->count() ?? 0;
-<<<<<<< HEAD
-			$d->projectManager = DB::table('m_proyek')
-				 ->join('m_users', 'm_users.id', '=', 'm_proyek.pm_id')
-				 ->where('m_proyek.id', $d->id)
-				 ->pluck('m_users.name')
-				 ->first();
-			$d->geolocation = [];
-		}
-
-		$totalPlannedCost = $data->sum('plannedCost');
-		$totalActualCost = $data->sum('actualCost');
-=======
             $d->projectManager = DB::table('m_proyek')
                      ->join('m_users', 'm_users.id', '=', 'm_proyek.pm_id')
                      ->where('m_proyek.id', $d->id)
@@ -299,178 +271,60 @@ class ProjectController extends Controller
 
         $totalPlannedCost = $data->sum('plannedCost');
         $totalActualCost = $data->sum('actualCost');
->>>>>>> 3f193ec38ec78bd3d323b4aa304c5e1ab52425b6
 		$manpowers = User::count();
 		$projectsOnDanger = Project::where('budget_health', 'danger')->count();
-		$projectPhases = ProjectPhase::orderBy('order', 'asc')->pluck('name');
-		$projectTypes = ProjectType::orderBy('id', 'asc')->pluck('name');
-		try {
-			$projectsByPhase = DB::table('m_proyek')
-				->select('m_proyek_phase.name', 'm_proyek_phase.color', DB::raw('count(*) as total'))
-				->join('m_proyek_phase', 'm_proyek_phase.id', '=', 'm_proyek.phase_id')
-				->groupBy('m_proyek_phase.name', 'm_proyek_phase.color')
-				->get();
-		} catch (\DivisionByZeroError $e) {
-			return response()->json(['message' => $e->getMessage()]);
-		}
-		try {
-			$projectsByType = DB::table('m_proyek')
-				->select('m_type_proyek.name', DB::raw('count(*) as total'))
-				->join('m_type_proyek', 'm_type_proyek.id', '=', 'm_proyek.type_proyek_id')
-				->groupBy('m_type_proyek.name')
-				->get();
-		} catch (\DivisionByZeroError $e) {
-			return response()->json(['message' => $e->getMessage()]);
-		}
+        $projectPhases = ProjectPhase::orderBy('order', 'asc')->pluck('name');
+        $projectTypes = ProjectType::orderBy('id', 'asc')->pluck('name');
+        try {
+            $projectsByPhase = DB::table('m_proyek')
+                     ->select('m_proyek_phase.name', 'm_proyek_phase.color', DB::raw('count(*) as total'))
+                     ->join('m_proyek_phase', 'm_proyek_phase.id', '=', 'm_proyek.phase_id')
+                     ->groupBy('m_proyek_phase.name', 'm_proyek_phase.color')
+                     ->get();
+        } catch (\Exception $e) {
+            return response()->json(['message' => $e->getMessage()]);
+        }
+        try {
+            $projectsByType = DB::table('m_proyek')
+                     ->select('m_type_proyek.name', DB::raw('count(*) as total'))
+                     ->join('m_type_proyek', 'm_type_proyek.id', '=', 'm_proyek.type_proyek_id')
+                     ->groupBy('m_type_proyek.name')
+                     ->get();
+        } catch (\Exception $e) {
+            return response()->json(['message' => $e->getMessage()]);
+        }
 
 		return response()->json(
-			[
-				'status'=>'success',
-				'code'=>200,
-				'data'=>$data,
-				'totalRecord'=>$countData,
-				'totalPlannedCost' => $totalPlannedCost,
-				'totalActualCost' => $totalActualCost,
-				'totalRevenue' => $totalPlannedCost - $totalActualCost,
-				'manpowers' => $manpowers,
-				'projectsOnDanger'=> $projectsOnDanger,
-				'projectPhases' => $projectPhases,
-				'projectsByPhase' => $projectsByPhase,
-				'projectTypes' => $projectTypes,
-				'projectsByType' => $projectsByType,
-			], 200);
-	}
-
-	public function detail($id){
-		if(empty($id) || !is_int((int)$id))
-			return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
-
-		$result = Project::find($id);
-
-		if(!$result)
-			return response()->json(['status'=>'failed','message'=> 'Data not found!','code'=> 404], 404);
-
-		$gantt = MasterFunctionsHelper::getLatestGantt($id);
-		$result->projectManager = User::where('id', $result->pm_id)->value('name');
-		$result->header = Activity::whereNull('parent_id')->where("proyek_id", $id)->where("version_gantt_id", $gantt['last_gantt_id'])->first();
-		return response()->json(['status'=>'success','code'=> 200,'data'=>$result], 200);
-	}
-
-<<<<<<< HEAD
-	public function synchronizeReport($gantt_id)
-	{
-		$activities = Activity::where("version_gantt_id", $gantt_id)->get();
-		$reports = [];
-
-		foreach($activities as $activity) {
-			$activity_id = $activity->id;
-			$countReports = ReportActivityMaterial::where('activity_id', $activity_id)->count();
-			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")
-					);
-				}
-			}
-			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")
-				);
-			}
-			$activity->reports = $reports;
-		}
-		/* return response()->json(['status'=>'success','data'=> $reports,'code'=>200], 200); */
-		/* return response()->json(['status'=>'success','data'=> $activities,'code'=>200], 200); */
-
-		for ($i=0; $i < count($reports); $i++) {
-			$activity = Activity::find($reports[$i]['activity_id']);
-			$activity->start_date = $reports[$i]['min_date'];
-			$activity->end_date = $reports[$i]['max_date'];
-			$activity->save();
-		}
-
-		return response()->json(['status'=>'success','message'=>'Synchronize to report success!','code'=>200], 200);
-	}
-
-	public function setBaseline($gantt_id)
-	{
-		$activities = Activity::where("version_gantt_id", $gantt_id)->get();
-
-		foreach ($activities as $activity) {
-			$activity->update([
-				"planned_start"=>$activity->start_date,
-				"planned_end"=>$activity->end_date,
-			]);
-		}
-
-		return response()->json(['status'=>'success','message'=>'Set baseline success!','code'=> 200], 200);
-	}
-
-	public function getOverdueActivities(Request $request){
-		$payload = $request->all();
-		if(empty($payload['id']) || !is_int((int)$payload['id']))
-			return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
-
-		$result = Project::find($payload['id']);
-
-		if(!$result)
-			return response()->json(['status'=>'failed','message'=> 'Project not found!','code'=> 404], 404);
-		//TODO possible overdue bug
-		if(isset($payload['till_date']))
-			$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();
-		else
-			$overdueActivities = Activity::where('proyek_id', $payload['id'])->whereNotNull('parent_id')->where('persentase_progress', '!=', 100)->orderBy('end_date', 'asc')->get();
-
-		$result->overdueActivities = $overdueActivities;
-
-		return response()->json(['status'=>'success','code'=> 200,'data'=>$result], 200);
-	}
-
-	public function getInvoiceIntegration(Request $request) {
-		$search = urlencode($request->search);
-		if(empty($search))
-			return response()->json(['status'=>'error', 'message'=>'Empty query string!'], 400);
-		$url = str_replace("SEARCH", $search, config('api.adw').'/project_cost?project_no=SEARCH');
-
-		$response = MasterFunctionsHelper::curlReq($url);
-
-
-		return response()->json(['status'=>'success', 'data'=> $response, 'code'=>200], 200);
+		    [
+		        'status'=>'success',
+		        'code'=>200,
+		        'data'=>$data,
+		        'totalRecord'=>$countData,
+		        'totalPlannedCost' => $totalPlannedCost,
+		        'totalActualCost' => $totalActualCost,
+		        'totalRevenue' => $totalPlannedCost - $totalActualCost,
+		        'manpowers' => $manpowers,
+		        'projectsOnDanger'=> $projectsOnDanger,
+		        'projectPhases' => $projectPhases,
+		        'projectsByPhase' => $projectsByPhase,
+		        'projectTypes' => $projectTypes,
+		        'projectsByType' => $projectsByType,
+	        ], 200);
 	}
 
-	public function getReportDistribution(Request $request){
-		$payload = $request->all();
-
-		if(empty($payload['project_id']) || !is_int((int)$payload['project_id']))
-			return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
-
-		$reports = DB::table('assign_material_to_activity as ama')
-			->select('u.name', 'a.name as activity_name', 'ama.qty_planning', 'ram.qty as qty_real','rm.description as material_name', 'rm.uom as material_unit',
-			   	'ram.lat', 'ram.lon', 'ram.description as report_notes', 'ram.report_date')
-			->join('report_activity_material as ram', 'ram.assign_material_id', '=', 'ama.id')
-			->join('m_req_material as rm', 'rm.id', '=', 'ama.material_id')
-			->join('m_activity as a', 'a.id', '=', 'ama.activity_id')
-			->join('m_users as u', 'u.id', '=', 'ram.user_id')
-			->where('ama.proyek_id', '=', $payload['project_id'])
-			->whereNotNull('ram.lat')
-			->whereBetween('ram.report_date', [$payload['start_date'], $payload['end_date']])
+	public function getListProjectTask($id){
+		$data = UserToActivity::select("assign_hr_to_activity.user_id as user_id","m_proyek.*")
+			->where("assign_hr_to_activity.user_id", $id)
+			->join('m_proyek', 'assign_hr_to_activity.proyek_id', '=', 'm_proyek.id')
+			->groupBy("m_proyek.proyek_id")
 			->get();
 
-		return response()->json(['status'=>'success', 'code'=> 200, 'data'=> $reports], 200);
-	}
+		if(!$data)
+			return response()->json(['status'=>'failed','message'=>'Data not found!','code'=> 404], 404);
 
-	public function getSCurve(Request $request){
-		$data = MasterFunctionsHelper::getSCurve($request);
-		return response()->json(['status'=>'success','code'=>200, 'data' => $data], 200);
+		return response()->json(['status'=>'success','code'=>200,'data'=>$data], 200);
 	}
-=======
+
 	public function dashboard($id)
 	{
 		$data = DB::table('m_proyek as mp')
@@ -523,6 +377,5 @@ class ProjectController extends Controller
         return json_decode($output);
 	}
 
->>>>>>> 3f193ec38ec78bd3d323b4aa304c5e1ab52425b6
 }
 
diff --git a/app/Models/TmpImport.php b/app/Models/TmpImport.php
new file mode 100644
index 0000000..a7a2311
--- /dev/null
+++ b/app/Models/TmpImport.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class TmpImport extends Model
+{
+    protected $table = 'tmp_import';
+
+    const CREATED_AT = 'created_at';
+    const UPDATED_AT = 'created_by';
+
+    protected $fillable = [
+        'file', 'type_dokumen', 'gantt_id', 'created_at', 'created_by'
+    ];
+}