From 157dd4be378b9a6ca4f5634d680f4098051b88e6 Mon Sep 17 00:00:00 2001 From: Damien LASSERRE Date: Thu, 7 Apr 2011 15:26:55 +0000 Subject: [PATCH] Modification de giant Le 7 Avril 2011 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PatchNote : Création de quelques fonctions ajax pour les chargement + modification de la base de donnée. --- includes/dbmodels/giantclient/rapport.php | 1 + includes/dbmodels/giantclient/rapport.sql | 3 +- includes/giant/Config.php | 3 ++ includes/giant/RapportGiant.php | 35 ++++++++------- .../templates/GiantCommandeRapport.tpl.php | 17 +++++-- www/css/giant.css | 37 +++++++++++++++ www/img/icones/loading11.gif | Bin 0 -> 10819 bytes www/includejs.php | 4 +- www/js/giant.js | 19 +++++++- www/pages/giant/Config/LabelConfiguration.ini | 42 ++++++++++++++---- 10 files changed, 128 insertions(+), 33 deletions(-) create mode 100644 www/img/icones/loading11.gif diff --git a/includes/dbmodels/giantclient/rapport.php b/includes/dbmodels/giantclient/rapport.php index 14ec7cfb0..7e11d45c7 100644 --- a/includes/dbmodels/giantclient/rapport.php +++ b/includes/dbmodels/giantclient/rapport.php @@ -10,5 +10,6 @@ Class rapport extends Doctrine_Record $this->hasColumn('DataSetType', 'varchar', 50, array('notnull' => true)); $this->hasColumn('UrlObjectRapportFile', 'blob', null, array('notnull'=> true)); $this->hasColumn('DateTimeSave', 'date', null, array('notnull'=> true)); + $this->hasColumn('Delivred', 'bool', null, array('notnull'=> true)); } } \ No newline at end of file diff --git a/includes/dbmodels/giantclient/rapport.sql b/includes/dbmodels/giantclient/rapport.sql index a3cc92669..a5c13c39b 100644 --- a/includes/dbmodels/giantclient/rapport.sql +++ b/includes/dbmodels/giantclient/rapport.sql @@ -3,5 +3,6 @@ CREATE TABLE IF NOT EXISTS rapport ( CompanyId int COLLATE utf8_unicode_ci NOT NULL, DataSetType varchar(50) NOT NULL, UrlObjectRapportFile varchar(255) NOT NULL, - DateTimeSave date NOT NULL + DateTimeSave date NOT NULL, + Delivred boolean NOT NULL )ENGINE = MYISAM; diff --git a/includes/giant/Config.php b/includes/giant/Config.php index 9d787c8fb..e557cb69b 100644 --- a/includes/giant/Config.php +++ b/includes/giant/Config.php @@ -26,6 +26,9 @@ define ('GIANT_CREDIT_PASS','ClaudeMonet'); define('NUM_ROWS', $_SESSION['tabInfo']['nbReponses']); define('MAX_ROWS', 200); +//Permet de definir le temps de sauvegarde des rapports ! ce compte en jours ! +define('_LIMIT_DATE_RAPPORT_', 30); + require_once (realpath(dirname(__FILE__)).'/modulesGiants/ClassWsdl/CreditDataPortType/IncludedFiles.php'); require_once (realpath(dirname(__FILE__)).'/modulesGiants/ClassWsdl/CreditDataPortType.php'); require_once (realpath(dirname(__FILE__)).'/modulesGiants/ClassWsdl/SearchPortType/IncludedFiles.php'); diff --git a/includes/giant/RapportGiant.php b/includes/giant/RapportGiant.php index f78ff46f4..e601409c1 100644 --- a/includes/giant/RapportGiant.php +++ b/includes/giant/RapportGiant.php @@ -8,7 +8,7 @@ require_once (realpath(dirname(__FILE__)).'/Client.php'); require_once (realpath(dirname(__FILE__)).'/modulesGiants/Functions.php'); require_once ('dbbootstrap.php'); -set_time_limit(60); +set_time_limit(100); setDbConn('giantclient'); $OrderExists = Doctrine_Query::create() @@ -18,8 +18,19 @@ $OrderExists = Doctrine_Query::create() ->andWhere('DataSetType ="'.$_GET['type'].'"') ->fetchOne(); $InternalOrderId = $OrderExists->InternalOrderId; - -if (empty($InternalOrderId)) + +$rapportExists = Doctrine_Query::create() + ->select('CompanyId, UrlObjectRapportFile, DateTimeSave') + ->from('rapport') + ->where('CompanyId = '. $_GET['company']) + ->andWhere('DataSetType = "'. $_GET['type'].'"') + ->fetchOne(); + +$dateTime = new DateTime(); +$dateTimeBDD = new DateTime($rapportExists->DateTimeSave); +$daysOfRapport = $dateTime->diff($dateTimeBDD); + +if (!file_exists($rapportExists->UrlObjectRapportFile)) { $soap_client = getClient($_GET['pays'], 'OrderDataSet'); $OrderDataSet = new CreditDataPortType(); @@ -45,23 +56,13 @@ if (empty($InternalOrderId)) $request->OrderDateTime = $informations->Order->OrderDateTime; $request->save(); $InternalOrderId = $informations->Order->InternalOrderId; -} -$rapportExists = Doctrine_Query::create() - ->select('CompanyId, UrlObjectRapportFile') - ->from('rapport') - ->where('CompanyId = '. $_GET['company']) - ->andWhere('DataSetType = "'. $_GET['type'].'"') - ->fetchOne(); - -if (empty($rapportExists->CompanyId)) { - $nameFileRapport = 'rapport-'.date('Y-m-d').'-'.$_GET['pays'].'-'.$_GET['company'].'-'.$_GET['type']; $soap_client2 = getClient($_GET['pays'], 'RetrieveDataSet'); $RetrieveDataSet = new CreditDataPortType(); $params = $RetrieveDataSet->RetrieveDataSet(); - + $params->RetrieveDataSet->InternalOrderId = $InternalOrderId; $rapport = SwitchWSDLFunction('RetrieveDataSet', $params->RetrieveDataSet, $soap_client2); @@ -70,11 +71,11 @@ if (empty($rapportExists->CompanyId)) { $saveRapport->CompanyId = $_GET['company']; $saveRapport->DataSetType = $_GET['type']; $saveRapport->UrlObjectRapportFile = $directory.$nameFileRapport; - (file_put_contents($directory.$nameFileRapport, serialize($rapport->DataSet))) ? true : EXIT_FAILURE; + (file_put_contents($directory.$nameFileRapport, serialize($rapport->DataSet))) ? + $saveRapport->Delivred = true : $saveRapport->Delivred = EXIT_FAILURE; $saveRapport->DateTimeSave = date('Y-m-d'); $saveRapport->save(); $rapport = $rapport->DataSet; -} else { +} else ($rapport = unserialize(file_get_contents($rapportExists->UrlObjectRapportFile))) ? true : EXIT_FAILURE; -} ?> \ No newline at end of file diff --git a/includes/giant/templates/GiantCommandeRapport.tpl.php b/includes/giant/templates/GiantCommandeRapport.tpl.php index 0987962e8..cd3e7793e 100644 --- a/includes/giant/templates/GiantCommandeRapport.tpl.php +++ b/includes/giant/templates/GiantCommandeRapport.tpl.php @@ -1,3 +1,10 @@ + +   - + DataSetType->_;?> @@ -24,18 +33,20 @@ foreach($DataSetOptions as $params) ?> - + "> Consulter le rapport en immédiat. + + \ No newline at end of file diff --git a/www/css/giant.css b/www/css/giant.css index cf141e019..8cc918e89 100644 --- a/www/css/giant.css +++ b/www/css/giant.css @@ -1,5 +1,42 @@ @CHARSET "ISO-8859-1"; +/* Barre de progression JQuery */ + + /* progress bar container */ + #progressbar + { + border:1px solid black; + width:200px; + height:20px; + position:relative; + color:black; + } + /* color bar */ + #progressbar div.progress + { + position:absolute; + width:0; + height:100%; + overflow:hidden; + background-color:#369; + } + /* text on bar */ + #progressbar div.progress .text + { + position:absolute; + text-align:center; + color:white; + } + /* text off bar */ + #progressbar div.text + { + position:absolute; + width:100%; + height:100%; + text-align:center; + } +/* Fin Barre de progression JQuery */ + /* Gestion du template PaymentBehaviourGiant */ .PaymentBehaviourGiant { diff --git a/www/img/icones/loading11.gif b/www/img/icones/loading11.gif new file mode 100644 index 0000000000000000000000000000000000000000..47adbf03dafbdabb57e1c1dbf8633d0347f66956 GIT binary patch literal 10819 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 g|2k@-t6V^D=-lN;QH?)nSWpZ53kcXZ~y=R literal 0 HcmV?d00001 diff --git a/www/includejs.php b/www/includejs.php index 9bdaa724d..36fcefab2 100644 --- a/www/includejs.php +++ b/www/includejs.php @@ -60,8 +60,8 @@ $tabScripts = array( 'pages' => array('liasse'), ), 'script_giant' => array( - 'list' => array('giant.js'), - 'pages' => array('RapportGiant') + 'list' => array('jqueryprogressbar.js', 'giant.js'), + 'pages' => array('RapportGiant', 'GiantIdentiteSociete') ), ); ?> \ No newline at end of file diff --git a/www/js/giant.js b/www/js/giant.js index 24f8ee3f2..e37f82973 100644 --- a/www/js/giant.js +++ b/www/js/giant.js @@ -1,7 +1,17 @@ +var pct=0; + var handle=0; + function update(){ + $("#progressbar").reportprogress(++pct); + if(pct == 500) + pct=0; + } + $(document).ready(function(){ - $('.idpr').live('click', function(e){ - e.preventDefault(); + $('.idpr').live('click', function(){ + //e.preventDefault(); var n = $(this).attr('id'); + + $('#'+n).css('display', 'none'); if ($('#p'+n).css('display')=='none'){ $('#p'+n).css('display', 'block'); } else { @@ -19,5 +29,10 @@ $(document).ready(function(){ tooltip: 'topMiddle' } } }); }); + + $("#run").click(function(){ + handle = setInterval("update()",400); + //clearInterval(handle); + }); }); diff --git a/www/pages/giant/Config/LabelConfiguration.ini b/www/pages/giant/Config/LabelConfiguration.ini index b52e1380a..b3ce16d37 100644 --- a/www/pages/giant/Config/LabelConfiguration.ini +++ b/www/pages/giant/Config/LabelConfiguration.ini @@ -14,20 +14,46 @@ CompanyWebSite = "" CompanyEmail = "" +[Section_rapport] + DesciptionLanguage = "" + FullDescription = " + + Information sur le rapport + + + + + + + +
Ce rapport est composés en plusieurs parties
+
    +
  1. Identite et raison sociale
  2. +
  3. CreditRecommandation
  4. +
  5. Dirigeants
  6. +
  7. Les Bilans (actifs, Passifs, Compte de résultats)
  8. +
  9. Les Etablissements financiés
  10. +
  11. Comportement de paiement
  12. +
  13. Les partenaires financiés
  14. +
  15. Les actionnaires
  16. +
  17. Les annonces légales
  18. +
  19. Le Score
  20. +
+
" + CompactDescription = "" + rapportDescription = "" + +[Section_rapportTitre] + Dirigeants = "" + IdentiteDeLentreprise = "" + ElementsFinancies = "" + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Fiche de rapport ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -[Section_rapport] - RapportType = "" - DesciptionLanguage = "" - -[Section_rapportTitre] - Dirigeants = "" - IdentiteDeLentreprise = "" - ElementsFinancies = "" [Section_rapportCreditRecommendation] CreditRecommendation = ""