| 667,8 → 667,12 |
|---|
| $protocole = isset($this->parametres['protocole']) ? $this->parametres['protocole'] : 1; |
| |
| $requeteVotes = ' SELECT doi.id_image as id_image, IF(divo.ce_protocole = '.$protocole.', AVG(divo.valeur), 0) as total_votes '. |
| ' FROM del_obs_image doi INNER JOIN del_image di ON doi.id_image = di.id_image'. |
| ' FROM del_obs_image doi '. |
| ' INNER JOIN del_image di ON doi.id_image = di.id_image '. |
| ' INNER JOIN del_observation dob ON dob.id_observation = doi.id_observation '. |
| ' LEFT JOIN del_image_vote divo ON doi.id_image = divo.ce_image '; |
| |
| ; |
| |
| // Et si on a cherché par tag ? |
| if (isset($this->parametres['masque.tag'])) { |
| 678,7 → 682,7 |
|---|
| } |
| |
| $requeteVotes .= ' GROUP BY doi.id_image, doi.id_observation '. |
| ' ORDER by total_votes '.$this->directionTri .', id_observation '.$this->directionTri.' '. |
| ' ORDER by total_votes '.$this->directionTri .', doi.id_observation '.$this->directionTri.' '. |
| $this->gestionBdd->getLimitSql(); |
| |
| $resultatsVotes = $this->bdd->recupererTous($requeteVotes); |
| 704,17 → 708,18 |
|---|
| if ($this->parametres['tri'] == 'tags') { |
| |
| $requetetags = ' SELECT SQL_CALC_FOUND_ROWS doi.id_image, COUNT(id_tag) as total_tags '. |
| ' FROM del_obs_image doi LEFT JOIN del_image_tag dit ON dit.ce_image = doi.id_image AND dit.actif = 1 '; |
| |
| ' FROM del_obs_image doi LEFT JOIN del_image_tag dit ON dit.ce_image = doi.id_image AND dit.actif = 1 '. |
| ' INNER JOIN del_image di ON doi.id_image = di.id_image '. |
| ' INNER JOIN del_observation dob ON dob.id_observation = doi.id_observation '; |
| |
| if (isset($this->parametres['masque.tag'])) { |
| // Et si on a cherché par tag ? |
| $requetetags .= ' LEFT JOIN del_image di ON dit.ce_image = di.id_image '; |
| $tag = $this->parametres['masque.tag']; |
| $requetetags .= " WHERE (dit.tag_normalise LIKE '$tag%' OR di.mots_cles_texte LIKE '%$tag%') "; |
| } |
| |
| $requetetags .= ' GROUP BY id_image, id_observation '. |
| ' ORDER by total_tags '.$this->directionTri.', id_observation '.$this->directionTri. |
| $requetetags .= ' GROUP BY doi.id_image, doi.id_observation '. |
| ' ORDER by total_tags '.$this->directionTri.', doi.id_observation '.$this->directionTri. |
| $this->gestionBdd->getLimitSql(); |
| |
| $resultatstags = $this->bdd->recupererTous($requetetags); |