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

issue #0001772 : Display information complete

Browse Source
This commit is contained in:
Michael RICOIS 2013-11-13 13:47:18 +00:00
parent 74e353d989
commit 2e74954e45
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/FinanceController.php
View File

@ -1287,7 +1287,7 @@ class FinanceController extends Zend_Controller_Action
$id = $request->getParam('subventionId');
$ws = new WsScores();
$infos = $ws->getSubvention($id);
$infos = $ws->getSubventionDetail($id);
if ($infos === false) {
$this->forward('soap', 'error');
} elseif (is_string($infos)) {

9
application/views/default/scripts/finance/subvention.phtml
View File

@ -17,7 +17,7 @@
<h2>Détail de la subvention</h2>
<div class="paragraph">
<table>
<table class="data">
<tbody>
<tr>
<td>Année</td>
@ -25,7 +25,7 @@
</tr>
<tr>
<td>Subvention versé à</td>
<td><?=$this->AssoNom?> (<?=$this->AssoSiren?>)</td>
<td><?=$this->AssoNom?> (<?=$this->SirenTexte($this->AssoSiren)?>)</td>
</tr>
<tr>
<td>Budget</td>
@ -33,7 +33,8 @@
</tr>
<tr>
<td>Subvention reçu de </td>
<td><?=$this->OrigineSiren?></td>
<td><a href="<?=$this->url(array('controller'=>'identite', 'action'=>'fiche', 'siren'=>$this->OrigineSiren))?>">
<?=$this->SirenTexte($this->OrigineSiren)?></a></td>
</tr>
<tr>
<td>Origine de la subvention</td>
@ -45,7 +46,7 @@
</tr>
<tr>
<td>Montant</td>
<td><?=$this->Montant?></td>
<td nowrap><?=number_format($this->Montant, 2, ',', ' ')?> &euro;</td>
</tr>
<tr>
<td>Objet</td>

4
application/views/default/scripts/finance/subventions.phtml
View File

@ -45,10 +45,10 @@ Versée
<?php }?>
</td>
<td><?=$item->OrigineLib?></td>
<td><?=$item->AssoNom?> (<?=$this->AssoSiren?>)</td>
<td><?=$item->AssoNom?> (<?=$this->SirenTexte($item->AssoSiren)?>)</td>
<td><a href="<?=$this->url(array('controller'=>'finance', 'action'=>'subvention', 'subventionId'=>$item->Id, 'siret'=>$this->siret, 'id'=>$this->id), null, true)?>" title="Détail de la subvention">
<?=$item->Programme?></a></td>
<td><?=$item->Montant?></td>
<td nowrap><?=number_format($item->Montant, 2, ',', ' ')?> &euro;</td>
</tr>
<?php }?>
</tbody>

9
library/Scores/Menu.php
View File

@ -169,6 +169,9 @@ class Menu
),
array(
'label' => 'ELEMENTS FINANCIERS',
'activateMenu' => array(
array('controller'=>'finance', 'action'=>'subvention'),
),
'pages' => array(
array(
'label' => "Synthèse",
@ -219,6 +222,12 @@ class Menu
'forceVisible' => true,
'permission' => 'BANQUE',
),
array(
'label' => "Subventions",
'controller' => 'finance',
'action' => 'subventions',
'forceVisible' => true,
),
),
),
array(