Merge pull request 'Upload 2023-10-27' (#231) from staging into master

Reviewed-on: ordo/adw-backend#231

app/Helpers/MasterFunctionsHelper.php

@@ -402,8 +402,9 @@ class MasterFunctionsHelper
 
 				// if($tempTtlPercentActual >= $keyGantt['progress'])
 				// 	$tempTtlPercentActual = $keyGantt['progress'];
-				if ($tempTtlPercentPlan >= 100)
+                // todo
-					$tempTtlPercentPlan = 100;
+				// if ($tempTtlPercentPlan >= 100)
+				// 	$tempTtlPercentPlan = 100;
 				// $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual
 
 				// }
@@ -707,6 +708,9 @@ class MasterFunctionsHelper
 			if (isset($dataPayload['period']) && $dataPayload['period'] == 'week') {
 				$tempTtlPercentPlan += $sumPercentagePlan;
 				$tempTtlPercentActual += $sumPercentageActual;
+                // todo
+				// if ($tempTtlPercentPlan >= 100)
+				// 	$tempTtlPercentPlan = 100;
 
 				$currentACWP += $totalACWP;
 				$currentBCWP += $totalBCWP;
@@ -715,6 +719,9 @@ class MasterFunctionsHelper
 				$tempPercentagePlan[] = round($tempTtlPercentPlan, 2);
 				$tempPercentagePlanWhr[] = ["weekly period", $tempPercentagePlan];
 				$tempPercentageReal[] = round($tempTtlPercentActual, 2);
+				if ($tempTtlPercentPlan >= 100 && $tempTtlPercentActual >= 100) {
+					break;
+				}
 			} else {
 				$tempPercentage[] = array(round($sumPercentagePlan, 2), round($sumPercentageActual, 2));
 				$tempPercentagePlan[] = round($sumPercentagePlan, 2);

app/Http/Controllers/ActivityController.php

@@ -527,14 +527,39 @@ class ActivityController extends Controller
 		return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet, 'totalRecord' => $totalRecord], 200);
 	}
 
+    public function searchAnalysisPrep(Request $request)
+	{
+		$data = $request->all();
+        $dataGet = DB::table('m_activity')
+                        ->select('m_activity.name')
+						->where('m_activity.proyek_id', $data['columns'][0]['value'])
+                        ->where('m_activity.type_activity', 'task')
+                        ->where('m_activity.persentase_progress', '>', 0)
+                        ->groupByRaw('m_activity.name')
+		                ->get();
+		return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet ], 200);
+	}
+
     public function searchAnalysis(Request $request)
 	{
 		$dataBuilder = $this->setUpPayload($request->all(), 'm_activity');
 		$builder = $dataBuilder['builder'];
-        $dataGet = $builder->select('selfTable.*','m_version_gantt.name_version', 'm_users.name as user_name')
+        $dataGet = $builder->select(    'selfTable.name', 'persentase_progress',
+                                        'm_version_gantt.name_version', 'm_users.name as user_name',
+                                        DB::raw('SUM(report_activity_material.qty) as qty'), 'assign_material_to_activity.qty_planning',
+                                        'assign_material_to_activity.id as join_third_id')
                         ->join('m_version_gantt', 'm_version_gantt.id', '=', 'selfTable.version_gantt_id')
                         ->join('assign_hr_to_activity', 'assign_hr_to_activity.activity_id', '=', 'selfTable.id')
                         ->join('m_users', 'assign_hr_to_activity.user_id', '=', 'm_users.id')
+                        ->join('report_activity_material', 'report_activity_material.activity_id', '=', 'selfTable.id')
+                        ->join('assign_material_to_activity', 'assign_material_to_activity.activity_id', '=', 'selfTable.id')
+                        ->groupBy("selfTable.id")
+                        ->groupBy("selfTable.name")
+                        ->groupBy("selfTable.persentase_progress")
+                        ->groupBy("m_version_gantt.name_version")
+                        ->groupBy("m_users.name")
+                        ->groupBy("assign_material_to_activity.qty_planning")
+                        ->groupBy("assign_material_to_activity.id")
 		                ->get();
 		return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet ], 200);
 	}

app/Http/Controllers/Controller.php

@@ -54,11 +54,13 @@ class Controller extends BaseController
                     $tableName  = $join['name'];
                     $columnJoin = $join['column_join']; // foreign key table sini
                     $columnSelf = isset($join['column_self']) ? $join['column_self'] : "id"; // primary key table lawan
+                    if (isset($join['column_results'])) {
                     $columnResult = $join['column_results'];
 
                     foreach($columnResult as $sColumn){
                         $builder = $builder->addSelect($tableName.".".$sColumn." as join_".$this->listJoinAll[$no]."_".$sColumn);
                     }
+                    }
                     $builder = $builder->leftJoin($tableName, $tableJoin.".".$columnJoin, '=', $tableName.'.'.$columnSelf);
                     $no++;
                 }

app/Http/Controllers/DashboardBoDController.php

@@ -133,7 +133,7 @@ class DashboardBoDController extends Controller
 		];
 
 		$projects = Project::where('mulai_proyek', 'like', $year)->get();
-		foreach ($projects as $project) {
+		foreach ($projects as $index => $project) {
 			$project->scurve = MasterFunctionsHelper::getSCurve($project->id);
 			$selisihProgress = 0;
 			if ($project->scurve && $project->scurve[0]) {
@@ -144,12 +144,18 @@ class DashboardBoDController extends Controller
 			}
 			$selisihProgress = $planningProgress - $actualProgress;
 			try {
-				if ($selisihProgress > 0 && $selisihProgress <= 5)
+				if ($selisihProgress > 0 && $selisihProgress <= 5){
 					$return['warning'] += 1;
-				elseif ($selisihProgress == 0)
+					$projects[$index]->status = 'warning';
+				}
+				elseif ($selisihProgress == 0){
 					$return['on-schedule'] += 1;
-				else
+					$projects[$index]->status = 'on-schedule';
+				}
+				else {
 					$return['behind-schedule'] += 1;
+					$projects[$index]->status = 'behind-schedule';
+				}
 			} catch (\Error $e) {
 				return response()->json(['msg' => $e->getMessage(), 'data' => $project], 200);
 			}
@@ -163,7 +169,7 @@ class DashboardBoDController extends Controller
 		$year = $this->interpolateYear($year);
 
 		$divisions = Divisi::whereNull('parent')->get();
-		foreach ($divisions as $division) {
+		foreach ($divisions as $index => $division) {
 
 			$scheduleData = new Collection();
 			$behindSchedule = $warning = $onSchedule = 0;
@@ -171,18 +177,29 @@ class DashboardBoDController extends Controller
 			$projects = Project::where('mulai_proyek', 'like', $year)->where('divisi_id', $division->id)->get();
 			foreach ($projects as $project) {
 				$project->scurve = MasterFunctionsHelper::getSCurve($project->id);
-				if (@$project->scurve['difference'] > 0 && @$project->scurve['difference'] <= 5)
+				$selisihProgress = 0;
+				if ($project->scurve && $project->scurve[0]) {
+					$planningArray = $project->scurve[0]['data']['percentagePlan'];
+					$actualArray = $project->scurve[0]['data']['percentageReal'];
+					$planningProgress = !empty($planningArray) ? $planningArray[count($planningArray) - 1] : 0;
+					$actualProgress = !empty($actualArray) ? $actualArray[count($actualArray) - 1] : 0;
+				}
+				$selisihProgress = $planningProgress - $actualProgress;
+				if ($selisihProgress > 0 && $selisihProgress <= 5){
 					$warning++;
-				elseif (@$project->scurve['difference'] > 5 && @$project->scurve['difference'] <= 100)
+				}
-					$behindSchedule++;
+				elseif ($selisihProgress == 0){
-				elseif (@$project->scurve['difference'] == 0)
 					$onSchedule++;
 				}
+				else {
+					$behindSchedule++;
+				}
+			}
 
 			$scheduleData->prepend($behindSchedule, 'behindSchedule');
 			$scheduleData->prepend($warning, 'warning');
 			$scheduleData->prepend($onSchedule, 'onSchedule');
-			$division->scheduleData = $scheduleData;
+			$divisions[$index]->scheduleData = $scheduleData;
 		}
 		return response()->json([
 			'data' => [

app/Http/Controllers/UserToActivityController.php

@@ -6,6 +6,7 @@ use Illuminate\Http\Request;
 use App\Models\UserToActivity;
 use App\Models\Activity;
 use App\Models\AssignMaterial;
+use Illuminate\Support\Facades\DB;
 use Datatables;
 
 class UserToActivityController extends Controller
@@ -134,6 +135,12 @@ class UserToActivityController extends Controller
 		$dataBuilder = $this->setUpPayload($request->all(), 'assign_hr_to_activity');
 		$builder = $dataBuilder['builder'];
 		$countBuilder = $dataBuilder['count'];
+        $builder->addSelect(DB::raw('SUM(report_activity_material.qty) as volume_actual'));
+        $builder->groupBy("m_activity.id");
+        $builder->groupBy("selfTable.id");
+        $builder->groupBy("m_users.name");
+        $builder->groupBy("assign_material_to_activity.id");
+        $builder->groupBy("m_version_gantt.name_version");
 		$dataGet = $builder->get();
 		$totalRecord = $countBuilder->count();
 		return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet, 'totalRecord' => $totalRecord], 200);

app/Models/Activity.php

@@ -79,8 +79,14 @@ class Activity extends Model
 		});
 
 		static::deleted(function($data) {
-			if(Activity::where("parent_id", $data->parent_id)->count() == 0)
+            if (isset($data->parent_id)) {
-				Activity::find($data->parent_id)->update(["type_activity"=>"task"]);
+                if(Activity::where("parent_id", $data->parent_id)->count() == 0) {
+					$activity = Activity::find($data->parent_id);
+					if ($activity) {
+				    	$activity->update(["type_activity"=>"task"]);
+					}
+				}
+            }
 
 			$data->updateBobot(true);
 			$data->updateCostPlanning();
@@ -100,7 +106,7 @@ class Activity extends Model
 			->whereNull('parent_id')
 			->first();
 
-		if($root->rencana_biaya > 0){
+		if(isset($root) && $root->rencana_biaya > 0){
 			$activities = Activity::where("proyek_id", $this->proyek_id)->where("version_gantt_id", $this->version_gantt_id)->get();
 			foreach ($activities as $activity) {
 				if($isDelete && $activity->id == $this->id)

app/Models/HierarchyFtth.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use App\Models\VersionGantt;
 
 class HierarchyFtth extends Model
 {
@@ -23,6 +24,11 @@ class HierarchyFtth extends Model
           foreach ($ftths as $ftth) {
               $ftth->delete();
           }
+
+          $gantts = VersionGantt::where('hierarchy_ftth_id', $data->id)->get();
+          foreach ($gantts as $gantt) {
+            $gantt->delete();
+          }
 		});
 	}
 }

app/Models/VersionGantt.php

@@ -39,6 +39,13 @@ class VersionGantt extends Model
 		static::updated(function($data) {
 			$data->updateActDuration();
         });
+
+    static::deleted(function ($data) {
+      $activities = Activity::where('version_gantt_id', $data->id)->get();
+      foreach ($activities as $activity) {
+        $activity->delete();
+      }
+		});
 	}
 
     public function updateActDuration(){

routes/web.php

@@ -207,6 +207,7 @@ $router->group(['prefix'=>'api', 'middleware' => 'cors'], function () use ($rout
 		$router->get('/activity/{id}/{proyek_id}/get', 'ActivityController@getByGanttId');
 		$router->post('/activity/search', 'ActivityController@search');
 		$router->post('/activity/search-analysis', 'ActivityController@searchAnalysis');
+		$router->post('/activity/search-analysis-prep', 'ActivityController@searchAnalysisPrep');
     	$router->post('/activity/import', 'ActivityController@import');
     	$router->post('/activity/import-update', 'ActivityController@importUpdate');
     	$router->post('/activity/import-old', 'ActivityController@importOld');