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

issue #0001541, issue #0001806 : Liste, message pas d'éléments, correction téléchargement

Browse Source
This commit is contained in:
Michael RICOIS 2014-02-24 16:29:37 +00:00
parent 1af412c90b
commit c67f73adf4
4 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/FichierController.php
View File

@ -433,7 +433,7 @@ class FichierController extends Zend_Controller_Action
/**
* Bilan : Association
*/
public function bilanAction()
public function greffeAction()
{
$content_type = 'application/pdf';
$file = $this->getRequest()->getParam('fichier');

11
application/controllers/PiecesController.php
View File

@ -421,7 +421,7 @@ class PiecesController extends Zend_Controller_Action
if (copy($stream->getStreamName(), $c->profil->path->files . '/' . $file)) {
$this->view->assign('url', $this->view->url(array(
'controller' => 'fichier',
'action' => 'bilan',
'action' => 'greffe',
), null, true).'/'.$file);
} else {
$this->view->assign('msg', "Impossible de distribuer le fichier.");
@ -513,7 +513,7 @@ class PiecesController extends Zend_Controller_Action
//Télécharger le fichier
case 'T':
$reponse = $ws->getPiecesActe($siren, $mode, $depotNum, $depotDate, $acteType, $acteNum, $acteDate);
$response = $ws->getPiecesActe($siren, $mode, $depotNum, $depotDate, $acteType, $acteNum, $acteDate);
if ($response===false) {
$this->view->assign('msg', "Fichier introuvable.");
} else {
@ -525,11 +525,10 @@ class PiecesController extends Zend_Controller_Action
$c = Zend_Registry::get('config');
$file = 'acte-'.$siren.'-'.$depotNum.'-'.$acteNum.'.pdf';
if (copy($stream->getStreamName(), $c->profil->path->files . '/' . $file)) {
$this->view->assign('url', $this->url(array(
$this->view->assign('url', $this->view->url(array(
'controller' => 'fichier',
'action' => 'bilan',
'q' => $file,
), null, true));
'action' => 'greffe',
), null, true).'/'.$file);
} else {
$this->view->assign('msg', "Impossible de distribuer le fichier.");
}

18
application/views/default/scripts/pieces/actes.phtml
View File

@ -33,16 +33,18 @@ Les éléments disponibles ci-dessous en téléchargement ou commande peuvent fa
<h2>Actes & Status</h2>
<div class="paragraph">
<?php if ($this->ErreurMessage):?>
<?=$this->ErreurMessage?>
<?php else:?>
<?php if ($this->ErreurMessage) {?>
<?=$this->ErreurMessage?>
<?php } else {?>
<?php if ( count($this->InfosActes) > 0 ) {?>
<table class="greffe">
<thead>
<tr><th>Date</th><th>Type</th><th>Décisions</th>
</tr>
</thead>
<tbody>
<?php foreach($this->InfosActes as $acte):?>
<?php foreach($this->InfosActes as $acte) {?>
<?php
$style = '';
if ($acte['mode']=='T' && $acte['isFileExist'] && $this->ModeEdition) {
@ -82,10 +84,14 @@ Les éléments disponibles ci-dessous en téléchargement ou commande peuvent fa
<?php }?>
</td>
</tr>
<?php endforeach;?>
<?php }?>
</tbody>
</table>
<?php endif;?>
<?php } else {?>
Aucun acte disponible.
<?php }?>
<?php };?>
</div>
</div>

18
application/views/default/scripts/pieces/bilans.phtml
View File

@ -33,9 +33,11 @@ Les éléments disponibles ci-dessous en téléchargement ou commande peuvent fa
<h2>Compte annuels</h2>
<div class="paragraph">
<?php if ($this->ErreurMessage):?>
<?=$this->ErreurMessage?>
<?php else:?>
<?php if ($this->ErreurMessage) {?>
<?=$this->ErreurMessage?>
<?php } else {?>
<?php if ( count($this->InfosBilans) > 0 ) {?>
<table class="greffe">
<thead>
<tr>
@ -45,7 +47,7 @@ Les éléments disponibles ci-dessous en téléchargement ou commande peuvent fa
</tr>
</thead>
<tbody>
<?php foreach($this->InfosBilans as $bilan):?>
<?php foreach($this->InfosBilans as $bilan) {?>
<?php
$style = '';
if ($bilan['mode']=='T' && $bilan['isFileExist'] && $this->ModeEdition) {
@ -91,10 +93,14 @@ Les éléments disponibles ci-dessous en téléchargement ou commande peuvent fa
<?php }?>
</td>
</tr>
<?php endforeach;?>
<?php }?>
</tbody>
</table>
<?php endif;?>
<?php } else {?>
Aucun bilan disponible.
<?php }?>
<?php }?>
</div>
</div>