Subversion Repositories eFlore/Applications.del

Compare Revisions

Ignore whitespace Rev 2225 → Rev 2226

/trunk/services/modules/0.1/plantnet/Changements.php
107,7 → 107,7
$date_fin = "'{$date_fin}'";
 
$requete =
'SELECT SQL_CALC_FOUND_ROWS p.id_observation, p.id_image, '.
'SELECT SQL_CALC_FOUND_ROWS p.id_observation, GROUP_CONCAT(DISTINCT p.id_image) as id_image, '.
'iv.moyenne AS moyenne_votes, '.
'iv.nb_votes AS nb_votes, '.
'iv.nb_points AS nb_points_votes, '.
126,7 → 126,7
' ON (p.id_observation = c.ce_observation) '.
' LEFT JOIN del_commentaire_vote AS cv '.
' ON (c.id_commentaire = cv.ce_proposition) '.
'GROUP BY p.id_image, p.id_observation '.
'GROUP BY p.id_observation '.
'ORDER BY modif_date ' . $ordre . ' '.
'LIMIT '.$depart.', '.$limite.
' -- '.__FILE__.':'.__LINE__;
186,60 → 186,68
$imgCelTpl = $this->conteneur->getParametre('cel_img_url_tpl');
foreach ($this->idsObsImg as $ids) {
$idobs = $ids['id_observation'];
$idimg = $ids['id_image'];
$idimg = explode(',', $ids['id_image']);
 
$imgdata = $this->infosObsImg[$idimg];
$obs[$idobs]['id_observation'] = $idobs;
 
if (!isset($obs[$idobs])) {
$obs[$idobs] = array();
}
foreach ($idimg as $image){
$imgInfos = null;
$imgdata = null;
 
$obs[$idobs]['id_observation'] = $idobs;
$obs[$idobs]['id_plantnet'] = $imgdata['id_plantnet'];
$obs[$idobs]['auteur_courriel'] = $imgdata['courriel_utilisateur'];
$imgdata = $this->infosObsImg[$image];
$imgInfos = $this->recupererInfosParImage($image);
 
$obs[$idobs]['mots_cles_cel_obs'] = $imgdata['mots_cles_cel_obs'];
$obs[$idobs]['programme'] = $imgdata['programme'];
if (!isset($obs[$idobs])) {
$obs[$idobs] = array();
}
 
$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]['type_donnees'] = $imgdata['type_donnees'];
$obs[$idobs]['identiplante_score'] = $imgdata['identiplante_score'];
$obs[$idobs]['is_identiplante_validated'] = $imgdata['is_identiplante_validated'];
$obs[$idobs]['id_plantnet'] = $imgdata['id_plantnet'];
$obs[$idobs]['auteur_courriel'] = $imgdata['courriel_utilisateur'];
 
$obs[$idobs]['nom_sel'] = $imgdata['nom_sel'];
$obs[$idobs]['nom_sel_nn'] = $imgdata['nom_sel_nn'];
$obs[$idobs]['nom_referentiel'] = $imgdata['nom_referentiel'];
$obs[$idobs]['nom_ret'] = $imgdata['nom_ret'];
$obs[$idobs]['nom_ret_nn'] = $imgdata['nom_ret_nn'];
$obs[$idobs]['famille'] = $imgdata['famille'];
$obs[$idobs]['mots_cles_cel_obs'] = $imgdata['mots_cles_cel_obs'];
$obs[$idobs]['programme'] = $imgdata['programme'];
 
$obs[$idobs]['zone_geo'] = $imgdata['zone_geo'];
$obs[$idobs]['latitude'] = $imgdata['latitude'];
$obs[$idobs]['longitude'] = $imgdata['longitude'];
$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]['type_donnees'] = $imgdata['type_donnees'];
$obs[$idobs]['identiplante_score'] = $imgdata['identiplante_score'];
$obs[$idobs]['is_identiplante_validated'] = $imgdata['is_identiplante_validated'];
 
if (!isset($obs[$idobs]['images'])) {
$obs[$idobs]['images'] = array();
}
$obs[$idobs]['nom_sel'] = $imgdata['nom_sel'];
$obs[$idobs]['nom_sel_nn'] = $imgdata['nom_sel_nn'];
$obs[$idobs]['nom_referentiel'] = $imgdata['nom_referentiel'];
$obs[$idobs]['nom_ret'] = $imgdata['nom_ret'];
$obs[$idobs]['nom_ret_nn'] = $imgdata['nom_ret_nn'];
$obs[$idobs]['famille'] = $imgdata['famille'];
 
$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' => [
'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;
$obs[$idobs]['zone_geo'] = $imgdata['zone_geo'];
$obs[$idobs]['latitude'] = $imgdata['latitude'];
$obs[$idobs]['longitude'] = $imgdata['longitude'];
 
if (!isset($obs[$idobs]['images'])) {
$obs[$idobs]['images'] = array();
}
 
$img_obj = array(
'id_image' => $image,
'nom_image' => $imgdata['nom_image'],
'image_updated' => $imgdata['image_updated'],
'date_shot' => $imgdata['date_shot'],
'mots_cles_cel_image' => $imgInfos[0]['mots_cles_cel_image'],
'url' => sprintf($imgCelTpl, $idimg, 'O'),
'votes' => [
'moyenne_votes' => $imgInfos[0]['moyenne_votes'],
'nb_votes' => $imgInfos[0]['nb_votes'],
'nb_points_votes' => $imgInfos[0]['nb_points_votes'],
],
'del_tags' => explode(',', $imgInfos[0]['del_image_tags']),
);
// push
$obs[$idobs]['images'][] = $img_obj;
}
 
}
return $obs;
}
328,4 → 336,25
return $ret;
}
 
/**
* On charge les infos spécifique à chaque image d'une obs
*/
private function recupererInfosParImage($id_image){
$requete =
'SELECT SQL_CALC_FOUND_ROWS p.id_image, '.
'p.mots_cles_cel_image, '.
'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 '.
'FROM del_plantnet_images AS p '.
' 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) '.
' WHERE id_image = '. $id_image .' '.
'GROUP BY p.id_image '.
' -- '.__FILE__.':'.__LINE__;
return $this->bdd->recupererTous($requete);
}
}