Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 1570 → Rev 1571

/trunk/jrest/services/InventoryExport.php
73,12 → 73,16
$limite = isset($criteres['limite']) ? $criteres['limite'] : 0;
 
$observations = $chercheur_observations->rechercherObservations($uid[0], $criteres, $numero_page, $limite);
 
$ids_obs = array();
$indices_lignes_obs = array();
$i=1;
foreach ($observations as $obs) {
foreach ($observations as &$obs) {
 
$obs = $this->denullifierTableauValeurCel(&$obs);
 
$ids_obs[] = $obs['id_observation'];
$indices_lignes_obs[$obs['id_observation']] = $i;
if ($obs['date_observation'] != "0000-00-00 00:00:00") {
$obs['date_observation'] = $this->formaterDate($obs['date_observation']);
}
107,9 → 111,28
$worksheet->write($i,18,$obs['id_observation']);
$i++;
}
 
$indice_dernier_champ_supp = 19;
$indices_champs_supp = array();
$gestion_champs_etendus = new GestionChampsEtendus($this->config, 'obs');
$champs_supp_par_obs = $gestion_champs_etendus->consulterParLots($ids_obs);
foreach($champs_supp_par_obs as $id_obs => &$champs_supp) {
foreach($champs_supp as &$champ_etendu) {
$cle = $champ_etendu->cle;
$label = $champ_etendu->label;
$valeur = $champ_etendu->valeur;
if(!isset($indices_champs_supp[$cle])) {
$indices_champs_supp[$cle] = $indice_dernier_champ_supp;
$worksheet->write(0, $indice_dernier_champ_supp, utf8_decode($label));
$indice_dernier_champ_supp++;
}
$num_ligne_obs = $indices_lignes_obs[$id_obs];
$worksheet->write($num_ligne_obs,$indices_champs_supp[$cle],utf8_decode($valeur));
}
}
$workbook->close();
 
exit();
}
}