Skip to content
Snippets Groups Projects
Commit dd91c1ef authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'hotfix_optionify_ur' into develop

parents d1710114 23a77035
Branches
Tags 1.0.2
No related merge requests found
......@@ -636,7 +636,7 @@ class StructureService extends BaseService
->andWhere('substitutionTo.id IS NULL OR pasHistorise(substitutionTo) != 1');
if ($order) $qb->orderBy(' structure.' . $order);
else {
if ($type === TypeStructure::CODE_ECOLE_DOCTORALE) $qb->orderBy('structure.ferme, structureConcrete.sourceCode');
if ($type === TypeStructure::CODE_ECOLE_DOCTORALE || $type === TypeStructure::CODE_UNITE_RECHERCHE) $qb->orderBy('structure.ferme, structureConcrete.sourceCode');
}
$result = $qb->getQuery()->getResult();
......
......@@ -545,20 +545,20 @@ class TheseRechercheService
private function fetchUnitesRecherchesOptions()
{
//$urs = $this->getStructureService()->getAllStructuresAffichablesByType(TypeStructure::CODE_UNITE_RECHERCHE, 'libelle');
$all = $this->getStructureService()->getUnitesRechercheSelection();
$urs = $this->getStructureService()->getAllStructuresAffichablesByType(TypeStructure::CODE_UNITE_RECHERCHE);
// $all = $this->getStructureService()->getUnitesRechercheSelection();
$options = [];
// foreach ($urs as $ur) {
// $options[] = $this->optionify($ur);
foreach ($urs as $ur) {
$options[] = $this->optionify($ur);
}
// foreach ($all as $a) {
// $options[] = [
// 'value' => $a[4], //['sourceCode'],
// 'label' => $a[3], //['sigle'],
// 'subtext' => $a[2], //['libelle']
// ];
// }
foreach ($all as $a) {
$options[] = [
'value' => $a[4], //['sourceCode'],
'label' => $a[3], //['sigle'],
'subtext' => $a[2], //['libelle']
];
}
// usort($options, function($a, $b) {
// return strcmp($a['label'], $b['label']);
// });
......@@ -785,7 +785,7 @@ class TheseRechercheService
} elseif ($value instanceof UniteRecherche) {
$subtext = $value->getLibelle();
if ($value->getStructure()->isFerme()) $subtext.= "&nbsp; <span class='label' style='color:darkred;'>FERMEE</span>";
return ['value' => $value->getSourceCode(), 'label' => $value->getCode(), 'subtext' => $subtext];
return ['value' => $value->getSourceCode(), 'label' => $value->getSigle(), 'subtext' => $subtext];
} elseif ($value instanceof DomaineScientifique) {
return ['value' => (string) $value->getId(), 'label' => $value->getLibelle()];
} elseif ($value instanceof OrigineFinancement) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment