Subversion Repositories eFlore/Applications.del

Rev

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

Rev 1036 Rev 1276
Line 52... Line 52...
52 
					"	FROM del_commentaire dc, del_observation dob".
 52 
					"	FROM del_commentaire dc, del_observation dob".
53 
					"		WHERE dc.nom_sel = dob.nom_sel ".
 53 
					"		WHERE dc.nom_sel = dob.nom_sel ".
54 
					"		AND dc.ce_utilisateur = dob.ce_utilisateur ".
 54 
					"		AND dc.ce_utilisateur = dob.ce_utilisateur ".
55 
					"		AND dc.ce_observation = dob.id_observation ".
 55 
					"		AND dc.ce_observation = dob.id_observation ".
56 
					") ".
 56 
					") ".
- 
 
 57 
					"AND dc.ce_utilisateur IN ".
- 
 
 58 
					"( ".
- 
 
 59 
					"	SELECT id_utilisateur ".
- 
 
 60 
					"	FROM del_utilisateur_infos ".
- 
 
 61 
					"		WHERE preferences LIKE ".$this->conteneur->getBdd()->proteger('%"mail_notification_mes_obs":"1"%')." ".
- 
 
 62 
					") ".
57 
					"AND DATE_FORMAT( dc.date, '%Y-%m-%d' ) = CURDATE()".
 63 
					"AND DATE_FORMAT( dc.date, '%Y-%m-%d' ) = CURDATE() ".
58 
					"ORDER BY dc.ce_observation";
 64 
					"ORDER BY dc.ce_observation";
- 
 
 65 
 
59 
		$commentaires = $this->conteneur->getBdd()->recupererTous($requete);
 66 
		$commentaires = $this->conteneur->getBdd()->recupererTous($requete);
60 
		return $commentaires;
 67 
		return $commentaires;
61 
	}
 68 
	}
Line 62... Line 69...
62
69
Line 87... Line 94...
87 
		foreach ($liste_obs as $obs) {
 94 
		foreach ($liste_obs as $obs) {
88 
			$id_obs = $obs['id_observation'];
 95 
			$id_obs = $obs['id_observation'];
89 
			$auteur_obs = $obs['ce_utilisateur'];
 96 
			$auteur_obs = $obs['ce_utilisateur'];
90 
			$obs['date'] = $this->formaterDateObs($obs['date_observation']);
 97 
			$obs['date'] = $this->formaterDateObs($obs['date_observation']);
91 
			$obs['lien'] = $this->obtenirLienFicheObs($obs['id_observation']);
 98 
			$obs['lien'] = $this->obtenirLienFicheObs($obs['id_observation']);
- 
 
 99 
			$obs['commentaires'] = array();
92 
			$this->correspondance_id_obs_auteurs[$id_obs] = $auteur_obs;
 100 
			$this->correspondance_id_obs_auteurs[$id_obs] = $auteur_obs;
93 
			$this->observations_concernees[$auteur_obs][$id_obs] = $obs;
 101 
			$this->observations_concernees[$auteur_obs][$id_obs] = $obs;
94 
		}
 102 
		}
95 
	}
 103 
	}