Subversion Repositories eFlore/Applications.del

Rev

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

Rev 1328 Rev 1330
Line 665... Line 665...
665 
			if ($this->parametres['tri'] == 'votes') {
 665 
			if ($this->parametres['tri'] == 'votes') {
Line 666... Line 666...
666
666
Line 667... Line 667...
667 
				$protocole = isset($this->parametres['protocole']) ? $this->parametres['protocole'] : 1;
 667 
				$protocole = isset($this->parametres['protocole']) ? $this->parametres['protocole'] : 1;
- 
 
 668
668
669 
				$requeteVotes = ' SELECT doi.id_image as id_image, IF(divo.ce_protocole = '.$protocole.', AVG(divo.valeur), 0) as total_votes '.
- 
 
 670 
								' FROM del_obs_image doi '.
669 
				$requeteVotes = ' SELECT doi.id_image as id_image, IF(divo.ce_protocole = '.$protocole.', AVG(divo.valeur), 0) as total_votes '.
 671 
								' INNER JOIN del_image di ON doi.id_image = di.id_image '.
- 
 
 672 
								' INNER JOIN del_observation dob ON dob.id_observation = doi.id_observation '.
- 
 
 673 
								' LEFT JOIN del_image_vote divo ON doi.id_image = divo.ce_image ';
Line 670... Line 674...
670 
								' FROM del_obs_image doi INNER JOIN del_image di ON doi.id_image = di.id_image'.
 674 
 
671 
								' LEFT JOIN del_image_vote divo ON doi.id_image = divo.ce_image ';
 675 
;
672
676
673 
				// Et si on a cherché par tag ?
 677 
				// Et si on a cherché par tag ?
674 
				if (isset($this->parametres['masque.tag'])) {
 678 
				if (isset($this->parametres['masque.tag'])) {
675 
					$tag = $this->parametres['masque.tag'];
 679 
					$tag = $this->parametres['masque.tag'];
Line 676... Line 680...
676 
					$requeteVotes .= ' LEFT JOIN del_image_tag dit ON dit.ce_image = di.id_image ';
 680 
					$requeteVotes .= ' LEFT JOIN del_image_tag dit ON dit.ce_image = di.id_image ';
677 
					$requeteVotes .= " WHERE (dit.tag_normalise LIKE '$tag%' OR  di.mots_cles_texte LIKE '%$tag%') AND dit.actif = 1 ";
 681 
					$requeteVotes .= " WHERE (dit.tag_normalise LIKE '$tag%' OR  di.mots_cles_texte LIKE '%$tag%') AND dit.actif = 1 ";
678 
				}
 682 
				}
Line 679... Line 683...
679
683
680 
				$requeteVotes .= ' GROUP BY doi.id_image, doi.id_observation '.
 684 
				$requeteVotes .= ' GROUP BY doi.id_image, doi.id_observation '.
681 
								 ' ORDER by total_votes '.$this->directionTri .', id_observation '.$this->directionTri.' '.
 685 
								 ' ORDER by total_votes '.$this->directionTri .', doi.id_observation '.$this->directionTri.' '.
Line 702... Line 706...
702 
			}
 706 
			}
Line 703... Line 707...
703
707
Line 704... Line 708...
704 
			if ($this->parametres['tri'] == 'tags') {
 708 
			if ($this->parametres['tri'] == 'tags') {
705
709
- 
 
 710 
				$requetetags = ' SELECT SQL_CALC_FOUND_ROWS doi.id_image, COUNT(id_tag) as total_tags '.
- 
 
 711 
						' FROM del_obs_image doi LEFT JOIN del_image_tag dit ON dit.ce_image = doi.id_image AND dit.actif = 1 '.
706 
				$requetetags = ' SELECT SQL_CALC_FOUND_ROWS doi.id_image, COUNT(id_tag) as total_tags '.
 712 
						 ' INNER JOIN del_image di ON doi.id_image = di.id_image '.
707 
						' FROM del_obs_image doi LEFT JOIN del_image_tag dit ON dit.ce_image = doi.id_image AND dit.actif = 1 ';
 713 
						 ' INNER JOIN del_observation dob ON dob.id_observation = doi.id_observation ';
708
714 
 
709 
				if (isset($this->parametres['masque.tag'])) {
 - 
 
710 
					// Et si on a cherché par tag ?
 715 
				if (isset($this->parametres['masque.tag'])) {
711 
					$requetetags .= ' LEFT JOIN del_image di ON dit.ce_image = di.id_image ';
 716 
					// Et si on a cherché par tag ?
712 
					$tag = $this->parametres['masque.tag'];
 717 
					$tag = $this->parametres['masque.tag'];
Line 713... Line 718...
713 
					$requetetags .= " WHERE (dit.tag_normalise LIKE '$tag%' OR  di.mots_cles_texte LIKE '%$tag%') ";
 718 
					$requetetags .= " WHERE (dit.tag_normalise LIKE '$tag%' OR  di.mots_cles_texte LIKE '%$tag%') ";
714 
				}
 719 
				}
715
720
Line 716... Line 721...
716 
				$requetetags .= ' GROUP BY id_image, id_observation '.
 721 
				$requetetags .= ' GROUP BY doi.id_image, doi.id_observation '.
717 
						' ORDER by total_tags '.$this->directionTri.', id_observation '.$this->directionTri.
 722 
						' ORDER by total_tags '.$this->directionTri.', doi.id_observation '.$this->directionTri.
718 
						$this->gestionBdd->getLimitSql();
 723 
						$this->gestionBdd->getLimitSql();