WebSVN – eFlore/Applications.cel – Diff – /branches/v3.00-serfouette/jrest/services/CelWidgetMapPoint.php



			$this->construireWhereNomTaxon().
			$this->construireWhereReferentiel().
			$this->construireWhereProjet().
			$this->construireWhereTag().
			$this->construireWhereGroupeZoneGeo().
			'ORDER BY utilisateur ASC';
		//$this->debug[] = $requete;
		//die($requete);
		$resultats = Cel::db()->requeter($requete);

 
		$observations = null;
		if ($resultats != false) {
			$observations = array();
			foreach ($resultats as $occurence) {
				$utilisateur = $occurence['utilisateur'];
				$ordre = $occurence['id_obs'];
				if (!array_key_exists($utilisateur, $observations)) {
					$observations[$utilisateur] = array();
				}
				if (!array_key_exists($ordre, $observations[$utilisateur])) {

						'FROM cel_images_export ci'.
						'	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) ".
						"WHERE ".$transmission.
						$this->construireWhereCoordonnees().
						$this->construireWhereUtilisateur().
						$this->construireWhereNumTaxon().
						$this->construireWhereNomTaxon().
						$this->construireWhereReferentiel().
						$this->construireWhereProjet().
						(!$this->etreNull($tag_sql) ? "AND ($tag_sql) " : '').
						'ORDER BY utilisateur ASC';
			//$this->debug[] = $requete;
			//die($requete);
			$elements_tag = Cel::db()->requeter($requete);

 

Subversion Repositories eFlore/Applications.cel

(root)/branches/v3.00-serfouette/jrest/services/CelWidgetMapPoint.php – Rev 3687 → 3688

Rev 3687		Rev 3688
Line 779...		Line 779...
779	`$this->construireWhereNomTaxon().`	779	`$this->construireWhereNomTaxon().`
780	`$this->construireWhereReferentiel().`	780	`$this->construireWhereReferentiel().`
781	`$this->construireWhereProjet().`	781	`$this->construireWhereProjet().`
782	`$this->construireWhereTag().`	782	`$this->construireWhereTag().`
783	`$this->construireWhereGroupeZoneGeo().`	783	`$this->construireWhereGroupeZoneGeo().`
784	`'ORDER BY utilisateur ASC, ordre ASC';`	784	`'ORDER BY utilisateur ASC';`
785	`//$this->debug[] = $requete;`	785	`//$this->debug[] = $requete;`
786	`//die($requete);`	786	`//die($requete);`
787	`$resultats = Cel::db()->requeter($requete);`	787	`$resultats = Cel::db()->requeter($requete);`
Line 788...		Line 788...
788		788
789	`$observations = null;`	789	`$observations = null;`
790	`if ($resultats != false) {`	790	`if ($resultats != false) {`
791	`$observations = array();`	791	`$observations = array();`
792	`foreach ($resultats as $occurence) {`	792	`foreach ($resultats as $occurence) {`
793	`$utilisateur = $occurence['utilisateur'];`	793	`$utilisateur = $occurence['utilisateur'];`
794	`$ordre = $occurence['ordre'];`	794	`$ordre = $occurence['id_obs'];`
795	`if (!array_key_exists($utilisateur, $observations)) {`	795	`if (!array_key_exists($utilisateur, $observations)) {`
796	`$observations[$utilisateur] = array();`	796	`$observations[$utilisateur] = array();`
797	`}`	797	`}`
798	`if (!array_key_exists($ordre, $observations[$utilisateur])) {`	798	`if (!array_key_exists($ordre, $observations[$utilisateur])) {`
Line 1153...		Line 1153...
1153	`'FROM cel_images_export ci'.`	1153	`'FROM cel_images_export ci'.`
1154	`' INNER JOIN '.$this->table_export.' AS co '.`	1154	`' INNER JOIN '.$this->table_export.' AS co '.`
1155	`' ON (ci.ce_observation = co.id_observation) '.`	1155	`' ON (ci.ce_observation = co.id_observation) '.`
1156	`' LEFT JOIN cel_zones_geo AS zg '.`	1156	`' LEFT JOIN cel_zones_geo AS zg '.`
1157	`" ON (zg.nom = co.zone_geo AND zg.id_zone_geo = co.ce_zone_geo) ".`	1157	`" ON (zg.nom = co.zone_geo AND zg.id_zone_geo = co.ce_zone_geo) ".`
1158	`"WHERE ".`	1158	`"WHERE ".$transmission.`
1159	`$this->construireWhereCoordonnees().`	1159	`$this->construireWhereCoordonnees().`
1160	`$this->construireWhereUtilisateur().`	1160	`$this->construireWhereUtilisateur().`
1161	`$this->construireWhereNumTaxon().`	1161	`$this->construireWhereNumTaxon().`
1162	`$this->construireWhereNomTaxon().`	1162	`$this->construireWhereNomTaxon().`
1163	`$this->construireWhereReferentiel().`	1163	`$this->construireWhereReferentiel().`
1164	`$this->construireWhereProjet().`	1164	`$this->construireWhereProjet().`
1165	`(!$this->etreNull($tag_sql) ? "AND ($tag_sql) " : '').`	1165	`(!$this->etreNull($tag_sql) ? "AND ($tag_sql) " : '').`
1166	`'ORDER BY utilisateur ASC, ci.ordre ASC';`	1166	`'ORDER BY utilisateur ASC';`
1167	`//$this->debug[] = $requete;`	1167	`//$this->debug[] = $requete;`
1168	`//die($requete);`	1168	`//die($requete);`
1169	`$elements_tag = Cel::db()->requeter($requete);`	1169	`$elements_tag = Cel::db()->requeter($requete);`
Line 1170...		Line 1170...
1170		1170