Loading module/Oscar/src/Oscar/Service/TimesheetService.php +5 Changes for module/Oscar/src/Oscar/Service/TimesheetService.php: 5 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -1103,18 +1103,23 @@ class TimesheetService implements ServiceLocatorAwareInterface, EntityManagerAwa if( $declarationStatusIndex < $currentStatusIndex ){ $periodsDetails[$period]['validation_state'] = $declaration->getStatus(); $periodsDetails[$period]['validators'] = []; if( $declaration->requireValidation() ){ foreach ( $declaration->getCurrentValidators() as $validator ){ $periodsDetails[$period]['validators'][] = (string)$validator; } } } else if( $declarationStatusIndex == $currentStatusIndex ){ if( $declaration->requireValidation() ) { foreach ( $declaration->getCurrentValidators() as $validator ){ $validatorStr = (string)$validator; if (!in_array($validatorStr, $periodsDetails[$period]['validators'])) { $periodsDetails[$period]['validators'][] = (string)$validator; } } } } $periodsDetails[$period]['validations_id'][] = $declaration->getId(); $datas['validations'][$declaration->getId()] = $declaration->toJson(); Loading Loading
module/Oscar/src/Oscar/Service/TimesheetService.php +5 Changes for module/Oscar/src/Oscar/Service/TimesheetService.php: 5 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -1103,18 +1103,23 @@ class TimesheetService implements ServiceLocatorAwareInterface, EntityManagerAwa if( $declarationStatusIndex < $currentStatusIndex ){ $periodsDetails[$period]['validation_state'] = $declaration->getStatus(); $periodsDetails[$period]['validators'] = []; if( $declaration->requireValidation() ){ foreach ( $declaration->getCurrentValidators() as $validator ){ $periodsDetails[$period]['validators'][] = (string)$validator; } } } else if( $declarationStatusIndex == $currentStatusIndex ){ if( $declaration->requireValidation() ) { foreach ( $declaration->getCurrentValidators() as $validator ){ $validatorStr = (string)$validator; if (!in_array($validatorStr, $periodsDetails[$period]['validators'])) { $periodsDetails[$period]['validators'][] = (string)$validator; } } } } $periodsDetails[$period]['validations_id'][] = $declaration->getId(); $datas['validations'][$declaration->getId()] = $declaration->toJson(); Loading