Loading CHANGELOG.md +2 −1 Changes for CHANGELOG.md: 2 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -3,9 +3,10 @@ Journal des modifications 13.4.0 ------ - Possibilité de créer une thèse à paritr d'un dossier d'admission validé (depuis la page de recherche de dossiers). - Possibilité de créer une thèse à partir d'un dossier d'admission validé (depuis la page de recherche de dossiers). - Changement d'apparence (plus sobre) des texte du genre 'Non renseigné'. - Fiche Thèse : mention en cas de thèse supprimée/historisée. - Structure de type Etablissement : possibilité de renseigner le pays. - [FIX] Import : plantage des imports à partir d'une API (dû à un mésusage de Assert::isInstanceOf() dans unicaen/db-import). 13.3.0 Loading doc/release-notes/v13/13.4.0/02_structure.sql 0 → 100644 +2 −0 Changes for doc/release-notes/v13/13.4.0/02_structure.sql: 2 added lines, 0 removed lines. Original line number Diff line number Diff line alter table structure add column pays_id bigint constraint structure_pays_id_fk references pays; module/Application/src/Application/Entity/Db/Repository/PaysRepository.php +14 −0 Changes for module/Application/src/Application/Entity/Db/Repository/PaysRepository.php: 14 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -8,6 +8,20 @@ use RuntimeException; class PaysRepository extends DefaultEntityRepository { /** * @return \Application\Entity\Db\Pays[] */ public function findAllPays(): array { $qb = $this->createQueryBuilder('p') ->orderBy('p.libelle'); /** @var Pays[] $pays */ $pays = $qb->getQuery()->getResult(); return $pays; } public function findOneByCodeIsoAlpha2(string $codeIsoAlpha2): ?Pays { try { Loading module/Application/src/Application/Service/Pays/PaysService.php +3 −14 Changes for module/Application/src/Application/Service/Pays/PaysService.php: 3 added lines, 14 removed lines. Original line number Diff line number Diff line Loading @@ -29,10 +29,7 @@ class PaysService extends BaseService $pays = $qb->getQuery()->getResult(); $options = []; foreach ($pays as $p) { $label = $p->getLibelleNationalite(); if(!in_array($label, $options)){ $options[$p->getId()] = $label; } $options[$p->getId()] = $p->getLibelleNationalite() . ' [' . $p->getLibelleIso() . ']'; } return $options; } Loading @@ -42,17 +39,9 @@ class PaysService extends BaseService */ public function getPaysAsOptions(): array { $qb = $this->getRepository()->createQueryBuilder('p') ->orderBy('p.libelle'); /** @var Pays[] $pays */ $pays = $qb->getQuery()->getResult(); $options = []; foreach ($pays as $p) { $label = $p->getLibelle(); if(!in_array($label, $options)){ $options[$p->getId()] = $label; } foreach ($this->getRepository()->findAllPays() as $p) { $options[$p->getId()] = $p->getLibelleIso(); } return $options; } Loading module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.Structure.dcm.xml +6 −0 Changes for module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.Structure.dcm.xml: 6 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -31,6 +31,12 @@ </join-columns> </many-to-one> <many-to-one field="pays" target-entity="Application\Entity\Db\Pays"> <join-columns> <join-column name="pays_id" referenced-column-name="id"/> </join-columns> </many-to-one> <!-- Relations one-to-many traités comme des one-to-one (car un seul enregistrement cible non historisé) --> <one-to-many field="etablissement" target-entity="Structure\Entity\Db\Etablissement" mapped-by="structure"/> <one-to-many field="ecoleDoctorale" target-entity="Structure\Entity\Db\EcoleDoctorale" mapped-by="structure"/> Loading Loading
CHANGELOG.md +2 −1 Changes for CHANGELOG.md: 2 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -3,9 +3,10 @@ Journal des modifications 13.4.0 ------ - Possibilité de créer une thèse à paritr d'un dossier d'admission validé (depuis la page de recherche de dossiers). - Possibilité de créer une thèse à partir d'un dossier d'admission validé (depuis la page de recherche de dossiers). - Changement d'apparence (plus sobre) des texte du genre 'Non renseigné'. - Fiche Thèse : mention en cas de thèse supprimée/historisée. - Structure de type Etablissement : possibilité de renseigner le pays. - [FIX] Import : plantage des imports à partir d'une API (dû à un mésusage de Assert::isInstanceOf() dans unicaen/db-import). 13.3.0 Loading
doc/release-notes/v13/13.4.0/02_structure.sql 0 → 100644 +2 −0 Changes for doc/release-notes/v13/13.4.0/02_structure.sql: 2 added lines, 0 removed lines. Original line number Diff line number Diff line alter table structure add column pays_id bigint constraint structure_pays_id_fk references pays;
module/Application/src/Application/Entity/Db/Repository/PaysRepository.php +14 −0 Changes for module/Application/src/Application/Entity/Db/Repository/PaysRepository.php: 14 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -8,6 +8,20 @@ use RuntimeException; class PaysRepository extends DefaultEntityRepository { /** * @return \Application\Entity\Db\Pays[] */ public function findAllPays(): array { $qb = $this->createQueryBuilder('p') ->orderBy('p.libelle'); /** @var Pays[] $pays */ $pays = $qb->getQuery()->getResult(); return $pays; } public function findOneByCodeIsoAlpha2(string $codeIsoAlpha2): ?Pays { try { Loading
module/Application/src/Application/Service/Pays/PaysService.php +3 −14 Changes for module/Application/src/Application/Service/Pays/PaysService.php: 3 added lines, 14 removed lines. Original line number Diff line number Diff line Loading @@ -29,10 +29,7 @@ class PaysService extends BaseService $pays = $qb->getQuery()->getResult(); $options = []; foreach ($pays as $p) { $label = $p->getLibelleNationalite(); if(!in_array($label, $options)){ $options[$p->getId()] = $label; } $options[$p->getId()] = $p->getLibelleNationalite() . ' [' . $p->getLibelleIso() . ']'; } return $options; } Loading @@ -42,17 +39,9 @@ class PaysService extends BaseService */ public function getPaysAsOptions(): array { $qb = $this->getRepository()->createQueryBuilder('p') ->orderBy('p.libelle'); /** @var Pays[] $pays */ $pays = $qb->getQuery()->getResult(); $options = []; foreach ($pays as $p) { $label = $p->getLibelle(); if(!in_array($label, $options)){ $options[$p->getId()] = $label; } foreach ($this->getRepository()->findAllPays() as $p) { $options[$p->getId()] = $p->getLibelleIso(); } return $options; } Loading
module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.Structure.dcm.xml +6 −0 Changes for module/Structure/src/Structure/Entity/Db/Mapping/Structure.Entity.Db.Structure.dcm.xml: 6 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -31,6 +31,12 @@ </join-columns> </many-to-one> <many-to-one field="pays" target-entity="Application\Entity\Db\Pays"> <join-columns> <join-column name="pays_id" referenced-column-name="id"/> </join-columns> </many-to-one> <!-- Relations one-to-many traités comme des one-to-one (car un seul enregistrement cible non historisé) --> <one-to-many field="etablissement" target-entity="Structure\Entity\Db\Etablissement" mapped-by="structure"/> <one-to-many field="ecoleDoctorale" target-entity="Structure\Entity\Db\EcoleDoctorale" mapped-by="structure"/> Loading