| /branches/topic-dbsingleton/jrest/lib/GestionChampsEtendus.php |
|---|
| 235,11 → 235,12 |
| $ids = $this->protegerTableau($ids_elements_lies); |
| $requete = "SELECT cle FROM {$this->table_champs_etendus} WHERE {$this->champ_id} IN (".implode(',',$ids).") "; |
| $cles = Cel::db()->executerRequete($requete); |
| $i = 0; |
| foreach($cles as &$cle) { |
| $cles_fmt[] = $cle['cle']; |
| $cles_fmt[$cle['cle']] = $i++; |
| } |
| } |
| return $cles_fmt; |
| return array_values(array_flip($cles_fmt)); |
| } |
| /** |
| /branches/topic-dbsingleton/jrest/lib/FormateurGroupeColonne.php |
|---|
| 607,8 → 607,7 |
| // si header n'est pas défini, aucune observation ne possède de champ étendu |
| // et nous n'ajoutons ni colonnes, ni valeurs. |
| if(! isset(self::$cache['champsEtendus']['header'])) return; |
| var_dump(self::$cache['champsEtendus']['header']);die; |
| $ligne_etendue_aplatie = @self::$cache['champsEtendus']['data'][$ligne['id_observation']]; |
| $ligne_etendue_aplatie = @self::$cache['champsEtendus']['data'][$obs['id_observation']]; |
| $ligne_supp = array_fill(0, count(self::$cache['champsEtendus']['header']), ''); |
| $ligne_etendue_fmt = array(); |
| /branches/topic-dbsingleton/jrest/services/ImportXLS.php |
|---|
| 153,7 → 153,7 |
| public $bilan = Array(); |
| function ExportXLS($config) { |
| function ImportXLS($config) { |
| parent::__construct($config); |
| } |