| 66,10 → 66,10 |
|---|
| public function getStations($params) { |
| $json = null; |
| $requete = 'SELECT utm_secteur, utm_x, utm_y, wgs84_latitude AS latitude, wgs84_longitude AS longitude '. |
| 'FROM cel_obs AS co '. |
| 'FROM cel_export AS co '. |
| ' RIGHT JOIN cel_zones_geo AS zg '. // exclut les obs non localisées sur zone geo, pour obtenir un décompte cohérent |
| ' ON (zg.id_zone_geo = co.ce_zone_geo) '. |
| "WHERE transmission = '1' ". |
| "WHERE 1 ". |
| $this->construireWhereDept(). |
| $this->construireWhereCommune(). |
| $this->construireWherePhotosSeulement(). |
| 140,10 → 140,10 |
|---|
| ' nom_sel, nom_ret, nom_sel_nn, nom_ret_nn, nt, famille, '. |
| ' lieudit, zone_geo, date_observation, milieu, commentaire, '. |
| ' utm_secteur, utm_x, utm_y, id_zone_geo, date_transmission, nom_referentiel '. |
| 'FROM cel_obs AS co '. |
| 'FROM cel_export AS co '. |
| ' LEFT JOIN cel_zones_geo AS zg '. |
| " ON (zg.id_zone_geo = co.ce_zone_geo) ". |
| "WHERE transmission = '1' ". |
| "WHERE 1 ". |
| $this->construireWhereCoordonnees(). |
| $this->construireWherePhotosSeulement(). |
| $this->construireWhereUtilisateur(). |
| 279,11 → 279,11 |
|---|
| $json = null; |
| |
| $requete = 'SELECT SQL_CALC_FOUND_ROWS DISTINCT nom_ret, nom_ret_nn, nt, famille '. |
| 'FROM cel_obs AS co '. |
| 'FROM cel_export AS co '. |
| ' LEFT JOIN cel_zones_geo AS zg '. |
| ' ON (zg.id_zone_geo = co.ce_zone_geo) '. |
| "WHERE transmission = '1' ". |
| " AND nom_ret != '' ". |
| "WHERE ". |
| " nom_ret != '' ". |
| $this->construireWhereDept(). |
| $this->construireWhereCommune(). |
| $this->construireWherePhotosSeulement(). |
| 510,12 → 510,12 |
|---|
| private function obtenirObsLieesImg($type, $param) { |
| // Construction de la requête |
| $requete = 'SELECT DISTINCT id_observation AS id_obs, co.ce_utilisateur AS utilisateur '. |
| 'FROM cel_images AS ci'. |
| ' INNER JOIN cel_obs AS co '. |
| 'FROM cel_images_export AS ci'. |
| ' INNER JOIN cel_export AS co '. |
| ' ON ci.ce_observation = co.id_observation '. |
| ' LEFT JOIN cel_zones_geo AS zg '. |
| ' ON (zg.id_zone_geo = co.ce_zone_geo) '. |
| "WHERE co.transmission = '1' ". |
| "WHERE '' ". |
| ($type == 'date.photo' ? " AND (date_prise_de_vue LIKE ".str_replace('-', ':', $param).") " : ''). |
| ($type == 'date.ajout' ? " AND ci.date_creation LIKE $param " : ''). |
| ($type == 'date.liaison' ? " AND ci.date_liaison LIKE $param " : ''). |
| 601,7 → 601,7 |
|---|
| private function construireWherePhotosSeulement() { |
| $sql = ''; |
| if (isset($this->parametres['photos']) && $this->parametres['photos'] == 1) { |
| $sql = 'AND co.id_observation IN (SELECT DISTINCT ce_observation FROM cel_images) '; |
| $sql = 'AND co.id_observation IN (SELECT DISTINCT ce_observation FROM cel_images_export) '; |
| } |
| return $sql; |
| } |
| 670,12 → 670,12 |
|---|
| $tag_sql = $this->getSqlWhereMotsCles($tag); |
| // Construction de la requête |
| $requete = 'SELECT DISTINCT co.id_observation AS id_obs, ci.ce_utilisateur AS utilisateur '. |
| 'FROM cel_images AS ci '. |
| ' INNER JOIN cel_obs AS co '. |
| 'FROM cel_images_export AS ci '. |
| ' INNER JOIN cel_export AS co '. |
| ' ON (ci.ce_observation = co.id_observation) '. |
| ' LEFT JOIN cel_zones_geo AS zg '. |
| " ON (zg.id_zone_geo = co.ce_zone_geo) ". |
| "WHERE co.transmission = '1' ". |
| "WHERE 1 ". |
| $this->construireWhereCoordonnees(). |
| $this->construireWhereUtilisateur(). |
| $this->construireWhereNumTaxon(). |