Subversion Repositories eFlore/Applications.cel

Rev

Rev 3718 | Rev 3736 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 3718 Rev 3719
Line 120... Line 120...
120
								$concatenation_id." as id_coord ".
120
								$concatenation_id." as id_coord ".
121
					'FROM '.$this->table_export.' AS co '.
121
					'FROM '.$this->table_export.' AS co '.
Line 122... Line 122...
122
             
122
             
123
                    "WHERE ".$transmission.
123
                    "WHERE ".$transmission.
124
                    " (".
124
                    " (".
125
                    $this->construireWhereRectangleStationOR()." OR ".
125
                    $this->construireWhereRectangleStationOR()." ".
126
					$this->construireWhereRectangleCommuneOR().") ".
126
					$this->construireWhereRectangleCommuneOR().") ".
127
					$this->construireWhereDept().
127
					$this->construireWhereDept().
128
                    $this->construireWhereCommune().
128
                    $this->construireWhereCommune().
129
                    $this->construireWherePays().
129
                    $this->construireWherePays().
Line 347... Line 347...
347
		
347
		
348
		if (isset($this->parametres['station']) && !$this->etreNull($this->parametres['station'])) {
348
		if (isset($this->parametres['station']) && !$this->etreNull($this->parametres['station'])) {
349
			$requete = 	'SELECT SQL_CALC_FOUND_ROWS id_observation, ce_utilisateur, courriel_utilisateur, pseudo_utilisateur as nom_utilisateur, "" as prenom_utilisateur, '.
349
			$requete = 	'SELECT SQL_CALC_FOUND_ROWS id_observation, ce_utilisateur, courriel_utilisateur, pseudo_utilisateur as nom_utilisateur, "" as prenom_utilisateur, '.
350
						'	nom_sel, nom_ret, nom_sel_nn, nom_ret_nn, "" as nt, famille, '.
350
						'	nom_sel, nom_ret, nom_sel_nn, nom_ret_nn, "" as nt, famille, '.
351
						'	lieudit, zone_geo, date_observation, milieu, commentaire, '.
351
						'	lieudit, zone_geo, date_observation, milieu, commentaire, '.
352
						'	utm_secteur, utm_x, utm_y, code, date_transmission, nom_referentiel '.
352
						'	null as utm_secteur, null as utm_x, null as utm_y, ce_zone_geo as code, date_transmission, nom_referentiel '.
353
						'FROM '.$this->table_export.' AS co '.
353
						'FROM '.$this->table_export.' AS co '.
354
						"WHERE ".$transmission.
354
						"WHERE ".$transmission.
355
						(($this->communeEstDemandee()) ? $this->construireWhereCommuneSansCoordonneesAvecSensibles() : $this->construireWhereCoordonneesSansSensibles()).
355
						(($this->communeEstDemandee()) ? $this->construireWhereCommuneSansCoordonneesAvecSensibles() : $this->construireWhereCoordonneesSansSensibles()).
356
						$this->construireWhereDept().
356
						$this->construireWhereDept().