Mise a jours de giant majeur de giant !

This commit is contained in:
Damien LASSERRE 2011-09-05 14:31:19 +00:00
parent 07f5b30600
commit cd087eea83
6 changed files with 28 additions and 24 deletions

View File

@ -76,7 +76,7 @@ class GiantController extends Zend_Controller_Action
$this->view->soap = $ListeRapport->soapG;
}
public function commandesAction()
public function fullAction()
{
$Utilisateur = new Utilisateur();
$Commande = new Commandes();
@ -103,16 +103,11 @@ class GiantController extends Zend_Controller_Action
if(!$Commande->getCommandeExistToday($CommandeP->login, $CommandeP->date, $CommandeP->rapportId, $CommandeP->typeReport, $CommandeP->pays)) {
$Commande->setCommandes($CommandeP);
}
$this->_forward(lcfirst($this->getRequest()->getParam('Type')), 'giant', null, array('idRapport' => $id, 'Pays' => $this->getRequest()->getParam('Pays')));
}
public function fullAction()
{
$fullAction = array('getAvisDeCredit' => 'CreditRecommendation', 'getComptesAnnuels' => 'AnnualAccounts', 'getPositionFinanciere' => 'FinancialSummary',
'getComportementPaiement' => 'PaymentBehaviour', 'getStructureEntreprise' => 'Associated', 'getDirigeant' => 'Position',
'getComportementPaiement' => 'PaymentBehaviour', 'getStructureEntreprise' => 'Associated', 'getDirigeant' => 'Position',
'getComparaisonValeurs'=> 'PeerGroup', 'getHistoriques' => 'Event'
);
$full = unserialize(base64_decode($this->getRequest()->getParam('idRapport')));
$full = unserialize(base64_decode($id));
$identiteController = new GiantIdentiteController($full);
$giantConstroller = new GiantControllerLib($this->getRequest()->getParam('CompanyId'));
$identiteController->ficheAction();
@ -124,7 +119,7 @@ class GiantController extends Zend_Controller_Action
}
$fiche = $giantConstroller->getInformationGenerale($full);
$this->view->carte = $this->getRequest()->getParam('Pays');
$this->view->reportType = $this->getRequest()->getParam('Type');
$this->view->report = $fiche;

View File

@ -64,6 +64,9 @@ class PrintController extends Zend_Controller_Action
$params['siret'] = $elements[2];
$params['id'] = $elements[3];
break;
case 'giant':
$params['idRapport'] = $element[2];
break;
default:
return false;
break;

View File

@ -1,20 +1,38 @@
<div id="center">
<h2>1. Informations d'entreprise générales</h2>
<div id="break">
<?php echo $this->partial('giant/partials/rapports/InformationEntreprise.phtml', null, array('report' => $this->report, 'carte' => $this->carte)); ?>
</div>
<h2>2. Avis de crédit</h2>
<div id="break">
<?php echo $this->partial('giant/partials/rapports/AvisDeCredit.phtml', null, array('report' => $this->report)); ?>
</div>
<h2>3. Compte Annuels</h2>
<div id="break">
<?php echo $this->partial('giant/partials/rapports/ComptesAnnuels.phtml', null, array('report' => $this->report)); ?>
</div>
<h2>4. Position financiére</h2>
<div id="break">
<?php echo $this->partial('giant/partials/rapports/PositionFinanciere.phtml', null, array('report' => $this->report)); ?>
</div>
<h2>5. Comportement de paiement</h2>
<div id="break">
<?php echo $this->partial('giant/partials/rapports/ComportementDePaiement.phtml', null, array('report' => $this->report)); ?>
</div>
<h2>6. Structure de l'entreprise</h2>
<div id="break">
<?php echo $this->partial('giant/partials/rapports/StructureEntreprise.phtml', null, array('report' => $this->report)); ?>
</div>
<h2>7. Dirigeants</h2>
<div id="break">
<?php echo $this->partial('giant/partials/rapports/Dirigeant.phtml', null, array('report' => $this->report)); ?>
</div>
<h2>8. Comparaison avec valeurs similaires</h2>
<div id="break">
<?php echo $this->partial('giant/partials/rapports/ComparaisonValeurs.phtml', null, array('report' => $this->report)); ?>
</div>
<h2>9. Historiques</h2>
<div id="break">
<?php echo $this->partial('giant/partials/rapports/Historiques.phtml', null, array('report' => $this->report)); ?>
</div>
</div>

View File

@ -59,7 +59,7 @@
<?php endforeach;?>
</td>
<td class="StyleInfoData" width="300px">
<a id="r<?php echo $i?>" class="idpr" href="/giant/commandes/Pays/<?php echo $this->Pays; ?>/Type/<?php echo $rapport->DataSetType->_?>/CompanyId/<?php echo $this->CompanyId;?>/Language/en<?php //echo $language;?>" >Consulter le rapport en immédiat</a>
<a id="r<?php echo $i?>" class="idpr" href="/giant/full/Pays/<?php echo $this->Pays; ?>/Type/<?php echo $rapport->DataSetType->_?>/CompanyId/<?php echo $this->CompanyId;?>/Language/en<?php //echo $language;?>" >Consulter le rapport en immédiat</a>
<div id="pr<?php echo $i?>" class="hide" style="display:none;">
<center><img style="padding-top:30%" src="/themes/default/images/giant/19-1.gif" /></center>
</div>

View File

@ -1,14 +0,0 @@
<div id="center">
<h1>Fiche</h1>
<?php switch($this->reportType) {
case 'Full':
echo $this->partial('giant/partials/rapports/full.phtml', null, array('report' => $this->fiche));
break;
case 'Compact':
echo $this->partial('giant/partials/rapports/compact.phtml', null, array('report' => $this->report));
break;
case 'CreditRecommendation':
echo $this->partial('giant/partials/rapports/creditrecommendation.phtml', null, array('report' => $this->report));
break;
} ?>
</div>

View File

@ -26,6 +26,7 @@ class PagePrint
'evaluation-indiscore2' => 'siret,id',
'evaluation-indiscore3' => 'siret,id',
'evaluation-scoring' => 'siret,id',
'giant-full' => 'Pays,Type,CompanyId',
);
protected $pagePDF = array(
@ -50,6 +51,7 @@ class PagePrint
'evaluation-indiscore2' => 'siret,id',
'evaluation-indiscore3' => 'siret,id',
'evaluation-scoring' => 'siret,id',
'giant-full' => 'Pays,Type,CompanyId',
);
protected $pageXML = array(