Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 1751 → Rev 1755

/trunk/jrest/services/CelWidgetExport.php
154,6 → 154,7
$criteres['transmission'] = 1;
if($this->doitEtPeutExporterObsPrivees($criteres)) {
unset($criteres['transmission']);
$this->id_utilisateur = $criteres['ce_utilisateur'];
}
$chercheur_observations = new RechercheObservation($this->config);
/trunk/jrest/services/InventoryExport.php
82,6 → 82,11
$limite = isset($criteres['limite']) ? $criteres['limite'] : 0;
 
$observations = $chercheur_observations->rechercherObservations($uid[0], $criteres, $numero_page, $limite)->get();
if(!$observations) {
header('HTTP/1.0 204 No Content');
exit;
}
 
$ids_obs = array();
$indices_lignes_obs = array();
/trunk/jrest/services/ExportXLS.php
84,7 → 84,7
$parametres['debut'] = isset($params['debut']) ? intval($params['debut']) : 0;
$parametres['limite'] = isset($params['limite']) ? intval($params['limite']) : 0;
$parametres['id_utilisateur'] = $this->traiterIdUtilisateur($uid);
$parametres['groupe_champs'] = isset($criteres['colonnes']) ? $criteres['colonnes'] : 'standard,avance';
$parametres['groupe_champs'] = isset($params['colonnes']) ? $params['colonnes'] : 'standard,avance';
return $parametres;
}
190,7 → 190,7
$no_colonne = 0;
foreach($colonnes as $abbrev => $colonne) {
$valeur = null;
if($colonne['extra'] == 2) continue;
if($colonne['extra'] == 2 || ! is_null($colonne['dyna'])) continue;
// valeur direct depuis cel_obs ?
if(isset($obs[$abbrev])) $valeur = $obs[$abbrev];