| Line 211... |
Line 211... |
| 211 |
}
|
211 |
}
|
| Line 212... |
Line 212... |
| 212 |
|
212 |
|
| 213 |
private function getServiceParDefaut() {
|
213 |
private function getServiceParDefaut() {
|
| 214 |
// Construction de la requête
|
214 |
// Construction de la requête
|
| 215 |
$requete = (isset($this->distinct) ? 'SELECT DISTINCT' : 'SELECT').' * '.
|
215 |
$requete = (isset($this->distinct) ? 'SELECT DISTINCT' : 'SELECT').' * '.
|
| 216 |
'FROM cel_obs '.
|
216 |
'FROM cel_export_total '.
|
| 217 |
(($this->etreFluxAdmin()) ? '' : 'WHERE transmission = 1 ').
|
217 |
(($this->etreFluxAdmin()) ? '' : 'WHERE transmission = 1 ').
|
| 218 |
'ORDER BY '.(isset($this->orderby) && (!is_null($this->orderby)) ? $this->orderby : 'date_modification DESC').' '.
|
218 |
'ORDER BY '.(isset($this->orderby) && (!is_null($this->orderby)) ? $this->orderby : 'date_modification DESC').' '.
|
| Line 219... |
Line 219... |
| 219 |
"LIMIT $this->start,$this->limit ";
|
219 |
"LIMIT $this->start,$this->limit ";
|
| Line 232... |
Line 232... |
| 232 |
|
232 |
|
| Line 233... |
Line 233... |
| 233 |
$this->limit = ($this->limit < 1000) ? $this->limit : 1000;// Pour éviter les abus !
|
233 |
$this->limit = ($this->limit < 1000) ? $this->limit : 1000;// Pour éviter les abus !
|
| 234 |
|
234 |
|
| 235 |
// Construction de la requête
|
235 |
// Construction de la requête
|
| 236 |
$requete = (isset($this->distinct) ? 'SELECT DISTINCT' : 'SELECT').' * '.
|
236 |
$requete = (isset($this->distinct) ? 'SELECT DISTINCT' : 'SELECT').' * '.
|
| Line 237... |
Line 237... |
| 237 |
'FROM cel_obs '.
|
237 |
'FROM cel_export_total '.
|
| 238 |
'WHERE 1 AND '.(($this->etreFluxAdmin()) ? '' : ' transmission = 1 AND ');
|
238 |
'WHERE 1 AND '.(($this->etreFluxAdmin()) ? '' : ' transmission = 1 AND ');
|
| 239 |
|
239 |
|
| Line 401... |
Line 401... |
| 401 |
$ids_observations = array();
|
401 |
$ids_observations = array();
|
| 402 |
foreach ($elements as $element) {
|
402 |
foreach ($elements as $element) {
|
| 403 |
$identifiants[$element['courriel_utilisateur']] = $element['courriel_utilisateur'];
|
403 |
$identifiants[$element['courriel_utilisateur']] = $element['courriel_utilisateur'];
|
| 404 |
$ids_observations[] = $element['id_observation'];
|
404 |
$ids_observations[] = $element['id_observation'];
|
| 405 |
}
|
405 |
}
|
| 406 |
$gestion_champs_etendus = new GestionChampsEtendus($this->config, 'obs');
|
406 |
$gestion_obs_etendus = new GestionChampsEtendus($this->config, 'obs');
|
| - |
|
407 |
$gestion_champs_etendus = new GestionChampsEtendus2($this->config);
|
| 407 |
$champs_etendus = $gestion_champs_etendus->consulterParLots($ids_observations);
|
408 |
$champs_etendus = $gestion_obs_etendus->consulterParLots($ids_observations);
|
| 408 |
if(!empty($champs_etendus)) {
|
409 |
if(!empty($champs_etendus)) {
|
| 409 |
$this->catalogue_cles_labels_champs_etendus = $gestion_champs_etendus->consulterCatalogueChampsEtendusPredefinis(true);
|
410 |
$this->catalogue_cles_labels_champs_etendus = $gestion_champs_etendus->consulterCatalogueChampsEtendusPredefinis(true);
|
| 410 |
// afin de simplifier les erreurs de majuscules et minuscules
|
411 |
// afin de simplifier les erreurs de majuscules et minuscules
|
| 411 |
$this->catalogue_cles_labels_champs_etendus = array_change_key_case($this->catalogue_cles_labels_champs_etendus);
|
412 |
$this->catalogue_cles_labels_champs_etendus = array_change_key_case($this->catalogue_cles_labels_champs_etendus);
|
| 412 |
}
|
413 |
}
|