384,7 → 384,7 |
' LEFT JOIN locations AS l '. |
" ON (l.name = i.location AND l.code = i.id_location) ". |
"WHERE transmission = '1' ". |
((!$this->etreNull($this->parametres['commune'])) ? $this->construireWhereCommuneSansCoordonnees() : $this->construireWhereCoordonnees()). |
$this->construireWhereCoordonnees(). |
$this->construireWhereUtilisateur(). |
$this->construireWhereNumTaxon(). |
$this->construireWhereNomTaxon(). |
488,10 → 488,8 |
private function ajouterImagesAuxObs($observations) { |
$images = $this->chargerImages(array_keys($observations['observations'])); |
foreach ($observations['observations'] as $id => $infos) { |
if(isset($images[$id])) { |
$infos['images'] = $images[$id]; |
$observations['observations'][$id] = $infos; |
} |
$infos['images'] = $images[$id]; |
$observations['observations'][$id] = $infos; |
} |
return $observations; |
} |
922,18 → 920,6 |
return $sql; |
} |
|
private function construireWhereCommuneSansCoordonnees() { |
$sql = ''; |
// Récupération des coordonnées depuis l'id station |
extract($this->parametres); |
if (!$this->etreNull($commune)) { |
$commune = $this->proteger($commune); |
$sql = " AND location LIKE $commune "; |
$sql .= " AND ((coord_x = '000null' OR coord_x = '') ". |
" AND (coord_y = '000null' OR coord_y = '')) "; |
} |
return $sql; |
} |
|
private function construireWhereUtilisateur() { |
$sql = ''; |