Commit 23d3474d authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

La clef "numbers" a été ajoutés pour les données des feuilles de temps, elle... 

La clef "numbers" a été ajoutés pour les données des feuilles de temps, elle permet d'afficher les numérotations personnalisées dans le gabarit
parent 7a4a86b7

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

+10 −0
Original line number Diff line number Diff line
@@ -4718,6 +4718,7 @@ class TimesheetService implements UseOscarUserContextService, UseOscarConfigurat 
        $validationsStates = $this->getValidationStatePersonPeriod($person, $period, $restrictedActivityId);



        $commentaires = "";

        $numbers = [];

        $acronyms = [];

        $debut = "";

        $num = [];
@@ -4770,6 +4771,14 @@ class TimesheetService implements UseOscarUserContextService, UseOscarConfigurat 
                    if (!in_array($timesheet->getActivity(), $activities)) {

                        $activities[] = $timesheet->getActivity();

                    }

                    foreach ($timesheet->getActivity()->getNumbers() as $key => $value) {

                        if( !array_key_exists($key, $numbers) ){

                            $numbers[$key] = [];

                        }

                        if( !in_array($value, $numbers[$key]) ){

                            $numbers[$key][] = $value;

                        }

                    }

                }

            }
@@ -4925,6 +4934,7 @@ class TimesheetService implements UseOscarUserContextService, UseOscarConfigurat 
            'activities' => $activities,

            'totalGroup' => $totalGroup,

            'organizations' => $organizationsPrimary,

            'numbers' => $numbers,

            'num' => implode(', ', $num),

            'pfi' => implode(', ', $pfi),

            'acronyms' => implode(', ', $acronyms),