issue #0001870 : Pagination sur la page des événements
This commit is contained in:
Michael RICOIS
parent
4781f69a32
commit
d42b1c10aa
@ -22,9 +22,6 @@ class JuridiqueController extends Zend_Controller_Action
|
||||
|
||||
$vue = $request->getParam('vue', 'bodacc');
|
||||
|
||||
$p = $request->getParam('p', 1);
|
||||
$this->view->assign('p', $p);
|
||||
|
||||
$idAnn = $request->getParam('idAnn', null);
|
||||
$siren = substr($this->siret, 0,9);
|
||||
|
||||
@ -57,8 +54,11 @@ class JuridiqueController extends Zend_Controller_Action
|
||||
|
||||
$this->view->assign('vue', $vue);
|
||||
|
||||
$nbAnnonces = 20;
|
||||
$position = ($p-1)*$nbAnnonces;
|
||||
//Pagination
|
||||
$page = $request->getParam('page', 1);
|
||||
if ( $page <= 0 ) $page = 1;
|
||||
$nbAffichage = 20;
|
||||
$position = ($page - 1 ) * $nbAffichage;
|
||||
|
||||
$ws = new WsScores();
|
||||
switch ( $vue ) {
|
||||
@ -68,25 +68,25 @@ class JuridiqueController extends Zend_Controller_Action
|
||||
if(intval($siren)==0) {
|
||||
$idAnn = $session->getSourceId();
|
||||
}
|
||||
$infos = $ws->getAnnoncesLegales($siren, $idAnn, null, $position, $nbAnnonces);
|
||||
$infos = $ws->getAnnoncesLegales($siren, $idAnn, null, $position, $nbAffichage);
|
||||
break;
|
||||
case 'balo':
|
||||
$infos = $ws->getAnnoncesBalo($siren, $idAnn, null, $position, $nbAnnonces);
|
||||
$infos = $ws->getAnnoncesBalo($siren, $idAnn, null, $position, $nbAffichage);
|
||||
break;
|
||||
case 'asso':
|
||||
if ( intval($siren)==0 && substr($session->getAutreId(),0,1)=='W' ) {
|
||||
$infos = $ws->getAnnoncesAsso($session->getAutreId(), $idAnn, null, $position, $nbAnnonces);
|
||||
$infos = $ws->getAnnoncesAsso($session->getAutreId(), $idAnn, null, $position, $nbAffichage);
|
||||
} elseif (intval($siren)!=0) {
|
||||
$infos = $ws->getAnnoncesAsso($siren, $idAnn, null, $position, $nbAnnonces);
|
||||
$infos = $ws->getAnnoncesAsso($siren, $idAnn, null, $position, $nbAffichage);
|
||||
} else {
|
||||
$idAnn = $session->getSourceId();
|
||||
$infos = $ws->getAnnoncesAsso($siren, $idAnn, null, $position, $nbAnnonces);
|
||||
$infos = $ws->getAnnoncesAsso($siren, $idAnn, null, $position, $nbAffichage);
|
||||
}
|
||||
break;
|
||||
case 'bomp':
|
||||
$filtre = $request->getParam('filtre', null);
|
||||
$this->view->assign('filtre', $filtre);
|
||||
$infos = $ws->getAnnoncesBoamp($siren, $idAnn, $filtre, $position, $nbAnnonces);
|
||||
$infos = $ws->getAnnoncesBoamp($siren, $idAnn, $filtre, $position, $nbAffichage);
|
||||
break;
|
||||
}
|
||||
if ($infos === false) $this->_forward('soap', 'error');
|
||||
@ -148,6 +148,9 @@ class JuridiqueController extends Zend_Controller_Action
|
||||
//$this->_helper->viewRenderer->setNoRender(true);
|
||||
$this->renderScript('juridique/annonce-ajax.phtml');
|
||||
} else {
|
||||
|
||||
$this->view->assign('PageCurrent', $page);
|
||||
|
||||
//Définir url pour téléchargement pdf
|
||||
if ( in_array($annonce['Code'], array('BODA', 'BODB', 'BODC')) && intval($annonce['Annee'])>=2008) {
|
||||
$lienBodacc = $this->view->url(array(
|
||||
@ -166,45 +169,36 @@ class JuridiqueController extends Zend_Controller_Action
|
||||
//Affichage pour la liste des annonces
|
||||
} else {
|
||||
|
||||
$nbReponses = $infos->nbReponses;
|
||||
$nbPages = ceil($nbReponses/$nbAnnonces);
|
||||
|
||||
//Attention ajout des filtres
|
||||
if ( $p <= 1 ) {
|
||||
$lienPagePrecedente = false;
|
||||
//Calcul pagination
|
||||
$nbReponses = count($infos->result->item);
|
||||
$nbReponsesTotal = $infos->nbReponses;
|
||||
if ($nbReponses < $nbReponsesTotal) {
|
||||
$pageTotal = ceil( $nbReponsesTotal / $nbAffichage );
|
||||
$pageCurrent = $page;
|
||||
$pagePrev = $page - 1;
|
||||
if ($pagePrev < 1) {
|
||||
$pagePrev = 1;
|
||||
}
|
||||
$pageNext = $page + 1;
|
||||
if( $pageNext > $pageTotal ) {
|
||||
$pageNext = $pageTotal;
|
||||
}
|
||||
} else {
|
||||
$lienPagePrecedente = $this->view->url(array(
|
||||
'controller' => 'juridique',
|
||||
'action' => 'annonces',
|
||||
'vue'=> $vue,
|
||||
'p' => $p-1
|
||||
));
|
||||
$pageTotal = $pageCurrent = 1;
|
||||
}
|
||||
$this->view->assign('PageTotal', $pageTotal);
|
||||
$this->view->assign('PagePrev', $pagePrev);
|
||||
$this->view->assign('PageNext', $pageNext);
|
||||
$this->view->assign('PageCurrent', $pageCurrent);
|
||||
|
||||
if ( $p+1 > $nbPages ) {
|
||||
$lienPageSuivante = false;
|
||||
} else {
|
||||
$lienPageSuivante = $this->view->url(array(
|
||||
'controller' => 'juridique',
|
||||
'action' => 'annonces',
|
||||
'vue' => $vue,
|
||||
'p' => $p+1
|
||||
));
|
||||
}
|
||||
$this->view->assign('nbReponses', empty($nbReponses) ? 0 : $nbReponses);
|
||||
$this->view->assign('nbReponsesTotal', empty($nbReponsesTotal) ? 0 : $nbReponsesTotal);
|
||||
|
||||
$this->view->assign('nbPages',$nbPages);
|
||||
$this->view->assign('lienPagePrecedente',$lienPagePrecedente);
|
||||
$this->view->assign('lienPageSuivante',$lienPageSuivante);
|
||||
|
||||
foreach ($typeAnnonces as $type)
|
||||
{
|
||||
foreach ( $typeAnnonces as $type ) {
|
||||
$classType = 'annonces'.$type;
|
||||
$annonces = array();
|
||||
if (count($objAnnonces->$classType)>0)
|
||||
{
|
||||
foreach($objAnnonces->$classType as $ann)
|
||||
{
|
||||
Zend_Registry::get('firebug')->info('id:'.$ann->id.', deleted:'.$ann->deleted);
|
||||
if ( count( $objAnnonces->$classType ) > 0 ) {
|
||||
foreach( $objAnnonces->$classType as $ann ) {
|
||||
$annonces[] = $objAnnonces->getAnnonceResume($ann);
|
||||
}
|
||||
$this->view->assign($classType, $annonces);
|
||||
|
||||
@ -2,16 +2,12 @@
|
||||
<h1 class="titre">ANNONCES LÉGALES</h1>
|
||||
<div class="paragraph">
|
||||
<table class="identite">
|
||||
<tr>
|
||||
<tr>
|
||||
<td width="30"> </td>
|
||||
<td width="200" class="StyleInfoLib">
|
||||
Numéro identifiant Siren
|
||||
</td>
|
||||
<td width="350" class="StyleInfoData">
|
||||
<?=$this->SirenTexte($this->siren)?>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="200" class="StyleInfoLib">Numéro identifiant Siren</td>
|
||||
<td width="350" class="StyleInfoData"><?=$this->SirenTexte($this->siren)?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="30"> </td>
|
||||
<td width="200" class="StyleInfoLib">Dénomination Sociale</td>
|
||||
<td width="350" class="StyleInfoData">
|
||||
@ -25,9 +21,9 @@
|
||||
))?>">(Edition)</a>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php if ($this->surveillance) {?>
|
||||
<tr>
|
||||
</tr>
|
||||
<?php if ($this->surveillance) {?>
|
||||
<tr>
|
||||
<td width="30"> </td>
|
||||
<td colspan="2" width="550" class="StyleInfoData">
|
||||
<?=$this->action('infos','surveillance', null, array(
|
||||
@ -35,8 +31,8 @@
|
||||
'siret' => $this->siret
|
||||
))?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php }?>
|
||||
</tr>
|
||||
<?php }?>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
@ -153,7 +149,8 @@ $href = $this->url(array(
|
||||
'action' => 'annonces',
|
||||
'siret' => $this->siret,
|
||||
'id' => $this->id,
|
||||
'vue' => $this->vue
|
||||
'vue' => $this->vue,
|
||||
'page' => $this->PageCurrent,
|
||||
), null, true);
|
||||
?>
|
||||
<a href="<?=$href?>">Revenir à la liste des annonces</a>
|
||||
|
||||
@ -6,20 +6,15 @@
|
||||
<h1 class="titre">ANNONCES LÉGALES</h1>
|
||||
<div class="paragraph">
|
||||
<table class="identite">
|
||||
<tr>
|
||||
<tr>
|
||||
<td width="30"> </td>
|
||||
<td width="200" class="StyleInfoLib">
|
||||
Numéro identifiant Siren
|
||||
</td>
|
||||
<td width="350" class="StyleInfoData">
|
||||
<?=$this->SirenTexte($this->siren)?>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="200" class="StyleInfoLib">Numéro identifiant Siren</td>
|
||||
<td width="350" class="StyleInfoData"><?=$this->SirenTexte($this->siren)?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="30"> </td>
|
||||
<td width="200" class="StyleInfoLib">Dénomination Sociale</td>
|
||||
<td width="350" class="StyleInfoData">
|
||||
<?=$this->raisonSociale?>
|
||||
<td width="350" class="StyleInfoData"><?=$this->raisonSociale?>
|
||||
<?php if($this->hasModeEdition) : ?>
|
||||
<a href="<?=$this->url(array(
|
||||
'controller' => 'saisie',
|
||||
@ -29,9 +24,9 @@
|
||||
))?>">(Edition)</a>
|
||||
<?php endif ?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php if ($this->surveillance) {?>
|
||||
<tr>
|
||||
</tr>
|
||||
<?php if ($this->surveillance) {?>
|
||||
<tr>
|
||||
<td width="30"> </td>
|
||||
<td colspan="2" width="550" class="StyleInfoData">
|
||||
<?=$this->action('infos','surveillance', null, array(
|
||||
@ -39,8 +34,8 @@
|
||||
'siret' => $this->siret
|
||||
))?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php }?>
|
||||
</tr>
|
||||
<?php }?>
|
||||
</table>
|
||||
</div>
|
||||
<?php endif;?>
|
||||
@ -204,17 +199,19 @@ Néant
|
||||
<?php }?>
|
||||
|
||||
<?php if (empty($this->AutrePage)) {?>
|
||||
<div style="text-align:center;">
|
||||
<?php if ($this->lienPagePrecedente) { ?>
|
||||
<a href="<?=$this->lienPagePrecedente?>" title="Page précédente..."><<</a>
|
||||
<?php }?>
|
||||
<?php if ($this->nbPages>1) { ?>
|
||||
<span>Page <?=$this->p?>/<?=$this->nbPages?></span>
|
||||
<?php } ?>
|
||||
<?php if ($this->lienPageSuivante) {?>
|
||||
<a href="<?=$this->lienPageSuivante?>" title="Page suivante...">>></a>
|
||||
<?php }?>
|
||||
|
||||
<?php if ($this->PageTotal>1) {?>
|
||||
<div class="paragraph">
|
||||
<div class="pagination clearfix">
|
||||
<a class="first" href="<?=$this->url(array('page'=>1))?>">«</a>
|
||||
<a class="previous" href="<?=$this->url(array('page'=>$this->PagePrev))?>">‹</a>
|
||||
<span>Page <?=$this->PageCurrent?>/<?=$this->PageTotal?></span>
|
||||
<a class="next" href="<?=$this->url(array('page'=>$this->PageNext))?>">›</a>
|
||||
<a class="last" href="<?=$this->url(array('page'=>$this->PageTotal))?>">»</a>
|
||||
</div>
|
||||
</div>
|
||||
<?php }?>
|
||||
|
||||
<?php }?>
|
||||
|
||||
<?php if (empty($this->AutrePage)) {?>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user