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

refactor

pull/3/head
Muhammad Sulaiman Yusuf 2 years ago
parent
72661df9bf
commit
ffb296832e
1 changed files with 917 additions and 1003 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 460
      app/Http/Controllers/ActivityController.php

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

@ -2,43 +2,38 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Models\Activity;
use App\Models\Link;
use App\Models\Project;
use App\Models\TemplateGantt;
use App\Models\UserToActivity;
use App\Models\CommentActivity;
use App\Models\AssignMaterial;
use App\Models\AssignTools;
use App\Models\VersionGantt;
use App\Models\CommentActivity;
use App\Models\Holiday;
use App\Models\Link;
use App\Models\Project;
use App\Models\ReportActivity;
use App\Models\ReportActivityMaterial;
use DB;
use App\Models\TemplateGantt;
use App\Models\UserToActivity;
use App\Models\VersionGantt;
use Illuminate\Support\Facades\DB;
use Illuminate\Http\Request;
use Illuminate\Support\Arr;
class ActivityController extends Controller
{
public function getByGanttId($id, $proyek_id)
{
$cekData = Activity::where("version_gantt_id", $id)->count();
$dataGantt = [];
if($cekData > 0){
if(Activity::where("version_gantt_id", $id)->count() == 0)
$dataGantt = $this->getDataActivity($id);
}else{
$this->templateToActivity($id, $proyek_id);
$dataGantt = $this->getDataActivity($id);
}
return response()->json(['status'=>'success','data'=>$dataGantt,'code'=>200], 200);
return response()->json(['status'=>'success','data'=> $dataGantt,'code'=>200], 200);
}
private function getDataActivity($id)
{
$checkHeader = Activity::where('version_gantt_id', $id)->where('type_activity', 'header')->count();
$finalData = [];
if($checkHeader > 0){
$dataHeader = Activity::where('version_gantt_id', $id)->where('type_activity', 'header')->first();
$startDate = date_create($dataHeader->start_date);
$endDate = date_create($dataHeader->end_date);
@ -48,15 +43,19 @@ class ActivityController extends Controller
$dataHeader->text = $dataHeader->name;
$finalData[] = $dataHeader;
$data = Activity::where('version_gantt_id', $id)->where('parent_id', $dataHeader->id)->orderBy('id', 'asc')->get();
}else{
if(Activity::where('version_gantt_id', $id)->where('type_activity', 'header')->count() == 0)
$data = Activity::where('version_gantt_id', $id)->whereNull('parent_id')->orderBy('id', 'asc')->get();
}
foreach($data as $objRow){
$type = "project";
if($objRow->type_activity=="milestone")
$type = $objRow->type_activity;
if(empty($dataChildren))
$type = "task";
$objRow->text = $objRow->name;
if($objRow->parent_id){
$objRow->parent = $objRow->parent_id;
}
$objRow->parent = $objRow->parent_id ? $objRow->parent_id : null;
$startDate = date_create($objRow->start_date);
$endDate = date_create($objRow->end_date);
$objRow->jobs_done = $this->sumVolumeActualMaterial($objRow->id);
@ -69,13 +68,7 @@ class ActivityController extends Controller
$objRow->planned_end = isset($objRow->planned_end) ? date_format(date_create($objRow->planned_end),"Y-m-d H:i:s") : NULL;
$objRow->progress = (int)$objRow->persentase_progress/100;
$dataChildren = $this->getChildren($id, $objRow->id);
if($objRow->type_activity=="milestone"){
$objRow->type = $objRow->type_activity;
}else if(empty($dataChildren)){
$objRow->type = "task";
}else{
$objRow->type = "project";
}
$objRow->type = $type;
$finalData[] = $objRow;
$finalData = array_merge($finalData, $dataChildren);
}
@ -91,14 +84,9 @@ class ActivityController extends Controller
'type'=>$objRow->type_link,
'code'=>$objRow->code_link
);
if($objRow->lag)
{
$dataRow['lag'] = $objRow->lag;
}
$finalLink[] = $dataRow;
}
$resultData = array(
@ -141,108 +129,88 @@ class ActivityController extends Controller
return $finalData;
}
private function sumVolumeActuall($id)
{
$sumVa = ReportActivity::where("activity_id", $id)->sum("job_count_report");
return $sumVa;
}
private function sumVolumeActualMaterial($id)
{
$tmpPercentage = [];
$dataPlan = AssignMaterial::where('activity_id', $id)->get();
$tmpPercentage1 = [];
if(!$dataPlan->isEmpty()){
if($dataPlan->isEmpty())
return 0;
foreach ($dataPlan as $value) {
$qty_plan = $value->qty_planning;
$status_activity = $value->status_activity;
$tmpPercentage[] = 100;
$getDataVolActual = ReportActivityMaterial::where('assign_material_id', '=', $value->id)->sum("qty");
$percentage1 = ($getDataVolActual * 100) / $qty_plan;
if($status_activity == 'done'){
$tmpPercentage1[] = 100;
$percentage = ($getDataVolActual * 100) / $value->qty_planning;
if($value->status_activity != 'done'){
$tmpPercentage[] = $percentage >= 100 ? 90 : $percentage;
}
else{
$tmpPercentage1[] = $percentage1 >= 100 ? 90 : $percentage1;
}
}
$totalPercentage = array_sum($tmpPercentage1) > 0 ? array_sum($tmpPercentage1) / count($tmpPercentage1) : 0;
}else{
$totalPercentage = 0;
}
return $totalPercentage;
return array_sum($tmpPercentage) > 0 ? array_sum($tmpPercentage) / count($tmpPercentage) : 0;
}
private function getUserActivity($id)
{
$data = UserToActivity::select("u.name as name")->join("m_users as u", "u.id", "=", "assign_hr_to_activity.user_id")->where('assign_hr_to_activity.activity_id', $id)->get();
$nameCollection = [];
foreach($data as $value){
$nameCollection[] = $value->name;
}
return $nameCollection;
return Arr::flatten(UserToActivity::select("u.name as name")
->join("m_users as u", "u.id", "=", "assign_hr_to_activity.user_id")
->where('assign_hr_to_activity.activity_id', $id)
->get()
->toArray());
}
private function getMaterialActivity($id)
{
$data = AssignMaterial::select("m.description as name")->join("m_req_material as m", "m.id", "=", "assign_material_to_activity.material_id")->where('assign_material_to_activity.activity_id', $id)->get();
$nameCollection = [];
foreach($data as $value){
$nameCollection[] = $value->name;
}
return $nameCollection;
return Arr::flatten(AssignMaterial::select("m.description as name")
->join("m_req_material as m", "m.id", "=", "assign_material_to_activity.material_id")
->where('assign_material_to_activity.activity_id', $id)
->get()
->toArray());
}
private function getToolsActivity($id)
{
$data = AssignTools::select("m.name as name")->join("m_tools_resource as m", "m.id", "=", "assign_tools_to_activity.tools_id")->where('assign_tools_to_activity.activity_id', $id)->get();
$nameCollection = [];
foreach($data as $value){
$nameCollection[] = $value->name;
}
return $nameCollection;
return Arr::flatten(AssignTools::select("m.name as name")
->join("m_tools_resource as m", "m.id", "=", "assign_tools_to_activity.tools_id")
->where('assign_tools_to_activity.activity_id', $id)
->get()
->toArray());
}
private function templateToActivity($id, $proyek_id)
{
$resultProject = Project::find($proyek_id);
$newRencanaBiaya = str_replace(".","", $resultProject->rencana_biaya);
$dataHeader = array(
$project = Project::findOrFail($proyek_id);
$rootActivity = Activity::create([
'version_gantt_id'=>$id,
'proyek_id'=>$proyek_id,
'name'=> $resultProject->nama,
'kode_sortname'=>$resultProject->kode_sortname,
'start_date'=> $resultProject->mulai_proyek,
'end_date'=> $resultProject->akhir_proyek,
'rencana_biaya'=> $newRencanaBiaya,
'name'=> $project->nama,
'kode_sortname'=>$project->kode_sortname,
'start_date'=> $project->mulai_proyek,
'end_date'=> $project->akhir_proyek,
'rencana_biaya'=> str_replace(".","", $project->rencana_biaya),
'type_activity'=> 'header',
'created_by'=>$this->currentName
);
$newHeader = Activity::create($dataHeader);
$resultTypeProject = TemplateGantt::where('proyek_type_id',$resultProject->type_proyek_id)->whereNull('parent_id')->orderByRaw('id ASC')->get();
'created_by'=>$this->currentName,
]);
$typeProjectId = $resultProject->type_proyek_id;
$resultTypeProject = TemplateGantt::where('proyek_type_id',$project
->type_proyek_id)
->whereNull('parent_id')
->orderByRaw('id ASC')
->get();
foreach($resultTypeProject as $objRow){
$newActivity = array(
$childActivities = TemplateGantt::where("parent_id", $objRow->id)->count();
$resultNew = Activity::create([
'type_activity'=> $childActivities > 0 ? "project" : "task",
'version_gantt_id'=>$id,
'parent_id'=>$newHeader->id,
'parent_id'=>$rootActivity->id,
'proyek_id'=>$proyek_id,
'name'=> $objRow->name_activity,
'start_date'=>date("Y-m-d H:i:s"),
'end_date'=>date("Y-m-d H:i:s"),
'created_by'=>$this->currentName
);
$checkChild = TemplateGantt::where("parent_id", $objRow->id)->count();
if($checkChild > 0){
$newActivity['type_activity'] = "project";
}else{
$newActivity['type_activity'] = "task";
}
$resultNew = Activity::create($newActivity);
$this->getChildrenTemplate($id, $objRow->id, $typeProjectId, $proyek_id, $resultNew->id, $resultProject->mulai_proyek);
]);
$this->getChildrenTemplate($id, $objRow->id, $project->type_project_id ,$proyek_id, $resultNew->id, $project->mulai_proyek);
}
}
@ -250,7 +218,9 @@ class ActivityController extends Controller
{
$data = TemplateGantt::where('proyek_type_id', $type_proyek_id)->where('parent_id', $parent_id)->orderByRaw('id ASC')->get();
foreach($data as $objRow){
$newActivity = array(
$childActivities = TemplateGantt::where("parent_id", $objRow->id)->count();
$resultNew = Activity::create([
'type_activity'=> $childActivities > 0 ? "project" : "task",
'version_gantt_id'=>$id,
'parent_id'=>$parent_new,
'proyek_id'=>$proyek_id,
@ -258,14 +228,7 @@ class ActivityController extends Controller
'start_date'=>$firstDay,
'end_date'=>$firstDay,
'created_by'=>$this->currentName
);
$checkChild = TemplateGantt::where("parent_id", $objRow->id)->count();
if($checkChild > 0){
$newActivity['type_activity'] = "project";
}else{
$newActivity['type_activity'] = "task";
}
$resultNew = Activity::create($newActivity);
]);
$this->getChildrenTemplate($id, $objRow->id, $type_proyek_id, $proyek_id, $resultNew->id, $firstDay);
}
}
@ -282,20 +245,17 @@ class ActivityController extends Controller
$data['created_by'] = $this->currentName;
$data['type_activity'] = "task";
$parent = isset($data['parent_id']) ? $data['parent_id'] : null;
if($parent && $parent > 0){
$parent = $data['parent_id'] ?? null;
if($parent){
$this->updateTypeProject($parent);
$comment = CommentActivity::where('activity_id', $parent)->delete();
$hr = UserToActivity::where('activity_id', $parent)->delete();
CommentActivity::where('activity_id', $parent)->delete();
UserToActivity::where('activity_id', $parent)->delete();
}
$result = Activity::create($data);
if(!$result = Activity::create($data))
return response()->json(['status'=>'failed','action'=>'error','code'=> 500], 500);
if($result){
return response()->json(['status'=>'success','action'=>'inserted', 'tid'=>$result->id,'code'=>200], 200);
}else{
return response()->json(['status'=>'failed','action'=>'error','code'=>400], 400);
}
}
private function updateTypeProject($id)
@ -304,46 +264,42 @@ class ActivityController extends Controller
}
public function edit($id){
if(!$id || (int) $id < 0 || $id==""){
if(empty($id) || !is_int((int)$id))
return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
die();
}
$result = Activity::find($id);
if(!$result = Activity::find($id))
return response()->json(['status'=>'failed','message'=>'Data not found!','code'=> 404], 404);
if($result){
return response()->json(['status'=>'success','code'=>200,'data'=>$result], 200);
}else{
return response()->json(['status'=>'failed','message'=>'failed get data activity, please try again later!','code'=>400], 400);
}
return response()->json(['status'=>'success','code'=>200,'data'=> $result], 200);
}
public function update(Request $request, $id)
{
if(!$id || (int) $id < 0 || $id==""){
if(empty($id) || !is_int((int)$id))
return response()->json(['status'=>'failed', 'action'=>'error','message'=>'id is required!','code'=>400], 400);
}
$data = Activity::find($id);
$oldRencanaBiaya = $data->rencana_biaya;
$newRencanaBiaya = str_replace(",",".",$request->rencana_biaya);
if($oldRencanaBiaya==$newRencanaBiaya){
$updateBobot = false;
}else{
$updateBobot = true;
}
$data = Activity::findOrFail($id);
if(!$data = Activity::find($id))
return response()->json(['status'=>'failed', 'action'=>'error','message'=>'Data not found!','code'=> 404], 404);
$parent = $data->parent_id;
$dataUpdate = $request->all();
$oldRencanaBiaya = $data->rencana_biaya;
$newRencanaBiaya = str_replace(",",".",$request->rencana_biaya);
if($oldRencanaBiaya != $newRencanaBiaya)
$updateBobot = true;
$dataUpdate['name'] = $request->text;
$dataUpdate['persentase_progress'] = $request->progress*100;
$dataUpdate['updated_by'] = $this->currentName;
if($data->type_activity!='header'){
if($data->type_activity!='header')
$dataUpdate['type_activity'] = $request->type;
}
if($data){
$result = $data->update($dataUpdate);
if($result){
if($parent && (int)$parent > 0){
if(!$data->update($dataUpdate))
return response()->json(['status'=>'failed', 'action'=>'error','message'=>'data activity failed updated!','code'=>400], 400);
if($parent){
$this->updateCostPlanning($parent);
$this->updatePersentaseProgress($parent);
$this->updateCostActual($parent);
@ -351,58 +307,53 @@ class ActivityController extends Controller
$this->calculateAllBobot($data->proyek_id, $data->version_gantt_id);
return response()->json(['status'=>'success','update_bobot'=>$updateBobot,'data'=>$dataUpdate, 'action'=>'updated','message'=>'data activity successfully updated!','code'=>200], 200);
}else{
return response()->json(['status'=>'failed', 'action'=>'error','message'=>'data activity failed updated!','code'=>400], 400);
}
}else{
return response()->json(['status'=>'failed', 'action'=>'error','message'=>'data activity not found!','code'=>400], 400);
die();
}
return response()->json(['status'=>'success','update_bobot'=> $updateBobot, 'data'=>$dataUpdate, 'action'=>'updated','message'=>'Activity updated!','code'=>200], 200);
}
public function updateRegular(Request $request, $id){
if(!$id || (int) $id < 0 || $id==""){
if(empty($id) || !is_int((int)$id))
return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
}
$data = Activity::find($id);
if($data){
$result = $data->update($request->all());
}else{
return response()->json(['status'=>'failed','message'=>'data activity not found!','code'=>400], 400);
die();
}
if(!$data = Activity::find($id))
return response()->json(['status'=>'failed','message'=>'Data not found!','code'=> 404], 404);
if(!$data->update($request->all()))
return response()->json(['status'=>'failed','message'=>'Failed to update!','code'=> 500], 500);
if($result){
return response()->json(['status'=>'success','message'=>'data activity successfully updated!','code'=>200], 200);
}else{
return response()->json(['status'=>'failed','message'=>'data activity failed updated!','code'=>400], 400);
}
return response()->json(['status'=>'success','message'=>'Activity Updated!','code'=> 200], 200);
}
private function calculateAllBobot($proyek, $gantt)
{
$checkHeader = Activity::where('version_gantt_id', $gantt)->where("proyek_id", $proyek)->where('type_activity', 'header')->count();
if($checkHeader > 0){
$dataHeader = Activity::where('version_gantt_id', $gantt)->where("proyek_id", $proyek)->where('type_activity', 'header')->first();
$totalCost = Activity::select(DB::raw('sum(cast(rencana_biaya as double precision))'))->where("proyek_id", $proyek)->where("version_gantt_id", $gantt)->where("parent_id", $dataHeader->id)->first();
}else{
$totalCost = Activity::select(DB::raw('sum(cast(rencana_biaya as double precision))'))->where("proyek_id", $proyek)->where("version_gantt_id", $gantt)->whereNull("parent_id")->first();
}
$totalCost = $totalCost->sum;
if($totalCost > 0){
$activitys = Activity::where("proyek_id", $proyek)->where("version_gantt_id", $gantt)->get();
foreach ($activitys as $activity) {
$bobot = ((int)$activity->rencana_biaya/$totalCost)*100;
$willUpdated = Activity::find($activity->id);
$dataUpdate = array(
"bobot_planning"=>$bobot,
"updated_by"=>$this->currentName
);
$willUpdated->update($dataUpdate);
if(Activity::where('version_gantt_id', $gantt)->where("proyek_id", $proyek)->where('type_activity', 'header')->count() == 0)
$totalCost = Activity::select(
DB::raw('sum(cast(rencana_biaya as double precision))')
)
->where("proyek_id", $proyek)
->where("version_gantt_id", $gantt)
->whereNull("parent_id")
->first();
$rootActivity = Activity::where('version_gantt_id', $gantt)
->where("proyek_id", $proyek)
->where('type_activity', 'header')
->first();
$totalCost = Activity::select(DB::raw('sum(cast(rencana_biaya as double precision))'))
->where("proyek_id", $proyek)
->where("version_gantt_id", $gantt)
->where("parent_id", $rootActivity->id)
->first();
if($totalCost->sum > 0){
$activities = Activity::where("proyek_id", $proyek)->where("version_gantt_id", $gantt)->get();
foreach ($activities as $activity) {
$activity->update([
"bobot_planning" => ( (int)$activity->rencana_biaya / $totalCost->sum ) * 100,
"updated_by" => $this->currentName
]);
}
}
return true;
@ -410,112 +361,90 @@ class ActivityController extends Controller
public function delete($id)
{
$data = Activity::find($id);
$data = Activity::findOrFail($id);
if($data){
$parent = $data->parent_id;
if($parent && (int)$parent > 0){
$this->checkForUpdateParent($parent);
$this->updateCostPlanning($parent);
$this->updatePersentaseProgress($parent);
$this->updateCostActual($parent);
}
$delete = $data->delete();
}else{
return response()->json(['status'=>'failed', 'action'=>'error','message'=>'data activity not found!','code'=>400], 400);
die();
if(!$data = Activity::find($id))
return response()->json(['status'=>'failed', 'action'=>'error','message'=> 'Data not found!','code'=> 404], 404);
if($data->parent_id){
$this->checkForUpdateParent($data->parent_id);
$this->updateCostPlanning($data->parent_id);
$this->updatePersentaseProgress($data->parent_id);
$this->updateCostActual($data->parent_id);
}
if(!$data->delete())
return response()->json(['status'=>'failed', 'action'=>'error','message'=>'data activity failed deleted!','code'=> 500], 500);
if($delete){
return response()->json(['status'=>'success', "action"=>"deleted",'message'=>'data activity successfully deleted!','code'=>200], 200);
}else{
return response()->json(['status'=>'failed', 'action'=>'error','message'=>'data activity failed deleted!','code'=>400], 400);
}
}
private function checkForUpdateParent($id)
{
$count = Activity::where("parent_id", $id)->count();
if(!$count || $count==0){
if(Activity::where("parent_id", $id)->count() == 0)
Activity::find($id)->update(["type_activity"=>"task"]);
}
}
public function getUpdate($id)
{
$data = Activity::find($id);
if($data){
$data->progress = (int)$data->persentase_progress/100;
if(!$data = Activity::find($id))
return response()->json(['status'=>'failed', 'action'=>'error','message'=> 'Data not found!','code'=>400], 400);
$data->progress = (int) $data->persentase_progress / 100;
$data->rencana_biaya = str_replace(".", ",", $data->rencana_biaya);
$data->jobs_done = $this->sumVolumeActualMaterial($data->id);
$data->assign_hr = $this->getUserActivity($data->id);
$data->assign_tools = $this->getToolsActivity($data->id);
$data->assign_material = $this->getMaterialActivity($data->id);
return response()->json(['status'=>'success', "data"=> $data,'code'=>200], 200);
}else{
return response()->json(['status'=>'failed', 'action'=>'error','message'=>'data activity not found!','code'=>400], 400);
}
}
private function updateCostPlanning($id)
{
$sumBiaya = Activity::select(DB::raw('sum(cast(rencana_biaya as double precision))'))->where("parent_id", $id)->first();
$dataActivity = Activity::find($id);
$dataUpdate = array(
$sumBiaya = Activity::select(DB::raw('sum(cast(rencana_biaya as double precision))'))
->where("parent_id", $id)
->first();
$activity = Activity::find($id);
$data= array(
"rencana_biaya" => $sumBiaya->sum,
"updated_by" => $this->currentName
);
$dataActivity->update($dataUpdate);
if($dataActivity){
$parent = $dataActivity->parent_id;
if($parent && (int)$parent > 0){
$this->updateCostPlanning($parent);
}
}
if($activity->update($data) && $activity->parent_id)
$this->updateCostPlanning($activity->parent_id);
}
private function updatePersentaseProgress($id)
{
$sumProgress = Activity::where("parent_id", $id)->sum("persentase_progress");
$totalChild = Activity::where("parent_id", $id)->count();
$dataActivity = Activity::find($id);
$calculateProgressActual = $sumProgress/$totalChild;
$dataUpdate = array(
"persentase_progress" => $calculateProgressActual,
$siblings = Activity::where("parent_id", $id);
$sumProgress = $siblings->sum("persentase_progress");
$totalChild = $siblings->count();
$activity = Activity::find($id);
$activity->update([
"persentase_progress" => $sumProgress / $totalChild,
"updated_by" => $this->currentName
);
$dataActivity->update($dataUpdate);
if($dataActivity){
$parent = $dataActivity->parent_id;
if($parent && (int)$parent > 0){
$this->updatePersentaseProgress($parent);
}
}
]);
if($activity->parent_id)
$this->updatePersentaseProgress($activity->parent_id);
}
private function updateCostActual($id)
{
$biayaActual = Activity::where("parent_id", $id)->sum("biaya_actual");
$dataActivity = Activity::find($id);
$activity = Activity::find($id);
$dataUpdate = array(
"biaya_actual" => $biayaActual,
$activity->update([
"biaya_actual" => Activity::where("parent_id", $id)->sum("biaya_actual"),
"updated_by" => $this->currentName
);
$dataActivity->update($dataUpdate);
if($dataActivity){
$parent = $dataActivity->parent_id;
if($parent && (int)$parent > 0){
$this->updateCostActual($parent);
}
}
]);
if($activity->parent_id)
$this->updateCostActual($activity->parent_id);
}
public function search(Request $request)
{
$payload = $request->all();
$dataBuilder = $this->setUpPayload($payload, 'm_activity');
$dataBuilder = $this->setUpPayload($request->all(), 'm_activity');
$builder = $dataBuilder['builder'];
$countBuilder = $dataBuilder['count'];
$dataGet = $builder->get();
@ -523,21 +452,12 @@ class ActivityController extends Controller
return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200);
}
public function calculateAllCost($activity_id, $proyek_id)
{
$materialCostPlanning = 0;
$toolsCostPlanning = 0;
$allCost = $materialCostPlanning + $toolsCostPlanning;
return $allCost;
}
public function getPercentagePerDay(Request $request)
{
$dataPayload = $request->all();
$allGantt = [];
foreach ($dataPayload['project_id'] as $val) {
$allGantt[] = $this->getMaxVersionGantt($val);
$allGantt[] = $this->getLatestGantt($val);
}
$dataFinal=[];
@ -647,7 +567,7 @@ class ActivityController extends Controller
$allGantt = $dataPayload['gannt_id'];
}else{
foreach ($dataPayload['project_id'] as $val) {
$allGantt[] = $this->getMaxVersionGantt($val);
$allGantt[] = $this->getLatestGantt($val);
}
}
$dataFinal=[];
@ -841,7 +761,7 @@ class ActivityController extends Controller
$dataPayload = $request->all();
$allGantt = [];
foreach ($dataPayload['project_id'] as $val) {
$allGantt[] = $this->getMaxVersionGantt($val);
$allGantt[] = $this->getLatestGantt($val);
}
$dataFinal=[];
@ -954,13 +874,11 @@ class ActivityController extends Controller
}
}
private function getMaxVersionGantt($id){
$maxGanttId = VersionGantt::where("proyek_id", $id)->max("id");
$data = array(
"last_gantt_id" => $maxGanttId,
private function getLatestGantt($id){
return array(
"last_gantt_id" => VersionGantt::where("proyek_id", $id)->latest(),
"proyek_id" => $id
);
return $data;
}
public function setBaseline($gantt_id)
@ -968,17 +886,13 @@ class ActivityController extends Controller
$activities = Activity::where("version_gantt_id", $gantt_id)->get();
foreach ($activities as $activity) {
$planned_start = $activity->start_date;
$planned_end = $activity->end_date;
$willUpdated = Activity::find($activity->id);
$dataUpdate = array(
"planned_start"=>$planned_start,
"planned_end"=>$planned_end
);
$willUpdated->update($dataUpdate);
$activity->update([
"planned_start"=>$activity->start_date,
"planned_end"=>$activity->end_date,
]);
}
return response()->json(['status'=>'success','message'=>'Set baseline success!','code'=>200], 200);
return response()->json(['status'=>'success','message'=>'Set baseline success!','code'=> 200], 200);
}
public function synchronizeReport($gantt_id)
@ -999,7 +913,7 @@ class ActivityController extends Controller
);
}
}
elseif ($countReports > 1) {
if ($countReports > 1) {
$firstReport = ReportActivity::where('activity_id', $activity_id)->orderBy('report_date')->first();
$lastReport = ReportActivity::where('activity_id', $activity_id)->orderByDesc('report_date')->first();
$reports[] = array(

Write Preview
Loading…
Cancel
Save