| Line 70... |
Line 70... |
| 70 |
|
70 |
|
| 71 |
protected function chargerObservationsCommentees() {
|
71 |
protected function chargerObservationsCommentees() {
|
| 72 |
$preferences = $this->conteneur->getBdd()->proteger('%"mail_notification_mes_obs":"0"%');
|
72 |
$preferences = $this->conteneur->getBdd()->proteger('%"mail_notification_mes_obs":"0"%');
|
| 73 |
//TODO: optimiser la requête si beaucoup de mails sont envoyés
|
73 |
//TODO: optimiser la requête si beaucoup de mails sont envoyés
|
| 74 |
$requete = "SELECT * FROM del_observation AS do ".
|
74 |
$requete = "SELECT * FROM del_observation AS do ".
|
| - |
|
75 |
"WHERE do.id_observation IN ".
|
| - |
|
76 |
"( ".
|
| - |
|
77 |
"SELECT dc.ce_observation ".
|
| - |
|
78 |
"FROM del_commentaire AS dc ".
|
| - |
|
79 |
"WHERE dc.ce_observation != '0' ".
|
| 75 |
"WHERE do.id_observation IN ".
|
80 |
"AND dc.id_commentaire NOT IN ".
|
| 76 |
"( ".
|
81 |
"( ".
|
| 77 |
"SELECT dc.ce_observation ".
|
82 |
" SELECT dc.id_commentaire ".
|
| 78 |
"FROM del_commentaire AS dc ".
|
83 |
" FROM del_commentaire AS dc, del_observation AS dob".
|
| - |
|
84 |
" WHERE dc.nom_sel = dob.nom_sel ".
|
| - |
|
85 |
" AND dc.ce_utilisateur = dob.ce_utilisateur ".
|
| - |
|
86 |
" AND dc.ce_observation = dob.id_observation ".
|
| 79 |
"WHERE dc.ce_observation != '0' ".
|
87 |
") ".
|
| 80 |
"AND dc.id_commentaire NOT IN ".
|
88 |
"AND dc.ce_utilisateur NOT IN ".
|
| 81 |
"( ".
|
89 |
"( ".
|
| 82 |
" SELECT dc.id_commentaire ".
|
90 |
" SELECT id_utilisateur ".
|
| 83 |
" FROM del_commentaire AS dc, del_observation AS dob".
|
91 |
" FROM del_utilisateur_infos ".
|
| 84 |
" WHERE dc.nom_sel = dob.nom_sel ".
|
- |
|
| 85 |
" AND dc.ce_utilisateur = dob.ce_utilisateur ".
|
- |
|
| 86 |
" AND dc.ce_observation = dob.id_observation ".
|
92 |
" WHERE preferences LIKE $preferences ".
|
| 87 |
") ".
|
- |
|
| 88 |
"AND dc.ce_utilisateur NOT IN ".
|
- |
|
| 89 |
"( ".
|
- |
|
| 90 |
" SELECT id_utilisateur ".
|
- |
|
| 91 |
" FROM del_utilisateur_infos ".
|
- |
|
| 92 |
" WHERE preferences LIKE $preferences ".
|
- |
|
| 93 |
") ".
|
93 |
") ".
|
| 94 |
"AND TO_DAYS(NOW()) - TO_DAYS(dc.date) <= 1 ".
|
94 |
"AND TO_DAYS(NOW()) - TO_DAYS(dc.date) <= 1 ".
|
| 95 |
") ".
|
95 |
") ".
|
| 96 |
"ORDER BY do.ce_utilisateur, do.id_observation ";
|
96 |
"ORDER BY do.ce_utilisateur, do.id_observation ";
|
| 97 |
$observations = $this->conteneur->getBdd()->recupererTous($requete);
|
97 |
$observations = $this->conteneur->getBdd()->recupererTous($requete);
|
| 98 |
return $observations;
|
98 |
return $observations;
|
| Line 99... |
Line 99... |
| 99 |
}
|
99 |
}
|
| Line 142... |
Line 142... |
| 142 |
|
142 |
|
| 143 |
protected function formaterCommentaires($liste_commentaires) {
|
143 |
protected function formaterCommentaires($liste_commentaires) {
|
| 144 |
$liste_commentaires_formatee = array();
|
144 |
$liste_commentaires_formatee = array();
|
| 145 |
foreach ($liste_commentaires as $commentaire) {
|
145 |
foreach ($liste_commentaires as $commentaire) {
|
| 146 |
$id_obs = $commentaire['ce_observation'];
|
146 |
$id_obs = $commentaire['ce_observation'];
|
| 147 |
if(isset($this->correspondance_id_obs_auteurs[$commentaire['ce_observation']])) {
|
147 |
if (isset($this->correspondance_id_obs_auteurs[$commentaire['ce_observation']])) {
|
| 148 |
$auteur_obs = $this->correspondance_id_obs_auteurs[$commentaire['ce_observation']];
|
148 |
$auteur_obs = $this->correspondance_id_obs_auteurs[$commentaire['ce_observation']];
|
| 149 |
$commentaire['auteur'] = $this->formaterAuteur($commentaire);
|
149 |
$commentaire['auteur'] = $this->formaterAuteur($commentaire);
|
| 150 |
$this->observations_concernees[$auteur_obs][$id_obs]['commentaires'][] = $commentaire;
|
150 |
$this->observations_concernees[$auteur_obs][$id_obs]['commentaires'][] = $commentaire;
|
| 151 |
}
|
151 |
}
|
| Line 193... |
Line 193... |
| 193 |
'utilisateur_courriel' => Config::get('adresse_expediteur_recapitulatif'),
|
193 |
'utilisateur_courriel' => Config::get('adresse_expediteur_recapitulatif'),
|
| 194 |
'format' => 'html'
|
194 |
'format' => 'html'
|
| 195 |
);
|
195 |
);
|
| Line 196... |
Line 196... |
| 196 |
|
196 |
|
| - |
|
197 |
$ch = curl_init();
|
| 197 |
$ch = curl_init();
|
198 |
$options = array(
|
| 198 |
$options = array(CURLOPT_URL => $url_requete,
|
199 |
CURLOPT_URL => $url_requete,
|
| 199 |
CURLOPT_HEADER => false,
|
200 |
CURLOPT_HEADER => false,
|
| 200 |
CURLOPT_POST => 1,
|
201 |
CURLOPT_POST => 1,
|
| 201 |
CURLOPT_POSTFIELDS => $post,
|
202 |
CURLOPT_POSTFIELDS => $post,
|
| 202 |
CURLOPT_RETURNTRANSFER => true
|
203 |
CURLOPT_RETURNTRANSFER => true
|