| 18,6 → 18,7 |
|---|
| class RechercheObservationExport extends Cel { |
| |
| public $requete_selection_observations; |
| private $table = "cel_export"; |
| public static $tris_possibles = array( |
| 'nom_referentiel', |
| 'nom_sel', |
| 34,8 → 35,12 |
|---|
| |
| |
| public function rechercherObservations($id_utilisateur = null, $criteres = array(), $debut = 0, $limite = 50, $autoriser_sql_brut = FALSE) { |
| $requete_selection_observations = 'SELECT * FROM cel_export '; |
| unset($criteres['standard']); |
| if ((isset($criteres['standard']) && $criteres['standard'] == 0) || (!isset($criteres['standard']))) { |
| $this->table = "cel_export_total"; |
| } |
| unset($criteres['standard']); |
| $requete_selection_observations = 'SELECT * FROM '.$this->table.' '; |
| |
| if ($id_utilisateur != null) { |
| $requete_selection_observations .= 'WHERE ce_utilisateur = '.Cel::db()->proteger($id_utilisateur).' AND '; |
| } else if(count($criteres) > 0) { |
| 69,8 → 74,11 |
|---|
| } |
| |
| public function compterObservations($id_utilisateur = null, $criteres = array()) { |
| unset($criteres['standard']); |
| $requete = 'SELECT COUNT(*) AS nb_obs FROM cel_export '; |
| if ((isset($criteres['standard']) && $criteres['standard'] == 0) || (!isset($criteres['standard']))) { |
| $this->table = "cel_export_total"; |
| } |
| unset($criteres['standard']); |
| $requete = 'SELECT COUNT(*) AS nb_obs FROM '.$this->table.' '; |
| if ($id_utilisateur != null) { |
| $requete .= 'WHERE ce_utilisateur = '.Cel::db()->proteger($id_utilisateur).' AND '; |
| } else if(count($criteres) > 0) { |
| 104,7 → 112,7 |
|---|
| } |
| } |
| |
| $gestion_champs_etendus = new GestionChampsEtendus($this->config, 'obs'); |
| $gestion_champs_etendus = new GestionChampsEtendus2($this->config); |
| $champs_supp = $gestion_champs_etendus->consulterParLots($ids); |
| |
| foreach ($tableau_observations as &$obs) { |