diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php index ad931e9..c95c3f2 100644 --- a/app/Http/Controllers/ActivityController.php +++ b/app/Http/Controllers/ActivityController.php @@ -124,26 +124,6 @@ class ActivityController extends Controller $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; diff --git a/app/Models/Activity.php b/app/Models/Activity.php index eefcea4..3d09785 100644 --- a/app/Models/Activity.php +++ b/app/Models/Activity.php @@ -25,7 +25,7 @@ class Activity extends Model 'buffer_radius', 'duration', 'color_progress', 'jumlah_pekerjaan', 'satuan', 'description', 'priority', 'bobot_planning', 'type_activity', 'open', 'geom', 'version_gantt_id', 'budget_plan', 'biaya_material_plan', 'biaya_human_plan', 'biaya_tools_plan', - 'planned_start', 'planned_end', 'satuan_id', + 'planned_start', 'planned_end', 'satuan_id', 'actual_start', 'actual_end', 'created_at', 'created_by', 'updated_at', 'updated_by', 'sortorder' ];