| Line 344... |
Line 344... |
| 344 |
* Données pour l'affichage des obs d'une station
|
344 |
* Données pour l'affichage des obs d'une station
|
| 345 |
*/
|
345 |
*/
|
| 346 |
public function getObservations($params) {
|
346 |
public function getObservations($params) {
|
| 347 |
$resultats = array();
|
347 |
$resultats = array();
|
| 348 |
$total = 0;
|
348 |
$total = 0;
|
| 349 |
$transmission = ( $this->standard = 0) ? "transmission = '1' " : "";
|
349 |
$transmission = ( $this->standard = 0) ? "transmission = '1' " : " 1 ";
|
| Line 350... |
Line 350... |
| 350 |
|
350 |
|
| 351 |
if (isset($this->parametres['station']) && !$this->etreNull($this->parametres['station'])) {
|
351 |
if (isset($this->parametres['station']) && !$this->etreNull($this->parametres['station'])) {
|
| 352 |
$requete = 'SELECT SQL_CALC_FOUND_ROWS id_observation, ce_utilisateur, courriel_utilisateur, pseudo_utilisateur as nom_utilisateur, "" as prenom_utilisateur, '.
|
352 |
$requete = 'SELECT SQL_CALC_FOUND_ROWS id_observation, ce_utilisateur, courriel_utilisateur, pseudo_utilisateur as nom_utilisateur, "" as prenom_utilisateur, '.
|
| 353 |
' nom_sel, nom_ret, nom_sel_nn, nom_ret_nn, "" as nt, famille, '.
|
353 |
' nom_sel, nom_ret, nom_sel_nn, nom_ret_nn, "" as nt, famille, '.
|
| Line 979... |
Line 979... |
| 979 |
|
979 |
|
| 980 |
|
980 |
|
| 981 |
private function construireWherePhotosSeulement() {
|
981 |
private function construireWherePhotosSeulement() {
|
| 982 |
$sql = '';
|
982 |
$sql = '';
|
| 983 |
if (isset($this->parametres['photos']) && $this->parametres['photos'] == 1) {
|
983 |
if (isset($this->parametres['photos']) && $this->parametres['photos'] == 1) {
|
| 984 |
$sql = 'AND co.id_observation IN (SELECT DISTINCT ce_observation FROM cel_images_export) ';
|
984 |
$sql = 'AND co.images is not null) ';
|
| 985 |
}
|
985 |
}
|
| Line 986... |
Line 986... |
| 986 |
return $sql;
|
986 |
return $sql;
|
| Line 1143... |
Line 1143... |
| 1143 |
/**
|
1143 |
/**
|
| 1144 |
* Traitement de $tag pour construction du filtre dans la requête
|
1144 |
* Traitement de $tag pour construction du filtre dans la requête
|
| 1145 |
*/
|
1145 |
*/
|
| 1146 |
private function getSqlWhereObsAvecImagesTaguees($tag) {
|
1146 |
private function getSqlWhereObsAvecImagesTaguees($tag) {
|
| 1147 |
$sql = null;
|
1147 |
$sql = null;
|
| 1148 |
$transmission = ( $this->standard = 0) ? "co.transmission = '1' " : "";
|
1148 |
$transmission = ( $this->standard = 0) ? "co.transmission = '1' " : " 1 ";
|
| 1149 |
if (isset($tag) && !$this->etreNull($tag)) {
|
1149 |
if (isset($tag) && !$this->etreNull($tag)) {
|
| 1150 |
$tag_sql = $this->getSqlWhereMotsCles($tag);
|
1150 |
$tag_sql = $this->getSqlWhereMotsCles($tag);
|
| 1151 |
// Construction de la requête
|
1151 |
// Construction de la requête
|
| 1152 |
$requete = 'SELECT DISTINCT co.id_observation AS id_obs, co.ce_utilisateur AS utilisateur '.
|
1152 |
$requete = 'SELECT DISTINCT co.id_observation AS id_obs, co.ce_utilisateur AS utilisateur '.
|
| 1153 |
'FROM cel_images_export ci'.
|
1153 |
'FROM cel_images_export ci'.
|