Subversion Repositories eFlore/Applications.cel

Compare Revisions

No changes between revisions

Ignore whitespace Rev 3030 → Rev 3031

/branches/v2.26-scie/jrest/services/ImportXLS.php
617,7 → 617,10
$obs = $enregistrements[$images_pour_obs['obs_pos']];
$id_obs = $ordre_ids[$obs['ordre']]; // id réel de l'observation correspondant à l'ordre
$transmission = $obs['transmission'];
$date_transmission = $obs['date_transmission'];
$date_transmission = 'NOW()'; // par défaut pour les nouveaux imports
if ($obs['date_transmission'] != null) { // peut être NULL selon la valeur par défaut de la colonne, la version du SGBD, etc.
$date_transmission = $obs['date_transmission'];
}
foreach ($images_pour_obs['images'] as $image) {
$id_img = $image['id_image'];
$valuesSql[] = "($id_img, $id_obs, NOW(), $transmission, $date_transmission)";
1210,4 → 1213,4
$this->bilan[] = $errstr;
}
}
?>
?>
/branches/v2.26-scie/jrest/services
Property changes:
Modified: svn:mergeinfo
Merged /trunk/jrest/services:r3030
/branches/v2.26-scie/jrest
Property changes:
Modified: svn:mergeinfo
Merged /trunk/jrest:r3030
/branches/v2.26-scie
Property changes:
Modified: svn:mergeinfo
Merged /trunk:r3030