From b74dee239a181a0b421f927d2d61dab44562d4fa Mon Sep 17 00:00:00 2001 From: Arman KYOKCHAN Date: Wed, 18 Sep 2013 12:49:04 +0000 Subject: [PATCH] issue #0001719: config params to giant.ini --- .../rapports/ComportementDePaiement.phtml | 10 +++++----- .../giant/partials/rapports/Dirigeant.phtml | 15 +++++++++----- .../giant/partials/rapports/Historiques.phtml | 2 +- .../rapports/InformationEntreprise.phtml | 12 +++++------ .../rapports/PositionFinanciere.phtml | 4 ++-- .../rapports/StructureEntreprise.phtml | 20 +++++++++---------- library/Giant/WSgiant.php | 2 -- public/themes/default/styles/giant.css | 6 +++--- 8 files changed, 37 insertions(+), 34 deletions(-) diff --git a/application/views/default/scripts/giant/partials/rapports/ComportementDePaiement.phtml b/application/views/default/scripts/giant/partials/rapports/ComportementDePaiement.phtml index 6b8eef56a..9eb9d5745 100644 --- a/application/views/default/scripts/giant/partials/rapports/ComportementDePaiement.phtml +++ b/application/views/default/scripts/giant/partials/rapports/ComportementDePaiement.phtml @@ -1,7 +1,7 @@
report->PaymentBehaviour)):?> report->ComportementPaiement)):?> - Analyse par année

+ Analyse par année

report->ComportementPaiement as $dates => $valeurs):?> @@ -27,13 +27,13 @@

- Graphique Analyse par année

+ Graphique Analyse par année


- Qualification de paiement

+ Qualification de paiement

@@ -60,7 +60,7 @@
- Analyse par sommes

+ Analyse par sommes

report->ByAmount)):?>
PaymentQualification
report->ByAmount as $sommes => $valeurs):?> @@ -88,7 +88,7 @@
- Graphique Analyse par année
+ Graphique Analyse par année
diff --git a/application/views/default/scripts/giant/partials/rapports/Dirigeant.phtml b/application/views/default/scripts/giant/partials/rapports/Dirigeant.phtml index a22ed17d1..d836531b8 100644 --- a/application/views/default/scripts/giant/partials/rapports/Dirigeant.phtml +++ b/application/views/default/scripts/giant/partials/rapports/Dirigeant.phtml @@ -1,21 +1,26 @@
- Dirigeants

+ Dirigeants

report->Dirigeant)):?>
report->Dirigeant as $Dirigeants):?> + $Dirigeant):?> - + - + - diff --git a/application/views/default/scripts/giant/partials/rapports/Historiques.phtml b/application/views/default/scripts/giant/partials/rapports/Historiques.phtml index 529a6fc0f..488f3db8d 100644 --- a/application/views/default/scripts/giant/partials/rapports/Historiques.phtml +++ b/application/views/default/scripts/giant/partials/rapports/Historiques.phtml @@ -2,7 +2,7 @@ report->Event)):?> report->Event as $name => $Events):?> -

+



style="font-size:12px;padding:5px;">FirstName.' '.$dir->LastName.' Né(e) le: '.((!empty($dir->DateOfBirth->_))?$this->dateFunction->dateT('Ymd', 'd/m/Y', $dir->DateOfBirth->_):'NC').' Domicilié(e) à :'. - (($dir->PersonalAddress->HouseNumber!=0)?$dir->PersonalAddress->HouseNumber:'').' '.$dir->PersonalAddress->Street.' '.(($dir->PersonalAddress->PostCode!=0)?$dir->PersonalAddress->PostCode:'NC').' '.$dir->PersonalAddress->City;?> + FirstName.' '.$dir->LastName.' +
Né(e) le: '.((!empty($dir->DateOfBirth->_))?$this->dateFunction->dateT('Ymd', 'd/m/Y', $dir->DateOfBirth->_):'NC'). + '
Domicilié(e) à :'.(($dir->PersonalAddress->HouseNumber!=0)?$dir->PersonalAddress->HouseNumber:''). + ' '.$dir->PersonalAddress->Street. + ' '.(($dir->PersonalAddress->PostCode!=0)?$dir->PersonalAddress->PostCode:'NC'). + ' '.$dir->PersonalAddress->City;?>
@@ -73,7 +73,7 @@
report->Employees)):?> - Personnel

+ Personnel

Code
@@ -82,7 +82,7 @@ report->Employees as $year => $employees): ?> - + @@ -95,7 +95,7 @@
report->ProductName)):?> - Noms de produit

+ Noms de produit

Année
dateFunction->dateT('Ymd', 'd/m/Y', $year);?>dateFunction->dateT('Ymd', 'd/m/Y', $year);?>
diff --git a/application/views/default/scripts/giant/partials/rapports/PositionFinanciere.phtml b/application/views/default/scripts/giant/partials/rapports/PositionFinanciere.phtml index d4da3308f..e543fc20d 100644 --- a/application/views/default/scripts/giant/partials/rapports/PositionFinanciere.phtml +++ b/application/views/default/scripts/giant/partials/rapports/PositionFinanciere.phtml @@ -1,7 +1,7 @@
report->FinancialSummary)):?> - Informations Capital
+ Informations Capital
report->PositionFinanciere)):?>
Source
@@ -38,7 +38,7 @@ Evolution du capital

- Relation banquaires

+ Relation banquaires

report->Bank)):?>
diff --git a/application/views/default/scripts/giant/partials/rapports/StructureEntreprise.phtml b/application/views/default/scripts/giant/partials/rapports/StructureEntreprise.phtml index 62ec92177..e472227d2 100644 --- a/application/views/default/scripts/giant/partials/rapports/StructureEntreprise.phtml +++ b/application/views/default/scripts/giant/partials/rapports/StructureEntreprise.phtml @@ -1,9 +1,9 @@
report->Associated)):?> - Actionnaires

+ Actionnaires

report->Shareholder)):?> -
+
@@ -11,7 +11,7 @@ - + report->Shareholder as $Shareholder):$i++;?> @@ -21,7 +21,7 @@ - +
Identifiant Nom sociétéIsPrincipalStakeHolder
IsPrincipalStakeHolder == 1)?'Oui':'Non');?>
@@ -34,7 +34,7 @@
- Participations

+ Participations

report->Participation)):?> @@ -43,7 +43,7 @@ - + report->Participation as $Participation):$i++;?> @@ -52,7 +52,7 @@ - +
Pourcentage d'actions
Shares->Percentage))?$Participation->Shares->Percentage.'%':'NC';?>
@@ -65,7 +65,7 @@
- Etablissements

+ Etablissements

report->Branch)):?> @@ -74,7 +74,7 @@ - + report->Branch as $Branch):$i++;?> @@ -86,7 +86,7 @@ $Branch->BranchAddress[0]->City:'-')?> - +
Adresse
diff --git a/library/Giant/WSgiant.php b/library/Giant/WSgiant.php index c06c1558c..5c8754dd1 100644 --- a/library/Giant/WSgiant.php +++ b/library/Giant/WSgiant.php @@ -33,7 +33,6 @@ class WSgiant extends Zend_Soap_Client 'compression' => SOAP_COMPRESSION_ACCEPT ); $this->setOptions($options); - print_r($options); $giantHeader = new stdClass(); $giantHeader->ConsumerId = $this->wsService->header->ConsumerId; $giantHeader->CustomerId = $utilisateur->getLogin(); @@ -60,7 +59,6 @@ class WSgiant extends Zend_Soap_Client { $wsdl = 'wsdl'.$this->TestIndication; $this->setWsdl($this->wsService->$service->$wsdl); - print_r($this->wsService->$service->$wsdl); return ($this); } } diff --git a/public/themes/default/styles/giant.css b/public/themes/default/styles/giant.css index e8fc9924a..a9e606db7 100644 --- a/public/themes/default/styles/giant.css +++ b/public/themes/default/styles/giant.css @@ -16,9 +16,9 @@ font-size: 13px; } -.compteAnnuels .title { +.title { font-size: 16px; - color: #00008C; + color: #2599E7; font-weight: 800; } @@ -60,7 +60,7 @@ #ComparisonValeurs span { font-size: 16px; - color: #00008C; + color: #2599E7; font-weight: 800; }