| 173,9 → 173,7 |
|---|
| $img_a_taguer_ids_noms = array(); |
| $champsEtendusObs = array(); |
| foreach ($observations as $obs) { |
| $obs_etendue = $obs['obs_etendue']; |
| if (isset($obs['image_nom'])) { $obs_images['image_nom'] = $obs['image_nom'];} |
| if (isset($obs['image_b64'])) {$obs_images['image_b64'] = $obs['image_b64'];} |
| $fullObs = $obs; |
| unset($obs['obs_etendue']); |
| unset($obs['image_nom']); |
| unset($obs['image_b64']); |
| 192,11 → 190,11 |
|---|
| // récupérer l'id de l'obs nouvellement insérée |
| $idNouvelleObs = Cel::db()->obtenirDernierId(); |
| $obs_a_taguer_ids[] = $idNouvelleObs; |
| $champsEtendusObs[$idNouvelleObs] = $obs_etendue; |
| $champsEtendusObs[$idNouvelleObs] = $fullObs['obs_etendue']; |
| |
| $imgAAjouter = null; |
| if (!empty($obs_images)) { |
| $imgAAjouter = $this->traiterImagesALierAObs($idNouvelleObs, $obs_images); |
| if (isset($fullObs['image_nom'])) { |
| $imgAAjouter = $this->traiterImagesALierAObs($idNouvelleObs, $fullObs); |
| if ($imgAAjouter != null) { |
| foreach ($imgAAjouter as $uneImgAAjouter) { |
| $nomsOriginauxImagesTemp[] = $uneImgAAjouter['nom']; |
| 490,11 → 488,11 |
|---|
| return $gestionChampsEtendus->ajouterParLots($champs_etendus_obs, $this->projet); |
| } |
| |
| private function traiterImagesALierAObs($idObs, $obsImages) { |
| private function traiterImagesALierAObs($idObs, $obs) { |
| $imgAAjouter = null; |
| if (is_array($obsImages['image_nom'])) { |
| if (is_array($obs['image_nom'])) { |
| $imgAAjouter = array(); |
| foreach ($obsImages['image_nom'] as $index => $nom_image) { |
| foreach ($obs['image_nom'] as $index => $nom_image) { |
| $image = array(); |
| $image['id_utilisateur'] = $this->userId; |
| $image['id_obs'] = $idObs; |
| 501,19 → 499,17 |
|---|
| $image['nom'] = $nom_image; |
| // 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($obsImages['image_b64'][$index]) ? $obsImages['image_b64'][$index] : ''; |
| $this->debug[] = 'Contient B64 : '.(empty($obsImages['image_b64']) ? 'non' : 'oui'); |
| $image['b64'] = isset($obs['image_b64'][$index]) ? $obs['image_b64'][$index] : ''; |
| $this->debug[] = 'Contient B64 : '.(empty($obs['image_b64']) ? 'non' : 'oui'); |
| $imgAAjouter[] = $image; |
| } |
| } else { |
| if (!empty($obsImages['image_nom'])) { |
| $imgAAjouter = array(); |
| $imgAAjouter['id_utilisateur'] = $this->userId; |
| $imgAAjouter['id_obs'] = $idObs; |
| $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'); |
| } |
| $imgAAjouter = array(); |
| $imgAAjouter['id_utilisateur'] = $this->userId; |
| $imgAAjouter['id_obs'] = $idObs; |
| $imgAAjouter['nom'] = $obs['image_nom']; |
| $imgAAjouter['b64'] = isset($obs['image_b64']) ? $obs['image_b64'] : array(); |
| $this->debug[] = 'Contient B64 : '.(empty($obs['image_b64']) ? 'non' : 'oui'); |
| } |
| |
| return $imgAAjouter; |