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

possibilité de spécifier une date de publication pour cacher/afficher les sessions aux doctorants

parent 898c3000

doc/release-notes/8.6.1/01_divers.sql

+2 −0
Changes for doc/release-notes/8.6.1/01_divers.sql: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -35,3 +35,5 @@ alter table rapport add constraint rapport_annuel_fichier_fk foreign key (fichie 
alter table validite_fichier drop constraint validite_fichier_ffk;

alter table validite_fichier add constraint validite_fichier_ffk foreign key (fichier_id) references fichier on delete restrict;



ALTER TABLE formation_session

    ADD COLUMN date_publication timestamp;
 
 No newline at end of file

module/Formation/src/Formation/Controller/FormationController.php

+2 −1
Changes for module/Formation/src/Formation/Controller/FormationController.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ class FormationController extends AbstractController 
    public function afficherAction() : ViewModel

    {

        $formation = $this->getFormationService()->getRepository()->getRequestedFormation($this);

        $sessions = $this->getSessionService()->getRepository()->fetchSessionsByFormation($formation, 'id', 'asc', true);

        $verifierDatePublication = (bool)$this->userContextService->getSelectedRoleDoctorant();

        $sessions = $this->getSessionService()->getRepository()->fetchSessionsByFormation($formation, 'id', 'asc', true, $verifierDatePublication);

        $anneeUnivCourante = $this->anneeUnivService->courante();



        $sessionsAvecAnneeUniv = [];

module/Formation/src/Formation/Controller/IndexController.php

+2 −2
Changes for module/Formation/src/Formation/Controller/IndexController.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ class IndexController extends AbstractController 
            $anneeScolaire = $this->anneeUnivService->courante();

            $debut = $this->anneeUnivService->computeDateDebut($anneeScolaire);

            $fin = $this->anneeUnivService->computeDateFin($anneeScolaire);

            $ouvertes = $this->getEntityManager()->getRepository(Session::class)->findSessionsByDoctorant($doctorant, Etat::CODE_OUVERTE, $debut, $fin);

            $preparations = $this->getEntityManager()->getRepository(Session::class)->findSessionsByDoctorant($doctorant, Etat::CODE_PREPARATION, $debut, $fin);

            $ouvertes = $this->getEntityManager()->getRepository(Session::class)->findSessionsByDoctorant($doctorant, Etat::CODE_OUVERTE, $debut, $fin, true);

            $preparations = $this->getEntityManager()->getRepository(Session::class)->findSessionsByDoctorant($doctorant, Etat::CODE_PREPARATION, $debut, $fin, true);

            /** @var Inscription[] $inscription */

            $inscriptions = $this->getEntityManager()->getRepository(Inscription::class)->findInscriptionsByDoctorant($doctorant);

        } else {

module/Formation/src/Formation/Controller/ModuleController.php

+2 −1
Changes for module/Formation/src/Formation/Controller/ModuleController.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -133,8 +133,9 @@ class ModuleController extends AbstractController 
        $annee = AnneeUniv::fromPremiereAnnee((int)$anneeUniv);

        $debut = $this->anneeUnivService->computeDateDebut($annee);

        $fin = $this->anneeUnivService->computeDateFin($annee);

        $verifierDatePublication = (bool)$this->userContextService->getSelectedRoleDoctorant();



        $modules = $this->moduleService->getRepository()->getModulesCatalogue($debut, $fin);

        $modules = $this->moduleService->getRepository()->getModulesCatalogue($debut, $fin, $verifierDatePublication);



        // gestion d'anomalies INUTILE !!!!

//        {

module/Formation/src/Formation/Entity/Db/Mapping/Formation.Entity.Db.Session.dcm.xml

+1 −0
Changes for module/Formation/src/Formation/Entity/Db/Mapping/Formation.Entity.Db.Session.dcm.xml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
        <field name="tailleListeComplementaire" type="integer"                     column="taille_liste_complementaire"  nullable="true"/>



        <field name="dateClotureInscription" type="datetime" column="date_fermeture_inscription" nullable="true"/>

        <field name="datePublication" type="datetime" column="date_publication" nullable="true"/>





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