|
|
@ -473,11 +473,11 @@ class MasterFunctionsHelper { |
|
|
|
|
|
|
|
|
|
|
|
$minDate = $dataProject->mulai_proyek; |
|
|
|
$minDate = $dataProject->mulai_proyek; |
|
|
|
|
|
|
|
|
|
|
|
$begin = new \DateTime($minDate.' Monday'); |
|
|
|
$begin = new \DateTime($minDate); |
|
|
|
$begin->modify('last Monday'); |
|
|
|
$begin->modify('last Monday'); |
|
|
|
if(isset($dataPayload['end_date'])){ |
|
|
|
if(isset($dataPayload['end_date'])){ |
|
|
|
$maxDate = $dataPayload['end_date']; |
|
|
|
$maxDate = $dataPayload['end_date']; |
|
|
|
$end = new \DateTime($maxDate. ' Friday'); |
|
|
|
$end = new \DateTime($maxDate); |
|
|
|
$end->modify('next Friday'); |
|
|
|
$end->modify('next Friday'); |
|
|
|
$end->modify('next Friday'); |
|
|
|
$end->modify('next Friday'); |
|
|
|
/* $interval = \DateInterval::createFromDateString('1 day'); */ // should be using this but its bugged |
|
|
|
/* $interval = \DateInterval::createFromDateString('1 day'); */ // should be using this but its bugged |
|
|
@ -488,7 +488,7 @@ class MasterFunctionsHelper { |
|
|
|
// ->join('m_activity as a', 'a.id', '=', 'ama.activity_id') |
|
|
|
// ->join('m_activity as a', 'a.id', '=', 'ama.activity_id') |
|
|
|
// ->max("plan_date"); // plan date overlapped with assign_material_to_activity's, it should be m_activity's |
|
|
|
// ->max("plan_date"); // plan date overlapped with assign_material_to_activity's, it should be m_activity's |
|
|
|
$maxDate = $dataProject->akhir_proyek; |
|
|
|
$maxDate = $dataProject->akhir_proyek; |
|
|
|
$end = new \DateTime($maxDate. ' Friday'); |
|
|
|
$end = new \DateTime($maxDate); |
|
|
|
$end->modify('next Friday'); |
|
|
|
$end->modify('next Friday'); |
|
|
|
$end->modify('next Friday'); |
|
|
|
$end->modify('next Friday'); |
|
|
|
$interval = new \DateInterval('P7D'); |
|
|
|
$interval = new \DateInterval('P7D'); |
|
|
|