Loading CHANGELOG.md +4 −0 Changes for CHANGELOG.md: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Journal des modifications ========================= 5.2.7 ----- - Ajout d'une date de fermeture (indicative) pour les sessions de formation 5.2.6 ----- - Déclaration des membres du comite de suivi individuel Loading doc/release-notes/v5.2.7.md 0 → 100644 +21 −0 Changes for doc/release-notes/v5.2.7.md: 21 added lines, 0 removed lines. Original line number Diff line number Diff line # Version 5.2.7 ## 1. Sur le serveur d'application - Placez-vous dans le répertoire de l'application puis lancez la commande suivante pour installer la nouvelle version : ```bash git fetch --tags && git checkout --force 5.2.7 && bash ./install.sh ``` - Selon le moteur PHP que vous avez installé, rechargez le service, exemple : - php7.4-fpm : `service php7.4-fpm reload` - apache2-mod-php7.4 : `service apache2 reload` ## 2. Dans la base de données ```sql alter table formation_session add date_fermeture_inscription timestamp; ``` module/Formation/src/Formation/Entity/Db/Mapping/Formation.Entity.Db.Session.dcm.xml +2 −0 Changes for module/Formation/src/Formation/Entity/Db/Mapping/Formation.Entity.Db.Session.dcm.xml: 2 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -50,6 +50,8 @@ <field name="tailleListePrincipale" type="integer" column="TAILLE_LISTE_PRINCIPALE" nullable="true"/> <field name="tailleListeComplementaire" type="integer" column="TAILLE_LISTE_COMPLEMENTAIRE" nullable="true"/> <field name="dateClotureInscription" type="datetime" column="DATE_FERMETURE_INSCRIPTION" nullable="true"/> <!-- HISTORISATION ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <field name="histoCreation" type="datetime" column="HISTO_CREATION" nullable="false"/> Loading module/Formation/src/Formation/Entity/Db/Session.php +20 −87 Changes for module/Formation/src/Formation/Entity/Db/Session.php: 20 added lines, 87 removed lines. Original line number Diff line number Diff line Loading @@ -4,7 +4,6 @@ namespace Formation\Entity\Db; use Doctorant\Entity\Db\Doctorant; use Individu\Entity\Db\Individu; use Application\Entity\Db\Utilisateur; use DateInterval; use DateTime; use Doctrine\Common\Collections\Collection; Loading Loading @@ -46,6 +45,7 @@ class Session implements HistoriqueAwareInterface, private ?Individu $responsable = null; private ?Etat $etat = null; private ?string $description = null; private ?DateTime $dateClotureInscription = null; private Collection $structuresValides; private Collection $seances; Loading @@ -56,144 +56,85 @@ class Session implements HistoriqueAwareInterface, private ?int $tailleListePrincipale = null; private ?int $tailleListeComplementaire = null; /** * @return int */ public function getId(): int { return $this->id; } /** * @return int|null */ public function getIndex(): ?int { return $this->index; } /** * @param int $index * @return Session */ public function setIndex(int $index): Session public function setIndex(int $index): void { $this->index = $index; return $this; } /** * @return Formation|null */ public function getFormation(): ?Formation { return $this->formation; } /** * @param Formation|null $formation * @return Session */ public function setFormation(?Formation $formation): Session public function setFormation(?Formation $formation): void { $this->formation = $formation; return $this; } /** * @return Utilisateur|null */ public function getResponsable(): ?Individu { return $this->responsable; } /** * @param Individu|null $responsable * @return Session */ public function setResponsable(?Individu $responsable): Session public function setResponsable(?Individu $responsable): void { $this->responsable = $responsable; return $this; } /** * @return Etat|null */ public function getEtat(): ?Etat { return $this->etat; } /** * @param Etat|null $etat * @return Session */ public function setEtat(?Etat $etat): Session public function setEtat(?Etat $etat): void { $this->etat = $etat; return $this; } /** * @return Collection */ public function getStructuresValides(): Collection { return $this->structuresValides; } /** * @return Collection */ public function getSeances() : Collection { return $this->seances; } /** * @return Collection */ public function getFormateurs() : Collection { return $this->formateurs; } /** * @return Collection */ public function getInscriptions() : Collection { return $this->inscriptions; } /** * @param string|null $liste * @return Inscription[] */ public function getInscriptionsByListe(?string $liste) : array { $result = array_filter($this->inscriptions->toArray(), function (Inscription $a) use ($liste) { return ($a->estNonHistorise() AND $a->getListe()===$liste);}); return $result; } /** * @return int|null */ public function getTailleListePrincipale(): ?int { return $this->tailleListePrincipale; } /** * @param int|null $tailleListePrincipale * @return Session */ public function setTailleListePrincipale(?int $tailleListePrincipale): Session public function setTailleListePrincipale(?int $tailleListePrincipale): void { $this->tailleListePrincipale = $tailleListePrincipale; return $this; } public function getListePrincipale() : array Loading @@ -201,22 +142,15 @@ class Session implements HistoriqueAwareInterface, $inscriptions = array_filter($this->getInscriptions()->toArray(), function (Inscription $a) { return $a->estNonHistorise() AND $a->getListe() === Inscription::LISTE_PRINCIPALE; }); return $inscriptions; } /** * @return int|null */ public function getTailleListeComplementaire(): ?int { return $this->tailleListeComplementaire; } /** * @param int|null $tailleListeComplementaire * @return Session */ public function setTailleListeComplementaire(?int $tailleListeComplementaire): Session public function setTailleListeComplementaire(?int $tailleListeComplementaire): void { $this->tailleListeComplementaire = $tailleListeComplementaire; return $this; } public function getListeComplementaire() : array Loading @@ -231,22 +165,24 @@ class Session implements HistoriqueAwareInterface, return $inscriptions; } /** * @return string|null */ public function getDescription(): ?string { return $this->description; } /** * @param string|null $description * @return Session */ public function setDescription(?string $description): Session public function setDescription(?string $description): void { $this->description = $description; return $this; } public function getDateClotureInscription(): ?DateTime { return $this->dateClotureInscription; } public function setDateClotureInscription(?DateTime $dateClotureInscription): void { $this->dateClotureInscription = $dateClotureInscription; } public function getDuree() : float Loading Loading @@ -309,10 +245,6 @@ class Session implements HistoriqueAwareInterface, return $limite; } /** * @param Doctorant $doctorant * @return bool */ public function estInscrit(Doctorant $doctorant) : bool { /** @var Inscription $inscription */ Loading Loading @@ -358,6 +290,7 @@ class Session implements HistoriqueAwareInterface, /** Pour les macros ********************************************************************************/ /** * @noinspection PhpUnusedMethod (il s'agit d'une méthode utilisée par les macros) * @return string */ public function getSeancesAsTable() : string Loading module/Formation/src/Formation/Form/Session/SessionForm.php +21 −0 Changes for module/Formation/src/Formation/Form/Session/SessionForm.php: 21 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -3,8 +3,10 @@ namespace Formation\Form\Session; use Formation\Entity\Db\Interfaces\HasModaliteInterface; use Laminas\Form\Element\DateTime; use Structure\Service\Etablissement\EtablissementServiceAwareTrait; use Structure\Service\Structure\StructureServiceAwareTrait; use UnicaenApp\Form\Element\Date; use UnicaenApp\Form\Element\SearchAndSelect; use Laminas\Form\Element\Button; use Laminas\Form\Element\Number; Loading Loading @@ -158,6 +160,24 @@ class SessionForm extends Form { ], ]); //jour $this->add([ 'name' => 'date_fermeture_inscription', 'type' => Date::class, 'options' => [ 'label' => "Date de fermeture des inscriptions <span class='icon icon-info text-info' title='La date est seulement informative'></span> :", 'label_options' => [ 'disable_html_escape' => true, ], 'label_attributes' => [ 'class' => 'control-label', ], 'format' => 'd/m/Y', ], 'attributes' => [ 'id' => 'date_fermeture_inscription', 'class' => 'form-control', ], ]); //submit $this->add([ 'type' => Button::class, Loading Loading @@ -185,6 +205,7 @@ class SessionForm extends Form { 'type_structure'=> [ 'required' => false, ], 'taille_liste_principale'=> [ 'required' => true, ], 'taille_liste_complementaire'=> [ 'required' => true, ], 'date_fermeture_inscription'=> [ 'required' => false, ], ])); } } No newline at end of file Loading
CHANGELOG.md +4 −0 Changes for CHANGELOG.md: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Journal des modifications ========================= 5.2.7 ----- - Ajout d'une date de fermeture (indicative) pour les sessions de formation 5.2.6 ----- - Déclaration des membres du comite de suivi individuel Loading
doc/release-notes/v5.2.7.md 0 → 100644 +21 −0 Changes for doc/release-notes/v5.2.7.md: 21 added lines, 0 removed lines. Original line number Diff line number Diff line # Version 5.2.7 ## 1. Sur le serveur d'application - Placez-vous dans le répertoire de l'application puis lancez la commande suivante pour installer la nouvelle version : ```bash git fetch --tags && git checkout --force 5.2.7 && bash ./install.sh ``` - Selon le moteur PHP que vous avez installé, rechargez le service, exemple : - php7.4-fpm : `service php7.4-fpm reload` - apache2-mod-php7.4 : `service apache2 reload` ## 2. Dans la base de données ```sql alter table formation_session add date_fermeture_inscription timestamp; ```
module/Formation/src/Formation/Entity/Db/Mapping/Formation.Entity.Db.Session.dcm.xml +2 −0 Changes for module/Formation/src/Formation/Entity/Db/Mapping/Formation.Entity.Db.Session.dcm.xml: 2 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -50,6 +50,8 @@ <field name="tailleListePrincipale" type="integer" column="TAILLE_LISTE_PRINCIPALE" nullable="true"/> <field name="tailleListeComplementaire" type="integer" column="TAILLE_LISTE_COMPLEMENTAIRE" nullable="true"/> <field name="dateClotureInscription" type="datetime" column="DATE_FERMETURE_INSCRIPTION" nullable="true"/> <!-- HISTORISATION ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <field name="histoCreation" type="datetime" column="HISTO_CREATION" nullable="false"/> Loading
module/Formation/src/Formation/Entity/Db/Session.php +20 −87 Changes for module/Formation/src/Formation/Entity/Db/Session.php: 20 added lines, 87 removed lines. Original line number Diff line number Diff line Loading @@ -4,7 +4,6 @@ namespace Formation\Entity\Db; use Doctorant\Entity\Db\Doctorant; use Individu\Entity\Db\Individu; use Application\Entity\Db\Utilisateur; use DateInterval; use DateTime; use Doctrine\Common\Collections\Collection; Loading Loading @@ -46,6 +45,7 @@ class Session implements HistoriqueAwareInterface, private ?Individu $responsable = null; private ?Etat $etat = null; private ?string $description = null; private ?DateTime $dateClotureInscription = null; private Collection $structuresValides; private Collection $seances; Loading @@ -56,144 +56,85 @@ class Session implements HistoriqueAwareInterface, private ?int $tailleListePrincipale = null; private ?int $tailleListeComplementaire = null; /** * @return int */ public function getId(): int { return $this->id; } /** * @return int|null */ public function getIndex(): ?int { return $this->index; } /** * @param int $index * @return Session */ public function setIndex(int $index): Session public function setIndex(int $index): void { $this->index = $index; return $this; } /** * @return Formation|null */ public function getFormation(): ?Formation { return $this->formation; } /** * @param Formation|null $formation * @return Session */ public function setFormation(?Formation $formation): Session public function setFormation(?Formation $formation): void { $this->formation = $formation; return $this; } /** * @return Utilisateur|null */ public function getResponsable(): ?Individu { return $this->responsable; } /** * @param Individu|null $responsable * @return Session */ public function setResponsable(?Individu $responsable): Session public function setResponsable(?Individu $responsable): void { $this->responsable = $responsable; return $this; } /** * @return Etat|null */ public function getEtat(): ?Etat { return $this->etat; } /** * @param Etat|null $etat * @return Session */ public function setEtat(?Etat $etat): Session public function setEtat(?Etat $etat): void { $this->etat = $etat; return $this; } /** * @return Collection */ public function getStructuresValides(): Collection { return $this->structuresValides; } /** * @return Collection */ public function getSeances() : Collection { return $this->seances; } /** * @return Collection */ public function getFormateurs() : Collection { return $this->formateurs; } /** * @return Collection */ public function getInscriptions() : Collection { return $this->inscriptions; } /** * @param string|null $liste * @return Inscription[] */ public function getInscriptionsByListe(?string $liste) : array { $result = array_filter($this->inscriptions->toArray(), function (Inscription $a) use ($liste) { return ($a->estNonHistorise() AND $a->getListe()===$liste);}); return $result; } /** * @return int|null */ public function getTailleListePrincipale(): ?int { return $this->tailleListePrincipale; } /** * @param int|null $tailleListePrincipale * @return Session */ public function setTailleListePrincipale(?int $tailleListePrincipale): Session public function setTailleListePrincipale(?int $tailleListePrincipale): void { $this->tailleListePrincipale = $tailleListePrincipale; return $this; } public function getListePrincipale() : array Loading @@ -201,22 +142,15 @@ class Session implements HistoriqueAwareInterface, $inscriptions = array_filter($this->getInscriptions()->toArray(), function (Inscription $a) { return $a->estNonHistorise() AND $a->getListe() === Inscription::LISTE_PRINCIPALE; }); return $inscriptions; } /** * @return int|null */ public function getTailleListeComplementaire(): ?int { return $this->tailleListeComplementaire; } /** * @param int|null $tailleListeComplementaire * @return Session */ public function setTailleListeComplementaire(?int $tailleListeComplementaire): Session public function setTailleListeComplementaire(?int $tailleListeComplementaire): void { $this->tailleListeComplementaire = $tailleListeComplementaire; return $this; } public function getListeComplementaire() : array Loading @@ -231,22 +165,24 @@ class Session implements HistoriqueAwareInterface, return $inscriptions; } /** * @return string|null */ public function getDescription(): ?string { return $this->description; } /** * @param string|null $description * @return Session */ public function setDescription(?string $description): Session public function setDescription(?string $description): void { $this->description = $description; return $this; } public function getDateClotureInscription(): ?DateTime { return $this->dateClotureInscription; } public function setDateClotureInscription(?DateTime $dateClotureInscription): void { $this->dateClotureInscription = $dateClotureInscription; } public function getDuree() : float Loading Loading @@ -309,10 +245,6 @@ class Session implements HistoriqueAwareInterface, return $limite; } /** * @param Doctorant $doctorant * @return bool */ public function estInscrit(Doctorant $doctorant) : bool { /** @var Inscription $inscription */ Loading Loading @@ -358,6 +290,7 @@ class Session implements HistoriqueAwareInterface, /** Pour les macros ********************************************************************************/ /** * @noinspection PhpUnusedMethod (il s'agit d'une méthode utilisée par les macros) * @return string */ public function getSeancesAsTable() : string Loading
module/Formation/src/Formation/Form/Session/SessionForm.php +21 −0 Changes for module/Formation/src/Formation/Form/Session/SessionForm.php: 21 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -3,8 +3,10 @@ namespace Formation\Form\Session; use Formation\Entity\Db\Interfaces\HasModaliteInterface; use Laminas\Form\Element\DateTime; use Structure\Service\Etablissement\EtablissementServiceAwareTrait; use Structure\Service\Structure\StructureServiceAwareTrait; use UnicaenApp\Form\Element\Date; use UnicaenApp\Form\Element\SearchAndSelect; use Laminas\Form\Element\Button; use Laminas\Form\Element\Number; Loading Loading @@ -158,6 +160,24 @@ class SessionForm extends Form { ], ]); //jour $this->add([ 'name' => 'date_fermeture_inscription', 'type' => Date::class, 'options' => [ 'label' => "Date de fermeture des inscriptions <span class='icon icon-info text-info' title='La date est seulement informative'></span> :", 'label_options' => [ 'disable_html_escape' => true, ], 'label_attributes' => [ 'class' => 'control-label', ], 'format' => 'd/m/Y', ], 'attributes' => [ 'id' => 'date_fermeture_inscription', 'class' => 'form-control', ], ]); //submit $this->add([ 'type' => Button::class, Loading Loading @@ -185,6 +205,7 @@ class SessionForm extends Form { 'type_structure'=> [ 'required' => false, ], 'taille_liste_principale'=> [ 'required' => true, ], 'taille_liste_complementaire'=> [ 'required' => true, ], 'date_fermeture_inscription'=> [ 'required' => false, ], ])); } } No newline at end of file