diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index 4ba8865..c95c3f2 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -47,6 +47,10 @@ class ActivityController extends Controller
 			$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->actual_start = isset($dataHeader->actual_start) ? date_format(date_create($dataHeader->actual_start), "Y-m-d") : NULL;
+			$dataHeader->actual_end = isset($dataHeader->actual_end) ? date_format(date_create($dataHeader->actual_end), "Y-m-d") : NULL;
+
 			$dataHeader->type = "header";
 			$dataHeader->text = $dataHeader->name;
 			$finalData[] = $dataHeader;
@@ -72,6 +76,10 @@ class ActivityController extends Controller
 			$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->actual_start = isset($objRow->actual_start) ? date_format(date_create($objRow->actual_start), "Y-m-d") : NULL;
+			$objRow->actual_end = isset($objRow->actual_end) ? date_format(date_create($objRow->actual_end), "Y-m-d") : NULL;
+
 			$objRow->progress = $objRow->persentase_progress / 100;
 			$objRow->type = $type;
 			$finalData[] = $objRow;
@@ -115,6 +123,10 @@ class ActivityController extends Controller
 			$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->actual_start = isset($objRow->actual_start) ? date_format(date_create($objRow->actual_start), "Y-m-d") : NULL;
+			$objRow->actual_end = isset($objRow->actual_end) ? date_format(date_create($objRow->actual_end), "Y-m-d") : NULL;
+			
 			$dataChildren = $this->getChildren($gantt_id, $objRow->id);
 			if ($objRow->type_activity == "milestone") {
 				$objRow->type = $objRow->type_activity;
diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
index 1203fad..68f8165 100644
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -393,9 +393,12 @@ class ProjectController extends Controller
 			} 
 			if($reports[$i]['status'] != 'done'){
 				$reports[$i]['max_date']->modify('-1 day');
+			}else if($reports[$i]['status'] == 'done'){
+				$activity->actual_end = $reports[$i]['max_date']->setTime(23,59,59);
 			}
-			$activity->start_date = $reports[$i]['min_date'];
-			$activity->end_date = $reports[$i]['max_date']->setTime(23,59,59);
+			$activity->start_date = $reports[$i]['min_date'];  					//same early
+			$activity->end_date = $reports[$i]['max_date']->setTime(23,59,59); 	// same early
+			$activity->actual_start = $reports[$i]['min_date'];
 			$activity->save();
 		}
 
diff --git a/app/Models/Activity.php b/app/Models/Activity.php
index eefcea4..3d09785 100644
--- a/app/Models/Activity.php
+++ b/app/Models/Activity.php
@@ -25,7 +25,7 @@ class Activity extends Model
         'buffer_radius', 'duration', 'color_progress', 'jumlah_pekerjaan', 'satuan',
         'description', 'priority', 'bobot_planning', 'type_activity', 'open', 'geom',
         'version_gantt_id', 'budget_plan', 'biaya_material_plan', 'biaya_human_plan', 'biaya_tools_plan',
-        'planned_start', 'planned_end', 'satuan_id',
+        'planned_start', 'planned_end', 'satuan_id', 'actual_start', 'actual_end',
         'created_at', 'created_by', 'updated_at', 'updated_by', 'sortorder'
     ];