Merge branch 'feature_these_complete_from_ia' into release_13.2.0 (9574641d) · 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
		@@ -11,6 +11,7 @@ Journal des modifications
		- Thèses : modification de la valeur du témoin de corrections attendues d'une thèse non importée.
		- Thèses : notification en cas de modification manuelle de la valeur du témoin de corrections attendues d'une thèse (comme à l'issue d'un import).
		- Import (réception) d'inscription administrative : spécification partielle dans un fichier de config (complétée dynamiquement) pour la visibilité et accéder aux logs.
		- Inscription administrative : création de la thèse de manière plus complète à partir du dossier d'admission et de l'IA reçue.
		- Doctorant : prise en compte du code apprenant Pégase (si disponible)comma valeur du 'numéro étudiant'.
		- [FIX] Admission : invisibilité des détails de la quesiton 'Avez-vous un contrat doctoral ?' au chargement de la page.
		- [FIX] Saisie financement de thèse : invisibilité des listes déroulantes 'Année' et 'Origine' au chargement du formulaire.

composer.lock

+2 −2

Changes for composer.lock: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -13288,7 +13288,7 @@
		"source": {
		"type": "git",
		"url": "https://git.unicaen.fr/lib/unicaen/sygal-api.git",
		"reference": "d5b8c0d6c97aa1ab5ef6add2fb631c2ab341eaa5"
		"reference": "92bedae6f8949bdf8b782ff61599c95c391abe95"
		},
		"require": {
		"guzzlehttp/guzzle": "^7.0",
		@@ -13314,7 +13314,7 @@
		]
		},
		"description": "API SyGAL",
		"time": "2026-06-10T07:44:16+00:00"
		"time": "2026-08-27T12:52:37+00:00"
		},
		{
		"name": "unicaen/utilisateur",

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

+9 −24

Changes for module/Admission/src/Admission/Entity/Db/Financement.php: 9 added lines, 24 removed lines.
Original line number	Diff line number	Diff line
		@@ -11,6 +11,9 @@ class Financement implements HistoriqueAwareInterface{

		use HistoriqueAwareTrait;

		public const TEMPS_COMPLET = 1;
		public const TEMPS_PARTIEL = 2;

		private bool $contratDoctoral = false;

		/**
		@@ -100,12 +103,8 @@ class Financement implements HistoriqueAwareInterface{

		/**
		* Set financement.
		*
		* @param OrigineFinancement $financement
		*
		* @return Financement\|null
		*/
		public function setFinancement($financement = null)
		public function setFinancement(?OrigineFinancement $financement): static
		{
		$this->financement = $financement;

		@@ -114,22 +113,16 @@ class Financement implements HistoriqueAwareInterface{

		/**
		* Get financement.
		*
		* @return OrigineFinancement\|null
		*/
		public function getFinancement()
		public function getFinancement(): ?OrigineFinancement
		{
		return $this->financement;
		}

		/**
		* Set financementCompl.
		*
		* @param OrigineFinancement $financementCompl
		*
		* @return Financement\|null
		*/
		public function setFinancementCompl($financementCompl = null)
		public function setFinancementCompl(?OrigineFinancement $financementCompl): static
		{
		$this->financementCompl = $financementCompl;

		@@ -138,22 +131,16 @@ class Financement implements HistoriqueAwareInterface{

		/**
		* Get financementCompl.
		*
		* @return OrigineFinancement\|null
		*/
		public function getFinancementCompl()
		public function getFinancementCompl(): ?OrigineFinancement
		{
		return $this->financementCompl;
		}

		/**
		* Set detailContratDoctoral.
		*
		* @param string\|null $detailContratDoctoral
		*
		* @return Financement
		*/
		public function setDetailContratDoctoral($detailContratDoctoral = null)
		public function setDetailContratDoctoral(?string $detailContratDoctoral): static
		{
		$this->detailContratDoctoral = $detailContratDoctoral;

		@@ -162,10 +149,8 @@ class Financement implements HistoriqueAwareInterface{

		/**
		* Get detailContratDoctoral.
		*
		* @return string\|null
		*/
		public function getDetailContratDoctoral()
		public function getDetailContratDoctoral(): ?string
		{
		return $this->detailContratDoctoral;
		}

module/Admission/src/Admission/Form/Fieldset/Financement/FinancementFieldset.php

+3 −2

Changes for module/Admission/src/Admission/Form/Fieldset/Financement/FinancementFieldset.php: 3 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		<?php
		namespace Admission\Form\Fieldset\Financement;

		use Admission\Entity\Db\Financement;
		use Admission\Form\Fieldset\AdmissionBaseFieldset;
		use Admission\Form\Fieldset\Verification\VerificationFieldset;
		use Application\Entity\Db\OrigineFinancement;
		@@ -92,8 +93,8 @@ class FinancementFieldset extends AdmissionBaseFieldset implements InputFilterPr
		$this->add(
		(new Radio('tempsTravail'))
		->setValueOptions([
		1 => "temps complet",
		2 => "temps partiel"
		Financement::TEMPS_COMPLET => "temps complet",
		Financement::TEMPS_PARTIEL => "temps partiel"
		])
		->setLabel("Temps de travail du doctorant mené à")
		->setLabelAttributes(['data-after' => " / Doctoral student's working time in"])

module/Application/src/Application/Entity/Db/Financement.php

+22 −45

Changes for module/Application/src/Application/Entity/Db/Financement.php: 22 added lines, 45 removed lines.
Original line number	Diff line number	Diff line
		@@ -6,11 +6,20 @@ use DateTime;
		use These\Entity\Db\These;
		use UnicaenUtilisateur\Entity\Db\HistoriqueAwareInterface;
		use UnicaenUtilisateur\Entity\Db\HistoriqueAwareTrait;
		use Webmozart\Assert\Assert;

		class Financement implements HistoriqueAwareInterface{

		use HistoriqueAwareTrait;

		public const CONTRAT_DOCTORAL_AVEC__CODE = '1';
		public const CONTRAT_DOCTORAL_AVEC__LIBELLE = 'Contrat doctoral';
		public const CONTRAT_DOCTORAL_SANS__CODE = '0';
		public const CONTRAT_DOCTORAL_SANS__LIBELLE = 'Sans contrat doctoral';

		public const QUOTITE_100 = '100';
		public const QUOTITE_50 = '50';

		/** @var int */
		private $id;
		/** @var Source */
		@@ -116,91 +125,59 @@ class Financement implements HistoriqueAwareInterface{
		return $this;
		}

		/**
		* @return OrigineFinancement
		*/
		public function getOrigineFinancement()
		public function getOrigineFinancement(): ?OrigineFinancement
		{
		return $this->origineFinancement;
		}

		/**
		* @param OrigineFinancement $origineFinancement
		* @return Financement
		*/
		public function setOrigineFinancement($origineFinancement)
		public function setOrigineFinancement(?OrigineFinancement $origineFinancement): static
		{
		$this->origineFinancement = $origineFinancement;
		return $this;
		}

		/**
		* @return string
		*/
		public function getComplementFinancement()
		public function getComplementFinancement(): ?string
		{
		return $this->complementFinancement;
		}

		/**
		* @param string $complementFinancement
		* @return Financement
		*/
		public function setComplementFinancement($complementFinancement)
		public function setComplementFinancement(?string $complementFinancement): static
		{
		$this->complementFinancement = $complementFinancement;
		return $this;
		}

		/**
		* @return string
		*/
		public function getQuotiteFinancement()
		public function getQuotiteFinancement(): ?string
		{
		return $this->quotiteFinancement;
		}

		/**
		* @param string $quotiteFinancement
		* @return Financement
		*/
		public function setQuotiteFinancement($quotiteFinancement)
		public function setQuotiteFinancement(?string $quotiteFinancement): static
		{
		if ($quotiteFinancement !== null) {
		Assert::inArray($quotiteFinancement, [static::QUOTITE_100, static::QUOTITE_50]);
		}
		$this->quotiteFinancement = $quotiteFinancement;
		return $this;
		}

		/**
		* @return DateTime
		*/
		public function getDateDebut()
		public function getDateDebut(): ?DateTime
		{
		return $this->dateDebut;
		}

		/**
		* @param DateTime $dateDebut
		* @return Financement
		*/
		public function setDateDebut($dateDebut)
		public function setDateDebut(?DateTime $dateDebut): static
		{
		$this->dateDebut = $dateDebut;
		return $this;
		}

		/**
		* @return DateTime
		*/
		public function getDateFin()
		public function getDateFin(): ?DateTime
		{
		return $this->dateFin;
		}

		/**
		* @param DateTime $dateFin
		* @return Financement
		*/
		public function setDateFin($dateFin)
		public function setDateFin(?DateTime $dateFin): static
		{
		$this->dateFin = $dateFin;
		return $this;