| 549,19 → 549,21 |
|---|
| * @param array $observations la liste des observations |
| * */ |
| private function chargerImages($observations) { |
| foreach ($observations as $id => $observation) { |
| $idObs = $observation['id_observation']; |
| $requeteImages = 'SELECT * '. |
| 'FROM del_obs_image AS doi '. |
| ' INNER JOIN del_image AS di '. |
| ' ON doi.id_image = di.id_image '. |
| "WHERE doi.id_observation = $idObs "; |
| |
| $images = $this->bdd->recupererTous($requeteImages); |
| $images = $this->formaterImages($images); |
| $observations[$id]['images'] = $images; |
| $idObs = array_values(array_map(create_function('$a', 'return $a["id_observation"];'), |
| $observations)); |
| $r = sprintf('SELECT id_observation, doi.id_image, date_prise_de_vue AS date, hauteur , largeur ' . |
| ' FROM del_obs_image AS doi ' . |
| ' INNER JOIN del_image AS di ON doi.id_image = di.id_image ' . |
| ' WHERE doi.id_observation IN (%s)', |
| implode(',',$idObs)); |
| $images = $this->bdd->recupererTous($r); |
| foreach ($images as $image) { |
| $idObs = $image['id_observation']; |
| // rapide formatage de l'image puisque le SELECT à déjà fait le gros du travail |
| unset($image['id_observation']); |
| $image['binaire.href'] = $this->formaterLienImage($image['id_image']); |
| $observations['"' . $idObs . '"']['images'][] = $image; |
| } |
| |
| return $observations; |
| } |
| |
| 628,25 → 630,6 |
|---|
| --------------------------------------------------------------------------------*/ |
| |
| /** |
| * Formater les images d'une observation |
| * @param array $images les images de l'observation |
| * */ |
| private function formaterImages($images) { |
| $imagesRetour = array(); |
| foreach ($images as $image) { |
| $imageCourante = array(); |
| $imageCourante['id_image'] = $image['id_image']; |
| $imageCourante['date'] = $image['date_prise_de_vue']; |
| $imageCourante['binaire.href'] = $this->formaterLienImage($image['id_image']); |
| $imageCourante['hauteur'] = $image['hauteur']; |
| $imageRetour['largeur'] = $image['largeur']; |
| |
| $imagesRetour[] = $imageCourante; |
| } |
| return $imagesRetour; |
| } |
| |
| /** |
| * Formater une observation depuis une ligne liaison |
| * @param $liaison liaison issue de la recherche |
| * @return $observation l'observation mise en forme |