scores/extranet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of ssh://git@192.168.78.249:10022/SCORES/extranet.git into develop

Browse Source
This commit is contained in:
Jean Vladimir TWAHIRWA 2016-10-12 17:17:41 +02:00
commit d2f865f9b9
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/modules/default/controllers/EvaluationController.php
View File

@ -1052,8 +1052,11 @@ class EvaluationController extends Zend_Controller_Action
$params = new stdClass();
$params->companyId = $siren;
try {
$response = $ws->getCadastrePatrimoine($params);
if ($response === false) {
$this->forward('soap', 'error');
}

2
application/modules/default/controllers/PiecesController.php
View File

@ -280,7 +280,7 @@ class PiecesController extends Zend_Controller_Action
//Catégorie Juridique
$cj = $session->getFormeJuridique();
if( in_array($cj, $this->association_cj) ) {
$this->_forward('associationbilans');
$this->forward('associationbilans');
} else {
$request = $this->getRequest();
$siren = substr($this->siret,0,9);

12
application/modules/default/views/default/scripts/evaluation/cadastre.phtml
View File

@ -49,7 +49,7 @@
<?php foreach($this->List as $p) {?>
<?php if ($p->Type == 'local') {?>
<tr>
<td><?=$p->Role?></td>
<td title="<?=$p->RoleLib?>"><?=$p->Role?></td>
<td><?=$p->Departement?></td>
<td><?=$p->CommuneLib?></td>
<td><?=$p->Section?></td>
@ -64,14 +64,14 @@
<td><?=$p->Batiment?></td>
<td><?=$p->Ent?></td>
<td><?=$p->Niveau?></td>
<td><?=number_format($p->SurfaceTotal, 0, ",", " ")?></td>
<td><?=number_format($p->SurfaceTotal, 0, ",", " ")?> m²</td>
<td></td>
</tr>
<?php if (count($p->SurfaceDetail->item) > 0) {?>
<?php foreach($p->SurfaceDetail->item as $s) {?>
<tr>
<td colspan="10" align="right"><i>Detail</i></td>
<td><?=number_format($s->Surface, 0, ",", " ")?></td>
<td><?=number_format($s->Surface, 0, ",", " ")?> m²</td>
<td><?=$s->Label?></td>
</tr>
<?php }?>
@ -104,7 +104,7 @@
<?php foreach($this->List as $p) {?>
<?php if ($p->Type == 'parcelle') {?>
<tr>
<td><?=$p->Role?></td>
<td title="<?=$p->RoleLib?>"><?=$p->Role?></td>
<td><?=$p->Departement?></td>
<td><?=$p->CommuneLib?></td>
<td><?=$p->Section?></td>
@ -116,14 +116,14 @@
<?=empty($p->AdresseType) ? '' : $p->AdresseType.' ' ; ?>
<?=empty($p->AdresseLib) ? '' : $p->AdresseLib.' ' ; ?>
</td>
<td><?=number_format($p->SurfaceTotal, 0, ",", " ")?></td>
<td><?=number_format($p->SurfaceTotal, 0, ",", " ")?> m²</td>
<td></td>
</tr>
<?php if (count($p->SurfaceDetail->item) > 0) {?>
<?php foreach($p->SurfaceDetail->item as $s) {?>
<tr>
<td colspan="7" align="right"><i>Detail</i></td>
<td><?=number_format($s->Surface, 0, ",", " ")?></td>
<td><?=number_format($s->Surface, 0, ",", " ")?> m²</td>
<td><?=$s->Label?></td>
</tr>
<?php }?>

10
application/modules/default/views/default/scripts/juridique/ctx.phtml
View File

@ -27,7 +27,7 @@
<td width="200" class="StyleInfoLib">Affaire(s) en tant que</td>
<td width="350" class="StyleInfoData">
<form action="<?=$this->url(array('module'=>'default','controller'=>'juridique',
'action'=>'ctx'))?>" method="post">
'action'=>'ctx', 'siret'=>$this->siret, 'id'=>$this->id), 'default', true)?>" method="post">
<select name="type">
<?php foreach($this->TypeList as $k => $v) {?>
<option value="<?=$k?>" <?php if ($k==$this->Type){?> selected<?php }?>><?=$v?></option>
@ -80,11 +80,11 @@
<?php if ($this->PageTotal>1) {?>
<div class="paragraph">
<div class="pagination clearfix">
<a class="first" href="<?=$this->url(array('page'=>1))?>">&laquo;</a>
<a class="previous" href="<?=$this->url(array('page'=>$this->PagePrev))?>">&lsaquo;</a>
<a class="first" href="<?=$this->url(array('page'=>1, 'type'=>$this->Type))?>">&laquo;</a>
<a class="previous" href="<?=$this->url(array('page'=>$this->PagePrev, 'type'=>$this->Type))?>">&lsaquo;</a>
<span>Page <?=$this->PageCurrent?>/<?=$this->PageTotal?></span>
<a class="next" href="<?=$this->url(array('page'=>$this->PageNext))?>">&rsaquo;</a>
<a class="last" href="<?=$this->url(array('page'=>$this->PageTotal))?>">&raquo;</a>
<a class="next" href="<?=$this->url(array('page'=>$this->PageNext, 'type'=>$this->Type))?>">&rsaquo;</a>
<a class="last" href="<?=$this->url(array('page'=>$this->PageTotal, 'type'=>$this->Type))?>">&raquo;</a>
</div>
</div>
<?php }?>