332,13 → 332,9 |
|
// Construction de la requête |
$requete = (isset($this->distinct) ? 'SELECT DISTINCT' : 'SELECT').' ci.*, '. |
' cim.id_image, cim.ce_utilisateur, nom_original, cim.date_creation, cim.mots_cles_texte as mots_cles_texte_images, |
ci.mots_cles_texte as mots_cles_texte_images_obs, cim.commentaire, note_qualite, nom_referentiel '. |
'FROM cel_obs_images AS coi '. |
'LEFT JOIN cel_obs AS ci '. |
'ON (coi.id_observation = ci.id_observation) '. |
'LEFT JOIN cel_images AS cim '. |
'ON (coi.id_image = cim.id_image) '. |
' cim.id_image, cim.ce_utilisateur, nom_original, cim.date_creation, cim.mots_cles_texte AS mots_cles_texte_images, '. |
' ci.mots_cles_texte AS mots_cles_texte_images_obs, cim.commentaire, note_qualite, nom_referentiel '. |
'FROM cel_obs AS ci LEFT JOIN cel_images AS cim ON (ci.id_observation = cim.ce_observation) '. |
'WHERE ci.transmission = 1 '. |
' AND ci.ce_utilisateur = cim.ce_utilisateur '. |
'ORDER BY '.(isset($this->orderby) && (!is_null($this->orderby)) ? $this->orderby : 'cim.date_creation DESC').' '. |
371,14 → 367,12 |
|
// Construction de la requête |
$requete = (isset($this->distinct) ? 'SELECT DISTINCT' : 'SELECT').' ci.*, '. |
' cim.id_image, ci.ce_utilisateur, nom_original, cim.date_creation, cim.mots_cles_texte as mots_cles_texte_images, '. |
' ci.mots_cles_texte as mots_cles_texte_obs, cim.commentaire as commentaire_img, note_qualite, nom_referentiel, '. |
' ci.commentaire as commentaire_obs '. |
' cim.id_image, ci.ce_utilisateur, nom_original, cim.date_creation, cim.mots_cles_texte AS mots_cles_texte_images, '. |
' ci.mots_cles_texte AS mots_cles_texte_obs, cim.commentaire AS commentaire_img, note_qualite, nom_referentiel, '. |
' ci.commentaire AS commentaire_obs '. |
'FROM cel_images AS cim '. |
' LEFT JOIN cel_obs_images AS coi '. |
' ON (coi.id_image = cim.id_image) '. |
' LEFT JOIN cel_obs AS ci '. |
' ON (coi.id_observation = ci.id_observation) '. |
' ON (cim.ce_observation = ci.id_observation) '. |
(($this->etreFluxAdmin()) ? '' : 'WHERE ci.transmission = 1 '). |
'ORDER BY '.(isset($this->orderby) && (!is_null($this->orderby)) ? $this->orderby : 'cim.date_creation DESC').' '. |
"LIMIT $this->start, $this->limit "; |
431,20 → 425,18 |
$sous_requete = 'SELECT * '. |
'FROM cel_images c '. |
'WHERE id_image '. |
' IN (SELECT id_image FROM cel_obs_images a '. |
(($this->etreFluxAdmin()) ? '' : 'INNER JOIN cel_obs b ON b.id_observation = a.id_observation AND b.transmission = 1 '). |
' IN (SELECT id_image FROM cel_images a '. |
(($this->etreFluxAdmin()) ? '' : 'INNER JOIN cel_obs b ON a.ce_observation = b.id_observation AND b.transmission = 1 '). |
') '; |
$sous_requete .= ' ORDER BY '.(isset($this->orderby) && (!is_null($this->orderby)) ? $this->orderby : 'c.date_creation DESC').' '. |
"LIMIT $this->start,$this->limit "; |
|
// Construction de la requête |
$requete = 'SELECT *, b.mots_cles_texte as mots_cles_texte_obs, c.mots_cles_texte as mots_cles_texte_images, '. |
' b.commentaire as commentaire_obs, c.commentaire as commentaire_img, nom_referentiel '. |
'FROM ('.$sous_requete.') as c '. |
' INNER JOIN cel_obs_images AS a '. |
' ON (a.id_image = c.id_image) '. |
$requete = 'SELECT *, b.mots_cles_texte AS mots_cles_texte_obs, c.mots_cles_texte AS mots_cles_texte_images, '. |
' b.commentaire AS commentaire_obs, c.commentaire AS commentaire_img, nom_referentiel '. |
'FROM ('.$sous_requete.') AS c '. |
' INNER JOIN cel_obs AS b '. |
' ON (a.id_observation = b.id_observation) AND b.ce_utilisateur = c.ce_utilisateur '; |
' ON (c.ce_observation = b.id_observation) AND b.ce_utilisateur = c.ce_utilisateur '; |
//echo $requete; |
return $requete; |
} |
453,11 → 445,9 |
// Construction de la requête |
$requete = 'SELECT *, b.mots_cles_texte as mots_cles_texte_obs, c.mots_cles_texte as mots_cles_texte_images, '. |
' b.commentaire as commentaire_obs, c.commentaire as commentaire_img, nom_referentiel '. |
'FROM cel_obs_images AS a '. |
'FROM cel_images AS c '. |
' INNER JOIN cel_obs AS b '. |
' ON (a.id_observation = b.id_observation) '. |
' INNER JOIN cel_images AS c '. |
' ON (a.id_image = c.id_image) '. |
' ON (c.ce_observation = b.id_observation) '. |
'WHERE b.ce_utilisateur = c.ce_utilisateur '. |
(($this->etreFluxAdmin()) ? '' : 'AND b.transmission = 1 '). |
' AND '; |