diff --git a/composer.lock b/composer.lock
index 64af755691e673ed79a91895d694775fefb1f23a..4c580c25a6c180469ae5c5a8b9a422bc6d4a2307 100644
--- a/composer.lock
+++ b/composer.lock
@@ -9943,14 +9943,13 @@
},
{
"name": "unicaen/parametre",
- "version": "5.0.0",
+ "version": "5.0.1",
"source": {
"type": "git",
"url": "https://git.unicaen.fr/lib/unicaen/parametre.git",
- "reference": "04311ff04b56bda07cb67eeed3d0757f0e50027a"
+ "reference": "5ee55b27320ded72c7e18fdcc18086867343dbd8"
},
"require": {
- "unicaen/app": "^5",
"unicaen/privilege": "^5"
},
"type": "library",
@@ -9961,7 +9960,7 @@
]
},
"description": "Module de gestion de paramètres",
- "time": "2022-07-21T08:58:12+00:00"
+ "time": "2023-03-03T10:09:58+00:00"
},
{
"name": "unicaen/pdf",
diff --git a/module/Formation/src/Formation/Controller/EnqueteQuestionController.php b/module/Formation/src/Formation/Controller/EnqueteQuestionController.php
index 4f6f17b13d08dbe02dc409fc85d7dbb76abc3558..831f92a11390c5e19f33fd8002d9ad64a4549d09 100644
--- a/module/Formation/src/Formation/Controller/EnqueteQuestionController.php
+++ b/module/Formation/src/Formation/Controller/EnqueteQuestionController.php
@@ -342,7 +342,7 @@ class EnqueteQuestionController extends AbstractController {
$categories = $this->getEntityManager()->getRepository(EnqueteCategorie::class)->findAll();
- $delai = $this->getParametreService()->getParametreByCode(FormationParametres::CATEGORIE, FormationParametres::DELAI_ENQUETE)->getValeur();
+ $delai = $this->getParametreService()->getValeurForParametre(FormationParametres::CATEGORIE, FormationParametres::DELAI_ENQUETE);
$date = DateTime::createFromFormat('d/m/Y', $inscription->getSession()->getDateFin()->format('d/m/Y'));
$date->add(new DateInterval('P'.$delai.'D'));
diff --git a/module/Formation/src/Formation/Controller/IndexController.php b/module/Formation/src/Formation/Controller/IndexController.php
index cacf7f211c6468fff37774ab06433fd6377b6709..2aeb04df3a24af463654d547cf3a69e50a05b332 100644
--- a/module/Formation/src/Formation/Controller/IndexController.php
+++ b/module/Formation/src/Formation/Controller/IndexController.php
@@ -53,7 +53,7 @@ class IndexController extends AbstractController
'ouvertes' => $ouvertes,
'preparations' => $preparations,
'inscriptions' => $inscriptions,
- 'delai' => $this->getParametreService()->getParametreByCode(FormationParametres::CATEGORIE, FormationParametres::DELAI_ENQUETE)->getValeur(),
+ 'delai' => $this->getParametreService()->getValeurForParametre(FormationParametres::CATEGORIE, FormationParametres::DELAI_ENQUETE),
]);
}
diff --git a/module/Formation/src/Formation/Controller/Recherche/AbstractRechercheController.php b/module/Formation/src/Formation/Controller/Recherche/AbstractRechercheController.php
index 160d48170cdd760b340a1b5903c80131f436100c..f9a16ada75c2638ef84fe57646cc8e342bc6aab4 100755
--- a/module/Formation/src/Formation/Controller/Recherche/AbstractRechercheController.php
+++ b/module/Formation/src/Formation/Controller/Recherche/AbstractRechercheController.php
@@ -40,7 +40,7 @@ class AbstractRechercheController extends AbstractController implements SearchCo
'paginator' => $paginator,
'routeName' => $this->routeName,
'returnUrl' => $this->getRequest()->getRequestUri(),
- 'delai' => $this->getParametreService()?$this->getParametreService()->getParametreByCode(FormationParametres::CATEGORIE, FormationParametres::DELAI_ENQUETE)->getValeur():null,
+ 'delai' => $this->getParametreService()?$this->getParametreService()->getValeurForParametre(FormationParametres::CATEGORIE, FormationParametres::DELAI_ENQUETE):null,
]);
$model->setTemplate($this->indexActionTemplate);
diff --git a/module/Soutenance/src/Soutenance/Assertion/InterventionAssertion.php b/module/Soutenance/src/Soutenance/Assertion/InterventionAssertion.php
index f7f0f0af15cfc885c2628bfe7df0d2f833de4b37..f3f2fabdd023f5b7eec8af36b59ccd3928896193 100644
--- a/module/Soutenance/src/Soutenance/Assertion/InterventionAssertion.php
+++ b/module/Soutenance/src/Soutenance/Assertion/InterventionAssertion.php
@@ -46,7 +46,7 @@ class InterventionAssertion implements AssertionInterface
$proposition = $this->getPropositionService()->findOneForThese($these);
$date_soutenance = ($these->getDateSoutenance())?$these->getDateSoutenance():$proposition->getDate();
- $interval = $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DELAI_INTERVENTION)->getValeur();
+ $interval = $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DELAI_INTERVENTION);
$mini = (new DateTime())->sub(new DateInterval('P'.$interval.'D'));
$maxi = (new DateTime())->add(new DateInterval('P'.$interval.'D'));
diff --git a/module/Soutenance/src/Soutenance/Controller/InterventionController.php b/module/Soutenance/src/Soutenance/Controller/InterventionController.php
index e2caa679127e0156ed49a92d3131312a686e2e8f..b5af26b332a2382d664f0f8df706b173004d6cdb 100644
--- a/module/Soutenance/src/Soutenance/Controller/InterventionController.php
+++ b/module/Soutenance/src/Soutenance/Controller/InterventionController.php
@@ -57,7 +57,7 @@ class InterventionController extends AbstractController
'membres' => $membres,
'justificatifs' => $justificatifs,
'urlFichierThese' => $this->urlFichierThese(),
- 'FORMULAIRE_DELEGUATION' => $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_DELEGATION_SIGNATURE)->getValeur(),
+ 'FORMULAIRE_DELEGUATION' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_DELEGATION_SIGNATURE),
]);
}
diff --git a/module/Soutenance/src/Soutenance/Controller/JustificatifController.php b/module/Soutenance/src/Soutenance/Controller/JustificatifController.php
index fcdaf714aac266c86c722557e086cbb35d1ff961..bf03f169a669c1b6e0e2dfca5f3e00dc54b7c592 100644
--- a/module/Soutenance/src/Soutenance/Controller/JustificatifController.php
+++ b/module/Soutenance/src/Soutenance/Controller/JustificatifController.php
@@ -104,11 +104,11 @@ class JustificatifController extends AbstractController {
'form' => $form,
'justificatifs' => $justificatifs,
- 'FORMULAIRE_DELOCALISATION' => $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_DELOCALISATION)->getValeur(),
- 'FORMULAIRE_DELEGUATION' => $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_DELEGATION_SIGNATURE)->getValeur(),
- 'FORMULAIRE_DEMANDE_LABEL' => $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_LABEL_EUROPEEN)->getValeur(),
- 'FORMULAIRE_DEMANDE_ANGLAIS' => $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_REDACTION_ANGLAIS)->getValeur(),
- 'FORMULAIRE_DEMANDE_CONFIDENTIALITE' => $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_CONFIDENTIALITE)->getValeur(),
+ 'FORMULAIRE_DELOCALISATION' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_DELOCALISATION),
+ 'FORMULAIRE_DELEGUATION' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_DELEGATION_SIGNATURE),
+ 'FORMULAIRE_DEMANDE_LABEL' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_LABEL_EUROPEEN),
+ 'FORMULAIRE_DEMANDE_ANGLAIS' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_REDACTION_ANGLAIS),
+ 'FORMULAIRE_DEMANDE_CONFIDENTIALITE' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_CONFIDENTIALITE),
]);
// $vm->setTemplate('soutenance/default/default-form');
return $vm;
diff --git a/module/Soutenance/src/Soutenance/Controller/PresoutenanceController.php b/module/Soutenance/src/Soutenance/Controller/PresoutenanceController.php
index 2dc4914bb09b74651bb14988a8cca8b58a011b63..ae8376fbb4203ae89e1fad005d3dbf8f35e63f23 100644
--- a/module/Soutenance/src/Soutenance/Controller/PresoutenanceController.php
+++ b/module/Soutenance/src/Soutenance/Controller/PresoutenanceController.php
@@ -131,7 +131,7 @@ class PresoutenanceController extends AbstractController
'evenementsEngagement' => $this->getEvenementService()->getEvenementsByPropositionAndType($proposition, Evenement::EVENEMENT_ENGAGEMENT),
'evenementsPrerapport' => $this->getEvenementService()->getEvenementsByPropositionAndType($proposition, Evenement::EVENEMENT_PRERAPPORT),
- 'deadline' => $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DELAI_RETOUR)->getValeur(),
+ 'deadline' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DELAI_RETOUR),
]);
}
diff --git a/module/Soutenance/src/Soutenance/Controller/PropositionController.php b/module/Soutenance/src/Soutenance/Controller/PropositionController.php
index 1bb1dd7ea8df2531f31eae9347a308123c378214..88b3cf0f699e91043b9d897ec9c5977327e0cff8 100644
--- a/module/Soutenance/src/Soutenance/Controller/PropositionController.php
+++ b/module/Soutenance/src/Soutenance/Controller/PropositionController.php
@@ -220,11 +220,11 @@ class PropositionController extends AbstractController
'informationsOk' => $informationsOk,
'avis' => $this->getAvisService()->getAvisByThese($these),
- 'FORMULAIRE_DELOCALISATION' => $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_DELOCALISATION)->getValeur(),
- 'FORMULAIRE_DELEGUATION' => $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_DELEGATION_SIGNATURE)->getValeur(),
- 'FORMULAIRE_DEMANDE_LABEL' => $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_LABEL_EUROPEEN)->getValeur(),
- 'FORMULAIRE_DEMANDE_ANGLAIS' => $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_REDACTION_ANGLAIS)->getValeur(),
- 'FORMULAIRE_DEMANDE_CONFIDENTIALITE' => $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_CONFIDENTIALITE)->getValeur(),
+ 'FORMULAIRE_DELOCALISATION' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_DELOCALISATION),
+ 'FORMULAIRE_DELEGUATION' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_DELEGATION_SIGNATURE),
+ 'FORMULAIRE_DEMANDE_LABEL' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_LABEL_EUROPEEN),
+ 'FORMULAIRE_DEMANDE_ANGLAIS' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_REDACTION_ANGLAIS),
+ 'FORMULAIRE_DEMANDE_CONFIDENTIALITE' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_CONFIDENTIALITE),
]);
}
@@ -737,7 +737,7 @@ class PropositionController extends AbstractController
$vm->setVariables([
'these' => $these,
'proposition' => $proposition,
- 'FORMULAIRE_DELOCALISATION' => $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_DELOCALISATION)->getValeur(),
+ 'FORMULAIRE_DELOCALISATION' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_DELOCALISATION),
'canModifier' => $this->isAllowed(PropositionPrivileges::getResourceId(PropositionPrivileges::PROPOSITION_MODIFIER)),
]);
return $vm;
@@ -759,7 +759,7 @@ class PropositionController extends AbstractController
$vm->setVariables([
'these' => $these,
'proposition' => $proposition,
- 'FORMULAIRE_DELEGUATION' => $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_DELEGATION_SIGNATURE)->getValeur(),
+ 'FORMULAIRE_DELEGUATION' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_DELEGATION_SIGNATURE),
'canModifier' => $this->isAllowed(PropositionPrivileges::getResourceId(PropositionPrivileges::PROPOSITION_MODIFIER)),
'indicateurs' => $indicateurs,
]);
@@ -777,9 +777,9 @@ class PropositionController extends AbstractController
$vm->setVariables([
'these' => $these,
'proposition' => $proposition,
- 'FORMULAIRE_DEMANDE_LABEL' => $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_LABEL_EUROPEEN)->getValeur(),
- 'FORMULAIRE_DEMANDE_ANGLAIS' => $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_REDACTION_ANGLAIS)->getValeur(),
- 'FORMULAIRE_DEMANDE_CONFIDENTIALITE' => $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_CONFIDENTIALITE)->getValeur(),
+ 'FORMULAIRE_DEMANDE_LABEL' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_LABEL_EUROPEEN),
+ 'FORMULAIRE_DEMANDE_ANGLAIS' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_REDACTION_ANGLAIS),
+ 'FORMULAIRE_DEMANDE_CONFIDENTIALITE' => $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DOC_CONFIDENTIALITE),
'canModifier' => $this->isAllowed(PropositionPrivileges::getResourceId(PropositionPrivileges::PROPOSITION_MODIFIER)),
]);
return $vm;
diff --git a/module/Soutenance/src/Soutenance/Service/Proposition/PropositionService.php b/module/Soutenance/src/Soutenance/Service/Proposition/PropositionService.php
index 2c03589da3a83142cab4f30416130c82b67b3013..9e42a5c931f15750413e3a74f04259176ba77898 100644
--- a/module/Soutenance/src/Soutenance/Service/Proposition/PropositionService.php
+++ b/module/Soutenance/src/Soutenance/Service/Proposition/PropositionService.php
@@ -284,12 +284,12 @@ class PropositionService extends BaseService
$nbExterieur = 0;
$nbRapporteur = 0;
- $membre_min = $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::NB_MIN_MEMBRE_JURY)->getValeur();
- $membre_max = $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::NB_MAX_MEMBRE_JURY)->getValeur();
- $rapporteur_min = $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::NB_MIN_RAPPORTEUR)->getValeur();
- $rangA_min = ((float) $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::RATIO_MIN_RANG_A)->getValeur());
- $exterieur_min = ((float) $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::RATIO_MIN_EXTERIEUR)->getValeur());
- $parite_min = ((float) $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::RATIO_PARITE)->getValeur());
+ $membre_min = $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::NB_MIN_MEMBRE_JURY);
+ $membre_max = $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::NB_MAX_MEMBRE_JURY);
+ $rapporteur_min = $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::NB_MIN_RAPPORTEUR);
+ $rangA_min = ((float) $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::RATIO_MIN_RANG_A));
+ $exterieur_min = ((float) $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::RATIO_MIN_EXTERIEUR));
+ $parite_min = ((float) $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::RATIO_PARITE));
/** @var Membre $membre */
foreach ($proposition->getMembres() as $membre) {
@@ -667,7 +667,7 @@ class PropositionService extends BaseService
if ($proposition->getDate() === null) throw new RuntimeException("Aucune date de soutenance de renseignée !");
try {
$renduRapport = $proposition->getDate();
- $deadline = $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DELAI_RETOUR)->getValeur();
+ $deadline = $this->getParametreService()->getValeurForParametre(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DELAI_RETOUR);
$renduRapport = $renduRapport->sub(new DateInterval('P'. $deadline.'D'));
$date = DateTime::createFromFormat('d/m/Y H:i:s', $renduRapport->format('d/m/Y') . " 23:59:59");