Commit 734ca357 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

bap >>> correspondance dans AgentGrade

parent 0d6b1aa4

module/Application/src/Application/Service/AgentGrade/AgentGradeService.php

+2 −2
Changes for module/Application/src/Application/Service/AgentGrade/AgentGradeService.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ class AgentGradeService { 
            ->join('agentgrade.structure', 'structure')->addSelect('structure')

            ->leftjoin('agentgrade.grade', 'grade')->addSelect('grade')

            ->leftjoin('agentgrade.corps', 'corps')->addSelect('corps')

            ->leftjoin('agentgrade.bap', 'correspondance')->addSelect('correspondance')

            ->leftjoin('agentgrade.correspondance', 'correspondance')->addSelect('correspondance')

            ->andWhere('agentgrade.deleted_on IS NULL')

        ;

        return $qb;
@@ -115,7 +115,7 @@ class AgentGradeService { 
    public function getAgentGradesByCorrespondance(Correspondance $correspondance, bool $actif = true) : array

    {

        $qb = $this->createQueryBuilder()

            ->andWhere('agentgrade.bap = :correspondance')

            ->andWhere('agentgrade.correspondance = :correspondance')

            ->setParameter('correspondance', $correspondance)

            ->orderBy('agent.nomUsuel, agent.prenom', 'ASC')

        ;

module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.Correspondance.dcm.xml

+1 −1
Changes for module/Carriere/src/Carriere/Entity/Db/Mapping/Carriere.Entity.Db.Correspondance.dcm.xml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
            <join-column name="type_id" referenced-column-name="id"/>

        </many-to-one>



        <one-to-many field="agentGrades" target-entity="Application\Entity\Db\AgentGrade" mapped-by="bap"/>

        <one-to-many field="agentGrades" target-entity="Application\Entity\Db\AgentGrade" mapped-by="correspondance"/>



        <!-- DB IMPORT #############################  -->

        <field name="created_on"               column="created_on"       type="datetime"/>