Subversion Repositories eFlore/Applications.del

Compare Revisions

Ignore whitespace Rev 2177 → Rev 2178

/trunk/services/modules/0.1/statistiques/StatistiquesParAnnee.php
150,7 → 150,7
if ($this->annee != null) {
$requete .= ' YEAR(date_transmission) = ' . $this->annee . " AND";
}
$requete .= " (mots_cles_texte LIKE '%determiner%' OR nom_sel_nn = '' OR nom_sel_nn IS NULL OR certitude IN ('aDeterminer','douteux'))";
$requete .= " (mots_cles_texte LIKE '%determiner%' OR nom_sel_nn = '' OR nom_sel_nn IS NULL OR certitude IN ('à déterminer','douteux'))";
if ($mpm) {
$requete = $this->encapsulerMPM($requete, 'date_transmission');
}
182,7 → 182,7
if ($this->annee != null) {
$requete .= ' YEAR(date_transmission) = ' . $this->annee . " AND";
}
$requete .= " (mots_cles_texte LIKE '%determiner%' OR certitude IN ('aDeterminer','douteux'))";
$requete .= " (mots_cles_texte LIKE '%determiner%' OR certitude IN ('à déterminer','douteux'))";
if ($mpm) {
$requete = $this->encapsulerMPM($requete, 'date_transmission');
}
198,7 → 198,7
if ($this->annee != null) {
$requete .= ' YEAR(date_transmission) = ' . $this->annee . " AND";
}
$requete .= " (certitude IN ('aDeterminer','douteux')))";
$requete .= " (certitude IN ('à déterminer','douteux')))";
if ($mpm) {
// @TODO vérifier que grouper sur "date" est pertinent
// date_transmission n'est pas dispo pour grouper ici :-/
216,7 → 216,7
if ($this->annee != null) {
$requete .= ' YEAR(date_transmission) = ' . $this->annee . " AND";
}
$requete .= " (mots_cles_texte LIKE '%determiner%' OR certitude IN ('aDeterminer','douteux')) AND id_observation IN"
$requete .= " (mots_cles_texte LIKE '%determiner%' OR certitude IN ('à déterminer','douteux')) AND id_observation IN"
. " (SELECT ce_observation FROM del_commentaire WHERE proposition_initiale = 1"
. " AND nom_sel_nn != 0"
. " AND nom_sel_nn IS NOT NULL"
245,7 → 245,7
if ($this->annee != null) {
$requete .= ' YEAR(date_transmission) = ' . $this->annee . " AND";
}
$requete .= " (mots_cles_texte LIKE '%determiner%' OR certitude IN ('aDeterminer','douteux')) AND id_observation IN"
$requete .= " (mots_cles_texte LIKE '%determiner%' OR certitude IN ('à déterminer','douteux')) AND id_observation IN"
. " (SELECT ce_observation FROM del_commentaire WHERE proposition_initiale = 1 AND proposition_retenue = 0"
. " AND nom_sel_nn != 0"
. " AND nom_sel_nn IS NOT NULL"
1074,4 → 1074,4
$resultat = json_decode($json, true);
return $resultat;
}
}
}
/trunk/services/modules/0.1/observations/ListeObservations.php
383,4 → 383,4
$commentaires = $this->bdd->recuperer($requete);
return $commentaires ? $commentaires['nb'] : 0;
}
}
}