| 69,11 → 69,14 |
|---|
| private function getDoublonHtml($parametres) { |
| |
| $widget = null; |
| $utilisateur = $this->getAuthIdentifiant(); |
| $utilisateur_mail = $this->getAuthIdentifiant(); |
| $utilisateur_infos = new User($this->config); |
| $utilisateur = $utilisateur_infos->obtenirUtilisateurSiExiste($utilisateur_mail); |
| $utilisateur = $utilisateur['id_utilisateur']; |
| |
| // Création des infos du widget |
| $widget['type'] = 'widget'; |
| $widget['donnees']['utilisateur'] = $utilisateur; |
| $widget['donnees']['utilisateur'] = $utilisateur_mail; |
| $widget['donnees']['doublons'] = $this->getImagesDoublon($utilisateur); |
| $widget['squelette'] = 'doublon_defaut'; |
| |
| 88,9 → 91,10 |
|---|
| |
| if (isset($utilisateur)) { |
| // Un utilisateur en particulier |
| $requete = 'SELECT ci_id_image, ci_ordre, ci_nom_original, ci_md5 '. |
| $requete = 'SELECT id_image, ordre, nom_original, md5 '. |
| 'FROM cel_images '. |
| "WHERE ci_ce_utilisateur = '$utilisateur' "; |
| "WHERE ce_utilisateur = '$utilisateur' "; |
| |
| $images = $this->executerRequete($requete); |
| |
| // Traitement |
| 98,47 → 102,48 |
|---|
| $images_doublons_id = array(); |
| $md5 = array(); |
| foreach ($images as $img) { |
| if (!isset($md5[$img['ci_md5']])) { |
| $md5[$img['ci_md5']] = array( |
| 'url' => $this->getUrlImage($img['ci_id_image'], 'CXS'), |
| if (!isset($md5[$img['md5']])) { |
| $md5[$img['md5']] = array( |
| 'url' => $this->getUrlImage($img['id_image'], 'CXS'), |
| 'obs_ordre' => array(), |
| 'img_ordre' => $img['ci_ordre'], |
| 'img_id' => $img['ci_id_image']); |
| 'img_ordre' => $img['ordre'], |
| 'img_id' => $img['id_image']); |
| } else { |
| if (!isset($doublons[$img['ci_md5']])) { |
| $id_img = $md5[$img['ci_md5']]['img_id']; |
| $doublons[$img['ci_md5']][$id_img] = $md5[$img['ci_md5']]; |
| if (!isset($doublons[$img['md5']])) { |
| $id_img = $md5[$img['md5']]['img_id']; |
| $doublons[$img['md5']][$id_img] = $md5[$img['md5']]; |
| $images_doublons_id[] = $this->bdd->quote($id_img); |
| } |
| $doublons[$img['ci_md5']][$img['ci_id_image']] = array( |
| 'url' => $this->getUrlImage($img['ci_id_image'], 'CXS'), |
| |
| $doublons[$img['md5']][$img['id_image']] = array( |
| 'url' => $this->getUrlImage($img['id_image'], 'CXS'), |
| 'obs_ordre' => array(), |
| 'img_ordre' => $img['ci_ordre'], |
| 'img_id' => $img['ci_id_image']); |
| $images_doublons_id[] = $this->bdd->quote($img['ci_id_image']); |
| 'img_ordre' => $img['ordre'], |
| 'img_id' => $img['id_image']); |
| $images_doublons_id[] = $this->bdd->quote($img['id_image']); |
| } |
| } |
| |
| if (count($images_doublons_id) > 0) { |
| $requete = 'SELECT ci_id_image, ci_nom_original, ci_md5, ordre '. |
| $requete = 'SELECT cim.id_image, nom_original, md5, co.ordre as ordre_obs '. |
| 'FROM cel_images AS cim '. |
| ' LEFT JOIN cel_obs_images AS coi '. |
| ' ON (coi.coi_ce_image = cim.ci_id_image) '. |
| ' LEFT JOIN cel_inventory AS ci '. |
| ' ON (coi.coi_ce_observation = ci.ordre AND coi.coi_ce_utilisateur = ci.identifiant) '. |
| "WHERE cim.ci_ce_utilisateur = '$utilisateur' ". |
| ' AND cim.ci_id_image IN ('.implode(',', $images_doublons_id).')'; |
| ' ON (coi.id_image = cim.id_image) '. |
| ' LEFT JOIN cel_obs AS co '. |
| ' ON (coi.id_observation = co.id_observation) '. |
| "WHERE cim.ce_utilisateur = '$utilisateur' ". |
| ' AND cim.id_image IN ('.implode(',', $images_doublons_id).')'; |
| |
| $infos = $this->executerRequete($requete); |
| |
| foreach ($infos as $info) { |
| if (isset($doublons[$info['ci_md5']][$info['ci_id_image']]) && ! $this->etreNull($info['ordre'])) { |
| $doublons[$info['ci_md5']][$info['ci_id_image']]['obs_ordre'][] = $info['ordre']; |
| if (isset($doublons[$info['md5']][$info['id_image']]) && ! $this->etreNull($info['ordre_obs'])) { |
| $doublons[$info['md5']][$info['id_image']]['obs_ordre'][] = $info['ordre_obs']; |
| } |
| } |
| } |
| } |
| |
| //echo '<pre>'.print_r($doublons, true).'</pre>'; |
| return $doublons; |
| } |
| } |