340,7 → 340,7 |
$requete = (isset($this->distinct) ? 'SELECT DISTINCT' : 'SELECT').' co.*, '. |
' ci.id_image, ci.ce_utilisateur, nom_original, ci.date_creation, ci.mots_cles_texte AS mots_cles_texte_images, '. |
' co.mots_cles_texte AS mots_cles_texte_images_obs, ci.commentaire, note_qualite, nom_referentiel '. |
'FROM cel_obs AS co LEFT JOIN cel_images AS ci ON (co.id_observation = ci.ce_observation) '. |
'FROM cel_export_total AS co LEFT JOIN photo AS ci ON (co.id_observation = ci.ce_observation) '. |
'WHERE co.transmission = 1 '. |
' AND co.ce_utilisateur = ci.ce_utilisateur '. |
'ORDER BY '.(isset($this->orderby) && (!is_null($this->orderby)) ? $this->orderby : 'ci.date_creation DESC').' '. |
380,8 → 380,8 |
' ci.id_image, co.ce_utilisateur, nom_original, ci.date_creation, ci.mots_cles_texte AS mots_cles_texte_images, '. |
' co.mots_cles_texte AS mots_cles_texte_obs, ci.commentaire AS commentaire_img, note_qualite, nom_referentiel, '. |
' co.commentaire AS commentaire_obs '. |
'FROM cel_images AS ci '. |
' LEFT JOIN cel_obs AS co '. |
'FROM photo AS ci '. |
' LEFT JOIN cel_export_total AS co '. |
' ON (ci.ce_observation = co.id_observation) '. |
(($this->etreFluxAdmin()) ? '' : 'WHERE co.transmission = 1 '). |
'ORDER BY '.(isset($this->orderby) && (!is_null($this->orderby)) ? $this->orderby : 'ci.date_creation DESC').' '. |
436,7 → 436,7 |
// et pas la jointure de toutes les tables |
$sous_requete = 'SELECT c.* '. |
'FROM cel_images c '. |
(($this->etreFluxAdmin()) ? '' : 'INNER JOIN cel_obs b ON c.ce_observation = b.id_observation AND b.transmission = 1 '); |
(($this->etreFluxAdmin()) ? '' : 'INNER JOIN cel_export_total b ON c.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 "; |
|
444,7 → 444,7 |
$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 '. |
' INNER JOIN cel_export_total AS b '. |
' ON (c.ce_observation = b.id_observation) AND b.ce_utilisateur = c.ce_utilisateur '; |
//echo $requete; |
return $requete; |
455,7 → 455,7 |
$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_images AS c '. |
' INNER JOIN cel_obs AS b '. |
' INNER JOIN cel_export_total AS b '. |
' ON (c.ce_observation = b.id_observation) '. |
'WHERE b.ce_utilisateur = c.ce_utilisateur '. |
(($this->etreFluxAdmin()) ? '' : 'AND b.transmission = 1 '). |