Loading module/Application/src/Application/Service/Structure/StructureService.php +12 −2 Changes for module/Application/src/Application/Service/Structure/StructureService.php: 12 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -106,10 +106,8 @@ class StructureService extends BaseService $structureConcreteCible = Structure::constructFromDataObject($structureCibleDataObject, $typeStructure, $sourceSygal); $structureConcreteCible->setSourceCode(Etablissement::CODE_COMUE . EtablissementPrefixFilter::ETAB_PREFIX_SEP . $unique); $structureConcreteCible->getStructure()->setSourceCode(Etablissement::CODE_COMUE . EtablissementPrefixFilter::ETAB_PREFIX_SEP . $unique); // $structureConcreteCible->getStructure()->setSourceCode(uniqid(Etablissement::CODE_COMUE . EtablissementPrefixFilter::ETAB_PREFIX_SEP)); $structureConcreteCible->getStructure()->setCode($unique); $structureRattachCible = $structureConcreteCible->getStructure(); // StructureSubstitution ne référence que des entités de type Structure // $structureRattachCible->setSourceCode(uniqid(Etablissement::CODE_COMUE . EtablissementPrefixFilter::ETAB_PREFIX_SEP)); // instanciations des substitutions $substitutions = StructureSubstit::fromStructures($structuresSources, $structureRattachCible); Loading Loading @@ -581,6 +579,18 @@ class StructureService extends BaseService return $result; } /** Les structures non substituées */ public function getStructuresUtilisablesByType($type) { $qb = $this->getEntityManager()->getRepository($this->getEntityByType($type))->createQueryBuilder('structureConcrete') ->join('structureConcrete.structure', 'structure') ->leftJoin('structure.structureSubstituante', 'substitutionTo') ->andWhere('substitutionTo.id IS NULL') ; $result = $qb->getQuery()->getResult(); return $result; } /** * @param TypeStructure $type * @param int $structureId Loading module/Application/src/Application/Service/These/Factory/TheseRechercheServiceFactory.php +4 −0 Changes for module/Application/src/Application/Service/These/Factory/TheseRechercheServiceFactory.php: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -5,6 +5,7 @@ namespace Application\Service\These\Factory; use Application\Service\EcoleDoctorale\EcoleDoctoraleService; use Application\Service\Etablissement\EtablissementService; use Application\Service\Source\SourceService; use Application\Service\Structure\StructureService; use Application\Service\These\TheseRechercheService; use Application\Service\These\TheseService; use Application\Service\UniteRecherche\UniteRechercheService; Loading @@ -28,6 +29,7 @@ class TheseRechercheServiceFactory * @var UniteRechercheService $uniteService * @var EcoleDoctoraleService $ecoleDoctoraleService * @var SourceService $sourceService * @var StructureService $structureService */ $theseService = $serviceLocator->get('TheseService'); $userContextService = $serviceLocator->get('UserContextService'); Loading @@ -35,6 +37,7 @@ class TheseRechercheServiceFactory $uniteService = $serviceLocator->get('UniteRechercheService'); $etablissementService = $serviceLocator->get('EtablissementService'); $sourceService = $serviceLocator->get('SourceService'); $structureService = $serviceLocator->get(StructureService::class); $service = new TheseRechercheService(); $service->setTheseService($theseService); Loading @@ -43,6 +46,7 @@ class TheseRechercheServiceFactory $service->setUniteRechercheService($uniteService); $service->setEcoleDoctoraleService($ecoleDoctoraleService); $service->setSourceService($sourceService); $service->setStructureService($structureService); return $service; } Loading module/Application/src/Application/Service/These/TheseRechercheService.php +6 −2 Changes for module/Application/src/Application/Service/These/TheseRechercheService.php: 6 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -6,12 +6,14 @@ use Application\Entity\Db\EcoleDoctorale; use Application\Entity\Db\Etablissement; use Application\Entity\Db\SourceInterface; use Application\Entity\Db\These; use Application\Entity\Db\TypeStructure; use Application\Entity\Db\UniteRecherche; use Application\Entity\UserWrapper; use Application\QueryBuilder\TheseQueryBuilder; use Application\Service\EcoleDoctorale\EcoleDoctoraleServiceAwareTrait; use Application\Service\Etablissement\EtablissementServiceAwareTrait; use Application\Service\Source\SourceServiceAwareTrait; use Application\Service\Structure\StructureServiceAwareTrait; use Application\Service\These\Filter\TheseSelectFilter; use Application\Service\These\Filter\TheseTextFilter; use Application\Service\UniteRecherche\UniteRechercheServiceAwareTrait; Loading @@ -19,6 +21,7 @@ use Application\Service\UserContextServiceAwareTrait; use Application\View\Helper\Sortable; use Doctrine\DBAL\DBALException; use Doctrine\ORM\Query\Expr\Join; use MongoDB\BSON\Type; use UnicaenApp\Exception\RuntimeException; use UnicaenApp\Util; Loading @@ -29,6 +32,7 @@ class TheseRechercheService use EtablissementServiceAwareTrait; use UniteRechercheServiceAwareTrait; use EcoleDoctoraleServiceAwareTrait; use StructureServiceAwareTrait; use SourceServiceAwareTrait; /** Loading Loading @@ -497,7 +501,7 @@ class TheseRechercheService private function fetchEcolesDoctoralesOptions() { $eds = $this->getEcoleDoctoraleService()->getRepository()->findAll(); $eds = $this->getStructureService()->getStructuresUtilisablesByType(TypeStructure::CODE_ECOLE_DOCTORALE); $options = []; foreach ($eds as $ed) { Loading @@ -512,7 +516,7 @@ class TheseRechercheService private function fetchUnitesRecherchesOptions() { $urs = $this->getUniteRechercheService()->getRepository()->findAll(); $urs = $this->getStructureService()->getStructuresUtilisablesByType(TypeStructure::CODE_UNITE_RECHERCHE); $options = []; foreach ($urs as $ur) { Loading Loading
module/Application/src/Application/Service/Structure/StructureService.php +12 −2 Changes for module/Application/src/Application/Service/Structure/StructureService.php: 12 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -106,10 +106,8 @@ class StructureService extends BaseService $structureConcreteCible = Structure::constructFromDataObject($structureCibleDataObject, $typeStructure, $sourceSygal); $structureConcreteCible->setSourceCode(Etablissement::CODE_COMUE . EtablissementPrefixFilter::ETAB_PREFIX_SEP . $unique); $structureConcreteCible->getStructure()->setSourceCode(Etablissement::CODE_COMUE . EtablissementPrefixFilter::ETAB_PREFIX_SEP . $unique); // $structureConcreteCible->getStructure()->setSourceCode(uniqid(Etablissement::CODE_COMUE . EtablissementPrefixFilter::ETAB_PREFIX_SEP)); $structureConcreteCible->getStructure()->setCode($unique); $structureRattachCible = $structureConcreteCible->getStructure(); // StructureSubstitution ne référence que des entités de type Structure // $structureRattachCible->setSourceCode(uniqid(Etablissement::CODE_COMUE . EtablissementPrefixFilter::ETAB_PREFIX_SEP)); // instanciations des substitutions $substitutions = StructureSubstit::fromStructures($structuresSources, $structureRattachCible); Loading Loading @@ -581,6 +579,18 @@ class StructureService extends BaseService return $result; } /** Les structures non substituées */ public function getStructuresUtilisablesByType($type) { $qb = $this->getEntityManager()->getRepository($this->getEntityByType($type))->createQueryBuilder('structureConcrete') ->join('structureConcrete.structure', 'structure') ->leftJoin('structure.structureSubstituante', 'substitutionTo') ->andWhere('substitutionTo.id IS NULL') ; $result = $qb->getQuery()->getResult(); return $result; } /** * @param TypeStructure $type * @param int $structureId Loading
module/Application/src/Application/Service/These/Factory/TheseRechercheServiceFactory.php +4 −0 Changes for module/Application/src/Application/Service/These/Factory/TheseRechercheServiceFactory.php: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -5,6 +5,7 @@ namespace Application\Service\These\Factory; use Application\Service\EcoleDoctorale\EcoleDoctoraleService; use Application\Service\Etablissement\EtablissementService; use Application\Service\Source\SourceService; use Application\Service\Structure\StructureService; use Application\Service\These\TheseRechercheService; use Application\Service\These\TheseService; use Application\Service\UniteRecherche\UniteRechercheService; Loading @@ -28,6 +29,7 @@ class TheseRechercheServiceFactory * @var UniteRechercheService $uniteService * @var EcoleDoctoraleService $ecoleDoctoraleService * @var SourceService $sourceService * @var StructureService $structureService */ $theseService = $serviceLocator->get('TheseService'); $userContextService = $serviceLocator->get('UserContextService'); Loading @@ -35,6 +37,7 @@ class TheseRechercheServiceFactory $uniteService = $serviceLocator->get('UniteRechercheService'); $etablissementService = $serviceLocator->get('EtablissementService'); $sourceService = $serviceLocator->get('SourceService'); $structureService = $serviceLocator->get(StructureService::class); $service = new TheseRechercheService(); $service->setTheseService($theseService); Loading @@ -43,6 +46,7 @@ class TheseRechercheServiceFactory $service->setUniteRechercheService($uniteService); $service->setEcoleDoctoraleService($ecoleDoctoraleService); $service->setSourceService($sourceService); $service->setStructureService($structureService); return $service; } Loading
module/Application/src/Application/Service/These/TheseRechercheService.php +6 −2 Changes for module/Application/src/Application/Service/These/TheseRechercheService.php: 6 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -6,12 +6,14 @@ use Application\Entity\Db\EcoleDoctorale; use Application\Entity\Db\Etablissement; use Application\Entity\Db\SourceInterface; use Application\Entity\Db\These; use Application\Entity\Db\TypeStructure; use Application\Entity\Db\UniteRecherche; use Application\Entity\UserWrapper; use Application\QueryBuilder\TheseQueryBuilder; use Application\Service\EcoleDoctorale\EcoleDoctoraleServiceAwareTrait; use Application\Service\Etablissement\EtablissementServiceAwareTrait; use Application\Service\Source\SourceServiceAwareTrait; use Application\Service\Structure\StructureServiceAwareTrait; use Application\Service\These\Filter\TheseSelectFilter; use Application\Service\These\Filter\TheseTextFilter; use Application\Service\UniteRecherche\UniteRechercheServiceAwareTrait; Loading @@ -19,6 +21,7 @@ use Application\Service\UserContextServiceAwareTrait; use Application\View\Helper\Sortable; use Doctrine\DBAL\DBALException; use Doctrine\ORM\Query\Expr\Join; use MongoDB\BSON\Type; use UnicaenApp\Exception\RuntimeException; use UnicaenApp\Util; Loading @@ -29,6 +32,7 @@ class TheseRechercheService use EtablissementServiceAwareTrait; use UniteRechercheServiceAwareTrait; use EcoleDoctoraleServiceAwareTrait; use StructureServiceAwareTrait; use SourceServiceAwareTrait; /** Loading Loading @@ -497,7 +501,7 @@ class TheseRechercheService private function fetchEcolesDoctoralesOptions() { $eds = $this->getEcoleDoctoraleService()->getRepository()->findAll(); $eds = $this->getStructureService()->getStructuresUtilisablesByType(TypeStructure::CODE_ECOLE_DOCTORALE); $options = []; foreach ($eds as $ed) { Loading @@ -512,7 +516,7 @@ class TheseRechercheService private function fetchUnitesRecherchesOptions() { $urs = $this->getUniteRechercheService()->getRepository()->findAll(); $urs = $this->getStructureService()->getStructuresUtilisablesByType(TypeStructure::CODE_UNITE_RECHERCHE); $options = []; foreach ($urs as $ur) { Loading