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

Ajout de l'historisation des qualités des membres du jury

parent 3f1395db

module/Soutenance/src/Soutenance/Controller/QualiteController.php

+5 −5
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ class QualiteController extends AbstractController 
        $idQualite = $this->params()->fromRoute('qualite');

        $qualite = null;

        if ($idQualite !== null) {

            $qualite = $this->getQualiteService()->getQualiteById($idQualite);

            $qualite = $this->getQualiteService()->getQualite($idQualite);

        } else {

            $qualite = new Qualite();

        }
@@ -68,9 +68,9 @@ class QualiteController extends AbstractController 
            $form->setData($data);

            if ($form->isValid()) {

                if ($idQualite) {

                    $this->getQualiteService()->updateQualite($qualite);

                    $this->getQualiteService()->update($qualite);

                } else {

                    $this->getQualiteService()->createQualite($qualite);

                    $this->getQualiteService()->create($qualite);

                }

            }

        }
@@ -93,9 +93,9 @@ class QualiteController extends AbstractController 


        /** @var Qualite $qualite */

        $idQualite = $this->params()->fromRoute('qualite');

        $qualite = $this->getQualiteService()->getQualiteById($idQualite);

        $qualite = $this->getQualiteService()->getQualite($idQualite);



        $this->getQualiteService()->removeQualite($qualite);

        $this->getQualiteService()->delete($qualite);



        $this->redirect()->toRoute('qualite', [], [], true);

    }

module/Soutenance/src/Soutenance/Entity/Mapping/Soutenance.Entity.Qualite.dcm.xml

+20 −0
Original line number Diff line number Diff line
@@ -13,5 +13,25 @@ 
        <field name="emeritat"          type="string"       length="1"          column="EMERITAT"       nullable="false"/>



        <one-to-many field="libellesSupplementaires" target-entity="Soutenance\Entity\QualiteLibelleSupplementaire" mapped-by="qualite"/>



        <!-- HISTORISATION ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->

        <field name="histoCreation" type="datetime" column="HISTO_CREATION" nullable="false"/>

        <field name="histoDestruction" type="datetime" column="HISTO_DESTRUCTION" nullable="true"/>

        <field name="histoModification" type="datetime" column="HISTO_MODIFICATION" nullable="false"/>

        <many-to-one field="histoCreateur" target-entity="Application\Entity\Db\Utilisateur">

            <join-columns>

                <join-column name="HISTO_CREATEUR_ID" referenced-column-name="ID"/>

            </join-columns>

        </many-to-one>

        <many-to-one field="histoModificateur" target-entity="Application\Entity\Db\Utilisateur">

            <join-columns>

                <join-column name="HISTO_MODIFICATEUR_ID" referenced-column-name="ID"/>

            </join-columns>

        </many-to-one>

        <many-to-one field="histoDestructeur" target-entity="Application\Entity\Db\Utilisateur">

            <join-columns>

                <join-column name="HISTO_DESTRUCTEUR_ID" referenced-column-name="ID"/>

            </join-columns>

        </many-to-one>

    </entity>

</doctrine-mapping>

module/Soutenance/src/Soutenance/Entity/Qualite.php

+3 −0
Original line number Diff line number Diff line
@@ -3,9 +3,12 @@ 
namespace Soutenance\Entity;



use Doctrine\Common\Collections\ArrayCollection;

use UnicaenApp\Entity\HistoriqueAwareTrait;



class Qualite

{

    use HistoriqueAwareTrait;



    const ID_INCONNUE = 0;



    /** @var int */

module/Soutenance/src/Soutenance/Form/Membre/MembreHydrator.php

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ class MembreHydrator implements HydratorInterface 
        $membre->setGenre($data['sexe']);

        $membre->setPrenom($data['prenom']);

        $membre->setNom($data['nom']);

        $membre->setQualite($this->getQualiteService()->getQualiteById($data['qualite']));

        $membre->setQualite($this->getQualiteService()->getQualite($data['qualite']));

        $membre->setEtablissement($data['etablissement']);

        $membre->setExterieur($data['exterieur']);

        $membre->setVisio($data['visio']);

module/Soutenance/src/Soutenance/Service/Membre/MembreService.php

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ class MembreService { 
     */

    public function createMembre($proposition, $acteur) {

        //Qualité par défaut

        $inconnue = $this->getQualiteService()->getQualiteById(Qualite::ID_INCONNUE);

        $inconnue = $this->getQualiteService()->getQualite(Qualite::ID_INCONNUE);



        $membre = new Membre();

        $membre->setProposition($proposition);