Commit 74184c21 authored by Johnny Leveneur's avatar Johnny Leveneur
Browse files

id etudiant : int -> varchar

parent c8d95311
Loading
Loading
Loading
Loading
+23 −19
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ class Etudiant implements ResourceInterface, IsSynchronisableInterface
{
    use IsSynchronisableTrait;

    private ?int          $id             = null;
    private ?string $id = null;
    private ?string $login = null;
    private ?string $nom = null;
    private ?string $prenom = null;
@@ -27,7 +27,8 @@ class Etudiant implements ResourceInterface, IsSynchronisableInterface
    private Collection $inscriptions;
    private Collection $inscriptionsAdministratives;

    public function __construct() {
    public function __construct()
    {
        $this->inscriptions = new ArrayCollection();
        $this->inscriptionsAdministratives = new ArrayCollection();
    }
@@ -37,7 +38,7 @@ class Etudiant implements ResourceInterface, IsSynchronisableInterface
        return 'Etudiant';
    }

    public function getId(): ?int
    public function getId(): ?string
    {
        return $this->id;
    }
@@ -129,7 +130,7 @@ class Etudiant implements ResourceInterface, IsSynchronisableInterface
     * Composante de l'année en cours
     * @return String
     */
    public function getComposante(): String
    public function getComposante(): string
    {
        $annee = Etudiant::getAnneeDate();
        $inscription = $this->getInscriptionAdministrativeByAnnee($annee)->first();
@@ -155,9 +156,12 @@ class Etudiant implements ResourceInterface, IsSynchronisableInterface
        $inscriptions = array_filter($inscriptions, function (Inscription $inscription) {
            return
                $inscription->estNonHistorise()
            AND $inscription->getSession()->isEtatActif(SessionEtats::ETAT_CLOTURE_INSTANCE);}
                and $inscription->getSession()->isEtatActif(SessionEtats::ETAT_CLOTURE_INSTANCE);
        }
        );
        usort($inscriptions, function(Inscription $inscription1, Inscription $inscription2) { return $inscription1->getSession()->getDebut(true) <=> $inscription2->getSession()->getDebut(true);});
        usort($inscriptions, function (Inscription $inscription1, Inscription $inscription2) {
            return $inscription1->getSession()->getDebut(true) <=> $inscription2->getSession()->getDebut(true);
        });

        $texte = "";
        foreach ($inscriptions as $inscription) {
+1 −3
Original line number Diff line number Diff line
@@ -3,9 +3,7 @@
                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
    <entity name="Etudiant\Entity\Db\Etudiant" table="etudiant_etudiant">

        <id name="id" type="integer" column="id">
            <generator strategy="IDENTITY"/>
        </id>
        <id name="id" type="string" length="256" column="id"/>

        <field name="login"                 type="string" length="256"       column="login"              nullable="true"/>
        <field name="nom"                   type="string" length="256"       column="nom"                nullable="true"/>