Modification affichage

This commit is contained in:
Michael RICOIS 2011-05-18 13:35:56 +00:00
parent f717568fd3
commit 16c91081d5
2 changed files with 69 additions and 61 deletions

View File

@ -818,27 +818,25 @@ class FinanceController extends Zend_Controller_Action
*/ */
public function liassexlsAction() public function liassexlsAction()
{ {
require_once 'finance/LiasseXLS.php'; $this->_helper->layout()->disableLayout();
$request = $this->getRequest();
$unite = $request->getParam('unit', '€');
$path = APPLICATION_PATH . '/../cache/liasse/';
$file = 'liasse-';
$file = '';
$model = ''; $model = '';
require_once 'finance/LiasseXLS.php';
$liasse = new LiasseXLS($model); $liasse = new LiasseXLS($model);
$liasse->dataModel($values); $liasse->dataModel($values);
$liasse->dataFile($file); $liasse->dataFile($file);
if( file_exists($xlsWriteFile) ) if( file_exists($path.$file) ){
{
$client->setLog('liassexls', $siren, 0, ''); $client->setLog('liassexls', $siren, 0, '');
echo '<a href="fichier/liasse/'.basename($xlsWriteFile). $this->view->assign('file', $file);
'" target="_blank">Télécharger le fichier excel.</a>';
} }
else
{
echo "Erreur lors de la construction du fichier.";
}
} }
@ -885,10 +883,11 @@ class FinanceController extends Zend_Controller_Action
$liasse = array (); $liasse = array ();
$request = $this->getRequest(); $request = $this->getRequest();
$siret = $this->getRequest()->getParam('siret'); $siret = $this->getRequest()->getParam('siret');
$siren = substr($siret,0,9);
$id = $this->getRequest()->getParam('id'); $id = $this->getRequest()->getParam('id');
$listBilan = $this->ws->getListeBilans($this->entreprise->siren); $listBilan = $this->ws->getListeBilans($this->entreprise->siren);
echo $date = ($request->isPost())?$request->getParam('date'):$listBilan->result->item[0]->dateExercice.':'. $date = ($request->isPost())? $request->getParam('date') :
$listBilan->result->item[0]->typeBilan; $listBilan->result->item[0]->dateExercice.':'.$listBilan->result->item[0]->typeBilan;
$unite = ($request->isPost())?$request->getParam('unit'):'€'; $unite = ($request->isPost())?$request->getParam('unit'):'€';
foreach ($listBilan->result->item as $item) foreach ($listBilan->result->item as $item)
@ -919,7 +918,8 @@ class FinanceController extends Zend_Controller_Action
/** Partie vue **/ /** Partie vue **/
$this->view->assign('ancres', $ancres); $this->view->assign('ancres', $ancres);
$this->view->assign('liste', $liste); $this->view->assign('liste', $liste);
$this->view->assign('nomSociete', $this->entreprise->nom); $this->view->assign('raisonSociale', $this->entreprise->nom);
$this->view->assign('siren', $siren);
$this->view->assign('siret', $siret); $this->view->assign('siret', $siret);
$this->view->assign('id', $id); $this->view->assign('id', $id);
$this->view->assign('type', $type); $this->view->assign('type', $type);

View File

@ -1,46 +1,52 @@
<div id="center"> <div id="center">
<h1>ELEMENTS FINANCIERS</h1> <h1>ELEMENTS FINANCIERS - BILANS</h1>
<div> <div class="paragraph">
<form method="POST" action="<?php echo $this->url(array('controller' => 'finance', 'action' => 'liasse', 'siret' => $this->siret, 'id' => $this->id))?>"> <table class="identite">
<table id="liasseForm" width="100%"> <tr>
<tr> <td width="30">&nbsp;</td>
<th>Numéro identifiant Siren : </th> <td width="200" class="StyleInfoLib">Num&eacute;ro identifiant Siren</td>
<td><?php echo $this->siret; ?></td> <td width="350" class="StyleInfoData"><?=$this->SirenTexte($this->siren)?></td>
</tr> </tr>
<tr> <tr>
<th>Raison Sociale : </th> <td width="30">&nbsp;</td>
<td><?php echo $this->nomSociete;?></td> <td width="200" class="StyleInfoLib">Raison Sociale</td>
</tr> <td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
<tr> </tr>
<th>Valeurs exprimées en : </th> <form method="POST" action="<?php echo $this->url(array('controller' => 'finance', 'action' => 'liasse', 'siret' => $this->siret, 'id' => $this->id))?>">
<td> <tr>
<select name="unit"> <th>Valeurs exprimées en : </th>
<?php foreach ($this->unit as $champUnit => $valeurUnit):?> <td>
<option <?php echo (($this->unit == ($valeurUnit))? 'selected': false);?> value="<?php echo $valeurUnit;?>"><?php echo $champUnit;?></option> <select name="unit">
<?php endforeach;?> <?php foreach ($this->unit as $champUnit => $valeurUnit):?>
</select> <option <?php echo (($this->unit == ($valeurUnit))? 'selected': false);?> value="<?php echo $valeurUnit;?>"><?php echo $champUnit;?></option>
</td> <?php endforeach;?>
</tr> </select>
<tr> </td>
<th>Millesime : </th> </tr>
<td> <tr>
<select name="date"> <th>Millesime : </th>
<?php foreach ($this->type as $champType => $name):?> <td>
<?php foreach ($this->liste[$champType] as $element):?> <select name="date">
<option <?php echo (($this->date == ($element))? 'selected': false);?> value="<?php echo $element.':'.$champType?>"><?php echo $this->dateFunction->dateT('Ymd', 'd/m/Y', $element).' '.$name;?></option> <?php foreach ($this->type as $champType => $name):?>
<?php endforeach;?> <?php foreach ($this->liste[$champType] as $element):?>
<?php endforeach;?> <option <?php echo (($this->date == ($element))? 'selected': false);?> value="<?php echo $element.':'.$champType?>"><?php echo $this->dateFunction->dateT('Ymd', 'd/m/Y', $element).' '.$name;?></option>
</select> <?php endforeach;?>
<input type="submit" value="Ok" /> <?php endforeach;?>
</td> </select>
</tr> <input type="submit" value="Ok" />
</table> </td>
</form> </tr>
</div> </form>
<div>
</div> <?php
<br /> //Affichage lien Exporter liasse XLS
<div align="center" width="100%"> //Affichage lien saisie bilan
?>
</table>
</div>
<div class="paragraph" align="center" width="100%">
<?php if (!empty($this->date)):?> <?php if (!empty($this->date)):?>
<div class="tabbed_area"> <div class="tabbed_area">
<ul class="tabs"> <ul class="tabs">
@ -85,4 +91,6 @@
<?php endforeach;?> <?php endforeach;?>
<?php endif;?> <?php endif;?>
</div> </div>
</div> </div>