RVNP, gestion des permissions, cedexa et bug affichage sur autre page, issue #0002113

This commit is contained in:
Michael RICOIS 2015-06-16 15:34:57 +00:00
parent be3e54c893
commit 8e434a509c
3 changed files with 36 additions and 13 deletions

View File

@ -2247,10 +2247,12 @@ class IdentiteController extends Zend_Controller_Action
{
$request = $this->getRequest();
if ( $request->isXmlHttpRequest() ) {
$this->_helper->layout()->disableLayout();
$this->view->tooltip = true;
$this->_helper->layout()->disableLayout();
$this->view->tooltip = true;
}
$user = new Scores_Utilisateur();
$this->view->hasRight = $user->checkPerm('rnvp');
$session = new Scores_Session_Entreprise($this->siret, $this->id, true);
$this->view->assign('id', $this->id);
$this->view->assign('siret', $this->siret);
@ -2259,15 +2261,17 @@ class IdentiteController extends Zend_Controller_Action
$this->view->assign('siren', $siren);
$this->view->assign('adresse', $session->getAdresse());
$ws = new Scores_Ws_Client('entreprise', '0.9');
$params = new stdClass();
$params->companyId = $this->siret;
$params->type = 'siren';
$response = $ws->getRNVP($params);
if ($response === false) {
$this->view->Error = true;
} else {
$this->view->RNVP = $response;
}
if ($this->view->hasRight) {
$ws = new Scores_Ws_Client('entreprise', '0.9');
$params = new stdClass();
$params->companyId = $this->siret;
$params->type = 'siren';
$response = $ws->getRNVP($params);
if ($response === false) {
$this->view->Error = true;
} else {
$this->view->RNVP = $response;
}
}
}
}

View File

@ -105,7 +105,9 @@ echo $this->partial('identite/fiche-item.phtml', $this->dBlock['DateImmat']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['DateCreaEn']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['DateCreaEt']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Adresse']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['RNVP']);
if ( empty($this->AutrePage) ) {
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['RNVP']);
}
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Zones']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Tel']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Fax']);

View File

@ -1,5 +1,7 @@
<?php if ($this->tooltip) {?>
<?php if ($this->hasRight){ ?>
<div style="padding-left:20px;">
<?php if (!empty($this->RNVP->L1)) {?><?=$this->RNVP->L1?></br><?php }?>
<?php if (!empty($this->RNVP->L2)) {?><?=$this->RNVP->L2?></br><?php }?>
@ -13,6 +15,10 @@
<p><a href="<?=$this->url(array('controller'=>'identite', 'action'=>'rnvp', 'id'=>$this->id, 'siret'=>$this->siret),
'default', true)?>">Détails techniques</a></p>
<?php } else {?>
<p>Vous n'avez pas les droits nécessaires pour afficher cette information.</p>
<?php }?>
<?php } else {?>
<div id="center">
@ -39,6 +45,8 @@
</div>
<h2>Adresse normalisée</h2>
<?php if ($this->hasRight){ ?>
<div class="paragraph">
<table class="data">
<tbody>
@ -73,6 +81,7 @@
<tr><td>Hexavia</td><td><?=$this->RNVP->GeoHexavia?></td></tr>
<tr><td>Hexapost</td><td><?=$this->RNVP->GeoHexapost?></td></tr>
<tr><td>Hexacle</td><td><?=$this->RNVP->GeoHexacle?></td></tr>
<tr><td>Cedexa</td><td><?=$this->RNVP->CedexaMatricule?></td></tr>
<tr><td>Date de mise à jour</td><td><?=$this->RNVP->DateUpdate?></td></tr>
</tbody>
</table>
@ -88,10 +97,18 @@
<tr><td>Ilot</td><td><?=$this->RNVP->GeoIlot?></td></tr>
<tr><td>Iris</td><td><?=$this->RNVP->GeoIris?></td></tr>
<tr><td>Canton</td><td><?=$this->RNVP->GeoCanton?></td></tr>
<tr><td>L5 Géographique</td><td><?=$this->RNVP->CedexaGeoL5?></td></tr>
<tr><td>Code postal et commune géographique</td><td><?=$this->RNVP->CedexaGeoL6?></td></tr>
</tbody>
</table>
</div>
<?php } else {?>
<div class="paragraph">
<p>Vous n'avez pas les droits nécessaires pour afficher cette information.</p>
</div>
<?php }?>
<?=$this->render('cgu.phtml', $this->cgu)?>
</div>