342,7 → 342,7 |
$requete = (isset($this->distinct) ? 'SELECT DISTINCT' : 'SELECT').' co.*, '. |
' 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_images_obs, "" as commentaire, "" as note_qualite, nom_referentiel '. |
'FROM cel_export_total AS co LEFT JOIN cel_images_export AS ci ON (co.id_observation = ci.ce_observation) '. |
'FROM cel_export_total AS co JOIN cel_images_export 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').' '. |
383,7 → 383,7 |
' 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_export AS ci '. |
' LEFT JOIN cel_export_total AS co '. |
' JOIN cel_export 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').' '. |
438,7 → 438,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, "" AS commentaire_img, nom_referentiel '. |
'FROM cel_images_export c '. |
' left JOIN cel_export AS b '. |
' JOIN cel_export AS b '. |
' ON (c.ce_observation = b.id_observation) '; |
$requete .= ' ORDER BY '.(isset($this->orderby) && (!is_null($this->orderby)) ? $this->orderby : 'c.date_creation DESC').' '. |
"LIMIT $this->start,$this->limit "; |
451,15 → 451,15 |
$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, "" as commentaire_img, nom_referentiel '. |
'FROM cel_images_export AS c '. |
' INNER JOIN cel_export_total AS b '. |
' JOIN cel_export_total AS b '. |
' ON (c.ce_observation = b.id_observation) '. |
'WHERE donnees_standard = 1'. |
'WHERE '. |
(($this->etreFluxAdmin()) ? '' : ' AND b.transmission = 1 '). |
' AND '; |
|
if ($this->estUneRechercheGenerale()) { |
$chaine_requete = $_GET['recherche']; |
$requete .= $this->creerSousRequeteRechercheGenerale($chaine_requete); |
$requete .= "donnees_standard = 1 AND ".$this->creerSousRequeteRechercheGenerale($chaine_requete); |
} else { |
$criteres = $this->traiterCriteresMultiples($_GET) ; |
if (!empty($criteres)) { |