| 48,11 → 48,11 |
|---|
| // @TODO faire mieux ! |
| foreach ($pso as $i => &$images) { |
| foreach ($images as $j => &$image) { |
| $pso[$i][$j]['observation']['station'] = str_replace('"', '', $image['observation']['station']); |
| $pso[$i][$j]['observation']['lieudit'] = str_replace('"', '', $image['observation']['lieudit']); |
| $pso[$i][$j]['observation']['milieu'] = str_replace('"', '', $image['observation']['milieu']); |
| $pso[$i][$j]['station.station'] = str_replace('"', '', $image['station.station']); |
| $pso[$i][$j]['station.libelle'] = str_replace('"', '', $image['station.libelle']); |
| $pso[$i][$j]['observation']['station'] = str_replace('"', '', isset($image['observation']['station']) ? $image['observation']['station'] : ''); |
| $pso[$i][$j]['observation']['lieudit'] = str_replace('"', '', isset($image['observation']['lieudit']) ? $image['observation']['lieudit'] : ''); |
| $pso[$i][$j]['observation']['milieu'] = str_replace('"', '', isset($image['observation']['milieu']) ? $image['observation']['milieu'] : ''); |
| $pso[$i][$j]['station.station'] = str_replace('"', '', isset($image['station.station']) ? $image['station.station'] : ''); |
| $pso[$i][$j]['station.libelle'] = str_replace('"', '', isset($image['station.libelle']) ? $image['station.libelle'] : ''); |
| } |
| } |
| |
| 295,12 → 295,12 |
|---|
| private function formaterListePhotos($projet, $images) { |
| foreach ($images as $idImg => $img) { |
| $infosImg = array(); |
| $infosImg['src'] = $img['binaire.href']; |
| $infosImg['nomSci'] = $img['determination.nom_sci']; |
| $infosImg['station'] = $img['station.libelle']; |
| $infosImg['src'] = isset($img['binaire.href']) ? $img['binaire.href'] : null; |
| $infosImg['nomSci'] = isset($img['determination.nom_sci']) ? $img['determination.nom_sci'] : null; |
| $infosImg['station'] = isset($img['station.libelle']) ? $img['station.libelle'] : null; |
| $infosImg['date'] = $this->formaterDateImg($img['date']); |
| $infosImg['auteur'] = $img['auteur.libelle']; |
| $infosImg['auteur.id'] = $img['auteur.id']; |
| $infosImg['auteur'] = isset($img['auteur.libelle']) ? $img['auteur.libelle'] : null; |
| $infosImg['auteur.id'] = isset($img['auteur.id']) ? $img['auteur.id'] : null; |
| if ($projet == "cel") { |
| $infosImg['urlDetailImg'] = $this->appUrls->obtenirUrlPopUpIllustrations($idImg); |
| $infosImg['urlImgGrandFormat'] = $this->obtenirUrlImageGrandFormatCel($idImg); |