diff --git a/module/Application/src/Application/Service/Structure/StructureService.php b/module/Application/src/Application/Service/Structure/StructureService.php index 3e09b44040c9882693fe2fdb06360a6466d44e59..eda5d2809cbc27a6baf7fe42ca246f16539a1b29 100755 --- a/module/Application/src/Application/Service/Structure/StructureService.php +++ b/module/Application/src/Application/Service/Structure/StructureService.php @@ -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(); diff --git a/module/Application/src/Application/Service/These/TheseRechercheService.php b/module/Application/src/Application/Service/These/TheseRechercheService.php index 1e58e4b9b510abbe64e54d318cfc916332f439c6..03ce6bdbea64baeb05d624ac76ef5454fcfc45bc 100644 --- a/module/Application/src/Application/Service/These/TheseRechercheService.php +++ b/module/Application/src/Application/Service/These/TheseRechercheService.php @@ -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.= " <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) {