| 159,10 → 159,20 |
|---|
| unset($observations['commune']); |
| $widget['donnees']['commune'] = $commune; |
| } |
| |
| $obs_ids = null; |
| if (isset($observations['ids'])) { |
| $obs_ids = $observations['ids']; |
| unset($observations['ids']); |
| } |
| $widget['squelette'] = $this->choisirFormatSortie(count($observations)); |
| |
| if ($widget['squelette'] == 'obs_liste' && $obs_ids != null && count($obs_ids) > 0) { |
| $widget['donnees']['images'] = $this->chargerImages($obs_ids); |
| } |
| |
| $widget['donnees']['observations'] = $observations; |
| $widget['donnees']['station_id'] = $station; |
| |
| $widget['squelette'] = $this->choisirFormatSortie(count($observations)); |
| |
| return $widget; |
| } |
| 191,6 → 201,7 |
|---|
| if (is_array($donnees) && count($donnees) > 0) { |
| foreach ($donnees as $donnee) { |
| $observation = array(); |
| $observation['id'] = $donnee->id; |
| $observation['nn'] = $this->etreVide($donnee->num_nom_sel) ? null : $donnee->num_nom_sel; |
| $observation['nom'] = $this->nettoyerTexte($donnee->nom_sel); |
| $observation['date'] = $this->formaterDate($donnee->date_observation, '%d/%m/%Y'); |
| 199,6 → 210,7 |
|---|
| |
| $observations[] = $observation; |
| $observations['commune'] = $this->nettoyerTexte($donnee->location); |
| $observations['ids'][] = $donnee->id; |
| } |
| } |
| return $observations; |
| 226,6 → 238,35 |
|---|
| return $sortie; |
| } |
| |
| private function chargerImages($obs_ids) { |
| // Récupération des données au format Json |
| $service = 'CelImage/liste-ids?obsId='.implode(',', $obs_ids); |
| $url = sprintf($this->config['chemins']['baseURLServicesCelTpl'], $service); |
| $json = $this->getDao()->envoyerRequeteConsultation($url); |
| $donnees = json_decode($json); |
| |
| // Post-traitement des données |
| $images = $this->traiterImages($donnees); |
| |
| return $images; |
| } |
| |
| private function traiterImages($donnees) { |
| $images = array(); |
| //echo '<br/><pre>'.print_r($donnees,true).'</pre>'; |
| if (count($donnees) > 0) { |
| foreach ($donnees as $id_obs => $id_images) { |
| foreach ($id_images as $id_img) { |
| $urls['id'] = $id_img; |
| $urls['S'] = $this->getUrlImage($id_img, 'S'); |
| $urls['L'] = $this->getUrlImage($id_img, 'L'); |
| $images[$id_obs][] = $urls; |
| } |
| } |
| } |
| return $images; |
| } |
| |
| /** |
| * Afficher message d'avertissement. |
| */ |