Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 3688 → Rev 3689

/branches/v3.00-serfouette/jrest/services/CelWidgetMapPoint.php
120,7 → 120,7
$concatenation_id." as id_coord ".
'FROM '.$this->table_export.' AS co '.
' LEFT JOIN cel_zones_geo AS zg '.
' ON (zg.nom = co.zone_geo AND zg.id_zone_geo = co.ce_zone_geo) '.
' ON (zg.nom = co.zone_geo AND zg.code = co.ce_zone_geo) '.
"WHERE ".$transmission.
" (".
$this->construireWhereRectangleStationOR()." OR ".
161,7 → 161,7
$requete = 'SELECT COUNT(*) as nb '.
'FROM '.$this->table_export.' AS co '.
' LEFT JOIN cel_zones_geo AS zg '.
' ON (zg.nom = co.zone_geo AND zg.id_zone_geo = co.ce_zone_geo) '.
' ON (zg.nom = co.zone_geo AND zg.code = co.ce_zone_geo) '.
"WHERE ".$transmission.
" (".
$this->construireWhereRectangleStationOR()." OR ".
355,7 → 355,7
' utm_secteur, utm_x, utm_y, code, date_transmission, nom_referentiel '.
'FROM '.$this->table_export.' AS co '.
' LEFT JOIN cel_zones_geo AS zg '.
" ON (zg.nom = co.zone_geo AND zg.id_zone_geo = co.ce_zone_geo) ".
" ON (zg.nom = co.zone_geo AND zg.code = co.ce_zone_geo) ".
"WHERE ".$transmission.
(($this->communeEstDemandee()) ? $this->construireWhereCommuneSansCoordonneesAvecSensibles() : $this->construireWhereCoordonneesSansSensibles()).
$this->construireWhereDept().
503,7 → 503,7
$requete = 'SELECT SQL_CALC_FOUND_ROWS DISTINCT nom_ret, nom_ret_nn, nt, famille '.
'FROM '.$this->table_export.' AS co '.
' LEFT JOIN cel_zones_geo AS zg '.
' ON (zg.nom = co.zone_geo AND zg.id_zone_geo = co.ce_zone_geo) '.
' ON (zg.nom = co.zone_geo AND zg.code = co.ce_zone_geo) '.
"WHERE ".$transmission.
" nom_ret != '' ".
$this->construireWhereDept().
765,7 → 765,7
$requete = 'SELECT DISTINCT co.id_obs, co.ce_utilisateur AS utilisateur '.
'FROM '.$this->table_export.' AS co '.
' LEFT JOIN cel_zones_geo AS zg '.
' ON (zg.nom = co.zone_geo AND zg.id_zone_geo = co.ce_zone_geo) '.
' ON (zg.nom = co.zone_geo AND zg.code = co.ce_zone_geo) '.
"WHERE ".$transmission." co.images != null".
($type == 'date.creation' ? " AND co.date_creation LIKE $param " : '').
($type == 'commentaire.obs' ? " AND co.commentaire LIKE $param " : '').
1154,7 → 1154,7
' INNER JOIN '.$this->table_export.' AS co '.
' ON (ci.ce_observation = co.id_observation) '.
' LEFT JOIN cel_zones_geo AS zg '.
" ON (zg.nom = co.zone_geo AND zg.id_zone_geo = co.ce_zone_geo) ".
" ON (zg.nom = co.zone_geo AND zg.code = co.ce_zone_geo) ".
"WHERE ".$transmission.
$this->construireWhereCoordonnees().
$this->construireWhereUtilisateur().