Commit 7b40416d authored by Thomas Hamel's avatar Thomas Hamel
Browse files

Merge branch 'améliorations_module_formation' into release_8.2.0

parents aa3d1bd2 dd2f2ab9

module/Formation/src/Formation/Service/Formation/FormationService.php

+4 −0
Changes for module/Formation/src/Formation/Service/Formation/FormationService.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -117,6 +117,10 @@ class FormationService { 
        //Année universitaire courante par défaut présente dans les options

        $anneeUnivCourante = $this->anneeUnivService->courante();

        $anneesUniv[$anneeUnivCourante->getPremiereAnnee()] = $anneeUnivCourante->getAnneeUnivToString();



        uksort($anneesUniv, function($a, $b) {

            return $a <=> $b;

        });

        return $anneesUniv;

    }

}
 
 No newline at end of file

module/Formation/src/Formation/Service/Formation/Search/FormationSearchService.php

+4 −0
Changes for module/Formation/src/Formation/Service/Formation/Search/FormationSearchService.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -183,6 +183,10 @@ class FormationSearchService extends SearchService 
            }

        }



        uksort($anneesUniv, function($a, $b) {

            return $a <=> $b;

        });



        return $anneesUniv;

    }

module/Formation/src/Formation/Service/Session/Search/SessionSearchService.php

+4 −0
Changes for module/Formation/src/Formation/Service/Session/Search/SessionSearchService.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -204,6 +204,10 @@ class SessionSearchService extends SearchService 
            if(!isset($anneesUniv[$anneeUniv->getPremiereAnnee()])) $anneesUniv[$anneeUniv->getPremiereAnnee()] = $anneeUniv->getAnneeUnivToString();

        }



        uksort($anneesUniv, function($a, $b) {

            return $a <=> $b;

        });



        return $anneesUniv;

    }