HDR : abandon de la saisie de la discipline, remplacée par la version de... (cdce7fe3) · Commits · open-source / sygal

composer.json

+1 −1

Changes for composer.json: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@
		"webmozart/assert": "^1.3",

		"unicaen/alerte": "^3.0",
		"unicaen/app": "^6.1.6",
		"unicaen/app": "dev-release_6.2.0 as 6.1.7",
		"unicaen/auth-token": "^7.1",
		"unicaen/authentification": "^6.4",
		"unicaen/console": "^6.0",

doc/release-notes/module_hdr/01_module_hdr.sql

+1 −0

Changes for doc/release-notes/module_hdr/01_module_hdr.sql: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -1060,6 +1060,7 @@ where tem_ses_uni = 'O' and tem_res_ths_vdi = 'O'
		order by lic_vdi;
		*/

		delete from unicaen_renderer_macro where variable_name = 'hdr' and methode_name = 'getLibelleDiscipline';
		INSERT INTO unicaen_renderer_macro (code, description, variable_name, methode_name) VALUES ('HDR#VersionDiplome', '<p>Affiche le libellé de la version de diplôme associée à l''HDR</p>', 'hdr', 'getLibelleVersionDiplome');

		alter table HDR add version_diplome_id bigint constraint hdr_version_diplome_fk references version_diplome(id) on delete no action;

module/Application/src/Application/Entity/Db/Repository/VersionDiplomeRepository.php

+13 −2

Changes for module/Application/src/Application/Entity/Db/Repository/VersionDiplomeRepository.php: 13 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -6,6 +6,17 @@ use Structure\Entity\Db\Etablissement;

		class VersionDiplomeRepository extends DefaultEntityRepository
		{
		public function findAll()
		{
		$qb = $this->createQueryBuilder('vdi')
		->join('vdi.etablissement', 'e')->addSelect('e')
		->join('e.structure', 'es')->addSelect('es')
		->addOrderBy('es.sigle', 'ASC')
		->addOrderBy('vdi.libelleLong', 'ASC');

		return $qb->indexBy('vdi', 'vdi.id')->getQuery()->getResult();
		}

		public function findForEtablissement(Etablissement\|string $etablissement): array
		{
		if ($etablissement instanceof Etablissement) {
		@@ -13,11 +24,11 @@ class VersionDiplomeRepository extends DefaultEntityRepository
		}

		$qb = $this->createQueryBuilder('vdi')
		->join('vdi.etablissement', 'e')
		->join('vdi.etablissement', 'e')->addSelect('e')
		->where("e.sourceCode = :etablissement")
		->setParameter("etablissement", $etablissement)
		->orderBy('vdi.libelleLong', 'ASC');

		return $qb->indexBy('vdi', 'vdi.code')->getQuery()->getResult();
		return $qb->indexBy('vdi', 'vdi.id')->getQuery()->getResult();
		}
		}
		No newline at end of file

module/Application/src/Application/View/Renderer/PhpRenderer.php

+2 −1

Changes for module/Application/src/Application/View/Renderer/PhpRenderer.php: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ use Fichier\View\Helper\Fichier\FichierViewHelper;
		use Laminas\Form\ElementInterface;
		use Structure\Entity\Db\EcoleDoctorale;
		use These\Entity\Db\These;
		use UnicaenApp\Form\Element\Select2;
		use Validation\Entity\Db\ValidationThese;
		use Depot\Entity\Db\VWorkflow;
		use Application\View\Helper\Actualite\ActualiteViewHelper;
		@@ -120,6 +121,7 @@ use UnicaenIdref\View\Helper\IdrefLinkViewHelper;
		* @method \UnicaenApp\Form\View\Helper\FormElementCollection\|string formElementCollection(ElementInterface $element = null, $wrap = true)
		* @method \UnicaenApp\Form\View\Helper\FormRowDateInfSup formrowdateinfsup(\Laminas\Form\ElementInterface $element = null, $labelPosition = null, $renderErrors = null, $partial = null)
		* @method \UnicaenApp\Form\View\Helper\FormSearchAndSelect formsearchandselect(\Laminas\Form\ElementInterface $element = null)
		* @method \UnicaenApp\Form\View\Helper\FormSelect2\|string formSelect2(Select2 $element = null)
		* @method \UnicaenApp\Form\View\Helper\FormLdapPeople formLdapPeople(\Laminas\Form\ElementInterface $element = null)
		* @method \UnicaenApp\Form\View\Helper\FormErrors\|string formErrors(\Laminas\Form\Form $form = null, $message = null)
		* @method \UnicaenApp\Form\View\Helper\Form form(\Laminas\Form\FormInterface $form = null)
		@@ -154,7 +156,6 @@ use UnicaenIdref\View\Helper\IdrefLinkViewHelper;
		* @method EcoleDoctoraleHelper ed(EcoleDoctorale $ecole)
		*
		* @method UrlDepotHelper urlThese()
		* @method StructureSubstitHelper structureSubstitHelper()
		* @method FinancementFormatterHelper financementFormatter()
		*
		* @method ActualiteViewHelper actualite()

module/HDR/src/HDR/Controller/HDRController.php

+1 −2

Changes for module/HDR/src/HDR/Controller/HDRController.php: 1 added line, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ class HDRController extends AbstractController
		//export
		$headers = ['id', 'Civilité', 'Nom usuel', 'Prénom',
		'Nom patronymique', 'Date de naissance', 'Nationalité',
		'Adresse électronique', 'Adresse électronique personnelle', 'Discipline', 'Version de diplôme',
		'Adresse électronique', 'Adresse électronique personnelle', 'Version de diplôme',
		'Garant', 'Établissement', 'Unité de Recherche Code', 'Unité de Recherche',
		'Date d\'abandon', 'Date de soutenance', 'Date de fin de confidentialité',
		'État de la HDR', 'Autorisation à soutenir', 'Est confidentielle', 'Résultat'
		@@ -110,7 +110,6 @@ class HDRController extends AbstractController
		$entry['Nationalité'] = $individu ? $individu->getPaysNationalite() : null;
		$entry["Adresse électronique"] = $individu ? $individu->getEmailPro() : null;
		$entry['Adresse électronique personnelle'] = $individu ? $individu->getEmailContact() : null;
		$entry['Discipline'] = $hdr->getDiscipline() ? $hdr->getDiscipline()->getLibelle() : null;;
		$entry['Version de diplôme'] = $hdr->getVersionDiplome()?->getLibelleLong();
		$entry['Garant'] = $garant ?: null;
		$entry['Établissement'] = $hdr->getEtablissement();