|
|
|
@ -431,11 +431,12 @@ class ActivityController extends Controller
|
|
|
|
|
$duration = MasterFunctionsHelper::countDays($ganttId, $plannedStart, $plannedEnd); |
|
|
|
|
if ($today >= $endDate) { |
|
|
|
|
$endDate = $today; |
|
|
|
|
$rerataBobot = $duration > 0 ? $activity->bobot_planning / $duration : 0; |
|
|
|
|
$bobotActual = $activity->progress * $activity->bobot_planning; |
|
|
|
|
$sisaBobot = $activity->bobot_planning - $bobotActual; |
|
|
|
|
$bobotPlanning = (int) $activity->bobot_planning; |
|
|
|
|
$rerataBobot = $duration > 0 ? $bobotPlanning / $duration : 0; |
|
|
|
|
$bobotActual = (int) $activity->persentase_progress/100 * $bobotPlanning; |
|
|
|
|
$sisaBobot = $bobotPlanning - $bobotActual; |
|
|
|
|
$sisaHari = $rerataBobot > 0 ? $sisaBobot / $rerataBobot : 0; |
|
|
|
|
$endDate->modify("+".$sisaHari." Days"); |
|
|
|
|
$endDate->modify("+".ceil($sisaHari)." Days"); |
|
|
|
|
$actualDuration = MasterFunctionsHelper::countDays($ganttId, $startDate, $endDate); |
|
|
|
|
$activity->duration = $actualDuration; |
|
|
|
|
$activity->end_date = $endDate; |
|
|
|
|