fix actual date, check status update schedule

app/Http/Controllers/ActivityController.php

@@ -3,6 +3,7 @@ namespace App\Http\Controllers;
 
 use App\Helpers\MasterFunctionsHelper;
 use App\Models\Activity;
+use App\Models\AssignMaterial;
 use App\Models\CommentActivity;
 use App\Models\Link;
 use App\Models\Project;
@@ -422,7 +423,14 @@ class ActivityController extends Controller
 			return response()->json(['status' => 'failed', 'message' => 'Activities not found!', 'code' => 404], 404);
 		$duration = 0;
         foreach ($activities as $key => $activity) {
-            if (isset($activity->planned_start) && isset($activity->planned_end)) {
+            $assignMaterial = AssignMaterial::where('activity_id', $activity->id)->first();
+			if (isset($assignMaterial)) {
+				$statusActivity = $assignMaterial->status_activity;
+			} else {
+				$statusActivity = '';
+			}
+            if (isset($activity->planned_start) && isset($activity->planned_end) && $statusActivity != "done") {
+                // todo check report for no report / progress == 0
                 $today = new DateTime();
                 $endDate = new DateTime($activity->end_date);
                 $startDate = new DateTime($activity->start_date);

app/Http/Controllers/ReportActivityMaterialController.php

@@ -63,6 +63,8 @@ class ReportActivityMaterialController extends Controller
 				$sumAssignMaterial = AssignMaterial::where('activity_id', $request->activity_id)->sum('qty_planning');
 				$sumReportActivityMaterial = ReportActivityMaterial::where('activity_id', $request->activity_id)->sum('qty');
 				$dataUpdate = array(
+                    "actual_start" => null,
+                    "actual_end" => null,
 					"persentase_progress" => $sumReportActivityMaterial/$sumAssignMaterial*100,
 					"updated_by" => $this->currentName
 				);

app/Models/ReportActivityMaterial.php

@@ -59,6 +59,8 @@ class ReportActivityMaterial extends Model
 			$assignedMaterial = AssignMaterial::find($data->assign_material_id);
 
 			$activity->biaya_actual -= floatval($assignedMaterial->budget) * floatval($data->qty);
+            $activity->actual_start = null;
+            $activity->actual_end = null;
 
 			$dataPlan = AssignMaterial::where('activity_id', $activity->id)->get();
 				$totalPlan = $dataPlan->sum('qty_planning');