résolution conflit rebase (ac69c81e) · Commits · open-source / sygal

module/HDR/view/hdr/hdr/identite.phtml

+2 −2

Changes for module/HDR/view/hdr/hdr/identite.phtml: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -91,8 +91,8 @@ switch ($hdr->getEtatHDR()){
		</div>
		<?php endif ?>
		</div>
		<div class="row informations-compl-these-div" style="padding-left:12px;">
		<div class="col-md-6 informations-compl-these-card information-etat-these-card <?=$etatHDRClass?>-etat-these-card"
		<div class="row informations-compl-div" style="padding-left:12px;">
		<div class="col-md-6 informations-compl-card information-etat-card <?=$etatHDRClass?>-etat-card"
		data-bs-toggle="tooltip" data-bs-original-title="<?=$etatHDRTextTooltip?>">
		<span class="icon icon-<?=$iconEtatHDR?>"></span>
		<h2><?= $hdr->getEtatHDRToString(); ?></h2>

module/Soutenance/src/Soutenance/Rule/PropositionJuryRule.php

+0 −9

Changes for module/Soutenance/src/Soutenance/Rule/PropositionJuryRule.php: 0 added lines, 9 removed lines.
Original line number	Diff line number	Diff line
		@@ -54,15 +54,6 @@ class PropositionJuryRule implements RuleInterface
		$emerites_max = (float) $this->getParametreService()->getValeurForParametre($categorieCode, SoutenanceParametres::RATIO_MAX_EMERITES);
		$parite_min = ((float) $this->getParametreService()->getValeurForParametre($categorieCode, SoutenanceParametres::EQUILIBRE_FEMME_HOMME));


		$membre_min = $this->parametreService->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::NB_MIN_MEMBRE_JURY);
		$membre_max = $this->parametreService->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::NB_MAX_MEMBRE_JURY);
		$rapporteur_min = $this->parametreService->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::NB_MIN_RAPPORTEUR);
		$rangA_min = (float)$this->parametreService->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::RATIO_MIN_RANG_A);
		$exterieur_min = (float)$this->parametreService->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::RATIO_MIN_EXTERIEUR);
		$emerites_max = (float)$this->parametreService->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::RATIO_MAX_EMERITES);
		$parite_min = (float)$this->parametreService->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::EQUILIBRE_FEMME_HOMME);

		/** @var Membre $membre */
		foreach ($this->proposition->getMembres() as $membre) {
		$nbMembre++;

module/Soutenance/src/Soutenance/Service/Proposition/PropositionHDR/PropositionHDRServiceFactory.php

+5 −0

Changes for module/Soutenance/src/Soutenance/Service/Proposition/PropositionHDR/PropositionHDRServiceFactory.php: 5 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@ use Notification\Service\NotifierService;
		use Psr\Container\ContainerExceptionInterface;
		use Psr\Container\ContainerInterface;
		use Psr\Container\NotFoundExceptionInterface;
		use Soutenance\Rule\PropositionJuryRule;
		use Soutenance\Service\Membre\MembreService;
		use Soutenance\Service\Notification\SoutenanceNotificationFactory;
		use Soutenance\Service\Validation\ValidationHDR\ValidationHDRService;
		@@ -66,6 +67,10 @@ class PropositionHDRServiceFactory
		$soutenanceNotificationFactory = $container->get(SoutenanceNotificationFactory::class);
		$service->setSoutenanceNotificationFactory($soutenanceNotificationFactory);

		/** @var PropositionJuryRule $propositionJuryRule */
		$propositionJuryRule = $container->get(PropositionJuryRule::class);
		$service->setPropositionJuryRule($propositionJuryRule);

		return $service;
		}
		}

module/Soutenance/src/Soutenance/Service/Proposition/PropositionThese/PropositionTheseServiceFactory.php

+5 −0

Changes for module/Soutenance/src/Soutenance/Service/Proposition/PropositionThese/PropositionTheseServiceFactory.php: 5 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@ use Notification\Service\NotifierService;
		use Psr\Container\ContainerExceptionInterface;
		use Psr\Container\ContainerInterface;
		use Psr\Container\NotFoundExceptionInterface;
		use Soutenance\Rule\PropositionJuryRule;
		use Soutenance\Service\Membre\MembreService;
		use Soutenance\Service\Notification\SoutenanceNotificationFactory;
		use Soutenance\Service\Validation\ValidationThese\ValidationTheseService;
		@@ -66,6 +67,10 @@ class PropositionTheseServiceFactory
		$soutenanceNotificationFactory = $container->get(SoutenanceNotificationFactory::class);
		$service->setSoutenanceNotificationFactory($soutenanceNotificationFactory);

		/** @var PropositionJuryRule $propositionJuryRule */
		$propositionJuryRule = $container->get(PropositionJuryRule::class);
		$service->setPropositionJuryRule($propositionJuryRule);

		return $service;
		}
		}

module/Soutenance/src/Soutenance/View/Helper/partial/etat.phtml

+8 −8

Changes for module/Soutenance/src/Soutenance/View/Helper/partial/etat.phtml: 8 added lines, 8 removed lines.
Original line number	Diff line number	Diff line
		@@ -33,8 +33,8 @@ switch ($etat->getCode()){
		Pas d'état

		<?php else : ?>
		<div class="row informations-compl-these-div">
		<div class="col-md-6 informations-compl-these-card information-etat-these-card <?=$etat->getCode()?>-etat-these-card"
		<div class="row informations-compl-div">
		<div class="col-md-6 informations-compl-card information-etat-card <?=$etat->getCode()?>-etat-card"
		data-bs-toggle="tooltip" data-bs-original-title="État de la proposition">
		<span class="icon icon-<?=$iconEtat?>"></span>
		<h2><?= $etat->getLibelle(); ?></h2>
		@@ -44,28 +44,28 @@ switch ($etat->getCode()){


		<style>
		div.information-etat-these-card.<?php echo Etat::VALIDEE; ?>-etat-these-card {
		div.information-etat-card.<?php echo Etat::VALIDEE; ?>-etat-card {
		color: darkgreen;
		border-left: 5px solid darkgreen;
		min-width: 09%;
		}
		div.information-etat-these-card.<?php echo Etat::REJETEE; ?>-etat-these-card {
		div.information-etat-card.<?php echo Etat::REJETEE; ?>-etat-card {
		color: darkred;
		border-left: 5px solid darkred;
		min-width: 09%;
		}
		div.information-etat-these-card.<?php echo Etat::EN_COURS_EXAMEN; ?>-etat-these-card,
		div.information-etat-these-card.<?php echo Etat::EN_COURS_SAISIE; ?>-etat-these-card{
		div.information-etat-card.<?php echo Etat::EN_COURS_EXAMEN; ?>-etat-card,
		div.information-etat-card.<?php echo Etat::EN_COURS_SAISIE; ?>-etat-card{
		color: darkorange;
		border-left: 5px solid darkorange;
		min-width: 09%;
		}
		div.information-etat-these-card.<?php echo Etat::ETABLISSEMENT; ?>-etat-these-card {
		div.information-etat-card.<?php echo Etat::ETABLISSEMENT; ?>-etat-card {
		color: teal;
		border-left: 5px solid teal;
		min-width: 09%;
		}
		div.information-etat-these-card.<?php echo Etat::COMPLET; ?>-etat-these-card {
		div.information-etat-card.<?php echo Etat::COMPLET; ?>-etat-card {
		color: dodgerblue;
		border-left: 5px solid dodgerblue;
		min-width: 09%;