| Line 38... |
Line 38... |
| 38 |
'num_taxon' => 'nt',
|
38 |
'num_taxon' => 'nt',
|
| 39 |
'commentaire' => 'commentaire',
|
39 |
'commentaire' => 'commentaire',
|
| 40 |
'date' => 'date_observation',
|
40 |
'date' => 'date_observation',
|
| 41 |
'motcle' => 'tags',
|
41 |
'motcle' => 'tags',
|
| 42 |
'projet' => 'mots-cles');
|
42 |
'projet' => 'mots-cles');
|
| - |
|
43 |
private $catalogue_cles_labels_champs_etendus = array();
|
| Line 43... |
Line 44... |
| 43 |
|
44 |
|
| 44 |
/**
|
45 |
/**
|
| 45 |
* Méthode appelée avec une requête de type GET.
|
46 |
* Méthode appelée avec une requête de type GET.
|
| 46 |
*/
|
47 |
*/
|
| Line 420... |
Line 421... |
| 420 |
$identifiants[$element['courriel_utilisateur']] = $element['courriel_utilisateur'];
|
421 |
$identifiants[$element['courriel_utilisateur']] = $element['courriel_utilisateur'];
|
| 421 |
$ids_observations[] = $element['id_observation'];
|
422 |
$ids_observations[] = $element['id_observation'];
|
| 422 |
}
|
423 |
}
|
| 423 |
$gestion_champs_etendus = new GestionChampsEtendus($this->config, 'obs');
|
424 |
$gestion_champs_etendus = new GestionChampsEtendus($this->config, 'obs');
|
| 424 |
$champs_etendus = $gestion_champs_etendus->consulterParLots($ids_observations);
|
425 |
$champs_etendus = $gestion_champs_etendus->consulterParLots($ids_observations);
|
| - |
|
426 |
if(!empty($champs_etendus)) {
|
| - |
|
427 |
$this->catalogue_cles_labels_champs_etendus = $gestion_champs_etendus->consulterCatalogueChampsEtendusPredefinis(true);
|
| - |
|
428 |
}
|
| 425 |
$this->auteurs = $this->creerAuteurs($identifiants);
|
429 |
$this->auteurs = $this->creerAuteurs($identifiants);
|
| 426 |
foreach ($elements as $element) {
|
430 |
foreach ($elements as $element) {
|
| 427 |
$element['obs_etendue'] = isset($champs_etendus[$element['id_observation']]) ? $champs_etendus[$element['id_observation']] : array();
|
431 |
$element['obs_etendue'] = isset($champs_etendus[$element['id_observation']]) ? $champs_etendus[$element['id_observation']] : array();
|
| 428 |
$donnees['items'][] = $this->construireDonneesCommunesAuxItems($element);
|
432 |
$donnees['items'][] = $this->construireDonneesCommunesAuxItems($element);
|
| 429 |
}
|
433 |
}
|
| Line 539... |
Line 543... |
| 539 |
}
|
543 |
}
|
| Line 540... |
Line 544... |
| 540 |
|
544 |
|
| 541 |
private function creerDescriptionChampsEtendus($obs, $item) {
|
545 |
private function creerDescriptionChampsEtendus($obs, $item) {
|
| 542 |
$champs_etendus = '';
|
546 |
$champs_etendus = '';
|
| - |
|
547 |
foreach($obs['obs_etendue'] as $cle => &$champ) {
|
| - |
|
548 |
if(isset($this->catalogue_cles_labels_champs_etendus[$champ->cle])) {
|
| - |
|
549 |
$label = $this->catalogue_cles_labels_champs_etendus[$champ->cle]['label'];
|
| - |
|
550 |
} else {
|
| - |
|
551 |
$label = preg_replace("/(?<=\\w)(?=[A-Z])/"," $1", $champ->cle);
|
| - |
|
552 |
$label = trim($label);
|
| - |
|
553 |
$label = $label;
|
| 543 |
foreach($obs['obs_etendue'] as $cle => &$champ) {
|
554 |
}
|
| 544 |
$champs_etendus .= '<li>'.$this->nePasInterpreterXml($champ->label.' : '.$champ->valeur).' </li>';
|
555 |
$champs_etendus .= '<li>'.$this->nePasInterpreterXml($label.' : '.$champ->valeur).' </li>';
|
| Line 545... |
Line 556... |
| 545 |
}
|
556 |
}
|
| 546 |
|
557 |
|
| 547 |
if($champs_etendus != '') {
|
558 |
if($champs_etendus != '') {
|