44,6 → 44,7 |
|
public function consulter($ressources, $parametres) { |
$this->paramsFiltres = $this->filtrage->filtrerUrlParamsAppliObs(); |
$this->sql->setAppli(Sql::APPLI_OBS); |
$this->sql->setParametres($this->paramsFiltres); |
$this->sql->ajouterContraintes(); |
$this->sql->ajouterConstrainteAppliObs(); |
90,7 → 91,7 |
*/ |
private function getIdObs() { |
$requete = 'SELECT SQL_CALC_FOUND_ROWS id_observation '. |
'FROM v_del_image AS vdi '. |
'FROM del_observation AS do '. |
$this->sql->getJoin(). |
'WHERE '.$this->sql->getWhere(). |
$this->sql->getGroupBy(). |
97,7 → 98,7 |
$this->sql->getOrderBy(). |
$this->sql->getLimit(). |
' -- '.__FILE__.':'.__LINE__; |
|
//Debug::printr($requete); |
$resultats = $this->bdd->recupererTous($requete); |
|
$idObs = array(); |
118,12 → 119,13 |
$requete = "SELECT id_observation, nom_sel AS `determination.ns`, nt AS `determination.nt`, ". |
'nom_sel_nn AS `determination.nn`, famille AS `determination.famille`, '. |
'nom_referentiel AS `determination.referentiel`, ce_zone_geo AS id_zone_geo, '. |
'zone_geo, lieudit, station, milieu, date_observation, mots_cles_texte, '. |
'date_transmission, commentaire, '. |
'ce_utilisateur AS `auteur.id`, prenom_utilisateur AS `auteur.prenom`, '. |
'nom_utilisateur AS `auteur.nom`, courriel_utilisateur AS `auteur.courriel`, '. |
'zone_geo, lieudit, station, milieu, date_observation, do.mots_cles_texte, '. |
'do.date_transmission, do.commentaire, '. |
'do.ce_utilisateur AS `auteur.id`, do.prenom_utilisateur AS `auteur.prenom`, '. |
'do.nom_utilisateur AS `auteur.nom`, do.courriel_utilisateur AS `auteur.courriel`, '. |
'id_image, date_prise_de_vue AS `date`, hauteur, largeur, nom_original '. |
'FROM v_del_image AS vdi '. |
'FROM del_observation AS do '. |
' LEFT JOIN del_image AS di ON (do.id_observation = di.ce_observation) '. |
"WHERE id_observation IN ($idsObsConcat) ". |
' -- '.__FILE__.':'.__LINE__; |
return $this->bdd->recupererTous($requete); |
164,7 → 166,6 |
private function extraireInfosImage(&$obs) { |
$champsImageAffichables = array('id_image', 'date', 'hauteur' , 'largeur', 'nom_original'); |
$image = array_intersect_key($obs, array_flip($champsImageAffichables)); |
|
$urlImgTpl = $this->conteneur->getParametre('cel_img_url_tpl'); |
$image['binaire.href'] = sprintf($urlImgTpl, $image['id_image'], 'XL'); |
|