ordo
/
surveyor_indonesia_backend
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of https://git.oslog.id/ibnu/generic-ospro-backend into dev-wahyun

pull/1/head
wahyun 1 year ago
parent
cf8c2cdec7 2e42d964b4
commit
c1443907b3
1 changed files with 128 additions and 127 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 231
      app/Http/Controllers/ActivityController.php

231
app/Http/Controllers/ActivityController.php
Unescape View File

@ -1,4 +1,5 @@
<?php <?php
namespace App\Http\Controllers; namespace App\Http\Controllers;
use DateTime; use DateTime;
@ -37,32 +38,33 @@ class ActivityController extends Controller
return response()->json(['status' => 'success', 'data' => $dataGantt, 'code' => 200], 200); return response()->json(['status' => 'success', 'data' => $dataGantt, 'code' => 200], 200);
} }
public function activitySCurve($proyek_id, $gantt_id){ public function activitySCurve($proyek_id, $gantt_id)
{
// "data": [
// { // "data": [
// "id": 1, // {
// "text": "Office itinerancy", // "id": 1,
// "type": "project", // "text": "Office itinerancy",
// "order": "10", // "type": "project",
// "progress": 0.4, // "order": "10",
// "open": true, // "progress": 0.4,
// "user":"0", // "open": true,
// "start_date": "02-04-2024 00:00", // "user":"0",
// "duration": 17, // "start_date": "02-04-2024 00:00",
// "end_date": "19-04-2024 00:00", // "duration": 17,
// "parent": 0 // "end_date": "19-04-2024 00:00",
// } // "parent": 0
// ], // }
// "links": [ // ],
// { // "links": [
// "id": "1", // {
// "source": "1", // "id": "1",
// "target": "2", // "source": "1",
// "type": "1" // "target": "2",
// } // "type": "1"
// ] // }
// } // ]
// }
$checkHeader = Activity::where('version_gantt_id', $gantt_id)->where('type_activity', 'header')->count(); $checkHeader = Activity::where('version_gantt_id', $gantt_id)->where('type_activity', 'header')->count();
$finalData = []; $finalData = [];
@ -122,7 +124,6 @@ class ActivityController extends Controller
); );
return response()->json(['status' => 'success', 'data' => $resultData, 'code' => 200], 200); return response()->json(['status' => 'success', 'data' => $resultData, 'code' => 200], 200);
} }
private function getDataActivity($id) private function getDataActivity($id)
@ -209,10 +210,10 @@ class ActivityController extends Controller
$finalData = []; $finalData = [];
$data = Activity::select('id', 'name as text', 'type_activity as type', 'bobot_planning', 'persentase_progress as progress', 'start_date', 'end_date', 'duration', 'parent_id', 'sortorder as order') $data = Activity::select('id', 'name as text', 'type_activity as type', 'bobot_planning', 'persentase_progress as progress', 'start_date', 'end_date', 'duration', 'parent_id', 'sortorder as order')
->where('version_gantt_id', $gantt_id)->where('parent_id', $parent_id)->orderBy('sortorder', 'asc')->get(); ->where('version_gantt_id', $gantt_id)->where('parent_id', $parent_id)->orderBy('sortorder', 'asc')->get();
foreach ($data as $objRow) { foreach ($data as $objRow) {
$objRow->parent = $parent_id; $objRow->parent = $parent_id;
$objRow->progress = (float) $objRow->bobot_planning /100; $objRow->progress = (float) $objRow->bobot_planning / 100;
// $objRow->start_date1 = isset($objRow->start) ? date_format(date_create($objRow->start), "d-m-Y H:i") : NULL; // $objRow->start_date1 = isset($objRow->start) ? date_format(date_create($objRow->start), "d-m-Y H:i") : NULL;
// $objRow->end_date1 = isset($objRow->end) ? date_format(date_create($objRow->end), "d-m-Y H:i") : NULL; // $objRow->end_date1 = isset($objRow->end) ? date_format(date_create($objRow->end), "d-m-Y H:i") : NULL;
@ -264,7 +265,7 @@ class ActivityController extends Controller
$objRow->type = "task"; $objRow->type = "task";
$objRow->actual_start = isset($objRow->actual_start) ? date_format(date_create($objRow->actual_start), "Y-m-d") : 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->actual_end = isset($objRow->actual_end) ? date_format(date_create($objRow->actual_end), "Y-m-d") : NULL;
if(isset($objRow->actual_start)){ if (isset($objRow->actual_start)) {
$objRow->auto_scheduling = false; $objRow->auto_scheduling = false;
} }
} else { } else {
@ -281,66 +282,67 @@ class ActivityController extends Controller
return $finalData; return $finalData;
} }
public function getActivityFirst($parentId){ public function getActivityFirst($parentId)
{
$activity = Activity::where('parent_id', $parentId)->orderByRaw('actual_start ASC')->first(); $activity = Activity::where('parent_id', $parentId)->orderByRaw('actual_start ASC')->first();
if (!isset($activity)) { if (!isset($activity)) {
return null; return null;
} }
if($activity->type_activity == "task"){ if ($activity->type_activity == "task") {
// Log::info("activity ", [$activity]); // Log::info("activity ", [$activity]);
return $activity->actual_start; return $activity->actual_start;
}else{ } else {
return $this->getActivityFirst($activity->id); return $this->getActivityFirst($activity->id);
} }
} }
public function getFirstLastDateActivity($id, $params){ public function getFirstLastDateActivity($id, $params)
if($params == "start"){ {
if ($params == "start") {
$data = Activity::select('id', 'parent_id', 'name', 'actual_start')->where('parent_id', $id)->get(); $data = Activity::select('id', 'parent_id', 'name', 'actual_start')->where('parent_id', $id)->get();
}else{ } else {
$data = Activity::select('id', 'parent_id', 'name', 'actual_end')->where('parent_id', $id)->get(); $data = Activity::select('id', 'parent_id', 'name', 'actual_end')->where('parent_id', $id)->get();
} }
$parent = Activity::findOrFail($id); $parent = Activity::findOrFail($id);
$dataFinal=[]; $dataFinal = [];
foreach ($data as $val) { foreach ($data as $val) {
$activity = $this->getchildActivityForActual($val->id, $params); $activity = $this->getchildActivityForActual($val->id, $params);
$dataFinal[] = $val; $dataFinal[] = $val;
$dataFinal = array_merge($dataFinal, $activity); $dataFinal = array_merge($dataFinal, $activity);
} }
if($params == "start"){ if ($params == "start") {
$actualStartValues = array_column(array_filter($dataFinal, function($item) { $actualStartValues = array_column(array_filter($dataFinal, function ($item) {
return isset($item['actual_start']); return isset($item['actual_start']);
}), 'actual_start'); }), 'actual_start');
$returnActualStartOrEnd = count($actualStartValues) > 0 ? min($actualStartValues) : null; $returnActualStartOrEnd = count($actualStartValues) > 0 ? min($actualStartValues) : null;
if (isset($parent)) { if (isset($parent)) {
$parent->actual_start = $returnActualStartOrEnd; $parent->actual_start = $returnActualStartOrEnd;
$parent->save(); $parent->save();
} }
}else{ } else {
$actualEndValues = array_column(array_filter($dataFinal, function($item) { $actualEndValues = array_column(array_filter($dataFinal, function ($item) {
return isset($item['actual_end']); return isset($item['actual_end']);
}), 'actual_end'); }), 'actual_end');
$returnActualStartOrEnd = count($actualEndValues) == count($dataFinal) && count($actualEndValues) > 0 ? max($actualEndValues) : null; $returnActualStartOrEnd = count($actualEndValues) == count($dataFinal) && count($actualEndValues) > 0 ? max($actualEndValues) : null;
if (isset($parent)) { if (isset($parent)) {
$parent->actual_end = $returnActualStartOrEnd; $parent->actual_end = $returnActualStartOrEnd;
$parent->save(); $parent->save();
} }
} }
// return json_encode(["min"=>$minActualStart, "max"=>$maxActualStart]); // return json_encode(["min"=>$minActualStart, "max"=>$maxActualStart]);
return $returnActualStartOrEnd; return $returnActualStartOrEnd;
} }
public function getchildActivityForActual($parent, $params){ public function getchildActivityForActual($parent, $params)
if($params == "start"){ {
if ($params == "start") {
$activity = Activity::select('id', 'actual_start')->where('parent_id', $parent)->get(); $activity = Activity::select('id', 'actual_start')->where('parent_id', $parent)->get();
}else{ } else {
$activity = Activity::select('id', 'actual_end')->where('parent_id', $parent)->get(); $activity = Activity::select('id', 'actual_end')->where('parent_id', $parent)->get();
} }
$temp = []; $temp = [];
foreach($activity as $val1){ foreach ($activity as $val1) {
$getChild = $this->getchildActivityForActual($val1->id, $params); $getChild = $this->getchildActivityForActual($val1->id, $params);
$temp[] = $val1; $temp[] = $val1;
$temp = array_merge($temp, $getChild); $temp = array_merge($temp, $getChild);
@ -348,18 +350,18 @@ class ActivityController extends Controller
return $temp; return $temp;
} }
public function getActivityLast($parentId){ public function getActivityLast($parentId)
{
$activity = Activity::where('parent_id', $parentId)->orderByRaw('actual_end DESC')->first(); $activity = Activity::where('parent_id', $parentId)->orderByRaw('actual_end DESC')->first();
if (!isset($activity)) { if (!isset($activity)) {
return null; return null;
} }
if($activity->type_activity == "task"){ if ($activity->type_activity == "task") {
// Log::info("activity ", [$activity]); // Log::info("activity ", [$activity]);
return $activity->actual_end; return $activity->actual_end;
}else{ } else {
return $this->getActivityLast($activity->id); return $this->getActivityLast($activity->id);
} }
} }
private function cloneTemplate($id, $proyek_id, $hierarchy_ftth_id = null) private function cloneTemplate($id, $proyek_id, $hierarchy_ftth_id = null)
@ -547,53 +549,54 @@ class ActivityController extends Controller
return response()->json(['status' => 'success', 'message' => 'Activity Updated!', 'code' => 200], 200); return response()->json(['status' => 'success', 'message' => 'Activity Updated!', 'code' => 200], 200);
} }
public function updateSchedule($ganttId){ public function updateSchedule($ganttId)
if (empty($ganttId) || !is_int((int) $ganttId)) {
if (empty($ganttId) || !is_int((int) $ganttId))
return response()->json(['status' => 'failed', 'message' => 'id is required!', 'code' => 400], 400); return response()->json(['status' => 'failed', 'message' => 'id is required!', 'code' => 400], 400);
$activities = Activity::where('version_gantt_id', $ganttId)->get(); $activities = Activity::where('version_gantt_id', $ganttId)->get();
if (!$activities) if (!$activities)
return response()->json(['status' => 'failed', 'message' => 'Activities not found!', 'code' => 404], 404); return response()->json(['status' => 'failed', 'message' => 'Activities not found!', 'code' => 404], 404);
$duration = 0; $duration = 0;
foreach ($activities as $key => $activity) { foreach ($activities as $key => $activity) {
$assignMaterial = AssignMaterial::where('activity_id', $activity->id)->first(); $assignMaterial = AssignMaterial::where('activity_id', $activity->id)->first();
if (isset($assignMaterial)) { if (isset($assignMaterial)) {
$statusActivity = $assignMaterial->status_activity; $statusActivity = $assignMaterial->status_activity;
} else { } else {
$statusActivity = ''; $statusActivity = '';
} }
if (isset($activity->planned_start) && isset($activity->planned_end) && $statusActivity != "done") { if (isset($activity->planned_start) && isset($activity->planned_end) && $statusActivity != "done") {
// todo check report for no report / progress == 0 // todo check report for no report / progress == 0
$today = new DateTime(); $today = new DateTime();
$endDate = new DateTime($activity->end_date); $endDate = new DateTime($activity->end_date);
$startDate = new DateTime($activity->start_date); $startDate = new DateTime($activity->start_date);
$plannedStart = new DateTime($activity->planned_start); $plannedStart = new DateTime($activity->planned_start);
$plannedEnd = new DateTime($activity->planned_end); $plannedEnd = new DateTime($activity->planned_end);
$duration = MasterFunctionsHelper::countDays($ganttId, $plannedStart, $plannedEnd); $duration = MasterFunctionsHelper::countDays($ganttId, $plannedStart, $plannedEnd);
if ($today >= $endDate) { if ($today >= $endDate) {
$endDate = $today; $endDate = $today;
$bobotPlanning = (int) $activity->bobot_planning; $bobotPlanning = (int) $activity->bobot_planning;
$rerataBobot = $duration > 0 ? $bobotPlanning / $duration : 0; $rerataBobot = $duration > 0 ? $bobotPlanning / $duration : 0;
$bobotActual = (int) $activity->persentase_progress/100 * $bobotPlanning; $bobotActual = (int) $activity->persentase_progress / 100 * $bobotPlanning;
$sisaBobot = $bobotPlanning - $bobotActual; $sisaBobot = $bobotPlanning - $bobotActual;
$sisaHari = $rerataBobot > 0 ? $sisaBobot / $rerataBobot : 0; $sisaHari = $rerataBobot > 0 ? $sisaBobot / $rerataBobot : 0;
$endDate->modify("+".ceil($sisaHari)." Days"); $endDate->modify("+" . ceil($sisaHari) . " Days");
$actualDuration = MasterFunctionsHelper::countDays($ganttId, $startDate, $endDate); $actualDuration = MasterFunctionsHelper::countDays($ganttId, $startDate, $endDate);
$activity->duration = $actualDuration; $activity->duration = $actualDuration;
$activity->end_date = $endDate; $activity->end_date = $endDate;
$activity->save(); $activity->save();
} }
} }
} }
return response()->json(['status' => 'success', 'message' => 'Activities Updated!', 'code' => 200], 200); return response()->json(['status' => 'success', 'message' => 'Activities Updated!', 'code' => 200], 200);
} }
public function batchUpdate(Request $request, $ganttId) public function batchUpdate(Request $request, $ganttId)
{ {
$entities = $request->all(); $entities = $request->all();
if (empty($ganttId) || !is_int((int) $ganttId)) if (empty($ganttId) || !is_int((int) $ganttId))
return response()->json(['status' => 'failed', 'message' => 'id is required!', 'code' => 400], 400); return response()->json(['status' => 'failed', 'message' => 'id is required!', 'code' => 400], 400);
$activity = Activity::where('version_gantt_id',$ganttId)->get(); $activity = Activity::where('version_gantt_id', $ganttId)->get();
$link = Link::where('version_gantt_id', $ganttId)->get(); $link = Link::where('version_gantt_id', $ganttId)->get();
if (!$activity) if (!$activity)
return response()->json(['status' => 'failed', 'message' => 'Activity not found!', 'code' => 404], 404); return response()->json(['status' => 'failed', 'message' => 'Activity not found!', 'code' => 404], 404);
@ -604,7 +607,7 @@ class ActivityController extends Controller
$activityToUpdate = $activity->firstWhere('id', $entity['data']['id']); $activityToUpdate = $activity->firstWhere('id', $entity['data']['id']);
$entity['data']['name'] = $entity['data']['text']; $entity['data']['name'] = $entity['data']['text'];
$entity['data']['persentase_progress'] = $entity['data']['progress'] * 100; $entity['data']['persentase_progress'] = $entity['data']['progress'] * 100;
$entity['data']['type_activity'] = $entity['data']['type']; $entity['data']['type_activity'] = $entity['data']['type'] ?? 'task';
if (isset($entity['data']['rencana_biaya'])) { if (isset($entity['data']['rencana_biaya'])) {
$entity['data']['rencana_biaya'] = str_replace(",", ".", $entity['data']['rencana_biaya']); $entity['data']['rencana_biaya'] = str_replace(",", ".", $entity['data']['rencana_biaya']);
} }
@ -627,25 +630,25 @@ class ActivityController extends Controller
{ {
if (!$data = Activity::find($id)) if (!$data = Activity::find($id))
return response()->json(['status' => 'failed', 'action' => 'error', 'message' => 'Data not found!', 'code' => 404], 404); return response()->json(['status' => 'failed', 'action' => 'error', 'message' => 'Data not found!', 'code' => 404], 404);
$this->deleteRelative($id); $this->deleteRelative($id);
if (!$data->delete()) if (!$data->delete())
return response()->json(['status' => 'failed', 'action' => 'error', 'message' => 'data activity failed deleted!', 'code' => 500], 500); return response()->json(['status' => 'failed', 'action' => 'error', 'message' => 'data activity failed deleted!', 'code' => 500], 500);
return response()->json(['status' => 'success', "action" => "deleted", 'message' => 'data activity successfully deleted!', 'code' => 200], 200); return response()->json(['status' => 'success', "action" => "deleted", 'message' => 'data activity successfully deleted!', 'code' => 200], 200);
} }
private function deleteRelative($activity_id) private function deleteRelative($activity_id)
{ {
UserToActivity::where('activity_id', $activity_id)->delete(); UserToActivity::where('activity_id', $activity_id)->delete();
AssignMaterial::where('activity_id', $activity_id)->delete(); AssignMaterial::where('activity_id', $activity_id)->delete();
$dataAd = ActivityDokumen::where("activity_id", $activity_id)->get(); $dataAd = ActivityDokumen::where("activity_id", $activity_id)->get();
foreach ($dataAd as $ad) { foreach ($dataAd as $ad) {
if(file_exists($this->pathActivityDocument.$ad->file)){ if (file_exists($this->pathActivityDocument . $ad->file)) {
unlink($this->pathActivityDocument.$ad->file); unlink($this->pathActivityDocument . $ad->file);
} }
} }
ActivityDokumen::where("activity_id", $activity_id)->delete(); ActivityDokumen::where("activity_id", $activity_id)->delete();
} }
public function getUpdate($id) public function getUpdate($id)
{ {
@ -667,24 +670,24 @@ class ActivityController extends Controller
return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet, 'totalRecord' => $totalRecord], 200); return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet, 'totalRecord' => $totalRecord], 200);
} }
public function searchAnalysisPrep(Request $request) public function searchAnalysisPrep(Request $request)
{ {
$data = $request->all(); $data = $request->all();
$dataGet = DB::table('m_activity') $dataGet = DB::table('m_activity')
->select('m_activity.name') ->select('m_activity.name')
->where('m_activity.proyek_id', $data['columns'][0]['value']) ->where('m_activity.proyek_id', $data['columns'][0]['value'])
->where('m_activity.type_activity', 'task') ->where('m_activity.type_activity', 'task')
// ->where('m_activity.persentase_progress', '>', 0) // ->where('m_activity.persentase_progress', '>', 0)
->groupByRaw('m_activity.name') ->groupByRaw('m_activity.name')
->get(); ->get();
return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet ], 200); return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet], 200);
} }
public function searchAnalysis(Request $request) public function searchAnalysis(Request $request)
{ {
$dataBuilder = $this->setUpPayload($request->all(), 'm_activity'); $dataBuilder = $this->setUpPayload($request->all(), 'm_activity');
$builder = $dataBuilder['builder']; $builder = $dataBuilder['builder'];
$dataGet = $builder->select( $dataGet = $builder->select(
'selfTable.name', 'selfTable.name',
'persentase_progress', 'persentase_progress',
'selfTable.start_date', 'selfTable.start_date',
@ -718,7 +721,7 @@ class ActivityController extends Controller
->groupBy('assign_material_to_activity.id') ->groupBy('assign_material_to_activity.id')
->groupBy('user_names.user_name') ->groupBy('user_names.user_name')
->get(); ->get();
return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet ], 200); return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet], 200);
} }
// before upload file // before upload file
public function importOld(Request $request) public function importOld(Request $request)
@ -777,8 +780,7 @@ class ActivityController extends Controller
$data['activities'][$key]['weight'] = $parentWeight / $siblingsCount; $data['activities'][$key]['weight'] = $parentWeight / $siblingsCount;
} }
} };
;
} }
$projectStart = Project::select('mulai_proyek')->where('id', $projectId)->first(); $projectStart = Project::select('mulai_proyek')->where('id', $projectId)->first();
foreach ($data['activities'] as $i => $activity_row) { foreach ($data['activities'] as $i => $activity_row) {
@ -1137,7 +1139,6 @@ class ActivityController extends Controller
return response()->json(['status' => 'failed', 'message' => 'Upload failed!', 'code' => 500], 500); return response()->json(['status' => 'failed', 'message' => 'Upload failed!', 'code' => 500], 500);
} }
return response()->json(['status' => 'success', 'message' => 'Upload successful!', 'code' => 200], 200); return response()->json(['status' => 'success', 'message' => 'Upload successful!', 'code' => 200], 200);
} }
return response()->json(['status' => 'failed', 'message' => 'Upload failed!', 'code' => 500], 500); return response()->json(['status' => 'failed', 'message' => 'Upload failed!', 'code' => 500], 500);
} }

Write Preview
Loading…
Cancel
Save