/trunk/widget/modules/carto/Carto.php |
---|
76,6 → 76,8 |
$this->num_taxon = (isset($num_taxon) ? $num_taxon : '*'); |
$this->station = (isset($station) ? $station : null); |
$this->format = (isset($format) ? $format : null); |
$this->start = (isset($start) ? $start : null); |
$this->limit = (isset($limit) ? $limit : null); |
} |
/** |
123,9 → 125,9 |
$url .= "/$action"; |
$parametres_retenus = array(); |
$parametres_a_tester = array('station', 'utilisateur', 'projet', 'dept', 'commune', 'num_taxon'); |
$parametres_a_tester = array('station', 'utilisateur', 'projet', 'dept', 'commune', 'num_taxon', 'start', 'limit'); |
foreach ($parametres_a_tester as $param) { |
if ($this->$param != null && $this->$param != '*') { |
if (isset($this->$param) && $this->$param != '*') { |
$parametres_retenus[$param] = $this->$param; |
} |
} |
137,8 → 139,6 |
$url .= '?'.implode('&', $parametres_url); |
} |
} |
$this->debug[] = $url; |
// Prendre en compte param "station" |
return $url; |
} |
202,7 → 202,7 |
/** |
* Tableau des observations d'une station |
*/ |
public function executerObservations() { |
public function executerStation() { |
$widget = null; |
$observations = $this->chargerObservations(); |
$nbre_obs = $this->chargerObservationsNbre(); |
232,6 → 232,37 |
return $widget; |
} |
/** |
* Tableau des observations d'une station |
*/ |
public function executerObservations() { |
$widget = null; |
$observations = $this->chargerObservations(); |
$nbre_obs = $this->chargerObservationsNbre(); |
// Création des infos du widget |
if (isset($observations['commune'])) { |
$commune = $observations['commune']; |
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)).'_contenu'; |
if ($widget['squelette'] == 'obs_liste_contenu' && $obs_ids != null && count($obs_ids) > 0) { |
$widget['donnees']['images'] = $this->chargerImages($obs_ids); |
} |
$widget['donnees']['observations'] = $observations; |
return $widget; |
} |
private function chargerPagination($url_tpl, $nbre) { |
} |
247,6 → 278,7 |
private function chargerObservations() { |
// Récupération des données au format Json |
$url = $this->contruireUrlServiceCarto('observations'); |
$this->debug[] = $url; |
$json = $this->getDao()->consulter($url); |
$donnees = json_decode($json); |
301,7 → 333,7 |
// Récupération des données au format Json |
$service = 'CelImage/liste-ids?obsId='.implode(',', $obs_ids); |
$url = sprintf($this->config['chemins']['baseURLServicesCelTpl'], $service); |
$this->debug[] = $url; |
$json = $this->getDao()->consulter($url); |
$donnees = json_decode($json); |
/trunk/widget/modules/carto/squelettes/obs_liste.tpl.html |
---|
6,8 → 6,9 |
</ul> |
</div> |
<div id="observations"> |
<div id="pagination"></div> |
<h2><?=count($observations)?> observations pour <?=(isset($commune) ? $commune : '?')?></h2> |
<ol> |
<ol id="obs-liste" class="obs-liste-conteneur"> |
<? foreach ($observations as $obs) : ?> |
<li> |
<div> |
/trunk/widget/modules/carto/squelettes/carte_defaut.tpl.html |
---|
30,6 → 30,7 |
<script type="text/javascript" src="http://www.tela-botanica.org/commun/jquery/1.6.2/jquery-1.6.2.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> |
<script type="text/javascript" src="http://www.tela-botanica.org/commun/jquery/pagination/2.2/jquery.pagination.js"></script> |
<!-- Javascript : données --> |
<script src="<?=$url_json?>" type="text/javascript"></script> |
40,7 → 41,14 |
var urlsLimitesCommunales = <?=$url_limites_communales?>; |
var nt = '<?=$num_taxon?>'; |
var plantesNbre = <?=count($taxons)?>; |
var urlObsStation = '<?=$url_base?>carto'+'?'+ |
var urlStation = '<?=$url_base?>carto'+'?'+ |
'carte=station'+'&'+ |
'utilisateur=<?=$utilisateur?>'+'&'+ |
'projet=<?=$projet?>'+'&'+ |
'num_taxon='+nt+'&'+ |
'dept=<?=$dept?>'+'&'+ |
'commune=<?=$commune?>'; |
var urlObs = '<?=$url_base?>carto'+'?'+ |
'carte=observations'+'&'+ |
'utilisateur=<?=$utilisateur?>'+'&'+ |
'projet=<?=$projet?>'+'&'+ |
/trunk/widget/modules/carto/squelettes/scripts/carto.js |
---|
215,12 → 215,47 |
infoBulle.setContent(chargement); |
} |
var pagineur = {'limite':150, 'obsTotal':0, 'stationId':null, 'format':null}; |
function handlePaginationClick(new_page_index, pagination_container) { |
$('.obs-liste-conteneur').css('display', 'none'); |
$('#chargement').clone().attr('id', 'chargement-copie').appendTo('#observations').css('display', 'block'); |
console.log($('#chargement').get()); |
var start = new_page_index * pagineur.limite; |
var url = urlObs+ |
'&format='+pagineur.format+ |
'&station='+pagineur.stationId+ |
'&start='+start+ |
'&limit='+pagineur.limite; |
$.get(url, function(observations) { |
$('#chargement-copie').remove(); |
$('.obs-liste-conteneur').css('display', 'block'); |
$('#obs-liste').empty(); |
$('#obs-liste').append(observations); |
}); |
return false; |
} |
function chargerFormatObs(stationId, format) { |
var url = urlObsStation+ |
'&format='+format+'&'+ |
'station='+stationId; |
pagineur.obsTotal = parseInt($('#obs-total').text()); |
pagineur.stationId = stationId; |
pagineur.format = format; |
var start = 1 * pagineur.limite; |
var url = urlStation+ |
'&format='+format+ |
'&station='+stationId+ |
'&start='+start+ |
'&limit='+pagineur.limite; |
$.get(url, function(observations){ |
infoBulle.setContent(observations); |
// First Parameter: number of items |
// Second Parameter: options object |
$("#pagination").pagination(pagineur.obsTotal, { |
items_per_page:pagineur.limite, |
callback:handlePaginationClick |
}); |
}); |
} |
/trunk/widget/modules/carto/squelettes/css/carto.css |
---|
264,7 → 264,7 |
overflow:none; |
} |
#observations ol { |
padding-left:20px; |
padding-left:30px; |
} |
.champ_nom_latin { |
display:none; |
341,4 → 341,34 |
} |
.cel-img-secondaire{ |
display:none; |
} |
} |
/*+-----------------------------------------------------------------------------------------------------------------+*/ |
/* Plugin Jquery Pagination */ |
.pagination { |
font-size: 80%; |
} |
.pagination a { |
text-decoration: none; |
border: solid 1px #AAE; |
color: #15B; |
} |
.pagination a, .pagination span { |
display: block; |
float: left; |
padding: 0.3em 0.5em; |
margin-right: 5px; |
margin-bottom: 5px; |
min-width:1em; |
text-align:center; |
} |
.pagination .current { |
background: #26B; |
color: #fff; |
border: solid 1px #AAE; |
} |
.pagination .current.prev, .pagination .current.next{ |
color:#999; |
border-color:#999; |
background:#fff; |
} |
/trunk/widget/modules/carto/squelettes/obs_tableau_contenu.tpl.html |
---|
New file |
0,0 → 1,14 |
<? foreach ($observations as $obs) : ?> |
<tr> |
<td> |
<? if (isset($obs['nn'])) : ?> |
<a href="http://www.tela-botanica.org/nn<?=$obs['nn']?>" onclick="window.open(this.href); arreter(event); return false; "><?=$obs['nom']?></a> |
<? else : ?> |
<?=$obs['nom']?> |
<? endif; ?> |
</td> |
<td> <?=$obs['date']?></td> |
<td> <?=$obs['lieu']?></td> |
<td> <?=$obs['observateur']?></td> |
</tr> |
<? endforeach; ?> |
/trunk/widget/modules/carto/squelettes/obs_liste_contenu.tpl.html |
---|
New file |
0,0 → 1,29 |
<? foreach ($observations as $obs) : ?> |
<li> |
<div> |
<? if (isset($images[$obs['id']])) : ?> |
<? foreach ($images[$obs['id']] as $num => $urls) : ?> |
<div<?=($num == 0) ? ' class="cel-img-principale"': ' class="cel-img-secondaire"'?>> |
<a class="cel-img" href="<?=$urls['normale']?>" rel="cel-obs-<?=$obs['id']?>"> |
<img src="<?=$urls['miniature']?>" alt="Image #<?=$urls['id']?> de l'osbervation #<?=$obs['id']?>" /> |
</a> |
</div> |
<? endforeach ?> |
<? endif ?> |
<dl> |
<dt class="champ_nom_latin">Nom</dt> |
<dd> |
<? if (isset($obs['nn'])) : ?> |
<a href="http://www.tela-botanica.org/nn<?=$obs['nn']?>" onclick="window.open(this.href); arreter(event); return false; "><?=$obs['nom']?></a> |
<? else : ?> |
<?=$obs['nom']?> |
<? endif; ?> |
</dd> |
<dt>Lieu</dt><dd> <?=$obs['lieu']?></dd> |
<dt>Publié par</dt><dd> <?=$obs['observateur']?></dd> |
<dt>Le</dt><dd> <?=$obs['date']?></dd> |
</dl> |
<hr class="nettoyage"/> |
</div> |
</li> |
<? endforeach; ?> |
/trunk/widget/modules/carto/squelettes/obs_tableau.tpl.html |
---|
6,10 → 6,8 |
</ul> |
</div> |
<div id="observations"> |
<table> |
<div id="pagination"> |
</div> |
<div id="pagination"></div> |
<table class="obs-liste-conteneur"> |
<caption><h2><span id="obs-total"><?=$nbre_obs_total?></span> observations pour <?=(isset($commune) ? $commune : '?')?></h2></caption> |
<thead> |
<tr> |
16,7 → 14,7 |
<th>Nom</th><th>Date</th><th>Lieu</th><th>Observateur</th> |
</tr> |
</thead> |
<tbody> |
<tbody id="obs-liste"> |
<? foreach ($observations as $obs) : ?> |
<tr> |
<td> |