| /trunk/services/modules/0.1/eflore/Cartes.php |
|---|
| 155,7 → 155,8 |
| } |
| private function chargerVille() { |
| $requete = "SELECT * FROM tb_cel.locations"; |
| $requete = "SELECT nom as name, code as insee_code, utm_x as x_utm, utm_y as y_utm, utm_secteur as sector". |
| " FROM tb_cel.cel_zones_geo;"; |
| $villes = $this->getBdd()->recupererTous($requete); |
| foreach ($villes as $ville) { |
| $this->tab_code_insee[$ville['insee_code']] = $ville; |
| 178,7 → 179,8 |
| $utm = $this->cartesFormateur->chercherVille($inventory, $this->tab_code_insee); |
| // Ultime tentative |
| if (!$utm) { |
| $requete = "SELECT * FROM tb_cel.locations WHERE name LIKE ".$this->getBdd()->proteger($inventory['location']); |
| $requete = "SELECT nom as name, code as insee_code, utm_x as x_utm, utm_y as y_utm, utm_secteur as sector". |
| " FROM tb_cel.cel_zones_geo WHERE name LIKE ".$this->getBdd()->proteger($inventory['location']); |
| $utm = $this->getBdd()->recupererTous($requete); |
| } |
| /trunk/services/modules/0.1/eflore/cartes/GeneralFormateur.php |
|---|
| 62,10 → 62,10 |
| if ($this->info['nt'] == 0) { |
| $inventoriesCel = array(); |
| } else { |
| $queryCel = "SELECT 'cel' as collection_code, location, id_location, date_observation, ". |
| " coord_y as y_utm, coord_x as x_utm, ref_geo as sector, identifiant FROM tb_cel.cel_inventory ". |
| "WHERE num_taxon = '".$this->info['nt']."' ". |
| " AND transmission = 1"; |
| $queryCel = "SELECT 'cel' as collection_code, zone_geo as location, REPLACE(ce_zone_geo,'INSEE-C:','') as id_location, date_observation, ". |
| " longitude as y_utm, latitude as x_utm, geodatum as sector, courriel_utilisateur as identifiant FROM tb_cel.cel_obs ". |
| "WHERE nt = '".$this->info['nt']."' ". |
| " AND transmission = 1"; |
| $inventoriesCel = $this->getBdd()->recupererTous($queryCel); |
| } |
| 190,15 → 190,18 |
| if (isset($tab_code_insee[$id_location_protege])) { |
| $utm = array(0 => $tab_code_insee[$id_location_protege]); |
| } else { |
| $requete = "SELECT * ". |
| "FROM tb_cel.locations ". |
| "WHERE name LIKE $location_protege ". |
| $requete = "SELECT nom as name, code as insee_code, utm_x as x_utm, utm_y as y_utm, utm_secteur as sector ". |
| "FROM tb_cel.cel_zones_geo ". |
| "WHERE nom LIKE $location_protege ". |
| " AND code = $id_location_protege "; |
| $resultat = $this->getBdd()->recupererTous($requete); |
| $utm = $resultat; |
| if ($resultat != false) { |
| $utm = $resultat; |
| } |
| } |
| } else { |
| $requete = "SELECT * FROM tb_cel.locations WHERE name LIKE $location_protege "; |
| $requete = "SELECT nom as name, code as insee_code, utm_x as x_utm, utm_y as y_utm, utm_secteur as sector". |
| " FROM tb_cel.cel_zones_geo WHERE nom LIKE $location_protege "; |
| $utm = $this->getBdd()->recupererTous($requete); |
| } |
| } |
| /trunk/services/modules/0.1/eflore/cartes/CelFormateur.php |
|---|
| 108,8 → 108,8 |
| if (isset($tab_code_insee) & in_array($inventory['id_location'], $tab_code_insee)) { |
| $utm = array(0 => $this->tab_code_insee[$id_location_protege]); |
| } else { |
| $requete = "SELECT *, nom as name, code as insee_code, utm_x as x_utm, utm_y as y_utm, utm_secteur as sector ". |
| "FROM tb_cel.cel_zones_geo ". |
| $requete = "SELECT nom as name, code as insee_code, utm_x as x_utm, utm_y as y_utm, utm_secteur as sector ". |
| "FROM cel.cel_zones_geo ". |
| "WHERE nom LIKE $location_protege ". |
| " AND code = $id_location_protege "; |
| $resultat = $this->getBdd()->recupererTous($requete); |
| 116,7 → 116,8 |
| $utm = $resultat; |
| } |
| } else { |
| $requete = "SELECT *, nom as name, code as insee_code, utm_x as x_utm, utm_y as y_utm, utm_secteur as sector FROM tb_cel.cel_zones_geo WHERE nom LIKE $location_protege "; |
| $requete = "SELECT nom as name, code as insee_code, utm_x as x_utm, utm_y as y_utm, utm_secteur as sector". |
| " FROM tb_cel.cel_zones_geo WHERE nom LIKE $location_protege "; |
| $utm = $this->getBdd()->recupererTous($requete); |
| } |
| return $utm; |