Admission : une année universitaire d'inscription cible doit désormais être... (4ea77196) · Commits · open-source / sygal

CHANGELOG.md

+1 −0

Changes for CHANGELOG.md: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@ Journal des modifications

		13.2.0
		------
		- Admission : une année universitaire d'inscription cible doit désormais être attribuée au dossier d'admission.
		- [FIX] Notification de thèse déposée : warning 'Undefined variable' à cause d'une variable non fournie au template.
		- [FIX] Notification 'Corrections attendues' et 'Résultats de thèses modifiés' : correction de l'erreur 'Typed property Notification\Notification::$subject must not be accessed before initialization'.
		- [FIX] Notification 'Corrections attendues' et 'Résultats de thèses modifiés' : problème dans l'algo de préparation des données (partie émergée : 'Warning: Undefined array key').

composer.lock

+3 −3

Changes for composer.lock: 3 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -13185,11 +13185,11 @@
		},
		{
		"name": "unicaen/search",
		"version": "1.1.2",
		"version": "1.2.0",
		"source": {
		"type": "git",
		"url": "https://git.unicaen.fr/lib/unicaen/search.git",
		"reference": "035be22cecb2e82ed457ba634a710bccb62d2001"
		"reference": "a59f0d206ca51f0897c66c7bda6fe4cb0f22655c"
		},
		"require": {
		"doctrine/doctrine-orm-module": "^5.3 \|\| ^6.0",
		@@ -13216,7 +13216,7 @@
		]
		},
		"description": "Module Unicaen proposant la création de pages de recherche en BDD et de filtres normalisés",
		"time": "2026-07-16T09:07:14+00:00"
		"time": "2026-07-20T12:35:01+00:00"
		},
		{
		"name": "unicaen/shell",

module/Admission/config/module.config.php

+6 −0

Changes for module/Admission/config/module.config.php: 6 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -446,6 +446,12 @@ return array(
		],
		],

		'search_services' => [
		'factories' => [
		AdmissionRechercheService::class => AdmissionRechercheServiceFactory::class,
		],
		],

		'view_manager' => [
		'template_path_stack' => [
		__DIR__ . '/../view',

module/Admission/src/Admission/Controller/AdmissionRechercheControllerFactory.php

+9 −9

Changes for module/Admission/src/Admission/Controller/AdmissionRechercheControllerFactory.php: 9 added lines, 9 removed lines.
Original line number	Diff line number	Diff line
		@@ -7,35 +7,35 @@ use Admission\Service\Admission\AdmissionRechercheService;
		use Admission\Service\Admission\AdmissionService;
		use Admission\Service\Operation\AdmissionOperationService;
		use Application\Service\Role\RoleService;
		use Interop\Container\ContainerInterface;
		use Psr\Container\ContainerInterface;
		use UnicaenSearch\SearchServicePluginManager;

		class AdmissionRechercheControllerFactory
		{
		/**
		* Create service
		*
		* @param ContainerInterface $container
		* @return AdmissionRechercheController
		* @throws \Psr\Container\NotFoundExceptionInterface
		* @throws \Psr\Container\ContainerExceptionInterface
		*/
		public function __invoke(ContainerInterface $container)
		public function __invoke(ContainerInterface $container): AdmissionRechercheController
		{
		/**
		* @var AdmissionService $admissionService
		* @var AdmissionRechercheService $admissionRechercheService
		* @var RoleService $roleService
		*/
		$admissionService = $container->get(AdmissionService::class);
		$admissionRechercheService = $container->get(AdmissionRechercheService::class);
		$admissionOperationService = $container->get(AdmissionOperationService::class);
		$admissionOperationRule = $container->get(AdmissionOperationRule::class);

		$controller = new AdmissionRechercheController();
		$controller->setSearchService($admissionRechercheService);
		$controller->setAdmissionService($admissionService);
		$controller->setAdmissionOperationService($admissionOperationService);
		$controller->setAdmissionOperationService($admissionOperationService);
		$controller->setOperationRule($admissionOperationRule);

		/** @var AdmissionRechercheService $admissionRechercheService */
		$admissionRechercheService = $container->get(SearchServicePluginManager::class)->get(AdmissionRechercheService::class);
		$controller->setSearchService($admissionRechercheService);

		return $controller;
		}
		}
		No newline at end of file

module/Admission/src/Admission/Entity/Db/Inscription.php

+18 −3

Changes for module/Admission/src/Admission/Entity/Db/Inscription.php: 18 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		<?php
		namespace Admission\Entity\Db;

		use Application\Entity\AnneeUniv;
		use Application\Entity\Db\Discipline;
		use Application\Entity\Db\Pays;
		use DateTime;
		@@ -19,6 +20,8 @@ class Inscription implements HistoriqueAwareInterface{

		use HistoriqueAwareTrait;

		private int $anneeUniv;

		/**
		* @var string\|null
		*/
		@@ -160,15 +163,27 @@ class Inscription implements HistoriqueAwareInterface{
		*/
		private $etablissementRattachementCoDirecteur;

		/**
		* Constructor
		*/
		public function __construct()
		{
		$this->anneeUniv = (int) (new DateTime('today'))->format('Y');
		$this->admission = new Admission();
		$this->verificationInscription = new ArrayCollection();
		}

		public function getAnneeUniv(): AnneeUniv
		{
		return AnneeUniv::fromPremiereAnnee($this->anneeUniv);
		}

		public function setAnneeUniv(int\|AnneeUniv $anneeUniv): self
		{
		if ($anneeUniv instanceof AnneeUniv) {
		$anneeUniv = $anneeUniv->getPremiereAnnee();
		}

		$this->anneeUniv = $anneeUniv;
		return $this;
		}

		/**
		* Set disciplineDoctorat.