Commit 694d6b96 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Ajout d'info dans IndividuInscription + Ajustement IndividuCompte

parent 0365d64d

config/module.config.php

+1 −1
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 


namespace Octopus;



use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain;

use Doctrine\ORM\Mapping\Driver\XmlDriver;

use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;

use Octopus\Controller\OctopusController;

use Octopus\Controller\OctopusControllerFactory;

use Octopus\Service\Fonction\FonctionService;

src/Octopus/Entity/Db/IndividuCompte.php

+11 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ class IndividuCompte { 
    private $login;

    /** @var string */

    private $email;

    private ?int $statut = null;



    /**

     * @return int
@@ -57,4 +58,14 @@ class IndividuCompte { 
        return $this->email;

    }



    /**

     * @return int|null

     */

    public function getStatut(): ?int

    {

        return $this->statut;

    }







}
 
 No newline at end of file

src/Octopus/Entity/Db/IndividuInscription.php

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

    /** @var string */

    private $aDistance;

    /** @var string */

    private $regime;

    private ?string $regime = null;

    private ?string $regimeCode = null;



    /**

     * @return int
@@ -103,12 +103,15 @@ class IndividuInscription { 
        return null;

    }



    /**

     * @return string|null

     */

    public function getRegime()

    public function getRegime(): ?string

    {

        return $this->regime;

    }



    public function getRegimeCode(): ?string

    {

        return $this->regimeCode;

    }





}
 
 No newline at end of file

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

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
        </many-to-one>

        <field name="login"           column="LOGIN"           type="string" length="15"    nullable="false"/>

        <field name="email"           column="EMAIL"           type="string" length="255"    nullable="false"/>

        <field name="statut"          column="STATUT_ID"          type="integer"    nullable="false"/>



    </entity>

</doctrine-mapping>
 
 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
@@ -25,6 +25,7 @@ 
        <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" />

        <field name="regimeCode"            column="STATUT_ETUDIANT"        type="string" length="5"           nullable="true" />



    </entity>

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