| 110,7 → 110,9 |
|---|
| |
| $requete = |
| 'SELECT SQL_CALC_FOUND_ROWS p.id_observation, p.id_image, '. |
| 'GROUP_CONCAT(iv.valeur) AS votes, '. |
| 'iv.moyenne AS moyenne_votes, '. |
| 'iv.nb_votes AS nb_votes, '. |
| 'iv.nb_points AS nb_points_votes, '. |
| 'GROUP_CONCAT(DISTINCT it.tag) AS del_image_tags, '. |
| 'modif_date '. |
| 'FROM del_plantnet AS p '. |
| 118,7 → 120,7 |
|---|
| ' ON (p.id_observation = del_observation_modif_date.id_observation '. |
| ' AND modif_date >= '.$date_debut.' '. |
| ' AND modif_date <= '.$date_fin.') '. |
| ' LEFT JOIN del_image_vote AS iv '. |
| ' LEFT JOIN del_image_stat AS iv '. |
| ' ON (id_image = iv.ce_image AND iv.ce_protocole = 3) '. |
| ' LEFT JOIN del_image_tag AS it '. |
| ' ON (id_image = it.ce_image AND it.actif = 1) '. |
| 152,15 → 154,15 |
|---|
| $idsImgConcat = implode(',', $idsImg); |
| |
| $requete = 'SELECT '. |
| 'p.id_observation, p.plantnet_id, p.id_image, '. |
| 'p.id_observation, p.id_plantnet, p.id_image, '. |
| 'cp.plant_net_occurrence_id, ' . |
| 'p.nom_sel, p.nom_sel_nn, p.nom_ret, p.nom_ret_nn,'. |
| 'p.nom_referentiel, p.famille, '. |
| 'p.zone_geo, p.altitude,'. |
| 'p.zone_geo, p.latitude, p.longitude,'. |
| 'p.date_observation, p.date_created, p.date_published, '. |
| 'p.is_wild, p.identiplante_score, p.is_identiplante_validated, p.cel_photo_tag, '. |
| 'p.type_donnees, p.identiplante_score, p.is_identiplante_validated, p.mots_cles_cel_obs, p.programme, '. |
| 'p.ce_utilisateur, p.courriel_utilisateur, '. |
| 'p.original_name AS nom_image, p.i_date_updated AS image_updated '. |
| 'p.original_name AS nom_image, p.i_date_shot AS date_shot, p.i_date_updated AS image_updated, p.mots_cles_cel_image AS mots_cles_cel_image '. |
| 'FROM del_plantnet AS p '. |
| 'LEFT JOIN tb_new_cel.pn_tb_pair AS cp ON p.id_observation = cp.occurrence_id '. |
| "WHERE id_image IN ($idsImgConcat) ". |
| 196,16 → 198,17 |
|---|
| } |
| |
| $obs[$idobs]['id_observation'] = $idobs; |
| $obs[$idobs]['plantnet_id'] = $imgdata['plantnet_id']; |
| $obs[$idobs]['id_plantnet'] = $imgdata['id_plantnet']; |
| $obs[$idobs]['auteur_courriel'] = $imgdata['courriel_utilisateur']; |
| |
| $obs[$idobs]['mots_cles_obs_cel'] = $imgdata['cel_photo_tag']; |
| $obs[$idobs]['mots_cles_cel_obs'] = $imgdata['mots_cles_cel_obs']; |
| $obs[$idobs]['programme'] = $imgdata['programme']; |
| |
| $obs[$idobs]['date_observation'] = $imgdata['date_observation']; |
| $obs[$idobs]['date_creation'] = $imgdata['date_created']; |
| $obs[$idobs]['date_changement'] = $ids['modif_date']; |
| $obs[$idobs]['date_publication'] = $imgdata['date_published']; |
| $obs[$idobs]['is_wild'] = $imgdata['is_wild']; |
| $obs[$idobs]['type_donnees'] = $imgdata['type_donnees']; |
| $obs[$idobs]['identiplante_score'] = $imgdata['identiplante_score']; |
| $obs[$idobs]['is_identiplante_validated'] = $imgdata['is_identiplante_validated']; |
| |
| 217,20 → 220,26 |
|---|
| $obs[$idobs]['famille'] = $imgdata['famille']; |
| |
| $obs[$idobs]['zone_geo'] = $imgdata['zone_geo']; |
| $obs[$idobs]['altitude'] = $imgdata['altitude']; |
| $obs[$idobs]['latitude'] = $imgdata['latitude']; |
| $obs[$idobs]['longitude'] = $imgdata['longitude']; |
| |
| if (!isset($obs[$idobs]['images'])) { |
| $obs[$idobs]['images'] = array(); |
| } |
| |
| //print_r($ids); |
| $img_obj = array( |
| 'id_image' => $idimg, |
| 'nom_image' => $imgdata['nom_image'], |
| 'image_updated' => $imgdata['image_updated'], |
| 'date_shot' => $imgdata['date_shot'], |
| 'mots_cles_cel_image' => $imgdata['mots_cles_cel_image'], |
| 'url' => sprintf($imgCelTpl, $idimg, 'O'), |
| 'votes' => array_map('intval', explode(',', $ids['votes'])), |
| 'tags' => explode(',', $ids['del_image_tags']), |
| // 'mots_cles_img_cel' => $this->formaterMotsClesCel($imgdata['mots_cles_texte_image']) |
| 'votes' => [ |
| 'moyenne_votes' => $ids['moyenne_votes'], |
| 'nb_votes' => $ids['nb_votes'], |
| 'nb_points_votes' => $ids['nb_points_votes'], |
| ], |
| 'del_tags' => explode(',', $ids['del_image_tags']), |
| ); |
| // push |
| $obs[$idobs]['images'][] = $img_obj; |