Commit 9c2054d4 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Complement à propos des inscriptions

parent 034f29f6

src/Octopus/Entity/Db/IndividuInscription.php

+10 −2
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ class IndividuInscription { 
    private $obtenuVet;

    /** @var string */

    private $aDistance;

    /** @var string */

    private $regime;



    /**

     * @return int
@@ -87,7 +89,7 @@ class IndividuInscription { 
    public function isObtenu()

    {

        if ($this->obtenuDip === 'O' OR $this->obtenuVet === 'O') return true;

        if ($this->obtenuDip === 'N' AND $this->obtenuVet === 'N') return false;

        if ($this->obtenuDip === 'N' OR $this->obtenuVet === 'N') return false;

        return null;

    }
@@ -101,6 +103,12 @@ class IndividuInscription { 
        return null;

    }





    /**

     * @return string|null

     */

    public function getRegime()

    {

        return $this->regime;

    }



}
 
 No newline at end of file

src/Octopus/Entity/Db/Mapping/Octopus.Entity.Db.IndividuInscription.dcm.xml

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
        <field name="obtenuVet"             column="T_OBTENU_VET"           type="string" length="1"            nullable="true" />

        <field name="aDistance"             column="T_A_DISTANCE"           type="string" length="1"            nullable="true" />

        <field name="annee"                 column="ANNEE_UNIV"             type="string" length="4"            nullable="true" />

        <field name="regime"                column="LIB_REGIME_SISE"        type="string" length="64"           nullable="true" />



    </entity>

</doctrine-mapping>
 
 No newline at end of file

src/Octopus/Entity/Db/Structure.php

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ class Structure { 
    /**

     * @return string

     */

    public function getLibelleLong()

    public function getLibelleLong() : ?string

    {

        return $this->libelleLong;

    }

src/Octopus/Service/Individu/IndividuService.php

+3 −3
Original line number Diff line number Diff line
@@ -30,10 +30,10 @@ class IndividuService { 
    }



    /**

     * @param integer $id

     * @return Individu

     * @param int|null $id

     * @return Individu|null

     */

    public function getIndividu($id)

    public function getIndividu(?int $id) : ?Individu

    {

        $qb = $this->getEntityManager()->getRepository(Individu::class)->createQueryBuilder('individu')

            ->andWhere('individu.cIndividuChaine = :id')