Commit 1b9311a7 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Ajout des groupes (lecture)

parent e86c7116

module/Oscar/src/Oscar/Service/TimesheetService.php

+3 −0
Changes for module/Oscar/src/Oscar/Service/TimesheetService.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2204,12 +2204,14 @@ class TimesheetService implements ServiceLocatorAwareInterface, EntityManagerAwa 
                $otherInfo = $this->getOthersWPByCode($t->getLabel());

                $label = $otherInfo['label'];

                $code = $otherInfo['code'];

                $group = $otherInfo['group'];



                $datas = [

                    'id' => $t->getId(),

                    'int' => $dayInt,

                    'label' => $label,

                    'code' => $code,

                    'group' => $group,

                    'description' => $t->getComment(),

                    'duration' => $t->getDuration(),

                    'status_id' => $t->getValidationPeriod() ? $t->getValidationPeriod()->getStatus() : 'draft',
@@ -2252,6 +2254,7 @@ class TimesheetService implements ServiceLocatorAwareInterface, EntityManagerAwa 
                'credentials' => $this->resolveTimeSheetCredentials($t),

                'validations' => $this->resolveTimeSheetValidation($t),

                'label' => $t->getLabel(),

                'group' => 'research',

                'comment' => $t->getComment(),

                'activity_id' => $activity_id,

                'activity' => (string)$activity,