Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 3529 → Rev 3530

/trunk/jrest/services/CelWidgetSaisie.php
125,6 → 125,9
$obsAAjouter['date_updated'] = $obsAAjouter['date_created'];
$obsAAjouter['date_published'] = $obsAAjouter['date_created'];
 
$obsAAjouter['image_nom'] = $obs['image_nom'] ?? null;
$obsAAjouter['image_b64'] = $obs['image_b64'] ?? null;
 
$obsAAjouter['certainty'] = '';
if (isset($obs['certitude'])) {
switch ($obs['certitude']) {
165,7 → 168,12
$champsEtendusObs = array();
foreach ($observations as $obs) {
$obs_etendue = $obs['obs_etendue'];
$obs_images['image_nom'] = $obs['image_nom'];
$obs_images['image_b64'] = $obs['image_b64'];
unset($obs['obs_etendue']);
unset($obs['image_nom']);
unset($obs['image_b64']);
 
$champs = implode(', ', array_keys($obs));
$valeurs = implode(', ', $obs);
$requete = "INSERT INTO occurrence ($champs) VALUES ($valeurs) ";
181,8 → 189,8
$champsEtendusObs[$idNouvelleObs] = $obs_etendue;
 
$imgAAjouter = null;
if (!empty($obs['image_nom'])) {
$imgAAjouter = $this->traiterImagesALierAObs($idNouvelleObs, $obs);
if (!empty($obs_images)) {
$imgAAjouter = $this->traiterImagesALierAObs($idNouvelleObs, $obs_images);
if ($imgAAjouter != null) {
foreach ($imgAAjouter as $uneImgAAjouter) {
$nomsOriginauxImagesTemp[] = $uneImgAAjouter['nom'];
476,31 → 484,29
return $gestionChampsEtendus->ajouterParLots($champs_etendus_obs);
}
 
private function traiterImagesALierAObs($idObs, $obs) {
private function traiterImagesALierAObs($idObs, $obsImages) {
$imgAAjouter = null;
if (is_array($obs['image_nom'])) {
if (is_array($obsImages['image_nom'])) {
$imgAAjouter = array();
foreach ($obs['image_nom'] as $index => $nom_image) {
foreach ($obsImages['image_nom'] as $index => $nom_image) {
$image = array();
$image['id_utilisateur'] = $this->userId;
$image['id_obs'] = $idObs;
$image['nom'] = $nom_image;
$image['tags'] = isset($obs['image_tag'][$index]) ? explode(',',$obs['image_tag'][$index]) : '';
// on suppose que les b64 des images sont envoyés dans le même ordre que leurs noms
// TODO: indexer le tableau avec le nom des images
$image['b64'] = isset($obs['image_b64'][$index]) ? $obs['image_b64'][$index] : '';
$this->debug[] = 'Contient B64 : '.(empty($obs['image_b64']) ? 'non' : 'oui');
$image['b64'] = isset($obsImages['image_b64'][$index]) ? $obsImages['image_b64'][$index] : '';
$this->debug[] = 'Contient B64 : '.(empty($obsImages['image_b64']) ? 'non' : 'oui');
$imgAAjouter[] = $image;
}
} else {
if (!empty($obs['image_nom'])) {
if (!empty($obsImages['image_nom'])) {
$imgAAjouter = array();
$imgAAjouter['id_utilisateur'] = $this->userId;
$imgAAjouter['id_obs'] = $idObs;
$imgAAjouter['nom'] = $obs['image_nom'];
//$imgAAjouter['tags'] = isset($obs['image_tag']) ? explode(',',$obs['image_tag']) : '';
$imgAAjouter['b64'] = isset($obs['image_b64']) ? $obs['image_b64'] : array();
$this->debug[] = 'Contient B64 : '.(empty($obs['image_b64']) ? 'non' : 'oui');
$imgAAjouter['nom'] = $obsImages['image_nom'];
$imgAAjouter['b64'] = isset($obsImages['image_b64']) ? $obsImages['image_b64'] : array();
$this->debug[] = 'Contient B64 : '.(empty($obsImages['image_b64']) ? 'non' : 'oui');
}
}