From cd087eea83129f1d9e05838d838a1495f35a72b4 Mon Sep 17 00:00:00 2001 From: Damien LASSERRE Date: Mon, 5 Sep 2011 14:31:19 +0000 Subject: [PATCH] Mise a jours de giant majeur de giant ! --- application/controllers/GiantController.php | 13 ++++--------- application/controllers/PrintController.php | 3 +++ .../views/default/scripts/giant/full.phtml | 18 ++++++++++++++++++ .../views/default/scripts/giant/identite.phtml | 2 +- .../views/default/scripts/giant/rapport.phtml | 14 -------------- library/Scores/PagePrint.php | 2 ++ 6 files changed, 28 insertions(+), 24 deletions(-) delete mode 100644 application/views/default/scripts/giant/rapport.phtml diff --git a/application/controllers/GiantController.php b/application/controllers/GiantController.php index af73b4ea3..1b83c6b8e 100644 --- a/application/controllers/GiantController.php +++ b/application/controllers/GiantController.php @@ -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; diff --git a/application/controllers/PrintController.php b/application/controllers/PrintController.php index e6daf718e..ff8e30564 100644 --- a/application/controllers/PrintController.php +++ b/application/controllers/PrintController.php @@ -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; diff --git a/application/views/default/scripts/giant/full.phtml b/application/views/default/scripts/giant/full.phtml index 4c5182252..eb274c0fb 100644 --- a/application/views/default/scripts/giant/full.phtml +++ b/application/views/default/scripts/giant/full.phtml @@ -1,20 +1,38 @@

1. Informations d'entreprise générales

+
partial('giant/partials/rapports/InformationEntreprise.phtml', null, array('report' => $this->report, 'carte' => $this->carte)); ?> +

2. Avis de crédit

+
partial('giant/partials/rapports/AvisDeCredit.phtml', null, array('report' => $this->report)); ?> +

3. Compte Annuels

+
partial('giant/partials/rapports/ComptesAnnuels.phtml', null, array('report' => $this->report)); ?> +

4. Position financiére

+
partial('giant/partials/rapports/PositionFinanciere.phtml', null, array('report' => $this->report)); ?> +

5. Comportement de paiement

+
partial('giant/partials/rapports/ComportementDePaiement.phtml', null, array('report' => $this->report)); ?> +

6. Structure de l'entreprise

+
partial('giant/partials/rapports/StructureEntreprise.phtml', null, array('report' => $this->report)); ?> +

7. Dirigeants

+
partial('giant/partials/rapports/Dirigeant.phtml', null, array('report' => $this->report)); ?> +

8. Comparaison avec valeurs similaires

+
partial('giant/partials/rapports/ComparaisonValeurs.phtml', null, array('report' => $this->report)); ?> +

9. Historiques

+
partial('giant/partials/rapports/Historiques.phtml', null, array('report' => $this->report)); ?> +
\ No newline at end of file diff --git a/application/views/default/scripts/giant/identite.phtml b/application/views/default/scripts/giant/identite.phtml index 5af7a61d1..ea5785e39 100644 --- a/application/views/default/scripts/giant/identite.phtml +++ b/application/views/default/scripts/giant/identite.phtml @@ -59,7 +59,7 @@ - Consulter le rapport en immédiat + Consulter le rapport en immédiat diff --git a/application/views/default/scripts/giant/rapport.phtml b/application/views/default/scripts/giant/rapport.phtml deleted file mode 100644 index 349dc38b5..000000000 --- a/application/views/default/scripts/giant/rapport.phtml +++ /dev/null @@ -1,14 +0,0 @@ -
-

Fiche

- 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; - } ?> -
\ No newline at end of file diff --git a/library/Scores/PagePrint.php b/library/Scores/PagePrint.php index 0caca9046..961c50eed 100644 --- a/library/Scores/PagePrint.php +++ b/library/Scores/PagePrint.php @@ -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(