Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 2393 → Rev 2394

/trunk/jrest/services/CelSyndicationObservation.php
40,6 → 40,7
'date' => 'date_observation',
'motcle' => 'tags',
'projet' => 'mots-cles');
private $catalogue_cles_labels_champs_etendus = array();
 
/**
* Méthode appelée avec une requête de type GET.
422,6 → 423,9
}
$gestion_champs_etendus = new GestionChampsEtendus($this->config, 'obs');
$champs_etendus = $gestion_champs_etendus->consulterParLots($ids_observations);
if(!empty($champs_etendus)) {
$this->catalogue_cles_labels_champs_etendus = $gestion_champs_etendus->consulterCatalogueChampsEtendusPredefinis(true);
}
$this->auteurs = $this->creerAuteurs($identifiants);
foreach ($elements as $element) {
$element['obs_etendue'] = isset($champs_etendus[$element['id_observation']]) ? $champs_etendus[$element['id_observation']] : array();
541,7 → 545,14
private function creerDescriptionChampsEtendus($obs, $item) {
$champs_etendus = '';
foreach($obs['obs_etendue'] as $cle => &$champ) {
$champs_etendus .= '<li>'.$this->nePasInterpreterXml($champ->label.' : '.$champ->valeur).' </li>';
if(isset($this->catalogue_cles_labels_champs_etendus[$champ->cle])) {
$label = $this->catalogue_cles_labels_champs_etendus[$champ->cle]['label'];
} else {
$label = preg_replace("/(?<=\\w)(?=[A-Z])/"," $1", $champ->cle);
$label = trim($label);
$label = $label;
}
$champs_etendus .= '<li>'.$this->nePasInterpreterXml($label.' : '.$champ->valeur).' </li>';
}
 
if($champs_etendus != '') {