Subversion Repositories eFlore/Applications.cel

Rev

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

Rev 1039 Rev 1043
Line 382... Line 382...
382 
						'	sector, x_utm, y_utm, insee_code, date_transmission '.
 382 
						'	sector, x_utm, y_utm, insee_code, date_transmission '.
383 
						'FROM cel_inventory AS i '.
 383 
						'FROM cel_inventory AS i '.
384 
						'	LEFT JOIN locations AS l '.
 384 
						'	LEFT JOIN locations AS l '.
385 
						"		ON (l.name = i.location AND l.code = i.id_location) ".
 385 
						"		ON (l.name = i.location AND l.code = i.id_location) ".
386 
						"WHERE transmission = '1' ".
 386 
						"WHERE transmission = '1' ".
387 
						$this->construireWhereCoordonnees().
 387 
						((!$this->etreNull($this->parametres['commune'])) ? $this->construireWhereCommuneSansCoordonnees() : $this->construireWhereCoordonnees()).
388 
						$this->construireWhereUtilisateur().
 388 
						$this->construireWhereUtilisateur().
389 
						$this->construireWhereNumTaxon().
 389 
						$this->construireWhereNumTaxon().
390 
						$this->construireWhereNomTaxon().
 390 
						$this->construireWhereNomTaxon().
391 
						$this->construireWhereDate().
 391 
						$this->construireWhereDate().
392 
						$this->construireWhereCommentaire().
 392 
						$this->construireWhereCommentaire().
Line 486... Line 486...
486 
	}
 486 
	}
Line 487... Line 487...
487 
 
 487 
 
488 
	private function ajouterImagesAuxObs($observations) {
 488 
	private function ajouterImagesAuxObs($observations) {
489 
		$images = $this->chargerImages(array_keys($observations['observations']));
 489 
		$images = $this->chargerImages(array_keys($observations['observations']));
- 
 
 490 
		foreach ($observations['observations'] as $id => $infos) {
490 
		foreach ($observations['observations'] as $id => $infos) {
 491 
			if(isset($images[$id])) {
491 
			$infos['images'] = $images[$id];
 492 
				$infos['images'] = $images[$id];
- 
 
 493 
				$observations['observations'][$id] = $infos;
492 
			$observations['observations'][$id] = $infos;
 494 
			}
493 
		}
 495 
		}
494 
		return $observations;
 496 
		return $observations;
Line 495... Line 497...
495 
	}
 497 
	}
Line 918... Line 920...
918 
			$sql = " AND location LIKE $commune ";
 920 
			$sql = " AND location LIKE $commune ";
919 
		}
 921 
		}
920 
		return $sql;
 922 
		return $sql;
921 
	}
 923 
	}
Line -... Line 924...
- 
 
 924 
 
- 
 
 925 
	private function construireWhereCommuneSansCoordonnees() {
- 
 
 926 
		$sql = '';
- 
 
 927 
		// Récupération des coordonnées depuis l'id station
- 
 
 928 
		extract($this->parametres);
- 
 
 929 
		if (!$this->etreNull($commune)) {
- 
 
 930 
			$commune = $this->proteger($commune);
- 
 
 931 
			$sql = " AND location LIKE $commune ";
- 
 
 932 
			$sql .= " AND ((coord_x = '000null' OR coord_x = '') ".
- 
 
 933 
								" AND (coord_y = '000null' OR coord_y = '')) ";
- 
 
 934 
		}
- 
 
 935 
		return $sql;
Line 922... Line 936...
922 
 
 936 
	}
923 
 
 937 
 
924 
	private function construireWhereUtilisateur() {
 938 
	private function construireWhereUtilisateur() {
925 
		$sql = '';
 939 
		$sql = '';