|
|
@ -200,7 +200,8 @@ class MasterFunctionsHelper |
|
|
|
->where('a.version_gantt_id', '=', $keyGantt['id']) |
|
|
|
->where('a.version_gantt_id', '=', $keyGantt['id']) |
|
|
|
->max("a.planned_end"); // plan date overlapped with assign_material_to_activity's, it should be m_activity' |
|
|
|
->max("a.planned_end"); // plan date overlapped with assign_material_to_activity's, it should be m_activity' |
|
|
|
$maxDate = max(new \DateTime($plannedMaxDate), new \DateTime($actualMaxDate)); |
|
|
|
$maxDate = max(new \DateTime($plannedMaxDate), new \DateTime($actualMaxDate)); |
|
|
|
$end = $maxDate; |
|
|
|
$end = new \DateTime($maxDate->format('Y-m-d') . ' Friday'); |
|
|
|
|
|
|
|
$end->modify('next Friday'); |
|
|
|
$interval = new \DateInterval('P7D'); |
|
|
|
$interval = new \DateInterval('P7D'); |
|
|
|
} |
|
|
|
} |
|
|
|
$period = new \DatePeriod($begin, $interval, $end); |
|
|
|
$period = new \DatePeriod($begin, $interval, $end); |
|
|
|