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

update early and actual

pull/3/head
ibnu 1 year ago
parent
37b3eed4fb
commit
80b186e224
2 changed files with 37 additions and 2 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. 32
      app/Http/Controllers/ActivityController.php
  2. 7
      app/Http/Controllers/ProjectController.php

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

@ -47,6 +47,10 @@ class ActivityController extends Controller
$dataHeader->progress = $dataHeader->persentase_progress / 100;
$dataHeader->planned_start = isset($dataHeader->planned_start) ? date_format(date_create($dataHeader->planned_start), "Y-m-d H:i:s") : NULL;
$dataHeader->planned_end = isset($dataHeader->planned_end) ? date_format(date_create($dataHeader->planned_end), "Y-m-d H:i:s") : NULL;
$dataHeader->actual_start = isset($dataHeader->actual_start) ? date_format(date_create($dataHeader->actual_start), "Y-m-d") : NULL;
$dataHeader->actual_end = isset($dataHeader->actual_end) ? date_format(date_create($dataHeader->actual_end), "Y-m-d") : NULL;
$dataHeader->type = "header";
$dataHeader->text = $dataHeader->name;
$finalData[] = $dataHeader;
@ -72,6 +76,10 @@ class ActivityController extends Controller
$objRow->end_date = date_format($endDate, "Y-m-d H:i:s");
$objRow->planned_start = isset($objRow->planned_start) ? date_format(date_create($objRow->planned_start), "Y-m-d H:i:s") : NULL;
$objRow->planned_end = isset($objRow->planned_end) ? date_format(date_create($objRow->planned_end), "Y-m-d H:i:s") : 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->progress = $objRow->persentase_progress / 100;
$objRow->type = $type;
$finalData[] = $objRow;
@ -115,6 +123,30 @@ class ActivityController extends Controller
$objRow->end_date = date_format($endDate, "Y-m-d H:i:s");
$objRow->planned_start = isset($objRow->planned_start) ? date_format(date_create($objRow->planned_start), "Y-m-d H:i:s") : NULL;
$objRow->planned_end = isset($objRow->planned_end) ? date_format(date_create($objRow->planned_end), "Y-m-d H:i:s") : NULL;
// $linking = Link::where('t_activity_id', $objRow->id)->first();
// if(isset($linking->s_activity_id)){
// $activityLink = Activity::where('id', $linking->s_activity_id)->first();
// $earlyStart=date_create($activityLink->end_date);
// date_add($earlyStart,date_interval_create_from_date_string("1 days"));
// $objRow->early_start = date_format($earlyStart, "Y-m-d");
// }else{
// $objRow->early_start = isset($objRow->planned_start) ? date_format(date_create($objRow->planned_start), "Y-m-d") : NULL;
// }
// if(isset($objRow->planned_end)){
// $baseStart = strtotime($objRow->planned_start);
// $baseFinish = strtotime($objRow->planned_end);
// $durationStrtotime = $baseFinish - $baseStart;
// $durasiBaseline = round($durationStrtotime / (60 * 60 * 24));
// $earlyEnd = date_create($objRow->start_date);
// date_add($earlyEnd,date_interval_create_from_date_string("".$durasiBaseline." days"));
// $objRow->early_end = date_format($earlyEnd, "Y-m-d");
// }
$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;
$dataChildren = $this->getChildren($gantt_id, $objRow->id);
if ($objRow->type_activity == "milestone") {
$objRow->type = $objRow->type_activity;

7
app/Http/Controllers/ProjectController.php
Unescape View File

@ -390,9 +390,12 @@ class ProjectController extends Controller
}
if($reports[$i]['status'] != 'done'){
$reports[$i]['max_date']->modify('-1 day');
}else if($reports[$i]['status'] == 'done'){
$activity->actual_end = $reports[$i]['max_date']->setTime(23,59,59);
}
$activity->start_date = $reports[$i]['min_date'];
$activity->end_date = $reports[$i]['max_date']->setTime(23,59,59);
$activity->start_date = $reports[$i]['min_date']; //same early
$activity->end_date = $reports[$i]['max_date']->setTime(23,59,59); // same early
$activity->actual_start = $reports[$i]['min_date'];
$activity->save();
}

Write Preview
Loading…
Cancel
Save