Subversion Repositories Sites.obs-saisons.fr

Rev

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

Rev 215 Rev 229
Line 189... Line 189...
189 
	private function getServiceParDefaut() {
 189 
	private function getServiceParDefaut() {
190 
		// Construction de la requête
 190 
		// Construction de la requête
191 
		$requete = 	'SELECT * '.
 191 
		$requete = 	'SELECT * '.
192 
			'FROM ods_observations '.
 192 
			'FROM ods_observations '.
193 
			'WHERE oo_ce_participant != '.$this->config['appli']['id_participant_demo'].' '.
 193 
			'WHERE oo_ce_participant != '.$this->config['appli']['id_participant_demo'].' '.
- 
 
 194 
			'WHERE oo_ce_participant != '.$this->config['appli']['id_participant_admin'].' '.
- 
 
 195 
			'AND DAY(oo_date) != "00" '.
194 
			'ORDER BY oo_date_modification DESC '.
 196 
			'ORDER BY oo_date_modification DESC '.
195 
			"LIMIT $this->start,$this->limit ";
 197 
			"LIMIT $this->start,$this->limit ";
Line 196... Line 198...
196
198
Line 211... Line 213...
211 
			'LEFT JOIN ods_individus '.
 213 
			'LEFT JOIN ods_individus '.
212 
			'ON ods_observations.oo_ce_individu = ods_individus.oi_id_individu '.
 214 
			'ON ods_observations.oo_ce_individu = ods_individus.oi_id_individu '.
213 
			'LEFT JOIN ods_stations '.
 215 
			'LEFT JOIN ods_stations '.
214 
			'ON ods_individus.oi_ce_station = ods_stations.os_id_station '.
 216 
			'ON ods_individus.oi_ce_station = ods_stations.os_id_station '.
215 
			'WHERE oo_ce_participant != '.$this->config['appli']['id_participant_demo'].' '.
 217 
			'WHERE oo_ce_participant != '.$this->config['appli']['id_participant_demo'].' '.
- 
 
 218 
			'WHERE oo_ce_participant != '.$this->config['appli']['id_participant_admin'].' '.
216 
			'AND oo_date_saisie != oo_date_modification '.
 219 
			'AND oo_date_saisie != oo_date_modification '.
217 
			'ORDER BY oo_date_modification DESC '.
 220 
			'ORDER BY oo_date_modification DESC '.
218 
			"LIMIT $this->start,$this->limit ";
 221 
			"LIMIT $this->start,$this->limit ";
Line 219... Line 222...
219
222
Line 315... Line 318...
315 
	}
 318 
	}
Line 316... Line 319...
316
319
Line 317... Line 320...
317 
	private function creerAuteur($element) {
 320 
	private function creerAuteur($element) {
318
321
319 
		//TODO externaliser les champs dans le fichier de config
 322 
		//TODO externaliser les champs dans le fichier de config
Line 320... Line 323...
320 
		$requete_selection_auteur = 'SELECT name FROM ods_redesign.drupal_users '.
 323 
		$requete_selection_auteur = 'SELECT name FROM drupal_users '.
321 
									'WHERE uid = '.$this->proteger($element);
 324 
									'WHERE uid = '.$this->proteger($element);
Line 322... Line 325...
322
325
323 
		$resultat_auteur = $this->executerRequete($requete_selection_auteur);
 326 
		$resultat_auteur = $this->executerRequete($requete_selection_auteur);
Line 324... Line 327...
324 
		$nom_auteur = $resultat_auteur[0]['name'];
 327 
		$nom_auteur = $resultat_auteur[0]['mail'];