From 9fb9744dd5cf564af7c69f3458953995ec5d3e63 Mon Sep 17 00:00:00 2001
From: wahyu <ssjrama@gmail.com>
Date: Tue, 29 Aug 2023 10:34:43 +0700
Subject: [PATCH 1/3] update bcwp

---
 app/Helpers/MasterFunctionsHelper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Helpers/MasterFunctionsHelper.php b/app/Helpers/MasterFunctionsHelper.php
index 6d75174..5c9764f 100644
--- a/app/Helpers/MasterFunctionsHelper.php
+++ b/app/Helpers/MasterFunctionsHelper.php
@@ -428,7 +428,7 @@ class MasterFunctionsHelper
 		}
 
         $lastReal = $tempPercentageReal[count($tempPercentageReal) - 1];
-        $totalBCWP = $lastReal * $totalBCWP;
+        $totalBCWP = $lastReal * $dataProject->rencana_biaya / 100;
 		$dataResponse = array(
 			"date" => $tempDate,
 			"percentage" => $tempPercentage,
@@ -723,7 +723,7 @@ class MasterFunctionsHelper
 		}
 
 		$lastReal = $tempPercentageReal[count($tempPercentageReal) - 1];
-        $totalBCWP = $lastReal * $totalBCWP;
+        $totalBCWP = $lastReal * $dataProject->rencana_biaya / 100;
 		$dataResponse = array(
 			"date" => $tempDate,
 			"percentage" => $tempPercentage,

From ff353fbf53707f58dffd1a6f642849c9dcbcd416 Mon Sep 17 00:00:00 2001
From: wahyu <ssjrama@gmail.com>
Date: Tue, 29 Aug 2023 14:08:50 +0700
Subject: [PATCH 2/3] scurve queue

---
 app/Http/Controllers/ProjectController.php    | 13 +++++--
 app/Jobs/ProcessSCurve.php                    | 36 +++++++++++++++++++
 .../2023_08_29_130624_create_jobs_table.php   | 36 +++++++++++++++++++
 3 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 app/Jobs/ProcessSCurve.php
 create mode 100644 database/migrations/2023_08_29_130624_create_jobs_table.php

diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
index 3a204d7..7478494 100644
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -30,6 +30,7 @@ use Illuminate\Support\Facades\DB;
 use App\Helpers\MasterFunctionsHelper;
 use App\Models\ReportActivityMaterial;
 use Illuminate\Support\Facades\Artisan;
+use App\Jobs\ProcessSCurve;
 
 const API_GEOLOCATION = "https://nominatim.oslogdev.com/search/ADDR?format=json&addressdetails=1&limit=1";
 
@@ -328,9 +329,15 @@ class ProjectController extends Controller
   }
   
   public function sCurveCommand(Request $request){
-    Artisan::call('calculate:scurve', [
-        'project_id' => $request->project_id
-    ]);
+    $project = Project::find($request->project_id);
+
+    if ($project) {
+        dispatch(new ProcessSCurve($project));
+
+        return response()->json(['message' => 'S Curve calculation queued']);
+    }
+
+    return response()->json(['message' => 'Project not found'], 404);
   }
   
   public function getLinearSCurve(Request $request){
diff --git a/app/Jobs/ProcessSCurve.php b/app/Jobs/ProcessSCurve.php
new file mode 100644
index 0000000..fe07ab9
--- /dev/null
+++ b/app/Jobs/ProcessSCurve.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Jobs;
+
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Support\Facades\Queue;
+use App\Helpers\MasterFunctionsHelper;
+use App\Models\Project;
+
+class ProcessSCurve extends Job
+{
+    protected $project;
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(Project $project)
+    {
+        $this->project = $project;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $data = MasterFunctionsHelper::CalculateSCurve($this->project->id);
+
+        $this->project->scurve = json_encode($data);
+        $this->project->calculation_status = true;
+        $this->project->save();
+    }
+}
diff --git a/database/migrations/2023_08_29_130624_create_jobs_table.php b/database/migrations/2023_08_29_130624_create_jobs_table.php
new file mode 100644
index 0000000..1be9e8a
--- /dev/null
+++ b/database/migrations/2023_08_29_130624_create_jobs_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateJobsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('jobs', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('queue')->index();
+            $table->longText('payload');
+            $table->unsignedTinyInteger('attempts');
+            $table->unsignedInteger('reserved_at')->nullable();
+            $table->unsignedInteger('available_at');
+            $table->unsignedInteger('created_at');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('jobs');
+    }
+}

From 427449bb26f4d468c8e119be35b8c7f722f5171c Mon Sep 17 00:00:00 2001
From: wahyu <ssjrama@gmail.com>
Date: Tue, 29 Aug 2023 14:55:32 +0700
Subject: [PATCH 3/3] disable queue

---
 app/Http/Controllers/ProjectController.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
index 7478494..48cb86e 100644
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -329,15 +329,18 @@ class ProjectController extends Controller
   }
   
   public function sCurveCommand(Request $request){
-    $project = Project::find($request->project_id);
+	Artisan::call('calculate:scurve', [
+		'project_id' => $request->project_id
+	]);
+    // $project = Project::find($request->project_id);
 
-    if ($project) {
-        dispatch(new ProcessSCurve($project));
+    // if ($project) {
+    //     dispatch(new ProcessSCurve($project));
 
-        return response()->json(['message' => 'S Curve calculation queued']);
-    }
+    //     return response()->json(['message' => 'S Curve calculation queued']);
+    // }
 
-    return response()->json(['message' => 'Project not found'], 404);
+    // return response()->json(['message' => 'Project not found'], 404);
   }
   
   public function getLinearSCurve(Request $request){