Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 546 → Rev 547

/trunk/widget/widget.ini.defaut.php
24,4 → 24,6
baseURLAbsoluDyn = ""
; URL des services web du CEL sous forme de template à utiliser avec sprintf
baseURLServicesCelTpl = "http://www.tela-botanica.org/eflore/cel2/jrest/%s"
; Squelette d'Url permettant d'afficher une image du CEL (remplace %s par l'id de l'image sans underscore)
celImgUrlTpl = "http://www.tela-botanica.org/appli:cel-img:%s.jpg"
;*/?>
/trunk/widget/modules/carto/Carto.php
159,10 → 159,20
unset($observations['commune']);
$widget['donnees']['commune'] = $commune;
}
$obs_ids = null;
if (isset($observations['ids'])) {
$obs_ids = $observations['ids'];
unset($observations['ids']);
}
$widget['squelette'] = $this->choisirFormatSortie(count($observations));
if ($widget['squelette'] == 'obs_liste' && $obs_ids != null && count($obs_ids) > 0) {
$widget['donnees']['images'] = $this->chargerImages($obs_ids);
}
$widget['donnees']['observations'] = $observations;
$widget['donnees']['station_id'] = $station;
$widget['squelette'] = $this->choisirFormatSortie(count($observations));
return $widget;
}
191,6 → 201,7
if (is_array($donnees) && count($donnees) > 0) {
foreach ($donnees as $donnee) {
$observation = array();
$observation['id'] = $donnee->id;
$observation['nn'] = $this->etreVide($donnee->num_nom_sel) ? null : $donnee->num_nom_sel;
$observation['nom'] = $this->nettoyerTexte($donnee->nom_sel);
$observation['date'] = $this->formaterDate($donnee->date_observation, '%d/%m/%Y');
199,6 → 210,7
$observations[] = $observation;
$observations['commune'] = $this->nettoyerTexte($donnee->location);
$observations['ids'][] = $donnee->id;
}
}
return $observations;
226,6 → 238,35
return $sortie;
}
private function chargerImages($obs_ids) {
// Récupération des données au format Json
$service = 'CelImage/liste-ids?obsId='.implode(',', $obs_ids);
$url = sprintf($this->config['chemins']['baseURLServicesCelTpl'], $service);
$json = $this->getDao()->envoyerRequeteConsultation($url);
$donnees = json_decode($json);
// Post-traitement des données
$images = $this->traiterImages($donnees);
return $images;
}
private function traiterImages($donnees) {
$images = array();
//echo '<br/><pre>'.print_r($donnees,true).'</pre>';
if (count($donnees) > 0) {
foreach ($donnees as $id_obs => $id_images) {
foreach ($id_images as $id_img) {
$urls['id'] = $id_img;
$urls['S'] = $this->getUrlImage($id_img, 'S');
$urls['L'] = $this->getUrlImage($id_img, 'L');
$images[$id_obs][] = $urls;
}
}
}
return $images;
}
/**
* Afficher message d'avertissement.
*/
/trunk/widget/modules/carto/squelettes/obs_liste.tpl.html
1,4 → 1,20
 
<div class="info-bulle-contenu">
<!-- Javascript : Fancybox -->
<script type="text/javascript">
//<![CDATA[
$(document).ready(function() {
$('a.cel-img').fancybox({
'autoDimensions': false,
'transitionIn' : 'elastic',
'transitionOut' : 'elastic',
'speedIn' : 600,
'speedOut' : 200,
'overlayShow' : true
});
});
//]]>
</script>
<div class="onglets">
<ul>
<li class="inactif"><a class="onglet" onclick="chargerFormatObs('<?=$station_id?>', 'tableau');return false;" href="#">Tableau</a></li>
10,6 → 26,15
<ol>
<? foreach ($observations as $obs) : ?>
<li>
<? if (isset($images[$obs['id']])) : ?>
<? foreach ($images[$obs['id']] as $num => $urls) : ?>
<div<?=($num == 0) ? '': ' style="display:none;"'?>>
<a class="cel-img" href="<?=$urls['L']?>" rel="cel-obs-<?=$obs['id']?>" >
<img src="<?=$urls['S']?>" alt="Image #<?=$urls['id']?> de l'osbervation #<?=$obs['id']?>" style="float:right;height:75px;"/>
</a>
</div>
<? endforeach ?>
<? endif ?>
<dl>
<dt class="champ_nom_latin">Nom</dt>
<dd>&nbsp;
/trunk/widget/modules/carto/squelettes/carte_defaut.tpl.html
1,4 → 1,5
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Observations publiques du CEL - Tela Botanica</title>
26,6 → 27,7
<script type="text/javascript" src="<?=$url_base?>modules/carto/squelettes/markerclusterer_compiled.js"></script>
<script type="text/javascript" src="http://www.tela-botanica.org/commun/jquery/<?=$jquery_version?>/jquery-<?=$jquery_version?>.min.js"></script>
<script type="text/javascript" src="http://www.tela-botanica.org/commun/jquery/tablesorter/2.0.5/jquery.tablesorter.min.js"></script>
<script type="text/javascript" src="http://www.tela-botanica.org/commun/jquery/fancybox/1.3.4/jquery.fancybox-1.3.4.pack.js"></script>
<!-- Javascript : données -->
<script src="<?=$url_json?>" type="text/javascript"></script>
189,6 → 191,7
<!-- CSS -->
<link href="<?=$url_base?>modules/carto/squelettes/css/carto.css" rel="stylesheet" type="text/css" media="screen" />
<link rel="stylesheet" href="http://www.tela-botanica.org/commun/jquery/fancybox/1.3.4/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
<!--[if lt IE 7]>
<style type="text/css">