| 213,7 → 213,7 |
|---|
| private function getServiceParDefaut() { |
| // Construction de la requête |
| $requete = (isset($this->distinct) ? 'SELECT DISTINCT' : 'SELECT').' * '. |
| 'FROM cel_obs '. |
| 'FROM cel_export_total '. |
| (($this->etreFluxAdmin()) ? '' : 'WHERE transmission = 1 '). |
| 'ORDER BY '.(isset($this->orderby) && (!is_null($this->orderby)) ? $this->orderby : 'date_modification DESC').' '. |
| "LIMIT $this->start,$this->limit "; |
| 234,7 → 234,7 |
|---|
| |
| // Construction de la requête |
| $requete = (isset($this->distinct) ? 'SELECT DISTINCT' : 'SELECT').' * '. |
| 'FROM cel_obs '. |
| 'FROM cel_export_total '. |
| 'WHERE 1 AND '.(($this->etreFluxAdmin()) ? '' : ' transmission = 1 AND '); |
| |
| if ($this->estUneRechercheGenerale()) { |
| 403,8 → 403,9 |
|---|
| $identifiants[$element['courriel_utilisateur']] = $element['courriel_utilisateur']; |
| $ids_observations[] = $element['id_observation']; |
| } |
| $gestion_champs_etendus = new GestionChampsEtendus($this->config, 'obs'); |
| $champs_etendus = $gestion_champs_etendus->consulterParLots($ids_observations); |
| $gestion_obs_etendus = new GestionChampsEtendus($this->config, 'obs'); |
| $gestion_champs_etendus = new GestionChampsEtendus2($this->config); |
| $champs_etendus = $gestion_obs_etendus->consulterParLots($ids_observations); |
| if(!empty($champs_etendus)) { |
| $this->catalogue_cles_labels_champs_etendus = $gestion_champs_etendus->consulterCatalogueChampsEtendusPredefinis(true); |
| // afin de simplifier les erreurs de majuscules et minuscules |