| 110,7 → 110,7 |
|---|
| public function compterImages($id_utilisateur = null, $criteres = array()) { |
| $requete_recherche_images = 'SELECT COUNT(*) AS nb_images '; |
| |
| $requete_recherche_images .= $this->fabriquerRequeteJointureObs(); |
| $requete_recherche_images .= $this->fabriquerRequeteJointureObs($criteres); |
| $requete_recherche_images .= ($id_utilisateur != null) ? 'AND co.ce_utilisateur = '.Cel::db()->proteger($id_utilisateur) : ''; |
| |
| $sous_requete_recherche = $this->fabriquerSousRequeteRecherche($id_utilisateur, $criteres); |
| 134,19 → 134,33 |
|---|
| (!empty($tri) && in_array($tri, $tris_obs)); |
| } |
| |
| private function fabriquerRequeteJointureObs() { |
| $requete = 'FROM cel_images_export ci '. |
| 'LEFT JOIN cel_export_total co '. |
| 'ON ci.ce_observation = co.id_observation '. |
| 'WHERE 1 '; |
| private function fabriquerRequeteJointureObs($criteres) { |
| if (isset($criteres['standard']) && $criteres['standard'] = 0 ) { |
| $requete = 'FROM cel_images_export ci '. |
| 'LEFT JOIN cel_export_total co '. |
| 'ON ci.ce_observation = co.id_observation '. |
| 'WHERE co.transmission = '.Cel::db()->proteger($criteres['transmission']); |
| } else { |
| $requete = 'FROM cel_images_export ci '. |
| 'LEFT JOIN cel_export co '. |
| 'ON ci.ce_observation = co.id_observation '. |
| 'WHERE 1 '; |
| } |
| return $requete; |
| } |
| |
| private function fabriquerRequeteJointureDblObs() { |
| $requete = 'FROM cel_images_export ci '. |
| 'JOIN cel_export_total co '. |
| 'ON ci.ce_observation = co.id_observation '. |
| 'WHERE 1 '; |
| if (isset($criteres['standard']) && $criteres['standard'] = 0 ) { |
| $requete = 'FROM cel_images_export ci '. |
| 'JOIN cel_export_total co '. |
| 'ON ci.ce_observation = co.id_observation '. |
| 'WHERE co.transmission = '.Cel::db()->proteger($criteres['transmission']); |
| } else { |
| $requete = 'FROM cel_images_export ci '. |
| 'JOIN cel_export co '. |
| 'ON ci.ce_observation = co.id_observation '. |
| 'WHERE 1 '; |
| } |
| return $requete; |
| } |
| |
| 219,7 → 233,7 |
|---|
| $sous_requete .= $this->fabriquerSousRequeteRechercheGenerale($id_utilisateur, $valeur); |
| $sous_requete .= ' AND '; |
| break; |
| case "transmission": |
| /*case "transmission": |
| $sous_requete .= 'co.transmission = '.Cel::db()->proteger($valeur) ; |
| $sous_requete .= ' AND '; |
| break; |
| 226,7 → 240,7 |
|---|
| case "standard": |
| $sous_requete .= 'co.donnees_standard = '.Cel::db()->proteger($valeur) ; |
| $sous_requete .= ' AND '; |
| break; |
| break;*/ |
| case "referentiel": |
| $sous_requete .= 'co.nom_referentiel = '.Cel::db()->proteger($valeur) ; |
| $sous_requete .= ' AND '; |