Commit f7399ed6 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

UP : En mode restrint, les validateurs des autres projets ne sont pas affichés

parent 4f284ba0

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

+25 −23
Original line number Diff line number Diff line
@@ -4608,7 +4608,7 @@ class TimesheetService implements UseOscarUserContextService, UseOscarConfigurat 
            );



        // état de la validation pour cette période

        $validationsStates = $this->getValidationStatePersonPeriod($person, $period);

        $validationsStates = $this->getValidationStatePersonPeriod($person, $period, $restrictedActivityId);



        $commentaires = "";

        $acronyms = [];
@@ -4864,7 +4864,7 @@ class TimesheetService implements UseOscarUserContextService, UseOscarConfigurat 
     * @return mixed

     * @throws OscarException

     */

    public function getValidationStatePersonPeriod(Person $person, $periodKey)

    public function getValidationStatePersonPeriod(Person $person, $periodKey, $restrictedActivityId = 0)

    {

        $periodData = DateTimeUtils::extractPeriodDatasFromString($periodKey);

        $year = $periodData['year'];
@@ -4900,6 +4900,7 @@ class TimesheetService implements UseOscarUserContextService, UseOscarConfigurat 
                $datas['validations'][] = (string)$vp;

                $globalState = max($globalState, array_search($vp->getStatus(), $states));



                if ( $restrictedActivityId == 0 || $vp->getObjectId() <= 0 || $vp->getObjectId() == $restrictedActivityId ){

                    // Récupération des validateurs

                    if ($vp->getValidationActivityById() > 0) {

                        $validators['prj'][$vp->getValidationActivityById()] = [
@@ -4925,6 +4926,7 @@ class TimesheetService implements UseOscarUserContextService, UseOscarConfigurat 
                        ];

                    }

                }

            }



            $datas['state'] = $states[$globalState];

            $datas['validators'] = $validators;