Subversion Repositories eFlore/Applications.cel

Rev

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

Rev 1038 Rev 1039
Line 186... Line 186...
186
					$this->construireWhereCommentaire().
186
					$this->construireWhereCommentaire().
187
					$this->construireWhereProjet().
187
					$this->construireWhereProjet().
188
					$this->construireWhereTag();
188
					$this->construireWhereTag();
Line 189... Line 189...
189
 
189
 
190
		$resultats_emplacements = $this->executerRequete($requete);
190
		$resultats_emplacements = $this->executerRequete($requete);
Line 191... Line 191...
191
		$emplacements = $this->traiterEmplacements($resultats_emplacements);
191
		$emplacements = $this->traiterEmplacements($resultats_emplacements, $this->compterObservations($params));
192
 
192
 
Line -... Line 193...
-
 
193
		return $emplacements;
-
 
194
	}
-
 
195
 
-
 
196
	private $nb_obs = 0;
-
 
197
 
-
 
198
	private function compterObservations($params) {
-
 
199
		$requete =  'SELECT COUNT(*) AS nb '.
-
 
200
					'FROM cel_inventory AS i '.
-
 
201
                    '   LEFT JOIN locations AS l '.
-
 
202
                    '       ON (l.name = i.location AND l.code = i.id_location) '.
-
 
203
                    "WHERE transmission = '1' ".
-
 
204
					" AND (".
-
 
205
						"(".($this->construireWhereRectangleStationOR() != null ? $this->construireWhereRectangleStationOR().' AND ' : '').
-
 
206
							" (mots_cles_texte IS NULL OR mots_cles_texte NOT LIKE '%sensible%') ".
-
 
207
						")".
-
 
208
						" OR ".
-
 
209
						" ( ".
-
 
210
							"(".($this->construireWhereRectangleCommuneOR() != null ? $this->construireWhereRectangleCommuneOR().' Or ' : '').
-
 
211
							" mots_cles_texte LIKE '%sensible%' ".
-
 
212
							")".
-
 
213
						" ) ".
-
 
214
					") ".
-
 
215
					$this->construireWhereDept().
-
 
216
                    $this->construireWhereCommune().
-
 
217
                    $this->construireWhereUtilisateur().
-
 
218
					$this->construireWhereNumTaxon().
-
 
219
					$this->construireWhereNomTaxon().
-
 
220
					$this->construireWhereDate().
-
 
221
					$this->construireWhereCommentaire().
-
 
222
					$this->construireWhereProjet().
-
 
223
					$this->construireWhereTag();
-
 
224
 
-
 
225
		$resultats_nb_obs = $this->executerRequete($requete);
193
		return $emplacements;
226
		return $resultats_nb_obs[0]['nb'];
194
	}
227
	}
195
 
228
 
Line 196... Line 229...
196
	private function traiterEmplacements(&$emplacements) {
229
	private function traiterEmplacements(&$emplacements, $nb_total_observation) {
197
		$zoom = (int) array_key_exists('zoom', $this->parametres) ? $this->parametres['zoom'] : 11;
230
		$zoom = (int) array_key_exists('zoom', $this->parametres) ? $this->parametres['zoom'] : 11;
Line 211... Line 244...
211
			// et permet de ne pas reparser le tableau pour compter les différents éléments
244
			// et permet de ne pas reparser le tableau pour compter les différents éléments
212
			$nb_elements = CartoGroupage::getNbElements();
245
			$nb_elements = CartoGroupage::getNbElements();
Line 213... Line 246...
213
 
246
 
214
			$marqueurs['stats']['stations'] = $nb_elements['stations'];
247
			$marqueurs['stats']['stations'] = $nb_elements['stations'];
215
			$marqueurs['stats']['communes'] = $nb_elements['communes'];
248
			$marqueurs['stats']['communes'] = $nb_elements['communes'];
216
			$marqueurs['stats']['observations'] = $nb_elements['observations'];
249
			$marqueurs['stats']['observations'] = (int)$nb_total_observation;
217
		} else {
250
		} else {
218
			$marqueurs['points'] = $emplacements;
251
			$marqueurs['points'] = $emplacements;
Line 219... Line 252...
219
		}
252
		}
Line 367... Line 400...
367
			$total = (int) $this->requeter($requete, self::SQL_RETOUR_COLONNE);
400
			$total = (int) $this->requeter($requete, self::SQL_RETOUR_COLONNE);
368
		}
401
		}
Line 369... Line 402...
369
 
402
 
370
		// Post-traitement
403
		// Post-traitement
371
		$observations = $this->traiterObservations($resultats, $total);
404
		$observations = $this->traiterObservations($resultats, $total);
372
		//$observations = $this->ajouterImagesAuxObs($observations);
405
		$observations = $this->ajouterImagesAuxObs($observations);
373
		//$observations = $this->ajouterAuteursAuxObs($observations);
406
		$observations = $this->ajouterAuteursAuxObs($observations);
Line 374... Line 407...
374
		$observations = $this->supprimerIdDesObs($observations);
407
		$observations = $this->supprimerIdDesObs($observations);
375
 
408