Commit a246fbbd authored by Thomas Hamel's avatar Thomas Hamel
Browse files

protection de la route : notifier-commentaires, notifier-gestionnaire, changements divers

parent 26be322b
Loading
Loading
Loading
Loading
+1 −1
Changes for module/Admission/Sql/admission.sql: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ create table IF NOT EXISTS admission_etudiant
    intitule_du_diplome_national              varchar(128),
    annee_dobtention_diplome_national         integer,
    etablissement_dobtention_diplome_national varchar(128),
    type_diplome_autre                        boolean,
    type_diplome_autre                        integer,
    intitule_du_diplome_autre                 varchar(128),
    annee_dobtention_diplome_autre            integer,
    etablissement_dobtention_diplome_autre    varchar(128),
+24 −3
Changes for module/Admission/src/Admission/Assertion/AdmissionAssertion.php: 24 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@
namespace Admission\Assertion;

use Admission\Entity\Db\Admission;
use Admission\Entity\Db\TypeValidation;
use Admission\Provider\Privilege\AdmissionPrivileges;
use Admission\Service\Admission\AdmissionServiceAwareTrait;
use Application\Assertion\AbstractAssertion;
@@ -11,7 +12,7 @@ use Application\Assertion\ThrowsFailedAssertionExceptionTrait;
use Application\RouteMatch;
use Application\Service\UserContextServiceAwareInterface;
use Application\Service\UserContextServiceAwareTrait;
use GuzzleHttp\Psr7\ServerRequest;
use Doctrine\Common\Collections\Collection;
use Laminas\Permissions\Acl\Resource\ResourceInterface;
use UnicaenApp\Service\MessageCollectorAwareInterface;
use UnicaenApp\Service\MessageCollectorAwareTrait;
@@ -85,6 +86,15 @@ class AdmissionAssertion extends AbstractAssertion implements UserContextService
                    }
                    break;
            }

            switch ($action) {
                case 'notifier-commentaires-ajoutes':
                case 'notifier-gestionnaire':
                    if ($this->admission !== null) {
                        $this->assertCanNotifierCommentairesAjoutes($this->admission->getAdmissionValidations());
                    }
                    break;
            }
        } catch (FailedAssertionException $e) {
            if ($e->getMessage()) {
                $this->getServiceMessageCollector()->addMessage($e->getMessage(), __CLASS__);
@@ -185,7 +195,7 @@ class AdmissionAssertion extends AbstractAssertion implements UserContextService
            $message = "Le dossier d'admission n'est pas dirigé par " . $individuUtilisateur;
            if(!empty($admission->getInscription()->first()->getDirecteur())){
                $this->assertTrue(
                    $admission->getInscription()->first()->getDirecteur()->getId() === $individuUtilisateur,
                    $admission->getInscription()->first()->getDirecteur()->getId() === $individuUtilisateur->getId(),
                    $message
                );
            }else{
@@ -196,7 +206,7 @@ class AdmissionAssertion extends AbstractAssertion implements UserContextService
            $message = "Le dossier d'admission n'est pas codirigé par " . $individuUtilisateur;
            if(!empty($admission->getInscription()->first()->getCoDirecteur())){
                $this->assertTrue(
                    $admission->getInscription()->first()->getCoDirecteur()->getId() === $individuUtilisateur,
                    $admission->getInscription()->first()->getCoDirecteur()->getId() === $individuUtilisateur->getId(),
                    $message
                );
            }else{
@@ -213,6 +223,17 @@ class AdmissionAssertion extends AbstractAssertion implements UserContextService
        );
    }

    protected function assertCanNotifierCommentairesAjoutes(Collection $admissionValidations)
    {
        foreach($admissionValidations as $admissionValidation){
            $this->assertTrue(
                TypeValidation::CODE_VALIDATION_GESTIONNAIRE !== $admissionValidation->getTypeValidation()->getCode(),
                "L'envoi de commentaires n'est possible que lorsque la validation des gestionnaires
                                 n'a pas encore été effectuée"
            );
        }
    }

    private function assertModificationPossible(Admission $admission)
    {
        if ($admission->getAdmissionValidations()->count()) {
+2 −2
Changes for module/Admission/src/Admission/Controller/AdmissionController.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ class AdmissionController extends AdmissionAbstractController {
            //Enregistrement des informations de l'Etudiant
            $this->enregistrerEtudiant($data, $admission);

        } else {
        } else if($data['_fieldset'] == "financement"){
            $this->admissionForm->bind($admission);
            //Enregistrement des informations de financement
            $this->enregistrerFinancement($data, $admission);
@@ -197,7 +197,7 @@ class AdmissionController extends AdmissionAbstractController {
            if($data['_fieldset'] == "inscription"){
                //Enregistrement des informations de l'inscription
                $this->enregistrerInscription($data, $admission);
            }else{
            }else if($data['_fieldset'] == "document"){
                //Enregistrement des informations de financement
                $this->enregistrerDocument($data, $admission);
            }
+3 −3
Changes for module/Admission/src/Admission/Entity/Db/Etudiant.php: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ class Etudiant implements HistoriqueAwareInterface{
    private $etablissementDobtentionDiplomeNational;

    /**
     * @var bool|null
     * @var integer|null
     */
    private $typeDiplomeAutre;

@@ -851,7 +851,7 @@ class Etudiant implements HistoriqueAwareInterface{
    /**
     * Set typeDiplomeAutre.
     *
     * @param bool|null $typeDiplomeAutre
     * @param integer|null $typeDiplomeAutre
     *
     * @return Etudiant
     */
@@ -865,7 +865,7 @@ class Etudiant implements HistoriqueAwareInterface{
    /**
     * Get typeDiplomeAutre.
     *
     * @return bool|null
     * @return integer|null
     */
    public function getTypeDiplomeAutre()
    {
+1 −1
Changes for module/Admission/src/Admission/Entity/Db/Mapping/Admission.Entity.Db.Etudiant.dcm.xml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@
        <field name="intituleDuDiplomeNational" type="string" column="INTITULE_DU_DIPLOME_NATIONAL" length="128" nullable="true"/>
        <field name="anneeDobtentionDiplomeNational" type="integer" column="ANNEE_DOBTENTION_DIPLOME_NATIONAL" nullable="true"/>
        <field name="etablissementDobtentionDiplomeNational" type="string" column="ETABLISSEMENT_DOBTENTION_DIPLOME_NATIONAL" length="128" nullable="true"/>
        <field name="typeDiplomeAutre" type="boolean" column="TYPE_DIPLOME_AUTRE" nullable="true"/>
        <field name="typeDiplomeAutre" type="integer" column="TYPE_DIPLOME_AUTRE" nullable="true"/>
        <field name="intituleDuDiplomeAutre" type="string" column="INTITULE_DU_DIPLOME_AUTRE" nullable="true"/>
        <field name="anneeDobtentionDiplomeAutre" type="integer" column="ANNEE_DOBTENTION_DIPLOME_AUTRE" nullable="true"/>
        <field name="etablissementDobtentionDiplomeAutre" type="string" column="ETABLISSEMENT_DOBTENTION_DIPLOME_AUTRE" length="128" nullable="true"/>
Loading