Subversion Repositories eFlore/Applications.del

Compare Revisions

Ignore whitespace Rev 1870 → Rev 1871

/trunk/services/modules/0.1/observations/ListeObservations.php
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');
 
/trunk/services/modules/0.1/images/ListeImages.php
48,6 → 48,7
 
public function consulter($ressources, $parametres) {
$this->paramsFiltres = $this->filtrage->filtrerUrlParamsAppliImg();
$this->sql->setAppli(Sql::APPLI_IMG);
$this->sql->setParametres($this->paramsFiltres);
$this->sql->ajouterContraintes();
$this->sql->ajouterConstrainteAppliImg();
79,7 → 80,7
 
private function getIdImages() {
$requete = 'SELECT SQL_CALC_FOUND_ROWS id_image '.
'FROM v_del_image AS vdi '.
'FROM del_image AS di '.
$this->sql->getJoin().
'WHERE '.$this->sql->getWhere().
$this->sql->getGroupBy().
98,14 → 99,16
}
 
private function getInfosImages() {
$obsChamps = $this->sql->getAliasDesChamps($this->mappings['observations']);
$imgChamps = $this->sql->getAliasDesChamps($this->mappings['images']);
$obsChamps = $this->sql->getAliasDesChamps($this->mappings['observations'], null, 'do');
$imgChamps = $this->sql->getAliasDesChamps($this->mappings['images'], null, 'di');
$idImgsConcat = implode(',', $this->idsImagesOrdonnees);
 
$requete = "SELECT $obsChamps, $imgChamps ".
'FROM v_del_image '.
"WHERE id_image IN ($idImgsConcat) ".
'FROM del_image AS di '.
' LEFT JOIN del_observation AS do ON (di.ce_observation = do.id_observation) '.
"WHERE di.id_image IN ($idImgsConcat) ".
'-- '.__FILE__.':'.__LINE__;
//Debug::printr($requete);
return $this->bdd->recupererTous($requete);
}
 
123,9 → 126,9
$image = array(
'id_image' => $id,
'binaire.href' => sprintf($urlImgTpl, $infos['id_image'], $imageFormat),
'mots_cles_texte' => isset($infos['mots_cles_texte_img']) ? $infos['mots_cles_texte_img'] : null,
'mots_cles_texte' => isset($infos['mots_cles_texte']) ? $infos['mots_cles_texte'] : null,
);
unset($infos['id_image'], $infos['mots_cles_texte_img']);
unset($infos['id_image'], $infos['mots_cles_texte']);
 
$obs_merged[$id] = $image;
$obs_merged[$id]['observation'] = $infos;