Try to solve loading of csv files

Changed also wdate from static to dynamic

application/controllers/AideController.php

@@ -35,6 +35,8 @@ class AideController extends Zend_Controller_Action
 	 */
 	public function newlisteAction()
 	{
+		$this->view->headTitle()->prepend('Nouveautés');
+
 		$request = $this->getRequest();
 
 		//Selection
@@ -66,7 +68,7 @@ class AideController extends Zend_Controller_Action
 				$identity->acceptationCGU = date('Y-m-d H:i:s');
 				$auth->getStorage()->write($identity);
 				//Redirect
-				$this->_redirect('/');
+				$this->redirect('/');
 			}
 		}
 	}

application/controllers/BdfController.php

@@ -1,11 +1,11 @@
 <?php
 class BdfController extends Zend_Controller_Action
 {
-	
+
 	public function indexAction()
 	{
 		$request = $this->getRequest();
-		
+
 		//Type de module
 		$module  = $request->getParam('module', '');
 		$siret   = $request->getParam('siret', '');
@@ -16,18 +16,18 @@ class BdfController extends Zend_Controller_Action
 		$rechet  = $request->getParam('rechet', '');
 		$ape     = $request->getParam('ape', '');
 		$service = $request->getParam('service', '');
-		
+
 		if ($siret != '' && $req != '' && substr($siret, 0, 9) != $req) {
 			$siret = '';
 		} else if (substr($siret, 0, 9) == $req || empty($req)) {
 			$req = substr($siret, 0, 9);
 		}
-		
+
 		if (is_array($module)){
 			$session = new Zend_Session_Namespace('BDF');
 			$session->module = $module;
 		}
-	
+
 		//Titre
 		$title = 'Banque De France - '.strtoupper($service);
 		if ($siret == '') {
@@ -35,30 +35,30 @@ class BdfController extends Zend_Controller_Action
 		} else {
 			$title .= substr($siren,0,9);
 		}
-		$this->view->headTitle()->append('Banque de France - '.$titre);
-		
-		
+		$this->view->headTitle()->prepend('Banque de France - '.$titre);
+
+
 		require_once 'Scores/Bdf.php';
 		$bdf = new BDF();
-		
+
 		$this->view->assign('siret', $siret);
 		$this->view->assign('req', $req);
 		$this->view->assign('module', $session->module);
-			
+
 		//Liste module FIBEN
 		$listModulesFiben = $bdf->bdf_modules_fiben();
 		$this->view->assign('listModulesFiben', $listModulesFiben);
-		
+
 		//Liste module FCC
 		$listModulesFcc = $bdf->bdf_modules_fcc();
 		$this->view->assign('listModulesFcc', $listModulesFcc);
 
 	}
-	
+
 	public function moduleAction()
 	{
 		$request = $this->getRequest();
-		
+
 		//Type de module
 		$module  = $request->getParam('bdfmodule', '');
 		$siret   = $request->getParam('siret', '');
@@ -69,20 +69,20 @@ class BdfController extends Zend_Controller_Action
 		$rechet  = $request->getParam('rechet', '');
 		$ape     = $request->getParam('ape', '');
 		$service = $request->getParam('service', '');
-		
+
 		if ($siret != '' && $req != '' && substr($siret, 0, 9) != $req) {
 			$siret = '';
 		} else if (substr($siret, 0, 9) == $req || empty($req)) {
 			$req = substr($siret, 0, 9);
 		}
-		
+
 		Zend_Registry::get('firebug')->info($module);
-		
+
 		$content = array();
-		
+
 		require_once 'Scores/Bdf.php';
 		$bdf = new BDF();
-		
+
 		//Mode multi module
 		if ($type=='u') {
 			if (is_array($module)) {
@@ -136,7 +136,7 @@ class BdfController extends Zend_Controller_Action
 		}
 		$this->view->assign('content', $content);
 	}
-	
+
 	public function module27Action()
 	{
 		$request = $this->getRequest();
@@ -144,7 +144,7 @@ class BdfController extends Zend_Controller_Action
 		$params['bdfmodule'] = array(27);
 		$this->_forward('module', null, null, $params);
 	}
-	
+
 	public function module28Action()
 	{
 		$request = $this->getRequest();
@@ -152,7 +152,7 @@ class BdfController extends Zend_Controller_Action
 		$params['bdfmodule'] = array(28);
 		$this->_forward('module', null, null, $params);
 	}
-	
+
 	public function module29Action()
 	{
 		$request = $this->getRequest();
@@ -160,7 +160,7 @@ class BdfController extends Zend_Controller_Action
 		$params['bdfmodule'] = array(29);
 		$this->_forward('module', null, null, $params);
 	}
-	
+
 	public function module40Action()
 	{
 		$request = $this->getRequest();
@@ -168,7 +168,7 @@ class BdfController extends Zend_Controller_Action
 		$params['bdfmodule'] = array(40);
 		$this->_forward('module', null, null, $params);
 	}
-	
+
 	public function module51Action()
 	{
 		$request = $this->getRequest();
@@ -176,6 +176,6 @@ class BdfController extends Zend_Controller_Action
 		$params['bdfmodule'] = array(51);
 		$this->_forward('module', null, null, $params);
 	}
-	
-	
+
+
 }

application/controllers/DashboardController.php

@@ -127,7 +127,6 @@ class DashboardController extends Zend_Controller_Action
 	public function init()
 	{
 		require_once 'Scores/WsScores.php';
-		require_once 'common/dates.php';
 	}
 
 	public function preDispatch()
@@ -435,7 +434,8 @@ class DashboardController extends Zend_Controller_Action
 											$document = 'DERNIER STATUS À JOUR';
 										} else {
 											$explodedRef = explode('-', $listCommandes[$i]->refDocument);
-											$dateref = WDate::dateT('Ymd','d/m/Y',$explodedRef[1]);
+											$date = new Zend_Date($explodedRef[1], 'yyyyMMdd');
+											$dateref = $date->toString('dd/MM/yyyy');
 											$depot = ', Dépôt n°'.$explodedRef[6].' au '.$dateref;
 											$document = $this->typeActes['a'.substr($listCommandes[$i]->refDocument,0,2)].$depot;
 										}
@@ -521,7 +521,7 @@ class DashboardController extends Zend_Controller_Action
 	}
 
 	/**
-	 * Affichage de la raison sociale à partir du siren
+	 * Affichage de la dénomination sociale à partir du siren
 	 */
 	public function rsAction()
 	{

application/controllers/DirigeantController.php

@@ -11,16 +11,6 @@ class DirigeantController extends Zend_Controller_Action
 		$this->id = $request->getParam('id', 0);
 
 		require_once 'Scores/WsScores.php';
-		require_once 'Scores/SessionEntreprise.php';
-		require_once 'common/dates.php';
-	}
-
-	/**
-	 * Forward
-	 */
-	public function indexAction()
-	{
-		$this->_forward('index', 'index');
 	}
 
 	/**
@@ -28,28 +18,36 @@ class DirigeantController extends Zend_Controller_Action
 	 */
 	public function listeAction()
 	{
+		$request = $this->getRequest();
+		$autrePage = $this->getRequest()->getParam('apage');
+
 		$siren = substr($this->siret, 0, 9);
 
-		$this->view->headTitle()->append('Liste des dirigeants');
-		$this->view->headTitle()->append('Siret '.$this->siret);
+		if (empty($autrePage)) {
+			$this->view->headTitle()->prepend('Liste des dirigeants');
+			$this->view->headTitle()->prepend('Siret '.$this->siret);
+		}
 
 		$ws = new WsScores();
 		$infos = $ws->getDirigeants($siren);
 
 		if ($infos === false){
-			$this->_forward('soap', 'error');
+			$this->forward('soap', 'error');
 		}
 
 		$dirigeants = $infos->result->item;
 
-		$session = new SessionEntreprise($this->siret, $this->id);
-
 		$user = new Scores_Utilisateur();
+		$session = new Scores_Session_Entreprise($this->siret, $this->id);
+
 		if ($user->checkPerm('dirigeantsop')){
 			$href = $this->view->url(array('controller'=>'dirigeant', 'action'=>'op', 'siret'=>$this->siret));
 			$this->view->assign('dirigeantsop', $href);
 		}
 
+		$this->view->assign('edition', $user->checkModeEdition());
+		$this->view->assign('accessWorldCheck', $user->checkPerm('WORLDCHECK'));
+
 		$this->view->assign('siren', $siren);
 		$this->view->assign('siret', $this->siret);
 		$this->view->assign('raisonSociale', $session->getRaisonSociale());
@@ -67,8 +65,8 @@ class DirigeantController extends Zend_Controller_Action
 	{
 		$siren = substr($this->siret, 0, 9);
 
-		$this->view->headTitle()->append('Historique des dirigeants');
-		$this->view->headTitle()->append('Siret '.$this->siret);
+		$this->view->headTitle()->prepend('Historique des dirigeants');
+		$this->view->headTitle()->prepend('Siret '.$this->siret);
 
 		$ws = new WsScores();
 		$infos = $ws->getDirigeants($siren, true);
@@ -79,7 +77,7 @@ class DirigeantController extends Zend_Controller_Action
 
 		$dirigeants = $infos->result->item;
 
-		$session = new SessionEntreprise($this->siret, $this->id);
+		$session = new Scores_Session_Entreprise($this->siret, $this->id);
 
 		$this->view->assign('dirigeants', $dirigeants);
 		$this->view->assign('exportObjet', $dirigeants);
@@ -96,8 +94,8 @@ class DirigeantController extends Zend_Controller_Action
 	{
 		$siren = substr($this->siret, 0, 9);
 
-		$this->view->headTitle()->append('Liste des dirigeants opérationnels');
-		$this->view->headTitle()->append('Siret '.$this->siret);
+		$this->view->headTitle()->prepend('Liste des dirigeants opérationnels');
+		$this->view->headTitle()->prepend('Siret '.$this->siret);
 
 		$ws = new WsScores();
 		$infos = $ws->getDirigeantsOp($siren);
@@ -108,7 +106,7 @@ class DirigeantController extends Zend_Controller_Action
 
 		$dirigeants = $infos->item;
 
-		$session = new SessionEntreprise($this->siret, $this->id);
+		$session = new Scores_Session_Entreprise($this->siret, $this->id);
 
 		$this->view->assign('siren', $siren);
 		$this->view->assign('siret', $this->siret);

application/controllers/ErrorController.php

@@ -51,8 +51,7 @@ class ErrorController extends Zend_Controller_Action
     	        $message.= "Referer : ".$_SERVER['HTTP_REFERER']."\n";
 
     	        $c = Zend_Registry::get('config');
-    	        require_once 'Scores/Mail.php';
-    	        $mail = new Mail();
+    	        $mail = new Scores_Mail();
     	        $mail->setSubject('[ERREUR APPLICATIVE] - '.$c->profil->server->name.' -'.date('Ymd'));
     	        $mail->setBodyTexte($message);
     	        $mail->setFrom('supportdev');

application/controllers/EvaluationController.php

@@ -10,16 +10,13 @@ class EvaluationController extends Zend_Controller_Action
 		$this->siret = $request->getParam('siret');
 		$this->id = $request->getParam('id', 0);
 
-		require_once 'common/dates.php';
 		require_once 'Scores/WsScores.php';
-		require_once 'Scores/SessionEntreprise.php';
 		require_once 'Scores/IdentiteEntreprise.php';
-		require_once 'Finance/RatiosData.php';
     }
 
     public function indexAction()
     {
-    	$this->_forward('entreprise', 'recherche');
+    	$this->forward('entreprise', 'recherche');
     }
 
 	/**
@@ -64,10 +61,9 @@ class EvaluationController extends Zend_Controller_Action
 	 */
     public function indiscoreAction()
     {
-        $user    = new Scores_Utilisateur();
-
+        $user = new Scores_Utilisateur();
 	    if(!$user->checkPerm('INDISCORE') && !$user->checkPerm('INDISCOREP'))
-	        $this->_forward('perms', 'error');
+	        $this->forward('perms', 'error');
 
 	    $this->view->assign('edition', $user->checkModeEdition());
 
@@ -76,6 +72,8 @@ class EvaluationController extends Zend_Controller_Action
 
         //Récupération des informations
         if (empty($autrePage)) {
+        	$this->view->headTitle()->prepend('IndiScore');
+        	$this->view->headTitle()->prepend('Siret '.$this->siret);
         	$plus = false;
         	if ($user->checkPerm('indiscorep')){
         		$plus = true;
@@ -86,7 +84,7 @@ class EvaluationController extends Zend_Controller_Action
 
         	$ws = new WsScores();
         	$infos = $ws->getIndiScore(substr($this->siret, 0,9), 0, 1, $plus, $ref, $encours, $email);
-        	if ($infos === false) $this->_forward('soap', 'error');
+        	if ($infos === false) $this->forward('soap', 'error');
         } else {
         	$infos = $this->getRequest()->getParam('infos');
         }
@@ -106,16 +104,17 @@ class EvaluationController extends Zend_Controller_Action
     public function indiscore2Action()
     {
         $this->view->headScript()->appendFile('/themes/default/scripts/finance.js', 'text/javascript');
+        $this->view->headTitle()->prepend("Rapport de synthèse");
+        $this->view->headTitle()->prepend("Siret ".$this->siret);
 
         $user = new Scores_Utilisateur();
-
         if(!$user->checkPerm('INDISCORE2') && !$user->checkPerm('INDISCORE2P'))
-	        $this->_forward('perms', 'error');
+	        $this->forward('perms', 'error');
 
 		$siren 			= substr($this->siret,0,9);
 
 	    $ws             = new WsScores();
-        $entreprise     = new SessionEntreprise($this->siret, $this->id);
+        $entreprise     = new Scores_Session_Entreprise($this->siret, $this->id);
         $identite		= $ws->getIdentite($siren);
         $indiscore      = $ws->getIndiScore($siren);
         $infos			= $ws->getRatios($siren, 'indiscore2'); // @todo : vérifier la page
@@ -135,7 +134,7 @@ class EvaluationController extends Zend_Controller_Action
 
         //Formattage des données
         $typeBilan = 'N';
-        $ratiosData = new RatiosData($infos);
+        $ratiosData = new Scores_Finance_Ratios_Data($infos);
 
         $nbBilanN = $ratiosData->getNbBilan('N');
         $nbBilanC = $ratiosData->getNbBilan('C');
@@ -165,8 +164,9 @@ class EvaluationController extends Zend_Controller_Action
         			$dataTotal[$idRatio] = $ratiosData->dTotal($typeBilan, $annee,  $idRatio, $valRatio['total']);
         			$dInfo[$idRatio] = $valRatio['total_info'];
         		}
+        		$date = new Zend_Date($annee, 'yyyyMMdd');
         		$tabResult[] = array(
-        			'dateCloture' 	=> WDate::dateT('Ymd','d/m/Y',$annee),
+        			'dateCloture' 	=> $date->toString('dd/MM/yyyy'),
         			'duree' 		=> $infosAnnee[$annee]->duree.' Mois',
         			'ratio' 		=> $data,
         			'total' 		=> $dataTotal,
@@ -217,9 +217,10 @@ class EvaluationController extends Zend_Controller_Action
 		$this->view->assign('dBlock', $dBlock);
 
 	    $dateRadiation = '';
-        if(isset($indiscore->DateRadiation) && $indiscore->DateRadiation!='' && $indiscore->DateRadiation!='0000-00-00')
-        	$this->view->assign('dateRadiation', WDate::dateT('Ymd', 'd/m/Y', str_replace('-','',$indiscore->DateRadiation)));
-
+        if(isset($indiscore->DateRadiation) && $indiscore->DateRadiation!='' && $indiscore->DateRadiation!='0000-00-00') {
+        	$date = new Zend_Date(str_replace('-','',$indiscore->DateRadiation), 'yyyyMMdd');
+        	$this->view->assign('dateRadiation', $date->toString('dd/MM/yyyy'));
+        }
         foreach($indiscore->scores as $name => $sc){
             if($name == 'ConanH')
                 $score[$name] = array($sc, 'Score Conan Holder');
@@ -242,8 +243,6 @@ class EvaluationController extends Zend_Controller_Action
 				break;
 		}
 
-        $score['Indiscore'] = array($indiscore->Indiscore20, 'IndiScore');
-
         $this->view->assign('siret', $this->siret);
         $this->view->assign('id', $this->id);
         $this->view->assign('siren', $siren);
@@ -264,10 +263,12 @@ class EvaluationController extends Zend_Controller_Action
     public function indiscore3Action()
     {
         $this->view->headScript()->appendFile('/themes/default/scripts/evaluation.js', 'text/javascript');
+        $this->view->headTitle()->prepend("Rapport complet");
+        $this->view->headTitle()->prepend("Siret ".$this->siret);
 
     	$user = new Scores_Utilisateur();
         if(!$user->checkPerm('INDISCORE3') && !$user->checkPerm('INDISCORE3P'))
-	        $this->_forward('perms', 'error');
+	        $this->forward('perms', 'error');
 
         // Lien pour le rapport personnalisé
         if ($user->getIdClient() == '110' || $user->checkModeEdition()) {
@@ -279,7 +280,7 @@ class EvaluationController extends Zend_Controller_Action
         	));
         }
 
-        $sessionEntreprise 	= new SessionEntreprise($this->siret, $this->id);
+        $sessionEntreprise 	= new Scores_Session_Entreprise($this->siret, $this->id);
         $ws                	= new WsScores();
         $siren 				= substr($this->siret,0,9);
 
@@ -362,7 +363,7 @@ class EvaluationController extends Zend_Controller_Action
     		$this->view->assign('siret', $this->siret);
     		$this->view->assign('id', $this->id);
 
-    		$sessionEntreprise 	= new SessionEntreprise($this->siret, $this->id);
+    		$sessionEntreprise 	= new Scores_Session_Entreprise($this->siret, $this->id);
     		$this->view->assign('rs', $sessionEntreprise->getRaisonSociale());
 
     	} else {
@@ -462,8 +463,7 @@ class EvaluationController extends Zend_Controller_Action
 	    		file_put_contents($outfile, $xml);
 
 	    		//Génération du pdf
-	    		require_once 'wkhtmltopdf/wkhtmltopdf.php';
-	    		$wkhtmltopdf = new wkhtmltopdf();
+	    		$wkhtmltopdf = new Scores_Wkhtml_Pdf();
 	    		$wkhtmltopdf->setOptions('footer-right', 'Page [page] sur [toPage]');
 	    		$wkhtmltopdf->setOptions('header-right', date('d/m/Y H:i:s'));
 	    		$wkhtmltopdf->setOptions('disable-external-links');
@@ -492,6 +492,8 @@ class EvaluationController extends Zend_Controller_Action
     public function enquetecAction()
     {
 		$this->view->headScript()->appendFile('/themes/default/scripts/enquetec.js', 'text/javascript');
+		$this->view->headTitle()->prepend("Enquete commerciale");
+		$this->view->headTitle()->prepend("Siret ".$this->siret);
 
     	//isset($_REQUEST['pays']) ? $pays=$_REQUEST['pays'] : $pays='' ;
 
@@ -595,8 +597,14 @@ class EvaluationController extends Zend_Controller_Action
 		$this->view->assign('commandeEnquete', $commandeEnquete);
     }
 
+    /**
+     * Demande d'avis de credit
+     */
     public function aviscreditAction()
     {
+    	$this->view->headTitle()->prepend("Avis de crédit");
+    	$this->view->headTitle()->prepend("Siret ".$this->siret);
+
     	$commande = false;
 
     	$request = $this->getRequest();
@@ -661,8 +669,7 @@ class EvaluationController extends Zend_Controller_Action
     			$texte = "<pre>".print_r($InfoUser, 1)."</pre>".
     				"<pre>".print_r($InfoEnq, 1)."</pre>";
 
-    			require_once 'Scores/Mail.php';
-    			$mail = new Mail();
+    			$mail = new Scores_Mail();
     			$mail->setFrom('production');
     			$mail->addToKey('support');
     			$mail->setSubject($sujet);
@@ -700,13 +707,13 @@ class EvaluationController extends Zend_Controller_Action
      */
     public function scoringAction()
     {
-        $user = new Scores_Utilisateur();
+    	$this->view->headTitle()->prepend("Scoring Credit Safe");
+    	$this->view->headTitle()->prepend("Siret ".$this->siret);
+
+    	$user = new Scores_Utilisateur();
         if(!$user->checkModeEdition() or !$user->checkPerm('SCORECSF'))
                 $this->render('error/perms', null, 'error');
 
-        require_once 'Evaluation/DomDocument2.lib.php';
-        require_once 'common/curl.php';
-
         define('CREDITSAFE_WS_URL', 'https://www.creditsafe.fr/getdata/service/CSFRServices.asmx');
         define('CREDITSAFE_WS_URI', 'https://www.creditsafe.fr/getdata/service/');
         define('CREDITSAFE_WS_USER', 'scores_decisions');
@@ -734,75 +741,80 @@ class EvaluationController extends Zend_Controller_Action
         	'</body>'.
     	'</xmlrequest>';
 
-    	$success    = true;
     	$date       = date('Ymd');
 		$url        = 'https://www.creditsafe.fr/getdata/service/CSFRServices.asmx/GetData?RequestXmlStr='.$req;
-		$referer    = $cookie = '';
-		$page       = getUrl($url, $cookie, '', $referer, false, '', '');
-		$referer    = $url;
 		$file       = APPLICATION_PATH.'/../../data/creditsafe/'.$this->siret.'.xml';
-		$xml        = html_entity_decode($page['body'], ENT_QUOTES, 'UTF-8');
-    	$dom_object = new DomDocument2();
-    	$ws = new WsScores();
-    	if(!file_exists($file)) {
-    	    file_put_contents($file, $xml); // Ne pas oublier de metre les bons droits sur le dossier.
-    		$ws->setLog('scorecsf', $this->siret);
-    	} else {
-    		$ws->setLog('scorecsf', $this->siret, 0, 'local');
-    	}
-    	$dom_object->load($file);
-	    $companyname = $dom_object->getValueFromTag('companyname');
-	    $rating      = $dom_object->getValueFromTag('rating');
-    	$ratingdesc1 = str_replace('?',"'",$dom_object->getValueFromTag('ratingdesc1'));
-    	$ratingdesc2 = str_replace('?',"'",$dom_object->getValueFromTag('ratingdesc2'));
-    	$creditlimit = $dom_object->getValueFromTag('creditlimit');
-    	$libelle     = '';
-    	if (strtoupper($creditlimit)<>strtolower($creditlimit) || $creditlimit=='')
-    		$strCreditlimit = $creditlimit;
-    	else
-    		$strCreditlimit = number_format($creditlimit,null,null,' '). ' &euro;';
 
-    	if ($rating >= 40){
-    		$fontColor = 'green';
-    		$imgFeux   = '<img src="/themes/default/images/scoring/feux_vert.png"/>';
-    		if ($rating>=71) $libelle='Très bonne cote de crédit/solvabilité';
-    		elseif ($rating>=51) $libelle='Bonne cote de crédit/solvabilité';
-    		else $libelle = 'Solvable';
-    	} elseif ($rating >= 20)	{
-    		$fontColor = 'yellow';//#f2be2c';
-    		$imgFeux   = '<img src="/themes/default/images/scoring/feux_orange.png"/>';
-    		$libelle   = 'Précautions recommandées';
-    	} elseif (strtoupper($rating) <> strtolower($rating)) {
-    		$fontColor = 'black';
-    		$imgFeux='&nbsp;';
-    	}
-    	elseif ($rating == '') {
-    		$fontColor = 'black';
-    		$imgFeux = '&nbsp;';
-    	}
-    	else {
-    		$fontColor = 'red';
-    		$imgFeux   = '<img src="/themes/default/images/scoring/feux_rouge.png"/>';
-    		if ($rating == 0) $libelle='Entreprise en situation de défaillance et ayant un très fort risque de radiation';
-    		else $libelle = 'Avertissement - Crédit à votre discrétion';
-    	}
+		try {
+			$client = new Zend_Http_Client($url);
+			$client->setStream();
+			$response = $client->request('GET');
+			if ( $response->isSuccessful() ) {
+				$xml = html_entity_decode($response->getBody(), ENT_QUOTES, 'UTF-8');
 
-    	/** Assigne les valeur a la vue **/
-    	if (!empty($companyname)) {
-    		$this->view->raisonSociale = $companyname;
-    	} else {
-    		$session = new SessionEntreprise($this->siret, $this->id);
-    		$this->view->raisonSociale = $session->getRaisonSociale();
-    	}
-    	$this->view->emailCommande = $user->getEmail();
-    	$this->view->id = $this->id;
-    	$this->view->siren = substr($this->siret, 0,9);
-    	$this->view->imgFeux = $imgFeux;
-    	$this->view->fontColor = $fontColor;
-    	$this->view->rating = $rating;
-    	$this->view->libelle = $libelle;
-    	$this->view->strCreditlimit = $strCreditlimit;
+				$dom_object = new DOMDocument();
+				$ws = new WsScores();
+				if(!file_exists($file)) {
+					file_put_contents($file, $xml); // Ne pas oublier de metre les bons droits sur le dossier.
+					$ws->setLog('scorecsf', $this->siret);
+				} else {
+					$ws->setLog('scorecsf', $this->siret, 0, 'local');
+				}
+				$dom_object->load($file);
+				$companyname = $dom_object->getElementsByTagName('companyname')->item(0)->nodeValue;
+				$rating      = $dom_object->getElementsByTagName('rating')->item(0)->nodeValue;
+				$ratingdesc1 = str_replace('?',"'",$dom_object->getElementsByTagName('ratingdesc1')->item(0)->nodeValue);
+				$ratingdesc2 = str_replace('?',"'",$dom_object->getElementsByTagName('ratingdesc2')->item(0)->nodeValue);
+				$creditlimit = $dom_object->getElementsByTagName('creditlimit')->item(0)->nodeValue;
+				$libelle     = '';
+				if (strtoupper($creditlimit)<>strtolower($creditlimit) || $creditlimit=='')
+					$strCreditlimit = $creditlimit;
+				else
+					$strCreditlimit = number_format($creditlimit,null,null,' '). ' &euro;';
 
+				if ($rating >= 40){
+					$fontColor = 'green';
+					$imgFeux   = '<img src="/themes/default/images/scoring/feux_vert.png"/>';
+					if ($rating>=71) $libelle='Très bonne cote de crédit/solvabilité';
+					elseif ($rating>=51) $libelle='Bonne cote de crédit/solvabilité';
+					else $libelle = 'Solvable';
+				} elseif ($rating >= 20)	{
+					$fontColor = 'yellow';//#f2be2c';
+					$imgFeux   = '<img src="/themes/default/images/scoring/feux_orange.png"/>';
+					$libelle   = 'Précautions recommandées';
+				} elseif (strtoupper($rating) <> strtolower($rating)) {
+					$fontColor = 'black';
+					$imgFeux='&nbsp;';
+				}
+				elseif ($rating == '') {
+					$fontColor = 'black';
+					$imgFeux = '&nbsp;';
+				}
+				else {
+					$fontColor = 'red';
+					$imgFeux   = '<img src="/themes/default/images/scoring/feux_rouge.png"/>';
+					if ($rating == 0) $libelle='Entreprise en situation de défaillance et ayant un très fort risque de radiation';
+					else $libelle = 'Avertissement - Crédit à votre discrétion';
+				}
+
+				/** Assigne les valeur a la vue **/
+				if (!empty($companyname)) {
+					$this->view->raisonSociale = $companyname;
+				} else {
+					$session = new Scores_Session_Entreprise($this->siret, $this->id);
+					$this->view->raisonSociale = $session->getRaisonSociale();
+				}
+				$this->view->emailCommande = $user->getEmail();
+				$this->view->id = $this->id;
+				$this->view->siren = substr($this->siret, 0,9);
+				$this->view->imgFeux = $imgFeux;
+				$this->view->fontColor = $fontColor;
+				$this->view->rating = $rating;
+				$this->view->libelle = $libelle;
+				$this->view->strCreditlimit = $strCreditlimit;
+
+			}
+		} catch (Zend_Http_Client_Exception $e) {}
     }
 
     /**
@@ -817,8 +829,7 @@ class EvaluationController extends Zend_Controller_Action
 
     		if (preg_match('#^[\w.-]+@[\w.-]+\.[a-zA-Z]{2,5}$#',$email)) {
 				$message = 'Entreprise mise sous surveillance scoring partenaire !';
-				require_once 'Scores/Mail.php';
-				$mail = new Mail();
+				$mail = new Scores_Mail();
 				$mail->setSubject("Demande de surveillance score CreditSafe pour $siren à ".$email);
 
 				$user = new Scores_Utilisateur();
@@ -847,11 +858,14 @@ class EvaluationController extends Zend_Controller_Action
 
     public function valorisationAction()
     {
+    	$this->view->headTitle()->prepend("Valorisation");
+    	$this->view->headTitle()->prepend("Siret ".$this->siret);
+
     	$user = new Scores_Utilisateur();
         if(!$user->checkPerm('INDISCORE3') && !$user->checkPerm('INDISCORE3P'))
 	        $this->_forward('perms', 'error');
 
-        $sessionEntreprise 	= new SessionEntreprise($this->siret, $this->id);
+        $sessionEntreprise 	= new Scores_Session_Entreprise($this->siret, $this->id);
         $ws                	= new WsScores();
         $siren 				= substr($this->siret,0,9);
 

application/controllers/FichierController.php

@@ -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');
@@ -455,4 +455,34 @@ class FichierController extends Zend_Controller_Action
 	    }
 	}
 
+	/**
+	 * Façade d'immeuble
+	 */
+	public function streetviewAction()
+	{
+		$file = $this->getRequest()->getParam('fichier');
+		$explode = explode('.', $file);
+		switch ($explode[1]) {
+			case 'png' : $content_type = 'image/png';  break;
+			case 'gif' : $content_type = 'image/gif';  break;
+			case 'jpeg':
+			case 'jpg' : $content_type = 'image/jpeg'; break;
+		}
+		$c = Zend_Registry::get('config');
+		$path = realpath($c->profil->path->data).'/google/streetview/';
+		if ( file_exists($path.$file) ) {
+			header('Content-Transfer-Encoding: none');
+			header('Content-type: ' . $content_type.'');
+			header('Content-Length: ' . filesize($path.$file));
+			header('Content-MD5: ' . base64_encode(md5_file($path.$file)));
+			header('Content-Disposition: filename="' . basename($path.$file) . '"');
+			header('Cache-Control: private, max-age=0, must-revalidate');
+			header('Pragma: public');
+			ini_set('zlib.output_compression', '0');
+			echo file_get_contents($path.$file);
+		} else {
+			echo file_get_contents(APPLICATION_PATH.'/../public/themes/default/images/1x1.png');
+		}
+	}
+
 }

application/controllers/FinanceController.php

@@ -6,12 +6,7 @@ class FinanceController extends Zend_Controller_Action
 
     public function init()
     {
-    	require_once 'common/dates.php';
-    	require_once 'Scores/SessionEntreprise.php';
     	require_once 'Scores/WsScores.php';
-    	require_once 'Finance/Liasse.php';
-    	require_once 'Finance/RatiosData.php';
-    	require_once 'Finance/RatiosGraph.php';
 
     	$request    	= $this->getRequest();
         $this->siret	= $request->getParam('siret');
@@ -22,7 +17,7 @@ class FinanceController extends Zend_Controller_Action
 
     public function indexAction()
     {
-    	$this->_forward('index', 'index');
+    	$this->forward('index', 'index');
     }
 
     /**
@@ -30,8 +25,8 @@ class FinanceController extends Zend_Controller_Action
      */
 	public function syntheseAction()
 	{
-	    $user           = new Scores_Utilisateur();
-	    $session 		= new SessionEntreprise($this->siret, $this->id);
+		$user           = new Scores_Utilisateur();
+	    $session 		= new Scores_Session_Entreprise($this->siret, $this->id);
 
 	    $request        = $this->getRequest();
 	    $typeBilan      = $request->getParam('typeBilan', 'N');
@@ -40,6 +35,8 @@ class FinanceController extends Zend_Controller_Action
 
 	    //Récupération des informations
 		if (empty($autrePage)) {
+			$this->view->headTitle()->prepend("Synthese financière");
+			$this->view->headTitle()->prepend("Siret ".$this->siret);
 			$ws = new WsScores();
 			$infos = $ws->getRatios(substr($this->siret, 0, 9), 'synthese');
 			if ($infos === false) $this->_forward('soap', 'error');
@@ -71,7 +68,7 @@ class FinanceController extends Zend_Controller_Action
 		}
 
 		//Formattage des données
-		$ratiosData = new RatiosData($infos);
+		$ratiosData = new Scores_Finance_Ratios_Data($infos);
 
 		$nbBilanN = $ratiosData->getNbBilan('N');
 		$nbBilanC = $ratiosData->getNbBilan('C');
@@ -92,7 +89,7 @@ class FinanceController extends Zend_Controller_Action
 			sort($annees);
 			if (count($annees)>1){
 				//Générer les différents graphiques d'évolutions
-				$ratiosGraph = new RatiosGraph($this->siret, $this->id);
+				$ratiosGraph = new Scores_Finance_Ratios_Graph($this->siret, $this->id);
 				$tabGraphEvol = array();
 				foreach($tabRatio as $idRatio => $infoRatio){
 					$dataGraphEvol = array();
@@ -138,8 +135,9 @@ class FinanceController extends Zend_Controller_Action
 					$data[$idRatio] = $ratiosData->dRatio($typeBilan, $annee, $idRatio);
 					$dataEvol[$idRatio] = $ratiosData->dEvol($typeBilan, $annee, $valRatio['evol']);
 				}
+				$date = new Zend_Date($annee, 'yyyyMMdd');
 				$tabResult[] = array(
-					'dateCloture' 	=> WDate::dateT('Ymd','d/m/Y',$annee),
+					'dateCloture' 	=> $date->toString('dd/MM/yyyy'),
 					'duree' 		=> $infosAnnee[$annee]->duree.' Mois',
 					'entrep' 		=> $data,
 					'entrepEvol' 	=> $dataEvol,
@@ -209,10 +207,12 @@ class FinanceController extends Zend_Controller_Action
 	    $request        = $this->getRequest();
 	    $autrePage 		= $request->getParam('apage');
 	    $typeBilan      = $request->getParam('typeBilan', 'N');
-	    $entreprise 	= new SessionEntreprise($this->siret, $this->id);
+	    $entreprise 	= new Scores_Session_Entreprise($this->siret, $this->id);
 
 	    //Récupération des informations
 		if (empty($autrePage)) {
+			$this->view->headTitle()->prepend("Bilan, Compte de résultat");
+			$this->view->headTitle()->prepend("Siret ".$this->siret);
 			$ws = new WsScores();
 			$infos = $ws->getRatios(substr($this->siret, 0, 9), 'ratios');
 			if ($infos === false) $this->_forward('soap', 'error');
@@ -220,7 +220,7 @@ class FinanceController extends Zend_Controller_Action
 			$infos = $this->getRequest()->getParam('infos');
 		}
 
-		$ratiosData = new RatiosData($infos);
+		$ratiosData = new Scores_Finance_Ratios_Data($infos);
 
 		$nbBilanN = $ratiosData->getNbBilan('N');
 		$nbBilanC = $ratiosData->getNbBilan('C');
@@ -234,7 +234,7 @@ class FinanceController extends Zend_Controller_Action
 			$infosAnnee = $ratiosData->getBilansInfo($typeBilan);
 			$annees = array_keys($infosAnnee);
 
-			$ratiosGraph = new RatiosGraph($this->siret, $this->id);
+			$ratiosGraph = new Scores_Finance_Ratios_Graph($this->siret, $this->id);
 
 	        $tabRatioActif   = array(
 		        'r59' => array( 'titre' => 'Actif Immobilisé Net', 'class' => 'subhead'),
@@ -332,8 +332,9 @@ class FinanceController extends Zend_Controller_Action
 		        );
 				$ratiosGraph->bilansgraphactif($dataGraphActif, $typeBilan, $annee);
 
+				$date = new Zend_Date($annee, 'yyyyMMdd');
 	        	$tabResultActif[] = array(
-	        		'dateCloture' 	=> WDate::dateT('Ymd','d/m/Y',$annee),
+	        		'dateCloture' 	=> $date->toString('dd/MM/yyyy'),
 	        		'duree' 		=> $infosAnnee[$annee]->duree.' Mois',
 	        		'entrep' 		=> $data,
 	        		'total' 		=> $dataTotal,
@@ -347,19 +348,20 @@ class FinanceController extends Zend_Controller_Action
 	        	}
 	        	//Génération données graphique passif
 	        	$dataGraphPassif = array(
-		        	$ratiosData->graphPercent($typeBilan, $annee, 'r70','r22'),
-		        	$ratiosData->graphPercent($typeBilan, $annee, 'r71','r22'),
-		        	$ratiosData->graphPercent($typeBilan, $annee, 'r72','r22'),
-		        	$ratiosData->graphPercent($typeBilan, $annee, 'r83','r22'),
-		        	$ratiosData->graphPercent($typeBilan, $annee, 'r84','r22'),
-		        	$ratiosData->graphPercent($typeBilan, $annee, 'r85','r22'),
-		        	$ratiosData->graphPercent($typeBilan, $annee, 'r86','r22'),
-		        	$ratiosData->graphPercent($typeBilan, $annee, 'r87','r22'),
+		        	$ratiosData->graphPercent($typeBilan, $annee, 'r70', 'r22'),
+		        	$ratiosData->graphPercent($typeBilan, $annee, 'r71', 'r22'),
+		        	$ratiosData->graphPercent($typeBilan, $annee, 'r72', 'r22'),
+		        	$ratiosData->graphPercent($typeBilan, $annee, 'r83', 'r22'),
+		        	$ratiosData->graphPercent($typeBilan, $annee, 'r84', 'r22'),
+		        	$ratiosData->graphPercent($typeBilan, $annee, 'r85', 'r22'),
+		        	$ratiosData->graphPercent($typeBilan, $annee, 'r86', 'r22'),
+		        	$ratiosData->graphPercent($typeBilan, $annee, 'r87', 'r22'),
 	        	);
 	        	$ratiosGraph->bilansgraphpassif($dataGraphPassif, $typeBilan, $annee);
 
+	        	$date = new Zend_Date($annee, 'yyyyMMdd');
 	        	$tabResultPassif[] = array(
-					'dateCloture' 	=> WDate::dateT('Ymd','d/m/Y',$annee),
+					'dateCloture' 	=> $date->toString('dd/MM/yyyy'),
 	        	    'duree' 		=> $infosAnnee[$annee]->duree.' Mois',
 	        	    'entrep' 		=> $data,
 	        		'total' 		=> $dataTotal,
@@ -383,8 +385,9 @@ class FinanceController extends Zend_Controller_Action
 	        	);
 	        	$ratiosGraph->bilansgraphsig($dataGraphSIG, $typeBilan, $annee);
 
+	        	$date = new Zend_Date($annee, 'yyyyMMdd');
 	        	$tabResultSig[] = array(
-					'dateCloture' 	=> WDate::dateT('Ymd','d/m/Y',$annee),
+					'dateCloture' 	=> $date->toString('dd/MM/yyyy'),
 	        	    'duree' 		=> $infosAnnee[$annee]->duree.' Mois',
 	        	    'entrep' 		=> $data,
 	        		'total' 		=> $dataTotal,
@@ -453,11 +456,13 @@ class FinanceController extends Zend_Controller_Action
 	 */
 	public function ratiosAction()
 	{
-        $request     = $this->getRequest();
+		$request     = $this->getRequest();
 	    $autrePage = $request->getParam('apage');
 
 		//Récupération des informations
 		if (empty($autrePage)) {
+			$this->view->headTitle()->prepend("Ratios");
+			$this->view->headTitle()->prepend("Siret ".$this->siret);
 			$ws = new WsScores();
 			$infos = $ws->getRatios(substr($this->siret, 0, 9), 'ratios');
 			if ($infos === false) $this->_forward('soap', 'error');
@@ -466,7 +471,7 @@ class FinanceController extends Zend_Controller_Action
 		}
 
 	    $typeBilan 	= $request->getParam('typeBilan', 'N');
-	    $entreprise = new SessionEntreprise($this->siret, $this->id);
+	    $entreprise = new Scores_Session_Entreprise($this->siret, $this->id);
 
 	    $tabRatio = array(
 		    array('titre' => 'EQUILIBRE FINANCIER'),
@@ -555,7 +560,7 @@ class FinanceController extends Zend_Controller_Action
 	    	$tabRatio = array( $ratio => $tabRatio[$ratio] );
 	    }
 
-	    $ratiosData = new RatiosData($infos);
+	    $ratiosData = new Scores_Finance_Ratios_Data($infos);
 
 	    $nbBilanN = $ratiosData->getNbBilan('N');
 	    $nbBilanC = $ratiosData->getNbBilan('C');
@@ -567,7 +572,7 @@ class FinanceController extends Zend_Controller_Action
 	    if ($nbBilanN!=0 || $nbBilanC!=0)
 	    {
 		    //Génération Graphique evolution
-		    $ratiosGraph = new RatiosGraph($this->siret, $this->id);
+	    	$ratiosGraph = new Scores_Finance_Ratios_Graph($this->siret, $this->id);
 
 		    $infosAnnee = $ratiosData->getBilansInfo($typeBilan);
 		    $annees = array_keys($infosAnnee);
@@ -577,7 +582,8 @@ class FinanceController extends Zend_Controller_Action
 
 		    $tabAnnees = array();
 		    foreach($annees as $annee){
-		    	$tabAnnees[$annee] = WDate::dateT('Ymd', 'd/m/Y', $annee);
+		    	$date = new Zend_Date($annee, 'yyyyMMdd');
+		    	$tabAnnees[$annee] = $date->toString('dd/MM/yyyy');
 		    }
 
 		    $tabResult = array();
@@ -644,7 +650,7 @@ class FinanceController extends Zend_Controller_Action
 		$unite      = $request->getParam('unit', '€');
 		$type       = $request->getParam('type', '');
 		$date       = $request->getParam('date', '');
-		$entreprise = new SessionEntreprise($this->siret, $this->id);
+		$entreprise = new Scores_Session_Entreprise($this->siret, $this->id);
 
 		switch($type)
 		{
@@ -672,8 +678,7 @@ class FinanceController extends Zend_Controller_Action
 		$path = $c->profil->path->files . '/';
 		$file = 'liasse-'.substr($this->siret, 0, 9).'-'.$this->id.'-'.$type.$date.'.xls';
 
-		require_once 'Finance/LiasseXLS.php';
-		$liasse = new LiasseXLS($model);
+		$liasse = new Scores_Finance_Liasse_XLS($model);
 		$liasse->dataModel(substr($this->siret, 0, 9), $entreprise->getRaisonSociale(), $data);
 		$liasse->dataFile($file);
 
@@ -742,7 +747,7 @@ class FinanceController extends Zend_Controller_Action
 								$type = 'réel normal ou simplifié';
 								break;
 						}
-						$session = new SessionEntreprise($params['siren']);
+						$session = new Scores_Session_Entreprise($params['siren']);
 						$this->view->assign('raisonSociale', $session->getRaisonSociale());
 						$this->view->assign('size', filesize($file));
 						$this->view->assign('name', $name);
@@ -817,7 +822,10 @@ class FinanceController extends Zend_Controller_Action
 	 */
 	public function liasseAction()
 	{
-	    $user   = new Scores_Utilisateur();
+		$this->view->headTitle()->prepend("Liasse fiscale");
+		$this->view->headTitle()->prepend("Siret ".$this->siret);
+
+		$user   = new Scores_Utilisateur();
 	    $this->view->assign('edition', $user->checkModeEdition());
 
 	    /** Les ancres pour les liens **/
@@ -835,7 +843,10 @@ class FinanceController extends Zend_Controller_Action
 	        	'amortissements' => 'Amortissements',
 	        	'provisions' => 'Provisions',
 	        	'creancesDettes' => 'Créances, Dettes',
-	        	'affectation' => 'Affectation'
+	        	'resultatfiscal' => 'Résultat fiscal',
+	        	'deficit' => 'Déficit',
+	        	'affectation' => 'Affectation',
+	        	'annexe16' => 'Valeur ajoutée',
 	        ),
 	    	'S' => array(
 				'actif' => 'Actif',
@@ -890,12 +901,11 @@ class FinanceController extends Zend_Controller_Action
         $listBilan   = $ws->getListeBilans(substr($this->siret, 0, 9));
         if ($listBilan === false) $this->_forward('soap', 'error');
 
-        $entreprise  = new SessionEntreprise($this->siret, $this->id);
+        $entreprise  = new Scores_Session_Entreprise($this->siret, $this->id);
 
         if( $listBilan->nbReponses > 0 )
         {
         	$date = $request->getParam('date',$listBilan->result->item[0]->dateExercice.':'.$listBilan->result->item[0]->typeBilan);
-        	$dateFunction = new WDate();
 
             foreach ($listBilan->result->item as $item)
                 $liste[$item->typeBilan][] = $item->dateExercice;
@@ -908,9 +918,22 @@ class FinanceController extends Zend_Controller_Action
 
     	        if ($infos === false) $this->_forward('soap', 'error');
 
-    	        $infoLiasse = new Liasse($infos, $unite);
+    	        $infoLiasse = new Scores_Finance_Liasse($infos, $unite);
         	    $this->view->assign('dateCloture', $infoLiasse->getInfo('dateCloture'));
     	        $this->view->assign('dateCloturePre', $infoLiasse->getInfo('dateCloturePre'));
+
+    	        $date = new Zend_Date($infoLiasse->getInfo('dateCloture'), 'yyyyMMdd');
+    	        $this->view->assign('dateClotureD', $date->toString('dd/MM/yyyy'));
+
+    	        Zend_Registry::get('firebug')->info('test:'.$infoLiasse->getInfo('dateCloturePre'));
+    	        $dateCloturePre = $infoLiasse->getInfo('dateCloturePre');
+    	        if ( $dateCloturePre == '' ) {
+    	            $this->view->assign('dateCloturePreD', '-');
+    	        } else {
+    	            $date = new Zend_Date($dateCloturePre, 'yyyyMMdd');
+    	            $this->view->assign('dateCloturePreD', $date->toString('dd/MM/yyyy'));
+    	        }
+
     	        $this->view->assign('dureesMois', $infoLiasse->getInfo('dureeMois'));
     	        $this->view->assign('dureesMoisPre', $infoLiasse->getInfo('dureeMoisPre'));
 
@@ -925,7 +948,6 @@ class FinanceController extends Zend_Controller_Action
         	    	$this->view->assign('exportxls', true);
         	    }
     	    }
-			$this->view->assign('dateFunction', $dateFunction);
         	$this->view->assign('liste', $liste);
         	$this->view->assign('id', $id);
 			$this->view->assign('type', $type);
@@ -953,13 +975,16 @@ class FinanceController extends Zend_Controller_Action
 	 */
 	public function bourseAction()
 	{
+		$this->view->headTitle()->prepend("Bourse & Cotations");
+		$this->view->headTitle()->prepend("Siret ".$this->siret);
+
 		require_once 'Scores/Logo.php';
 
 	    $siren = substr($this->siret, 0, 9);
 
 	    $urlImg = new Logo($siren);
 
-	    $sessionEntreprise = new SessionEntreprise($this->siret, $this->id);
+	    $sessionEntreprise = new Scores_Session_Entreprise($this->siret, $this->id);
 
 		$ws = new WsScores();
 	    $infos = $ws->getInfosBourse($siren);
@@ -992,6 +1017,8 @@ class FinanceController extends Zend_Controller_Action
 	    $autrePage = $this->getRequest()->getParam('apage');
 		//Récupération des informations
 		if (empty($autrePage)) {
+			$this->view->headTitle()->prepend("Relations Banquaires");
+			$this->view->headTitle()->prepend("Siret ".$this->siret);
 			$ws = new WsScores();
 			$infos = $ws->getBanques(substr($this->siret, 0, 9));
 			if ($infos === false) $this->_forward('soap', 'error');
@@ -999,7 +1026,7 @@ class FinanceController extends Zend_Controller_Action
 			$infos = $this->getRequest()->getParam('infos');
 		}
 
-	    $entreprise = new SessionEntreprise($this->siret, $this->id);
+	    $entreprise = new Scores_Session_Entreprise($this->siret, $this->id);
 	    $this->view->assign('banques', $infos->result->item);
 	    $this->view->assign('raisonSociale', $entreprise->getRaisonSociale());
 	    $this->view->assign('siren',  substr($this->siret, 0, 9));
@@ -1011,6 +1038,9 @@ class FinanceController extends Zend_Controller_Action
 	 */
 	public function fluxAction()
 	{
+		$this->view->headTitle()->prepend("Flux de trésorerie");
+		$this->view->headTitle()->prepend("Siret ".$this->siret);
+
 		$request = $this->getRequest();
 		$typeBilan = $request->getParam('type', 'N');
 		$this->view->assign('typeBilan', $typeBilan);
@@ -1020,13 +1050,13 @@ class FinanceController extends Zend_Controller_Action
 		$siren = substr($this->siret, 0, 9);
 
 		$ws = new WsScores();
-		$entreprise = new SessionEntreprise($this->siret, $this->id);
+		$entreprise = new Scores_Session_Entreprise($this->siret, $this->id);
 		$this->view->assign('raisonSociale', $entreprise->getRaisonSociale());
 
 		$infos = $ws->getRatios($siren, 'ratios');
 
 		//Formattage des données
-		$ratiosData = new RatiosData($infos);
+		$ratiosData = new Scores_Finance_Ratios_Data($infos);
 		$nbBilanN = $ratiosData->getNbBilan('N');
 		$nbBilanC = $ratiosData->getNbBilan('C');
 
@@ -1239,11 +1269,107 @@ class FinanceController extends Zend_Controller_Action
 			$labels[] = substr($date, 0, 4);
 		}
 
-		$graph = new RatiosGraph($this->siret, $this->id);
+		$graph = new Scores_Finance_Ratios_Graph($this->siret, $this->id);
 		$image = $graph->flux($labels, $data, $typeBilan);
 		if ( $image != false ){
 			$this->view->assign('graph', $image);
 		}
 
 	}
+
+	/**
+	 * Subvention accordés, principalement les associations
+	 */
+	public function subventionsAction()
+	{
+		$this->view->headTitle()->prepend("Subventions");
+		$this->view->headTitle()->prepend("Siret ".$this->siret);
+		$sessionEntreprise = new Scores_Session_Entreprise($this->siret, $this->id);
+		$siren = substr($this->siret, 0, 9);
+		$this->view->assign('raisonSociale', $sessionEntreprise->getRaisonSociale());
+		$this->view->assign('id', $this->id);
+		$this->view->assign('siret', $this->siret);
+		$this->view->assign('siren', $siren);
+
+		$ws = new WsScores();
+		$infos = $ws->getSubventionList($siren);
+		if ($infos === false) {
+			$this->forward('soap', 'error');
+		} elseif (is_string($infos)) {
+			$this->view->assign('msg', $infos);
+		} else {
+			$this->view->assign('subventions', $infos->result->item);
+		}
+	}
+
+	/**
+	 * Détail d'une subvention
+	 */
+	public function subventionAction()
+	{
+		$this->view->headTitle()->prepend("Subvention");
+		$this->view->headTitle()->prepend("Siret ".$this->siret);
+
+		$sessionEntreprise = new Scores_Session_Entreprise($this->siret, $this->id);
+		$siren = substr($this->siret, 0, 9);
+		$this->view->assign('raisonSociale', $sessionEntreprise->getRaisonSociale());
+		$this->view->assign('id', $this->id);
+		$this->view->assign('siret', $this->siret);
+		$this->view->assign('siren', $siren);
+
+		$request = $this->getRequest();
+		$id = $request->getParam('subventionId');
+
+		$ws = new WsScores();
+		$infos = $ws->getSubventionDetail($id);
+		if ($infos === false) {
+			$this->forward('soap', 'error');
+		} elseif (is_string($infos)) {
+			$this->view->assign('msg', $infos);
+		} else {
+
+			$p = $request->getParam('p', 1);
+			$this->view->assign('p', $p);
+
+			$nbMax = 100;
+			$nbReponses = $infos->nbReponses;
+			$nbPages = ceil($nbReponses/$nbMax);
+
+			if ( $p <= 1 ) {
+				$lienPagePrecedente = false;
+			} else {
+				$lienPagePrecedente = $this->view->url(array(
+						'controller' => 'finance',
+						'action' => 'subventions',
+						'p' => $p-1
+				));
+			}
+
+			if ( $p+1 > $nbPages ) {
+				$lienPageSuivante = false;
+			} else {
+				$lienPageSuivante = $this->view->url(array(
+						'controller' => 'finance',
+						'action' => 'subventions',
+						'p' => $p+1
+				));
+			}
+
+			$this->view->assign('nbPages',$nbPages);
+			$this->view->assign('lienPagePrecedente',$lienPagePrecedente);
+			$this->view->assign('lienPageSuivante',$lienPageSuivante);
+
+			$this->view->assign('Millesime',$infos->Millesime);
+			$this->view->assign('Budget',$infos->Budget);
+			$this->view->assign('AssoSiren',$infos->AssoSiren);
+			$this->view->assign('AssoNom',$infos->AssoNom);
+			$this->view->assign('OrigineSiren',$infos->OrigineSiren);
+			$this->view->assign('OrigineLib',$infos->OrigineLib);
+			$this->view->assign('Programme',$infos->Programme);
+			$this->view->assign('Montant',$infos->Montant);
+			$this->view->assign('SubventionObjet',$infos->SubventionObjet);
+			$this->view->assign('Mission',$infos->Mission);
+		}
+	}
+
 }

application/controllers/GiantController.php

@@ -1,14 +1,13 @@
 <?php
-require_once 'Scores/RechercheHistorique.php';
 require_once 'Giant/WSgiant.php';
 require_once 'Giant/Controllers.lib.php';
 require_once 'Giant/RequestDatabase.lib.php';
 require_once 'Giant/Functions.lib.php';
-require_once 'common/dates.php';
 
 class GiantController extends Zend_Controller_Action
 {
-	protected $TestIndication = true;
+	protected $TestIndication = false;
+	protected $config = array();
 
 	protected $TestCompanies = array(
 			'BE' => array(
@@ -32,12 +31,23 @@ class GiantController extends Zend_Controller_Action
 			),
 	);
 
+	protected $Companies = array(
+			'FR' =>'France',
+			'BE' => 'Belgium',
+			'ES' => 'Spain',
+			'GB' => 'United Kingdom',
+			'NL' => 'The Netherlands',
+	);
+
 
 	public function init()
 	{
+
 		$this->view->headLink()->appendStylesheet('/themes/default/styles/giant.css', 'all');
 		$this->view->headScript()->appendFile('/themes/default/scripts/giant.js', 'text/javascript');
 		$this->view->debug = false;
+		$this->config = new Zend_Config_Ini( APPLICATION_PATH.'/../library/Giant/giant.ini'  );
+		$this->TestIndication = $this->config->test->TestIndication;
 	}
 
 	public function searchAction()
@@ -46,6 +56,8 @@ class GiantController extends Zend_Controller_Action
 		$params                    = $this->getRequest()->getParams();
 		$search                    = new GiantRechercheController($params['pays'], $this->TestIndication);
 		$result                    = $search->Liste($params, $this->getRequest()->getParam('page'));
+		$this->view->TestIndication= $this->TestIndication;
+		$this->view->TestCompanies = $this->TestCompanies[$params['pays']];
 		$this->view->label         = $search->getObjet()->getLabelDesc();
 		$this->view->labelResults  = $search->getObjet()->getLabelResults();
 		$this->view->pays          = $params['pays'];
@@ -61,8 +73,12 @@ class GiantController extends Zend_Controller_Action
 
 	public function identiteAction()
 	{
-		$rechercheParams =  new RechercheHistorique();
+		$rechercheParams = new Scores_Session_Recherche();
 		$giantFunction = new GiantFunction();
+		$test = $this->getRequest()->getParam('test');
+		if($test == true){
+			$this->TestIndication = true;
+		}
 		if (count($rechercheParams->liste()) > 0)
 		{
 			$recherche = $rechercheParams->item(0);
@@ -75,7 +91,9 @@ class GiantController extends Zend_Controller_Action
 		$total                             = 0;
 		$liste                             = $giantFunction->divCommande($listeCommandes, $total);
 		$ListeRapport                      = new GiantRechercheController($params['pays'], $this->TestIndication);
-		$result                            = $ListeRapport->ListeRapport($this->getRequest()->getParam('CompanyId'));
+		$giantController				   = new GiantControllerLib($this->getRequest()->getParam('CompanyId'));
+		$result                            = $giantController->commandePays($this->getRequest()->getParam('CompanyId'),$params['pays'], $this->TestIndication);
+		$this->view->TestIndication		   = $this->TestIndication;
 		$this->view->total                 = $total;
 		$this->view->listeCommandes        = $liste;
 		$this->view->modification          = (isset($result->MonitoringOptions))?($ListeRapport->getModification($result->MonitoringOptions->MonitoringOption[0])):null;
@@ -94,6 +112,10 @@ class GiantController extends Zend_Controller_Action
 
 	public function creditrecommendationAction()
 	{
+		$test = $this->getRequest()->getParam('test');
+		if($test == true){
+			$this->TestIndication = true;
+		}
 		$giantController = new GiantControllerLib($this->getRequest()->getParam('CompanyId'));
 		$id = $giantController->commande($this->getRequest()->getParam('CompanyId'),
 				$this->getRequest()->getParam('Type'),
@@ -107,6 +129,7 @@ class GiantController extends Zend_Controller_Action
 		$giantConstroller	= new GiantControllerLib($this->getRequest()->getParam('CompanyId').'-'.$this->getRequest()->getParam('Type'));
 		$identiteController->ficheAction();
 		$fiche              = $identiteController->getObjet('fiche');
+
 		foreach($creditrecommendationAction as $action => $val) {
 			if(isset($creditrecommendation->DataSet->Company->$val)) {
 				$creditrecommendation = $giantConstroller->$action($creditrecommendation);
@@ -117,11 +140,15 @@ class GiantController extends Zend_Controller_Action
 		$this->view->reportType	  = $this->getRequest()->getParam('Type');
 		$this->view->report       = $fiche;
 		$this->view->Type		  = $this->getRequest()->getParam('Type');
-		$this->view->dateFunction = new WDate();
+		$this->view->assign('exportObjet', $creditrecommendation);
 	}
 
 	public function compactAction()
 	{
+		$test = $this->getRequest()->getParam('test');
+		if($test == true){
+			$this->TestIndication = true;
+		}
 		$giantController = new GiantControllerLib($this->getRequest()->getParam('CompanyId'));
 		$id = $giantController->commande($this->getRequest()->getParam('CompanyId'),
 				$this->getRequest()->getParam('Type'),
@@ -137,7 +164,6 @@ class GiantController extends Zend_Controller_Action
 		$giantConstroller	= new GiantControllerLib($this->getRequest()->getParam('CompanyId').'-'.$this->getRequest()->getParam('Type'));
 		$identiteController->ficheAction();
 		$fiche              = $identiteController->getObjet('fiche');
-
 		foreach($compactAction as $action => $val) {
 			if(isset($compact->DataSet->Company->$val)) {
 				$compact = $giantConstroller->$action($compact);
@@ -148,11 +174,15 @@ class GiantController extends Zend_Controller_Action
 		$this->view->reportType	  = $this->getRequest()->getParam('Type');
 		$this->view->report       = $fiche;
 		$this->view->Type		  = $this->getRequest()->getParam('Type');
-		$this->view->dateFunction = new WDate();
+		$this->view->assign('exportObjet', $compact);
 	}
 
 	public function fullAction()
 	{
+		$test = $this->getRequest()->getParam('test');
+		if($test == true){
+			$this->TestIndication = true;
+		}
 		$giantController = new GiantControllerLib($this->getRequest()->getParam('CompanyId').'-'.$this->getRequest()->getParam('Type'));
 		$id = $giantController->commande($this->getRequest()->getParam('CompanyId'),
 				$this->getRequest()->getParam('Type'),
@@ -180,7 +210,7 @@ class GiantController extends Zend_Controller_Action
 		$this->view->reportType = $this->getRequest()->getParam('Type');
 		$this->view->report       = $fiche;
 		$this->view->Type = $this->getRequest()->getParam('Type');
-		$this->view->dateFunction = new WDate();
+		$this->view->assign('exportObjet', $full);
 	}
 
 	public function getForm()
@@ -228,13 +258,20 @@ class GiantController extends Zend_Controller_Action
 	{
 		$this->_helper->layout()->disableLayout();
 		$this->view->headLink()->appendStylesheet('/themes/default/styles/giant.css', 'all');
+		$this->view->headScript()->appendFile('/themes/default/scripts/giant.js', 'text/javascript');
 		$this->view->lang	= $this->getRequest()->getParam('lang');
 		$this->view->CompanyId	= $this->getRequest()->getParam('CompanyId');
 		$this->view->Pays	= $this->getRequest()->getParam('Pays');
 		$this->view->CompanyName	= $this->getRequest()->getParam('CompanyName');
 		$this->view->action	= $this->getRequest()->getParam('action');
 		$this->view->values	= $this->getRequest()->getParams();
-
+		$result = new GiantControllerLib();
+		foreach($this->Companies as $key=>$pays){
+			if(($value = $result->getCache($key)) === false || empty($value->MonitoringOptions->MonitoringOption[0]->LanguageCodes->LanguageCode)) {
+				unset($this->Companies[$key]);
+			}
+		}
+		$this->view->countries	= $this->Companies;
 		if ($this->getRequest()->isPost()) {
 			$giantController = new GiantControllerLib($this->getRequest()->getParam('CompanyId'));
 			$result = $giantController->startmonitoring($this->getRequest()->getParam('CompanyId'),
@@ -245,7 +282,8 @@ class GiantController extends Zend_Controller_Action
 					$this->getRequest()->getParam('Version'),
 					$this->getRequest()->getParam('LanguageCode'),
 					$this->getRequest()->getParam('Pays'),
-					$this->TestIndication
+					$this->TestIndication,
+					$this->getRequest()->getParam('CompanyName')
 			);
 			$this->view->result = $result;
 		}
@@ -256,6 +294,7 @@ class GiantController extends Zend_Controller_Action
 		$this->_helper->layout()->disableLayout();
 		$this->view->headLink()->appendStylesheet('/themes/default/styles/giant.css', 'all');
 		$this->view->CompanyId	= $this->getRequest()->getParam('CompanyId');
+		$this->view->InternalOrderId	= $this->getRequest()->getParam('InternalOrderId');
 		$this->view->Pays	= $this->getRequest()->getParam('Pays');
 		$this->view->InternalOrderId	= $this->getRequest()->getParam('InternalOrderId');
 		$this->view->CompanyName	= $this->getRequest()->getParam('CompanyName');
@@ -279,6 +318,7 @@ class GiantController extends Zend_Controller_Action
 		$this->view->headLink()->appendStylesheet('/themes/default/styles/giant.css', 'all');
 		$this->view->lang	= $this->getRequest()->getParam('lang');
 		$this->view->CompanyId	= $this->getRequest()->getParam('CompanyId');
+		$this->view->InternalOrderId	= $this->getRequest()->getParam('InternalOrderId');
 		$this->view->Pays	= $this->getRequest()->getParam('Pays');
 		$this->view->CompanyName	= $this->getRequest()->getParam('CompanyName');
 		$this->view->action	= $this->getRequest()->getParam('action');
@@ -300,33 +340,96 @@ class GiantController extends Zend_Controller_Action
 		}
 
 	}
-	public function retrivemonitoringAction()
+	public function retriveAction()
 	{
 		$this->view->headScript()->appendFile('/themes/default/scripts/giant_monitoring.js', 'text/javascript');
-		$this->view->CompanyId	= $this->getRequest()->getParam('CompanyId');
-		$this->view->Pays	= $this->getRequest()->getParam('Pays');
-		$this->view->CompanyName	= $this->getRequest()->getParam('CompanyName');
-		$this->view->action	= $this->getRequest()->getParam('action');
-		$this->view->values	= $this->getRequest()->getParams();
-
-		$giantController = new GiantControllerLib($this->getRequest()->getParam('CompanyId'));
-		$result = $giantController->retrivemonitoring($this->getRequest()->getParam('CompanyId'),
-				$this->getRequest()->getParam('StartFrom'),
-				$this->getRequest()->getParam('InternalOrderId'),
-				$this->getRequest()->getParam('Pays'),
-				$this->TestIndication,
-				$this->getRequest()->getParam('monitor_type')
-		);
+		$giantController = new GiantControllerLib();
+		$auth = Zend_Auth::getInstance();
+		if ( $auth->hasIdentity() ) {
+			$identity = $auth->getIdentity();
+		}
+		$result = $auth->getStorage()->read($identity);
+		if(!empty($result->result->mon_result)){
+			$result = $result->result->mon_result;
+		}
+		else{
+			$result = $giantController->retrive(1,$this->TestIndication,'RetrieveMonitoringEventsForCustomer');
+			$sess = new stdClass();
+			$sess->mon_result = $result;
+			$identity->result = $sess;
+			$auth->getStorage()->write($identity);
+		}
+		$resultDB = $giantController->retrivDB();
+		$this->view->resultDB = $resultDB;
 		$this->view->result = $result;
-		
 		$merged =Array();
 		foreach ($result->MonitoringEvents->MonitoringEvent as $MonitoringEvent):
-		if ($merged[$MonitoringEvent->Company->Event[0]->EventCode]){
-			 array_push($merged[$MonitoringEvent->Company->Event[0]->EventCode],$MonitoringEvent) ;
+		if ($merged[$MonitoringEvent->ProviderOrderId]){
+			array_push($merged[$MonitoringEvent->ProviderOrderId],$MonitoringEvent) ;
 		} else {
-			 $merged[$MonitoringEvent->Company->Event[0]->EventCode][]=$MonitoringEvent;
+			$merged[$MonitoringEvent->ProviderOrderId][]=$MonitoringEvent;
 		}
 		endforeach;
 		$this->view->val	= $merged;
+
+		$merged_siren =Array();
+		foreach ($result->MonitoringEvents->MonitoringEvent as $MonitoringEvent):
+		if ($merged_siren[$MonitoringEvent->Company->CompanyId]){
+			array_push($merged_siren[$MonitoringEvent->Company->CompanyId],$MonitoringEvent) ;
+		} else {
+			$merged_siren[$MonitoringEvent->Company->CompanyId][]=$MonitoringEvent;
+		}
+		endforeach;
+		$this->view->val_siren	= $merged_siren;
+
+
+	}
+	public function retAction()
+	{
+		$giantController = new GiantControllerLib();
+		$resultDB = $giantController->retrivDB($this->getRequest()->getParam('date_st'));
+		print_r(serialize($resultDB[0]));
+	}
+	public function getpaysAction()
+	{
+		$this->_helper->layout()->disableLayout();
+		$pays = $this->getRequest()->getParam('Pays');
+		$result = new GiantControllerLib();
+		if(($value = $result->getCache($pays)) === false || empty($value->MonitoringOptions->MonitoringOption[0]->LanguageCodes->LanguageCode)) {
+			print_r(array('no'));
+		}
+		else {
+			print_r(json_encode($value->MonitoringOptions->MonitoringOption[0]->LanguageCodes->LanguageCode));
+		}
+	}
+	public function reteventsAction()
+	{
+		$this->_helper->layout()->disableLayout();
+		$this->view->headScript()->appendFile('/themes/default/scripts/giant_monitoring.js', 'text/javascript');
+		$this->view->headScript()->appendFile('/themes/default/scripts/giant.js', 'text/javascript');
+		$auth = Zend_Auth::getInstance();
+		$identity = $auth->getIdentity();
+		$result = $auth->getStorage()->read($identity);
+		$result = $result->result->mon_result;
+		$merged_siren = Array();
+		foreach ($result->MonitoringEvents->MonitoringEvent as $MonitoringEvent):
+		if ($merged_siren[$MonitoringEvent->Company->CompanyId]){
+			array_push($merged_siren[$MonitoringEvent->Company->Event[0]->EventCode],$MonitoringEvent) ;
+		} else {
+			$merged_siren[$MonitoringEvent->Company->Event[0]->EventCode][]=$MonitoringEvent;
+		}
+		endforeach;
+		$type = $this->getRequest()->getParam('Type');
+		$id = $this->getRequest()->getParam('Id');
+
+		$merged = Array();
+		foreach ($merged_siren[$type] as $MonitoringEvent):
+		if ($merged[$MonitoringEvent->ProviderOrderId]){
+			array_push($merged[$MonitoringEvent->ProviderOrderId],$MonitoringEvent) ;
+		} else {
+			$merged[$MonitoringEvent->ProviderOrderId][]=$MonitoringEvent;
+		}
+		endforeach;
+		$this->view->result = $merged[$id];
 	}
 }

application/controllers/IdentiteController.php

@@ -14,9 +14,7 @@ class IdentiteController extends Zend_Controller_Action
 		$this->id = $request->getParam('id', 0);
 
 		require_once 'Scores/WsScores.php';
-		require_once 'Scores/SessionEntreprise.php';
 		require_once 'Scores/IdentiteEntreprise.php';
-		require_once 'common/dates.php';
     }
 
     public function preDispatch()
@@ -26,7 +24,7 @@ class IdentiteController extends Zend_Controller_Action
     		case 'fiche':
     		case 'fichepc':
 				if (intval($this->siret)==0 && $this->id==0){
-					$this->_forward('params', 'error');
+					$this->forward('params', 'error');
 				}
     			break;
     	}
@@ -37,7 +35,7 @@ class IdentiteController extends Zend_Controller_Action
      */
 	public function indexAction()
 	{
-		$this->_forward('index', 'index');
+		$this->forward('index', 'index');
 	}
 
 	/**
@@ -45,24 +43,23 @@ class IdentiteController extends Zend_Controller_Action
 	 */
 	public function ficheAction()
 	{
-		//Modification du titre
-		if( empty($this->siret) ){
-			$titre = 'Identifiant '.$this->id;
-		} else {
-			$titre = 'Siret '.$this->siret;
-		}
-		$this->view->headTitle()->append('Identité - '.$titre);
-
 		$user = new Scores_Utilisateur();
 
 		$autrePage = $this->getRequest()->getParam('apage');
 
 		//Récupération des informations
 		if (empty($autrePage)) {
+			//Modification du titre
+			if( empty($this->siret) ){
+				$titre = 'Identifiant '.$this->id;
+			} else {
+				$titre = 'Siret '.$this->siret;
+			}
+			$this->view->headTitle()->prepend('Fiche Identité - '.$titre);
 			$ws = new WsScores();
 			$infos = $ws->getIdentite($this->siret, $this->id);
 			if ($infos === false) {
-			    $this->_forward('soap', 'error');
+			    $this->forward('soap', 'error');
 			}
 		} else {
 			$infos = $this->getRequest()->getParam('infos');
@@ -73,7 +70,7 @@ class IdentiteController extends Zend_Controller_Action
 		} else {
 
 		    //Mise en session
-		    $session = new SessionEntreprise($this->siret, $this->id, true);
+		    $session = new Scores_Session_Entreprise($this->siret, $this->id, true);
 		    $session->setInfoEntrep($infos);
 
 		    //Date de dernière mise à jour
@@ -92,14 +89,16 @@ class IdentiteController extends Zend_Controller_Action
 		                && $infos->{$dateId}!='0000-00-00') {
 
 		            if ( $dateId == 'DateMajID') {
-		                $dateDerMaj = ' le '.WDate::dateT('Y-m-d', 'd/m/Y', $infos->DateMajID);
+		            	$date = new Zend_Date($infos->DateMajID, 'yyyy-MM-dd');
+		                $dateDerMaj = $date->toString('dd/MM/yyyy');
 		            }
 
 		            if ( $dateId == 'DateMajID' && !$user->checkModeEdition()) {
 		            } else {
+		            	$date = new Zend_Date($infos->{$dateId}, 'yyyy-MM-dd');
 		                $datemajTexte.= '<tr>';
 		                $datemajTexte.= '<td>'.$dateLib.'</td>';
-		                $datemajTexte.= '<td>'.WDate::dateT('Y-m-d', 'd/m/Y', $infos->{$dateId}).'</td>';
+		                $datemajTexte.= '<td>'.$date->toString('dd/MM/yyyy').'</td>';
 		                $datemajTexte.= '</tr>';
 		            }
 
@@ -168,6 +167,7 @@ class IdentiteController extends Zend_Controller_Action
 		    $this->view->assign('raisonSociale', $session->getRaisonSociale());
 		    $this->view->assign('infos', $infos);
 		    $this->view->assign('siret', $infos->Siret);
+		    $this->view->assign('accessWorldCheck', $user->checkPerm('WORLDCHECK'));
 
 		    $survDroits = array('survannonce', 'survinsee', 'survbilan', 'survscore', 'survactes', 'survdirigeants', 'survpriv');
 		    $countSurvDroits = 0;
@@ -199,7 +199,7 @@ class IdentiteController extends Zend_Controller_Action
 		} else {
 			$titre = 'Siret '.$this->siret;
 		}
-		$this->view->headTitle()->append('Fiche procédure collective - '.$titre);
+		$this->view->headTitle()->prepend('Fiche procédure collective - '.$titre);
 
 		//Récupération des informations
 		$ws = new WsScores();
@@ -207,7 +207,7 @@ class IdentiteController extends Zend_Controller_Action
 		if ($infos === false) $this->_forward('soap', 'error');
 
 		//Mise en session
-		$session = new SessionEntreprise($this->siret, $this->id);
+		$session = new Scores_Session_Entreprise($this->siret, $this->id);
 		$session->setInfoEntrep($infos->Identite);
 
 		//Element Fiche identite
@@ -310,9 +310,9 @@ class IdentiteController extends Zend_Controller_Action
 	{
 		$siren = substr($this->siret,0,9);
 		$actif = $this->getRequest()->getParam('actif', -1);
-		$this->view->headTitle()->append('Liste des établissements - Siren '.$siren);
+		$this->view->headTitle()->prepend('Liste des établissements - Siren '.$siren);
 
-		$session = new SessionEntreprise($this->siret, $this->id);
+		$session = new Scores_Session_Entreprise($this->siret, $this->id);
 		$user = new Scores_Utilisateur();
 
 		$ws = new WsScores();
@@ -358,7 +358,7 @@ class IdentiteController extends Zend_Controller_Action
 		$siren = substr($this->siret,0,9);
 		$actif = $this->getRequest()->getParam('actif', -1);
 
-		$session = new SessionEntreprise($this->siret, $this->id);
+		$session = new Scores_Session_Entreprise($this->siret, $this->id);
 		$user = new Scores_Utilisateur();
 
 		$ws = new WsScores();
@@ -370,85 +370,55 @@ class IdentiteController extends Zend_Controller_Action
 		$marqueurs = array();
 
 		$j = 0;
-		foreach ($etabs as $i => $etab) {
-
-			if ($etab->Siege == 1) {
-				$type = 'Siège ';
-			} else {
-				$type = 'Etablissement ';
-			}
-			if ($etab->Actif == 1) {
-				$type .= 'actif';
-			} else {
-				$type .= 'inactif';
-			}
-			$type .= ' - '.$etab->NafEtabLib;
-
-			$titre = "$siren ".$etab->Nic." : $type<br/>";
-			if ($etab->Enseigne <> '') {
-				$titre .= 'Enseigne : '.$etab->Enseigne.'<br/>';
-			}
-
-			$texte = '';
-			$texte .= 'Etablissement : '.$etab->Nic.'<br/>';
-			$texte .= $etab->Adresse.'<br/>';
-			$adresse = $etab->Adresse.' ';
-			if ($etab->Adresse2 <> '') {
-				$texte .= $etab->Adresse2.'<br/>';
-				if (strlen(trim($adresse)) < 7) {
-					$adresse = $etab->Adresse2.' ';
+		if ( count($etabs)>0 ) {
+			foreach ($etabs as $i => $etab)
+			{
+				if ($etab->Siege == 1) {
+					$type = 'Siège ';
+				} else {
+					$type = 'Etablissement ';
 				}
-			}
-			$texte.='<b>'.$etab->CP.' '.$etab->Ville.'</b><br/>';
+				if ($etab->Actif == 1) {
+					$type .= 'actif';
+				} else {
+					$type .= 'inactif';
+				}
+				$type .= ' - '.$etab->NafEtabLib;
 
-			require_once 'Scores/classMMap.php';
-			$mmap = new MMap($adresse, $etab->CP, $etab->Ville);
-			if ($mmap->latitudeDec == '') {
-				continue;
-			}
-			$photo = 'http://cbk0.google.com/cbk?output=thumbnail&w=150&h=69&ll='.
-			$mmap->latitudeDec.','.
-			$mmap->longitudeDec;
+				$titre = "$siren ".$etab->Nic." : $type<br/>";
+				if ($etab->Enseigne <> '') {
+					$titre .= 'Enseigne : '.$etab->Enseigne.'<br/>';
+				}
 
-			$adresse .= $etab->CP.' '.$etab->Ville;
+				$texte = '';
+				$texte .= 'Etablissement : '.$etab->Nic.'<br/>';
+				$texte .= $etab->Adresse.'<br/>';
+				$adresse = $etab->Adresse.' ';
+				if ($etab->Adresse2 <> '') {
+					$texte .= $etab->Adresse2.'<br/>';
+					if (strlen(trim($adresse)) < 7) {
+						$adresse = $etab->Adresse2.' ';
+					}
+				}
+				$adresse .= $etab->CP.' '.$etab->Ville;
+				$texte.='<b>'.$etab->CP.' '.$etab->Ville.'</b><br/>';
+				$texte .= '</a>';
+				$texte .= '<br/>';
+				$texte .= '<i>'.$etab->NafEtab.' : '.$etab->NafEtabLib.'</i>';
 
-			$google_map = 'http://maps.google.fr/maps?q='.urlencode($adresse);
+				$icone = 'http://'.$_SERVER['SERVER_NAME'].'/themes/default/images/maps/'.$this->iconeDuMarqueur($etab->NafEtab, $etab->Siege, $etab->Actif);
 
-			$texte .= '<a href='.$google_map.' target=_blank>';
-			if ($mmap->precision >= 7 && @fopen($photo, 'r') != false) {
-				$texte .= '<img src='.$photo.' width=\"155\" height=\"74\" />';
-			} else {
-				$texte .= 'Afficher l\'adresse sur Google Map &copy;';
-			}
-			$texte .= '</a>';
-			$texte .= '<br/>';
-			$texte .= '<i>'.$etab->NafEtab.' : '.$etab->NafEtabLib.'</i>';
-
-			$icone = 'http://'.$_SERVER['SERVER_NAME'].'/themes/default/images/maps/'.$this->iconeDuMarqueur($etab->NafEtab, $etab->Siege, $etab->Actif);
-
-			$marqueurs[$j] = array($mmap->latitudeDec, $mmap->longitudeDec, $titre, $texte, $type, $icone);
-			++$j;
-			// if ($j >= 30) {  // Limitation du nombre d'etablissements sur la carte
-			//     break;
-			// }
-		}
-
-		if (count($marqueurs) > 1) {
-			$min_x = $max_x = $marqueurs[0][0];
-			$min_y = $max_y = $marqueurs[0][1];
-			for ($i = 1; $i < count($marqueurs); ++$i) {
-				$min_x = min($min_x, $marqueurs[$i][0]);
-				$max_x = max($max_x, $marqueurs[$i][0]);
-				$min_y = min($min_y, $marqueurs[$i][1]);
-				$max_y = max($max_y, $marqueurs[$i][1]);
+				$marks[$j] = array(
+						'address' => $adresse,
+						'title' => $titre,
+						'text' => $texte,
+						'type' => $type,
+						'icon' => $icone
+				);
+				$j++;
 			}
 		}
-
-		$this->view->assign('marqueurs', $marqueurs);
-		$this->view->assign('min_x', $min_x);
-		$this->view->assign('max_x', $max_x);
-		$this->view->assign('min_y', $min_y);
-		$this->view->assign('max_y', $max_y);
+		$this->view->assign('marks', json_encode($marks));
 	}
 
 	protected function iconeDuMarqueur($naf, $siege, $actif)
@@ -585,7 +555,7 @@ class IdentiteController extends Zend_Controller_Action
 	    $nbMonthForRecentLien = 3;
 
 	    $request = $this->getRequest();
-
+	    $autrePage = $this->getRequest()->getParam('apage');
 		$lienRef = $request->getParam('lienref', null);
 
 		$user = new Scores_Utilisateur();
@@ -597,7 +567,9 @@ class IdentiteController extends Zend_Controller_Action
 
 	        $this->view->assign('lienref', $lienRef);
 
-	        $this->view->headTitle()->append('Liens inter-entreprises - Id '.$lienRef);
+	        if (empty($autrePage)) {
+	        	$this->view->headTitle()->prepend('Liens inter-entreprises - Id '.$lienRef);
+	        }
 
 	        $identite = $ws->getLienRef($lienRef);
 	        $this->view->assign('raisonSociale', $identite->raisonSociale);
@@ -607,7 +579,7 @@ class IdentiteController extends Zend_Controller_Action
 	        //Define SIREN if exist
 	        if ( intval($identite->siren)!=0 ) {
 	            $siren = $identite->siren;
-	            $session = new SessionEntreprise($siren, null, true);
+	            $session = new Scores_Session_Entreprise($siren, null, true);
 	            $this->view->assign('siren', $siren);
 	            $this->view->assign('siret', $session->getSiret());
 	            $this->view->assign('isin', $session->getIsin());
@@ -621,14 +593,14 @@ class IdentiteController extends Zend_Controller_Action
 
 	        //Get links
 	        $infos = $ws->getLiensById($lienRef);
-	        Zend_Registry::get('firebug')->info($infos);
 
 	    } else {
 	        $siren = substr($this->siret,0,9);
 
-	        $this->view->headTitle()->append('Liens inter-entreprises - Siren '.$siren);
-
-	        $session = new SessionEntreprise($this->siret, $this->id);
+	        if (empty($autrePage)) {
+	        	$this->view->headTitle()->prepend('Liens inter-entreprises - Siren '.$siren);
+	        }
+	        $session = new Scores_Session_Entreprise($this->siret, $this->id);
 
 	        $this->view->assign('isin', $session->getIsin());
 	        $this->view->assign('siren', $siren);
@@ -710,6 +682,9 @@ class IdentiteController extends Zend_Controller_Action
 		$this->view->assign('AutrePage', $this->getRequest()->getParam('apage'));
 	}
 
+	/**
+	 * Fiche identite d'un lien
+	 */
 	public function lienficheAction()
 	{
 	    $this->_helper->layout()->disableLayout();
@@ -975,6 +950,9 @@ class IdentiteController extends Zend_Controller_Action
 	    $this->view->assign('result', $result);
 	}
 
+	/**
+	 * Documents liées à une fiche lien
+	 */
 	public function liendocAction()
 	{
 	    $request = $this->getRequest();
@@ -996,22 +974,54 @@ class IdentiteController extends Zend_Controller_Action
 	 */
 	public function evenementsAction()
 	{
-		$siren = substr($this->siret,0,9);
-		$this->view->headTitle()->append('Evènements - Siren '.$siren);
+	    $request = $this->getRequest();
 
-		$session = new SessionEntreprise($this->siret, $this->id);
+	    $siren = substr($this->siret,0,9);
+		$this->view->headTitle()->prepend('Evènements - Siren '.$siren);
+
+		//Pagination
+		$page = $request->getParam('page', 1);
+		if ( $page <= 0 ) $page = 1;
+		$nbAffichage = 50;
+		$position = ($page - 1 ) * $nbAffichage;
+
+		$session = new Scores_Session_Entreprise($this->siret, $this->id);
 
 		$ws = new WsScores();
-		$infos = $ws->getListeEvenements($siren);
-
+		$infos = $ws->getListeEvenements($siren, 0, $position, $nbReponses);
 		$evens = $infos->result->item;
 
+		$this->view->assign('evens', $evens);
 		$this->view->assign('siren', $siren);
 		$this->view->assign('siret', $this->siret);
 		$this->view->assign('id', $this->id);
 		$this->view->assign('raisonSociale', $session->getRaisonSociale());
-		$this->view->assign('evens', $evens);
 		$this->view->assign('exportObjet', $evens);
+
+		//Calcul pagination
+		$nbReponses = count($evens);
+		$nbReponsesTotal = $infos->nbReponses;
+		if ($nbReponses < $nbReponsesTotal) {
+		    $pageTotal = ceil( $nbReponsesTotal / $nbAffichage );
+		    $pageCurrent =  $page;
+		    $pagePrev = $page - 1;
+		    if ($pagePrev < 1) {
+		        $pagePrev = 1;
+		    }
+		    $pageNext = $page + 1;
+		    if( $pageNext > $pageTotal ) {
+		        $pageNext = $pageTotal;
+		    }
+		} else {
+		    $pageTotal = $pageCurrent = 1;
+		}
+		$this->view->assign('PageTotal', $pageTotal);
+		$this->view->assign('PagePrev', $pagePrev);
+		$this->view->assign('PageNext', $pageNext);
+		$this->view->assign('PageCurrent', $pageCurrent);
+
+		$this->view->assign('nbReponses', empty($nbReponses) ? 0 : $nbReponses);
+		$this->view->assign('nbReponsesTotal', empty($nbReponsesTotal) ? 0 : $nbReponsesTotal);
 	}
 
 	/**
@@ -1025,7 +1035,7 @@ class IdentiteController extends Zend_Controller_Action
 		$user = new Scores_Utilisateur();
 		if ($user->checkPref('news'))
 		{
-			$session = new SessionEntreprise($this->siret, $this->id);
+			$session = new Scores_Session_Entreprise($this->siret, $this->id);
 
 			$items = array();
 			if ($googleNews!==false){
@@ -1066,8 +1076,7 @@ class IdentiteController extends Zend_Controller_Action
 		$this->_helper->layout()->disableLayout();
 		$this->_helper->viewRenderer->setNoRender(true);
 		// ==> Start
-		require_once 'Scores/AvisSituation.php';
-		$avis = new AvisSituation($this->siret);
+		$avis = new Scores_Insee_AvisSituation($this->siret);
 
 		if (!$avis->erreur()){
 			$avis->erreurcpt('raz');
@@ -1097,6 +1106,9 @@ class IdentiteController extends Zend_Controller_Action
 		}
 	}
 
+	/**
+	 * Téléchargement des cartes IRIS
+	 */
 	public function irisAction()
 	{
 		$this->_helper->layout()->disableLayout();
@@ -1105,8 +1117,7 @@ class IdentiteController extends Zend_Controller_Action
 		$request = $this->getRequest();
 		$codeCommune = $request->getParam('code');
 		// ==> Start
-		require_once 'Scores/Iris.php';
-		$iris = new Iris($codeCommune);
+		$iris = new Scores_Insee_Iris($codeCommune);
 		$body = $iris->get('pdf');
 		if($body !== false) {
 			header("Pragma: public");
@@ -1123,15 +1134,15 @@ class IdentiteController extends Zend_Controller_Action
 		}
 	}
 
+	/**
+	 * Informations géographiques
+	 */
 	public function geoAction()
 	{
 		$infos = $this->getRequest()->getParam('infos');
 
-		$user = new Scores_Utilisateur();
-		$this->view->assign('facade', $user->checkPref('mappy'));
-
-		require_once 'Scores/Google.php';
-		$google = new Google();
+		// Text
+		$google = new Scores_Google_Maps();
 		$decLat = $google->dec2dms($infos->GeoLat);
 		$decLon = $google->dec2dms($infos->GeoLon);
 		$mapsHref = $google->getGoogleMapLink(urlencode(
@@ -1143,23 +1154,25 @@ class IdentiteController extends Zend_Controller_Action
 		$this->view->assign('decLat', $decLat);
 		$this->view->assign('decLon', $decLon);
 		$this->view->assign('infos', $infos);
-	}
 
-	public function facadeAction()
-	{
+		// Img
+		$user = new Scores_Utilisateur();
+		$this->view->assign('facade', $user->checkPref('mappy'));
 		require_once 'Scores/Mappy.php';
-		$infos = $this->getRequest()->getParam('infos');
+
 		$mappy = new Mappy();
 		if ($mappy->villeCouverte($infos->Ville))
 		{
+			$this->view->assign('source', 'mappy');
+
 			$adresse = '';
 			$adresse.= $infos->AdresseNum;
 
 			//Corriger la voie pour Mappy
 			$adresse.= ' '.strtr($infos->AdresseVoie, array(
-				'R' => 'RUE',
-				'AV' => 'AVENUE',
-				'RLE' => 'RUELLE',
+					'R' => 'RUE',
+					'AV' => 'AVENUE',
+					'RLE' => 'RUELLE',
 			));
 
 			$adresse.= ' '.$infos->AdresseRue;
@@ -1173,20 +1186,151 @@ class IdentiteController extends Zend_Controller_Action
 			}
 
 			$this->view->assign('adresse', $adresse);
-			$this->view->assign('source', 'mappy');
 			$this->view->assign('lienJs', $mappy->getJs());
 		}
 		else
 		{
-			require_once 'Scores/Google.php';
-			$google = new Google();
-			$googleKey = $google->getGoogleKey($_SERVER['SERVER_NAME']);
-			$this->view->assign('googleKey', $googleKey);
 			$this->view->assign('source', 'google');
-			$this->view->assign('infos', $infos);
 		}
 	}
 
+	/**
+	 * Display streetview image
+	 */
+	public function streetviewAction()
+	{
+		$request = $this->getRequest();
+
+		if ( $request->isXmlHttpRequest() ) {
+			$this->_helper->layout()->disableLayout();
+			$siret = $request->getParam('siret');
+			$lat = $request->getParam('lat', '');
+			$lon = $request->getParam('lon', '');
+			$address = $request->getParam('address');
+		} else {
+			$infos = $request->getParam('infos');
+			$siret = $infos->Siret;
+			$lat = $infos->GeoLat;
+			$lon = $infos->GeoLon;
+
+			$adresse = '';
+			if (intval($infos->AdresseNum)>0) {
+				$adresse.= intval($infos->AdresseNum).' ';
+			}
+
+			//Corriger la voie
+			$adresse.= strtr($infos->AdresseVoie, array(
+					'R' => 'RUE',
+					'AV' => 'AVENUE',
+					'RLE' => 'RUELLE',
+			));
+
+			$adresse.= ' '.$infos->AdresseRue;
+			$adresse.= ', '.$infos->Ville;
+
+			//Définir le pays
+			if ($infos->Pays == '') {
+				$adresse.= ', FRANCE';
+			} else {
+				$adresse.= ', '.$infos->Pays;
+			}
+		}
+
+		$num = $request->getParam('heading', 0);
+
+		$this->view->assign('siret', $siret);
+		$this->view->assign('lat', $lat);
+		$this->view->assign('lon', $lon);
+
+		$mode = 'address';
+		$this->view->assign('streetviewMode', $mode);
+
+		if ( $mode == 'address' && $adresse !== null ) {
+			$streetview = new Scores_Google_Streetview($siret);
+			$streetview->setLocationTxt($adresse);
+			$url = $streetview->serveUrl();
+			$this->view->assign('url', $url);
+		}
+
+		if ( $mode == 'GPS' && intval($siret)>100 && $lat != '' && $lon != '' ) {
+			$streetview = new Scores_Google_Streetview($siret);
+			$deg = $streetview->getNumDeg();
+			$nbImg = count($deg);
+			$pagePrec = $num-1;
+			if ($pagePrec<=0) {
+				$pagePrec = $nbImg-1;
+			}
+			$pageSuiv = $num+1;
+			if($pageSuiv>=$nbImg) {
+				$pageSuiv = 0;
+			}
+			$this->view->assign('pagePrec', $pagePrec);
+			$this->view->assign('pageSuiv', $pageSuiv);
+
+			$streetview->setLocationGeo( $lat, $lon );
+			$heading = $deg[$num];
+			$streetview->setHeading($heading);
+
+			$img = $streetview->serveImg();
+			if ( $img!==false ) {
+				$url = '/fichier/streetview/'.$img;
+				$this->view->assign('url', $url);
+			}
+		}
+
+	}
+
+	/**
+	 * Impression capture image arborescence du groupe
+	 */
+	public function groupesarboimgAction()
+	{
+		$request = $this->getRequest();
+
+		$siren = substr($this->siret,0,9);
+		$this->view->assign('siret', $siren);
+
+		$pctMin = $request->getParam('pctMin', 33);
+		$this->view->assign('pctMin', $pctMin);
+
+		$isin = $request->getParam('isin', 1);
+		$this->view->assign('isin', $isin);
+		if ($isin==0){
+			$stopAtIsin = false;
+		} else {
+			$stopAtIsin = true;
+		}
+
+		$user = new Scores_Utilisateur();
+		$this->view->assign('edition', $user->checkModeEdition());
+
+		$ws = new WsScores();
+		$result = $ws->getGroupesArbo($siren, $pctMin, 10, $stopAtIsin);
+
+		if ( $result!==false ) {
+			$infos = json_decode($result, true);
+			Zend_Registry::get('firebug')->info($infos);
+			if (count($infos)>0) {
+
+				$name = $infos['name'];
+				if ( $infos['siren']!='000000000' ) {
+					$name.= ' ('.$infos['siren'].')';
+				}
+
+				$structure = array();
+				$structure[] = array(
+						'data' 		=> $name,
+						'state' 	=> 'open',
+						'children' 	=> $this->groupesArboChildren($infos['children'], $siren),
+				);
+				$this->view->assign('data', json_encode($structure));
+			}
+		}
+	}
+
+	/**
+	 * Arborescence du groupe
+	 */
 	public function groupesarboAction()
 	{
 		$this->_helper->layout()->disableLayout();
@@ -1197,20 +1341,30 @@ class IdentiteController extends Zend_Controller_Action
 		$pctMin = $request->getParam('pctMin', 33);
 		$this->view->assign('pctMin', $pctMin);
 
+		$isin = $request->getParam('isin', 1);
+		$this->view->assign('isin', $isin);
+		if ($isin==0){
+			$stopAtIsin = false;
+		} else {
+			$stopAtIsin = true;
+		}
+
 		$user = new Scores_Utilisateur();
 		$this->view->assign('edition', $user->checkModeEdition());
 
 		$ws = new WsScores();
-		$result = $ws->getGroupesArbo($siren, $pctMin);
+		$result = $ws->getGroupesArbo($siren, $pctMin, 10, $stopAtIsin);
 
 		if ( $result!==false ) {
 			$infos = json_decode($result, true);
 			Zend_Registry::get('firebug')->info($infos);
 			if (count($infos)>0) {
 
+				$sirenTxt = substr($infos['siren'],0,3).' '.substr($infos['siren'],3,3).' '.substr($infos['siren'],6,3);
+
 				$name = $infos['name'];
 				if ( $infos['siren']!='000000000' ) {
-				    $name.= ' ('.$infos['siren'].')';
+				    $name.= ' ('.$sirenTxt.')';
 				}
 
 				$structure = array();
@@ -1224,18 +1378,26 @@ class IdentiteController extends Zend_Controller_Action
 		}
 	}
 
+	/**
+	 * Récursivité pour l'arborescence du groupe
+	 * @param unknown $items
+	 * @param string $detectSiren
+	 * @return multitype:multitype:string multitype: multitype:multitype:string multitype: NULL
+	 */
 	public function groupesArboChildren($items, $detectSiren = '')
 	{
 		$output = array();
 		if ( count($items)>0 ) {
 			foreach ( $items as $item ) {
 
+				$sirenTxt = substr($item['siren'],0,3).' '.substr($item['siren'],3,3).' '.substr($item['siren'],6,3);
+
 				$name = $item['name'];
 				if ( intval($item['siren'])!=0 ) {
 					$name.= ' (<a href="'.$this->view->url(array(
 					    'controller'=>'identite',
 						'action'=>'fiche',
-						'siret' => $item['siren']), null, true).'">'.$item['siren'].'</a>)';
+						'siret' => $item['siren']), null, true).'">'.$sirenTxt.'</a>)';
 				} else {
 					$name.= ' ('.$item['pays'].')';
 				}
@@ -1261,8 +1423,14 @@ class IdentiteController extends Zend_Controller_Action
 		return $output;
 	}
 
+	/**
+	 * Groupe
+	 */
 	public function groupeAction()
 	{
+		$this->view->headTitle()->prepend("Groupe");
+		$this->view->headTitle()->prepend("Siret ".$this->siret);
+
 		$siren = substr($this->siret,0,9);
 
 		$ws = new WsScores();
@@ -1271,4 +1439,80 @@ class IdentiteController extends Zend_Controller_Action
 		$this->view->assign('result', $result);
 		$this->view->assign('siren', $siren);
 	}
+
+	/**
+	 * Contact Data
+	 */
+	public function contactsAction()
+	{
+		$this->view->headTitle()->prepend("Contacts");
+		$this->view->headTitle()->prepend("Siret ".$this->siret);
+
+		$session = new Scores_Session_Entreprise($this->siret, $this->id);
+
+		$user = new Scores_Utilisateur();
+		$this->view->assign('edition', $user->checkModeEdition());
+
+		$request = $this->getRequest();
+		$this->view->assign('siret', $this->siret);
+		$siren = substr($this->siret, 0, 9);
+
+		$all = $request->getParam('get');
+		if ($all == 'all') {
+			$companyId = substr($this->siret,0,9);
+			$this->view->assign('all', true);
+		} else {
+			$companyId = $this->siret;
+		}
+
+		$filter = $request->getParam('filter');
+		$this->view->assign('filter', $filter);
+
+		$ws = new WsScores();
+		$result = $ws->getContactEt($companyId, $filter);
+
+		Zend_Registry::get('firebug')->info($result);
+
+		if ($result->nbReponses>0) {
+			$this->view->assign('contacts', $result->result->item);
+		}
+
+		$this->view->assign('raisonSociale', $session->getRaisonSociale());
+		$this->view->assign('siren', $siren);
+	}
+
+	/**
+	 * Corporama
+	 * Intégration en ajax du lien corporama
+	 * Solutions de prospection et de veille entreprise
+	 */
+	public function corporamaAction()
+	{
+	    $request = $this->getRequest();
+
+	    $this->view->assign('siret', $this->siret);
+	    $siren = substr($this->siret, 0, 9);
+
+	    $session = new Scores_Session_Entreprise($this->siret, $this->id);
+
+	    $corporamaUrl = "http://corporama.com/search?siren=".$siren."&company=".urlencode($session->getRaisonSociale())."&partner=sd268";
+	    $this->view->assign('corporamaUrl', $corporamaUrl);
+
+	    if ( $request->isXmlHttpRequest() || $request->getParam('include') ) {
+
+	        $this->_helper->layout()->disableLayout();
+	        $this->_helper->viewRenderer->setNoRender(true);
+
+	        $page = file_get_contents($corporamaUrl, false);
+	        if ($page === false) {
+	        	echo "Erreur";
+	        }
+	        $this->view->assign('page', $page);
+
+	    }
+
+	    $ws = new WsScores();
+    	$ws->setLog('corporama', $this->siret);
+	}
+
 }

application/controllers/IndexController.php

@@ -34,23 +34,62 @@ class IndexController extends Zend_Controller_Action
     	$this->_helper->layout()->disableLayout();
     	$this->_helper->viewRenderer->setNoRender(true);
 
-    	require_once 'Scores/WsScores.php';
+    	//'login' and 'hach' detecte from AuthAdapter
 
-		$user = new Scores_Utilisateur();
-		$login = $user->getLogin();
-		$idClient = $user->getIdClient();
+		$request = $this->getRequest();
+		$version = $request->getParam('v', 1);
 
-		$ws = new WsScores();
-		$reponse = $ws->getPortefeuilleCsv($login, $idClient);
+		if (intval($version) == 2) {
 
-		$log = Zend_Registry::get('config')->profil->path->data.'/log/altisys.log';
+			$log = Zend_Registry::get('config')->profil->path->data.'/log/altisys.log';
+
+			$user = new Scores_Utilisateur();
+			$login = $user->getLogin();
+			$idClient = $user->getIdClient();
+
+			$file = 'listesurv-score-'.$login.'-'.$idClient.'.csv';
+
+			$content_type = 'application/csv-tab-delimited-table';
+			$c = Zend_Registry::get('config');
+			$path = realpath($c->profil->path->files).'/';
+			//Envoi du fichier sur la sortie standard
+			if ( file_exists($path.$file) ) {
+				header('Content-Transfer-Encoding: none');
+				header('Content-type: ' . $content_type.'');
+				header('Content-Length: ' . filesize($path.$file));
+				header('Content-MD5: ' . base64_encode(md5_file($path.$file)));
+				header('Content-Disposition: filename="' . basename($path.$file) . '"');
+				header('Cache-Control: private, max-age=0, must-revalidate');
+				header('Pragma: public');
+				ini_set('zlib.output_compression', '0');
+				echo file_get_contents($path.$file);
+				file_put_contents($log, date('Y-m-d H:i:s')." APPEL ALTISYS - OK $file\n", FILE_APPEND);
+			} else {
+				echo 'Impossible de charger le fichier.';
+				file_put_contents($log, date('Y-m-d H:i:s')." APPEL ALTISYS - ERREUR $file\n", FILE_APPEND);
+			}
+
+		} else {
+
+	    	require_once 'Scores/WsScores.php';
+
+			$user = new Scores_Utilisateur();
+			$login = $user->getLogin();
+			$idClient = $user->getIdClient();
+
+			$ws = new WsScores();
+			$reponse = $ws->getPortefeuilleCsv($login, $idClient);
+
+			$log = Zend_Registry::get('config')->profil->path->data.'/log/altisys.log';
+
+			if ($reponse === false){
+				file_put_contents($log, date('Y-m-d H:i:s')." - URL = ERREUR\n", FILE_APPEND);
+				echo "Erreur";
+			} elseif (!empty($reponse->result->Url)) {
+				file_put_contents($log, date('Y-m-d H:i:s')." - URL = ".$reponse->result->Url."\n", FILE_APPEND);
+				echo $reponse->result->Url;
+			}
 
-		if ($reponse === false){
-			file_put_contents($log, date('Y-m-d H:i:s')." - URL = ERREUR\n", FILE_APPEND);
-			echo "Erreur";
-		} elseif (!empty($reponse->result->Url)) {
-			file_put_contents($log, date('Y-m-d H:i:s')." - URL = ".$reponse->result->Url."\n", FILE_APPEND);
-			echo $reponse->result->Url;
 		}
     }
 

application/controllers/JuridiqueController.php

@@ -11,8 +11,6 @@ class JuridiqueController extends Zend_Controller_Action
 		$this->id = $request->getParam('id', 0);
 
 		require_once 'Scores/WsScores.php';
-		require_once 'Scores/SessionEntreprise.php';
-		require_once 'common/dates.php';
     }
 
     /**
@@ -24,9 +22,6 @@ class JuridiqueController extends Zend_Controller_Action
 
 		$vue = $request->getParam('vue', 'bodacc');
 
-		$p = $request->getParam('p', 1);
-		$this->view->assign('p', $p);
-
 		$idAnn = $request->getParam('idAnn', null);
 		$siren = substr($this->siret, 0,9);
 
@@ -39,7 +34,7 @@ class JuridiqueController extends Zend_Controller_Action
 		    }
 		}
 
-		$session = new SessionEntreprise($this->siret, $this->id);
+		$session = new Scores_Session_Entreprise($this->siret, $this->id);
 		$fj = $session->getFormeJuridique();
 		if ( $fj>9000 && $fj<9999 && intval($siren)==0 ) {
 		    $vue = 'asso';
@@ -51,7 +46,7 @@ class JuridiqueController extends Zend_Controller_Action
 		$this->view->assign('raisonSociale', $session->getRaisonSociale());
 		$this->view->assign('AutrePage', $request->getParam('apage'));
 
-		if ($session->getSource()=='006') {
+		if ($session->getSource()=='006' || $session->getSourceId()=='007') {
 
 		    $this->view->assign('AutreSource', true);
 
@@ -59,8 +54,11 @@ class JuridiqueController extends Zend_Controller_Action
 
     	    $this->view->assign('vue', $vue);
 
-    	    $nbAnnonces = 20;
-    	    $position = ($p-1)*$nbAnnonces;
+    	    //Pagination
+    		$page = $request->getParam('page', 1);
+    		if ( $page <= 0 ) $page = 1;
+    		$nbAffichage = 20;
+    		$position = ($page - 1 ) * $nbAffichage;
 
     	    $ws = new WsScores();
     	    switch ( $vue ) {
@@ -70,25 +68,25 @@ class JuridiqueController extends Zend_Controller_Action
     	            if(intval($siren)==0) {
     	                $idAnn = $session->getSourceId();
     	            }
-    	            $infos = $ws->getAnnoncesLegales($siren, $idAnn, null, $position, $nbAnnonces);
+    	            $infos = $ws->getAnnoncesLegales($siren, $idAnn, null, $position, $nbAffichage);
     	            break;
     	        case 'balo':
-    	            $infos = $ws->getAnnoncesBalo($siren, $idAnn, null, $position, $nbAnnonces);
+    	            $infos = $ws->getAnnoncesBalo($siren, $idAnn, null, $position, $nbAffichage);
     	            break;
     	        case 'asso':
     	            if ( intval($siren)==0 && substr($session->getAutreId(),0,1)=='W' ) {
-    	                $infos = $ws->getAnnoncesAsso($session->getAutreId(), $idAnn, null, $position, $nbAnnonces);
+    	                $infos = $ws->getAnnoncesAsso($session->getAutreId(), $idAnn, null, $position, $nbAffichage);
     	            } elseif (intval($siren)!=0) {
-    	                $infos = $ws->getAnnoncesAsso($siren, $idAnn, null, $position, $nbAnnonces);
+    	                $infos = $ws->getAnnoncesAsso($siren, $idAnn, null, $position, $nbAffichage);
     	            } else {
     	                $idAnn = $session->getSourceId();
-    	                $infos = $ws->getAnnoncesAsso($siren, $idAnn, null, $position, $nbAnnonces);
+    	                $infos = $ws->getAnnoncesAsso($siren, $idAnn, null, $position, $nbAffichage);
     	            }
     	            break;
     	        case 'bomp':
     	            $filtre = $request->getParam('filtre', null);
     	            $this->view->assign('filtre', $filtre);
-    	            $infos = $ws->getAnnoncesBoamp($siren, $idAnn, $filtre, $position, $nbAnnonces);
+    	            $infos = $ws->getAnnoncesBoamp($siren, $idAnn, $filtre, $position, $nbAffichage);
     	            break;
     	    }
     	    if ($infos === false) $this->_forward('soap', 'error');
@@ -150,6 +148,9 @@ class JuridiqueController extends Zend_Controller_Action
     	            //$this->_helper->viewRenderer->setNoRender(true);
     	            $this->renderScript('juridique/annonce-ajax.phtml');
     	        } else {
+
+    	            $this->view->assign('PageCurrent', $page);
+
     	            //Définir url pour téléchargement pdf
     	            if ( in_array($annonce['Code'], array('BODA', 'BODB', 'BODC')) && intval($annonce['Annee'])>=2008) {
     	                $lienBodacc = $this->view->url(array(
@@ -165,48 +166,39 @@ class JuridiqueController extends Zend_Controller_Action
     	            $this->renderScript('juridique/annonce.phtml');
     	        }
 
-    	        //Affichage pour la liste des annonces
+			//Affichage pour la liste des annonces
     	    } else {
 
-    	        $nbReponses = $infos->nbReponses;
-    	        $nbPages = ceil($nbReponses/$nbAnnonces);
-
-    	        //Attention ajout des filtres
-    	        if ( $p <= 1 ) {
-    	            $lienPagePrecedente = false;
+    	        //Calcul pagination
+    	        $nbReponses = count($infos->result->item);
+    	        $nbReponsesTotal = $infos->nbReponses;
+    	        if ($nbReponses < $nbReponsesTotal) {
+    	            $pageTotal = ceil( $nbReponsesTotal / $nbAffichage );
+    	            $pageCurrent =  $page;
+    	            $pagePrev = $page - 1;
+    	            if ($pagePrev < 1) {
+    	                $pagePrev = 1;
+    	            }
+    	            $pageNext = $page + 1;
+    	            if( $pageNext > $pageTotal ) {
+    	                $pageNext = $pageTotal;
+    	            }
     	        } else {
-    	            $lienPagePrecedente = $this->view->url(array(
-    	                'controller' => 'juridique',
-    	                'action' => 'annonces',
-    	                'vue'=> $vue,
-    	                'p' => $p-1
-    	            ));
+    	            $pageTotal = $pageCurrent = 1;
     	        }
+    	        $this->view->assign('PageTotal', $pageTotal);
+    	        $this->view->assign('PagePrev', $pagePrev);
+    	        $this->view->assign('PageNext', $pageNext);
+    	        $this->view->assign('PageCurrent', $pageCurrent);
 
-    	        if ( $p+1 > $nbPages ) {
-    	            $lienPageSuivante = false;
-    	        } else {
-    	            $lienPageSuivante = $this->view->url(array(
-    	                'controller' => 'juridique',
-    	                'action' => 'annonces',
-    	                'vue' => $vue,
-    	                'p' => $p+1
-    	            ));
-    	        }
+    	        $this->view->assign('nbReponses', empty($nbReponses) ? 0 : $nbReponses);
+    	        $this->view->assign('nbReponsesTotal', empty($nbReponsesTotal) ? 0 : $nbReponsesTotal);
 
-    	        $this->view->assign('nbPages',$nbPages);
-    	        $this->view->assign('lienPagePrecedente',$lienPagePrecedente);
-    	        $this->view->assign('lienPageSuivante',$lienPageSuivante);
-
-    	        foreach ($typeAnnonces as $type)
-    	        {
+    	        foreach ( $typeAnnonces as $type ) {
     	            $classType = 'annonces'.$type;
     	            $annonces = array();
-    	            if (count($objAnnonces->$classType)>0)
-    	            {
-    	                foreach($objAnnonces->$classType as $ann)
-    	                {
-    	                    Zend_Registry::get('firebug')->info('id:'.$ann->id.', deleted:'.$ann->deleted);
+    	            if ( count( $objAnnonces->$classType ) > 0 ) {
+    	                foreach( $objAnnonces->$classType as $ann ) {
     	                    $annonces[] = $objAnnonces->getAnnonceResume($ann);
     	                }
     	                $this->view->assign($classType, $annonces);
@@ -222,10 +214,13 @@ class JuridiqueController extends Zend_Controller_Action
 	 */
 	public function infosregAction()
 	{
+		$this->view->headTitle()->prepend("Informations Réglementées");
+		$this->view->headTitle()->prepend("Siret ".$this->siret);
+
 		$request = $this->getRequest();
 		$idAnn = $request->getParam('idann', false);
 		$siren = substr($this->siret, 0,9);
-		$session = new SessionEntreprise($this->siret, $this->id);
+		$session = new Scores_Session_Entreprise($this->siret, $this->id);
 
 		$ws = new WsScores();
 		if ($idAnn!=false) {
@@ -234,7 +229,7 @@ class JuridiqueController extends Zend_Controller_Action
 		} else {
 		    $infos = $ws->getInfosReg($siren);
 		}
-		if ($infos === false) $this->_forward('soap', 'error');
+		if ($infos === false) $this->forward('soap', 'error');
 
 		if (is_string($infos)){
 			$this->view->assign('message', $infos);
@@ -244,13 +239,15 @@ class JuridiqueController extends Zend_Controller_Action
 		$annonces = array();
 		if (count($objAnnonces)>0) {
 			foreach ( $objAnnonces as $item ) {
+				$dateParution = new Zend_Date($item->DateParution, 'yyyy-MM-dd');
+				$dateInsertion = new Zend_Date($item->dateInsertionSD, 'yyyy-MM-dd');
 				$annonces[] = array(
 					'id' 				=> $item->id,
 					'titre' 			=> $item->titre,
 					'communique' 		=> $item->communique,
 					'source' 			=> $item->source,
-					'DateParution' 		=> WDate::dateT('Y-m-d','d/m/Y',$item->DateParution),
-					'dateInsertionSD'	=> WDate::dateT('Y-m-d','d/m/Y',$item->dateInsertionSD),
+					'DateParution' 		=> $dateParution->toString('dd/MM/yyyy'),
+					'dateInsertionSD'	=> $dateInsertion->toString('dd/MM/yyyy'),
 				);
 			}
 		}
@@ -267,10 +264,13 @@ class JuridiqueController extends Zend_Controller_Action
 	 */
 	public function competencesAction()
 	{
+		$this->view->headTitle()->prepend("Compétences Territoriales");
+		$this->view->headTitle()->prepend("Siret ".$this->siret);
+
 		$request = $this->getRequest();
 		$type = $request->getParam('type', '');
 		$siren = substr($this->siret,0,9);
-		$session = new SessionEntreprise($this->siret, $this->id);
+		$session = new Scores_Session_Entreprise($this->siret, $this->id);
 
 		$abbrev = array(
 			' TGI '		=> 'TRIBUNAL DE GRANDE INSTANCE DE ',
@@ -310,8 +310,11 @@ class JuridiqueController extends Zend_Controller_Action
 	 */
 	public function conventionsAction()
 	{
+		$this->view->headTitle()->prepend("Conventions Collectives");
+		$this->view->headTitle()->prepend("Siret ".$this->siret);
+
 		$siren = substr($this->siret, 0,9);
-		$session = new SessionEntreprise($this->siret, $this->id);
+		$session = new Scores_Session_Entreprise($this->siret, $this->id);
 		$this->view->assign('siren', $siren);
 		$this->view->assign('siret', $this->siret);
 		$this->view->assign('raisonSociale', $session->getRaisonSociale());
@@ -328,12 +331,15 @@ class JuridiqueController extends Zend_Controller_Action
 	 */
 	public function marquesAction()
 	{
+		$this->view->headTitle()->prepend("Marques Déposées");
+		$this->view->headTitle()->prepend("Siret ".$this->siret);
+
 		$this->view->headScript()->appendFile('/themes/default/scripts/marques.js', 'text/javascript');
 
 		$request = $this->getRequest();
 		$idObject = $request->getParam('idObject', 0);
 		$siren = substr($this->siret, 0,9);
-		$session = new SessionEntreprise($this->siret, $this->id);
+		$session = new Scores_Session_Entreprise($this->siret, $this->id);
 		$this->view->assign('siren', $siren);
 		$this->view->assign('siret', $this->siret);
 		$this->view->assign('raisonSociale', $session->getRaisonSociale());

application/controllers/LogoController.php

@@ -2,13 +2,13 @@
 class LogoController extends Zend_Controller_Action
 {
 	protected $pathLogo = '';
-	
+
 	public function init()
 	{
 		$c = Zend_Registry::get('config');
 		$this->pathLogo = $c->profil->path->data.'/logos';
 	}
-	
+
 	public function indexAction()
 	{
 		$this->_helper->layout->disableLayout();
@@ -16,18 +16,18 @@ class LogoController extends Zend_Controller_Action
 		$siren = $request->getParam('siren', '');
 		$isin = $request->getParam('isin', '');
 		$logo = $this->_findlogo($siren, $isin);
-		
+
 		$this->view->assign('siren', $siren);
 		$this->view->assign('logo', $logo);
 	}
-	
+
 	public function uploadAction()
 	{
 		$this->_helper->layout->disableLayout();
 		$request = $this->getRequest();
-		
+
 		$siren = $request->getParam('siren');
-		
+
 		if ($request->isPost()) {
 
 			if ( !empty($siren) && isset($_FILES['file']) && $_FILES['file']['error']!=UPLOAD_ERR_NO_FILE )
@@ -66,25 +66,25 @@ class LogoController extends Zend_Controller_Action
 		}
 		$this->view->assign('siren', $siren);
 	}
-	
+
 	public function cropAction()
 	{
 		$this->_helper->layout->disableLayout();
 		$request = $this->getRequest();
-		
+
 		$siren = $request->getParam('siren');
 		$image = $request->getParam('image');
-		
+
 		if ($request->isPost())
 		{
 			$jpeg_quality = 90;
 			$png_quality = 9;
-			
+
 			list($name, $ext) = explode('.', $image);
-			
+
 			$src = $name.'.'.$ext;
 			$dst = str_replace('tmp_', '', $src);
-			
+
 			//Création image
 			switch($ext){
 				case 'gif':
@@ -125,14 +125,14 @@ class LogoController extends Zend_Controller_Action
 		}
 		$this->view->assign('siren', $siren);
 	}
-	
+
 	public function saveAction()
 	{
 		$this->_helper->layout->disableLayout();
 		$request = $this->getRequest();
-		
+
 		$file = $request->getParam('image');
-		
+
 		if ( !empty($file) ) {
 			list($name, $ext) = explode('.', $file);
 			$name_dst = str_replace('tmp_','',$name);
@@ -196,79 +196,81 @@ class LogoController extends Zend_Controller_Action
 			}
 		}
 		$this->view->assign('message', $message);
-		
+
 	}
-	
+
 	public function urlAction()
 	{
 		$this->_helper->layout->disableLayout();
 		$request = $this->getRequest();
-		
+
 		$siren = $request->getParam('siren');
-		
+
 		if ($request->isPost()){
-			
-			require_once 'common/curl.php';
+
 			$logoUrl = $request->getParam('url');
 			$tabTmp  = parse_url($logoUrl);
 			$hostUrl = $tabTmp['host'];
 			$pathUrl = $tabTmp['path'];
 			$tmp = explode('.', basename($pathUrl));
 			$ext = strtolower(end($tmp));
-		
-			$page = getUrl($logoUrl, '', '', '', false, $hostUrl, '', 7);
-			$body = $page['body'];
-			
+
 			$extAuthorized = array('jpeg', 'jpg', 'png', 'gif', 'bmp');
-			
+
 			//Vérification fichier est une image
 			if ( in_array($ext, $extAuthorized ) )
 			{
 				$name_file = $siren.'.'.$ext;
-				$fp = fopen($this->pathLogo.'/'.$name_file, 'w');
-				fwrite($fp, $body);
-				fclose($fp);
-				$this->view->assign('image', $name_file);
+
+				try {
+					$client = new Zend_Http_Client($logoUrl);
+					$client->setStream();
+					$response = $client->request('GET');
+					if ( $response->isSuccessful()
+						&& copy($response->getStreamName(), $this->pathLogo.'/'.$name_file) ) {
+						$this->view->assign('image', $name_file);
+					}
+				} catch (Zend_Http_Client_Exception $e) {}
 			}
 			$this->view->assign('isPost', true);
 		}
 		$this->view->assign('siren', $siren);
-		
+
 	}
-	
+
 	public function deleteAction()
 	{
 		$this->_helper->layout->disableLayout();
 		$request = $this->getRequest();
-		
+
 		$file = $request->getParam('image');
-		
+
 		if ( !empty($file) ){
 			$message = "Erreur suppression fichier.";
 			if ( unlink($this->pathLogo.'/'.$file)){
 				$message = 'Fichier supprimé.';
 			}
 		}
-		
+
 		$this->view->assign('message', $message);
 	}
-	
+
 	//====> Function interne
-	
+
 	function _logo( $siren )
 	{
 		$message = '';
 		if ( isset($_FILES['logoFile']) &&
 		$_FILES['logoFile']['error']!=UPLOAD_ERR_NO_FILE ) {
-	
+
 			/** Un fichier a été uploadé **/
 			$logoFile = $_FILES['logoFile'];
 			$tmp_file = $logoFile['tmp_name'];
-	
+
 			if ( $logoFile['error']!=UPLOAD_ERR_OK ) {
 				$message = 'Erreur lors de la copie du fichier';
 			}
-	
+
 			if ( !is_uploaded_file($tmp_file) ){
 				$message = "Le fichier est introuvable";
 			} else {
@@ -294,9 +296,9 @@ class LogoController extends Zend_Controller_Action
 			}
 			//Suppression ou URL fichier image
 		} elseif ( isset($_REQUEST['logoUrl']['del']) ||
-		( isset($_REQUEST['logoUrl']['url']) &&
-		$_REQUEST['logoUrl']['url']!='' ) ) {
-	
+			( isset($_REQUEST['logoUrl']['url']) &&
+			$_REQUEST['logoUrl']['url']!='' ) ) {
+
 			//Suppression du fichier
 			if ( isset($_REQUEST['logoUrl']['del']) && $_REQUEST['logoUrl']['del'] )
 			{
@@ -307,12 +309,12 @@ class LogoController extends Zend_Controller_Action
 					}
 				}
 			} else {
-				saisie_getlogo($siren);
+				$this->_getlogo($siren);
 			}
 		}
 		return $message;
 	}
-	
+
 	function _saveimg( $siren )
 	{
 		$message = '';
@@ -349,7 +351,7 @@ class LogoController extends Zend_Controller_Action
 		}
 		return $output;
 	}
-	
+
 	function _findlogo( $siren, $isin = '' )
 	{
 		$img = '';
@@ -372,14 +374,14 @@ class LogoController extends Zend_Controller_Action
 		}
 		return $img;
 	}
-	
-	
+
+
 	function _loadlogo( $siren, $isin = '' )
 	{
 		$urlImg = '';
 		$locImg = $this->pathLogo.'/'.$siren;
 		$extensions = array('jpeg', 'jpg', 'png', 'gif', 'bmp');
-	
+
 		//Recherche image sur base siren
 		foreach ( $extensions as $ext ) {
 			if ( file_exists($locImg.'.'.$ext) ) {
@@ -387,7 +389,7 @@ class LogoController extends Zend_Controller_Action
 				break;
 			}
 		}
-	
+
 		//Recherche image sur base isin
 		if ( $urlImg == '' && $isin != '' ) {
 			$locImg = PATH_LOGOS . $isin;
@@ -398,7 +400,7 @@ class LogoController extends Zend_Controller_Action
 				}
 			}
 		}
-	
+
 		$output = '';
 		//Redimensionnement
 		if ( $urlImg != '' ) {
@@ -410,34 +412,36 @@ class LogoController extends Zend_Controller_Action
 			} else {
 				$strSize = '';
 			}
-	
+
 			$output = '<img src="'.$urlImg.'" '.$strSize.'/>';
 		}
 		return $output;
 	}
-	
+
 	function _getlogo( $siren )
 	{
-		require_once 'common/curl.php';
 		$logoUrl = $_REQUEST['logoUrl']['url'];
-		$tabTmp  = parse_url($logoUrl);
-		$hostUrl = $tabTmp['host'];
-		$pathUrl = $tabTmp['path'];
-		$tmp = explode('.', basename($pathUrl));
-		$ext = strtolower(end($tmp));
-		$page = getUrl($logoUrl, '', '', '', false, $hostUrl, '', 7);
-		$body = $page['body'];
 		$extAuthorized = array('jpeg', 'jpg', 'png', 'gif', 'bmp');
-		if ( !in_array($ext, $extAuthorized ) )
-		{
-			$tmp = explode('/', $page['header']['Content-Type']);
-			$ext = trim ( str_replace('?', '',strtolower(end($tmp)) ) );
-		}
-		$name_file = $siren.'.'.$ext;
-		$fp = @fopen($this->pathLogo.'/'.$name_file, 'w');
-		@fwrite($fp, $body);
-		@fclose($fp);
-		chmod($this->pathLogo.'/'.$name_file, 0755);
+
+		try {
+			$client = new Zend_Http_Client($pathUrl);
+			$client->setStream();
+			$response = $client->request('GET');
+			if ( $response->isSuccessful() ) {
+
+				$tmp = explode('.', basename($response->getStreamName()));
+				$ext = strtolower(end($tmp));
+				if ( !in_array($ext, $extAuthorized ) )
+				{
+					$tmp = explode('/', $page['header']['Content-Type']);
+					$ext = trim ( str_replace('?', '',strtolower(end($tmp)) ) );
+				}
+				$name_file = $siren.'.'.$ext;
+				if( copy($response->getStreamName(), $this->pathLogo.'/'.$name_file) ) {
+					chmod($this->pathLogo.'/'.$name_file, 0755);
+				}
+			}
+		} catch (Zend_Http_Client_Exception $e) {}
 	}
-	
+
 }

application/controllers/MandataireController.php

@@ -204,7 +204,7 @@ class MandataireController extends Zend_Controller_Action
 		$tabEntrep = $ws->getIdentite($siren);
 		if ($tabEntrep!==false){
 			/**
-			 * Utiliser la raison sociale la plus longue
+			 * Utiliser la dénomination sociale la plus longue
 			 * Nom, Nom2, NomLong
 			 */
 			if (!empty($tabEntrep->NomLong) && strlen($tabEntrep->NomLong)>strlen($tabEntrep->Nom)){

application/controllers/PrintController.php

@@ -1,9 +1,9 @@
 <?php
 class PrintController extends Zend_Controller_Action
 {
-		
+
 	public function init(){}
-	
+
 	/**
 	 * Renvoie les paramètres pour l'impression
 	 */
@@ -71,7 +71,10 @@ class PrintController extends Zend_Controller_Action
 				$params['id'] = $elements[3];
 				break;
 			case 'giant':
-            	$params['idRapport'] = $elements[2];
+            	$params['Pays'] = $elements[2];
+            	$params['Type'] = $elements[3];
+            	$params['CompanyId'] = $elements[4];
+            	$params['Language'] = $elements[5];
                 break;
 			case 'surveillance':
 				switch($action){
@@ -81,6 +84,10 @@ class PrintController extends Zend_Controller_Action
 						break;
 				}
 				break;
+			case 'worldcheck':
+				$params['matchIdentifier'] = $elements[2];
+				$params['nameType'] = $elements[3];
+				break;
 			default:
 				return false;
 				break;
@@ -91,9 +98,9 @@ class PrintController extends Zend_Controller_Action
 			'params' 		=> $params
 		);
 	}
-	
+
 	public function indexAction(){}
-	
+
 	/**
 	 * Imprime la page en PDF
 	 * Par défaut, le contenu html a déjà été enregistré..
@@ -106,13 +113,13 @@ class PrintController extends Zend_Controller_Action
 	{
 		$request = $this->getRequest();
 		$fichier = $request->getParam('fichier');
-		
+
 		if (substr($fichier,-4)!='.pdf') {
 			echo 'Fichier incorrect';
 			exit;
 		}
 		$fichier = str_replace('.pdf', '', $fichier);
-		
+
 		$c = Zend_Registry::get('config');
 		$file = $c->profil->path->pages.'/'.$fichier.'.html';
 		if (!file_exists($file))
@@ -120,20 +127,19 @@ class PrintController extends Zend_Controller_Action
 			echo 'Fichier introuvable';
 			exit;
 		}
-
-		require_once 'wkhtmltopdf/wkhtmltopdf.php';
-		$pdf = new wkhtmltopdf();
+
+		$pdf = new Scores_Wkhtml_Pdf();
 		$pdf->setOptions('footer-right', 'Page [page] sur [toPage]');
 		$pdf->setOptions('header-right', date('d/m/Y H:i:s'));
 		$output_file = $pdf->exec($file);
-		
+
 		//Envoi au navigateur
 		if(!file_exists($output_file))
 		{
 			echo 'Impossible de générer le fichier PDF';
 			exit;
 		}
-		
+
 		$content_type = 'application/pdf';
 		$dest = 'I';
 		switch($dest)
@@ -169,7 +175,7 @@ class PrintController extends Zend_Controller_Action
 				break;
 		}
 	}
-	
+
 	/**
 	 * Imprime la page en activant le javascript d'impression
 	 * Il faut récupérer le controller et l'action du nom du fichier, ainsi que
@@ -181,12 +187,12 @@ class PrintController extends Zend_Controller_Action
 	{
 		$request = $this->getRequest();
 		$fichier = $request->getParam('fichier', '');
-		
+
 		if (substr($fichier,-5)!='.html') {
 			echo 'Fichier incorrect';
 			exit;
 		}
-		
+
 		$fichier = str_replace('.html', '', $fichier);
 		$elements = $this->pageParams($fichier);
 		if ($elements===false){
@@ -196,7 +202,7 @@ class PrintController extends Zend_Controller_Action
 		$this->view->assign('action', $elements['action']);
 		$this->view->assign('params', $elements['params']);
 	}
-	
+
 	/**
 	 * Envoi le fichier XML de l'objet sérialiser sur la sortie standard
 	 */
@@ -206,19 +212,19 @@ class PrintController extends Zend_Controller_Action
 		$this->_helper->viewRenderer->setNoRender(true);
 		$request = $this->getRequest();
 		$fichier = $request->getParam('fichier', '');
-		
+
 		if (substr($fichier,-4)!='.xml') {
 			echo 'Fichier incorrect.';
 			exit;
 		}
-		
+
 		$c = Zend_Registry::get('config');
 		$file = $c->profil->path->files.'/'.$fichier;
 		if (!file_exists($file)){
 			echo "Erreur lors de la génération du fichier.";
 			exit;
 		}
-		
+
 		header("Content-type: application/xml");
 		header("Content-Disposition: attachement; filename=\"$fichier\"");
 		flush();

application/controllers/RechercheController.php

@@ -1,6 +1,7 @@
 <?php
 class RechercheController extends Zend_Controller_Action
 {
+	protected $theme;
 
     public function init()
     {
@@ -8,16 +9,15 @@ class RechercheController extends Zend_Controller_Action
         if(isset($_SESSION['recherche']['giant']))
             unset($_SESSION['recherche']['giant']);
 
-        require_once 'Scores/RechercheHistorique.php';
         require_once 'Scores/WsScores.php';
 
-        $theme = Zend_Registry::get('theme');
-        $this->view->headScript()->appendFile($theme->pathScript.'/recherche.js', 'text/javascript');
+        $this->theme = Zend_Registry::get('theme');
+        $this->view->inlineScript()->appendFile($this->theme->pathScript.'/recherche.js', 'text/javascript');
     }
 
     public function indexAction()
     {
-		$this->_forward('entreprise');
+		$this->forward('entreprise');
     }
 
     /**
@@ -26,7 +26,7 @@ class RechercheController extends Zend_Controller_Action
     public function entrepriseAction()
     {
     	$request = $this->getRequest();
-    	$this->view->headTitle()->append('Recherche Entreprise');
+    	$this->view->headTitle()->prepend('Recherche Entreprise');
     	$form = new Application_Form_RechercheEntreprise();
     	if ( $request->isPost() || $request->isGet() ){
     		$form->populate($request->getParams());
@@ -45,7 +45,7 @@ class RechercheController extends Zend_Controller_Action
     public function dirigeantAction()
     {
     	$request = $this->getRequest();
-    	$this->view->headTitle()->append('Recherche Dirigeant');
+    	$this->view->headTitle()->prepend('Recherche Dirigeant');
     	$form = new Application_Form_RechercheDirigeant();
     	if ( $request->isPost() || $request->isGet() ){
     		$form->populate($request->getParams());
@@ -53,6 +53,20 @@ class RechercheController extends Zend_Controller_Action
     	$this->view->assign('form', $form);
     }
 
+    /**
+     * Affiche le formulaire de recherche WorldCheck
+     */
+    public function worldcheckAction()
+    {
+    	$request = $this->getRequest();
+    	$this->view->headTitle()->prepend('Recherche WorldCheck');
+    	$form = new Application_Form_RechercheWorldcheck();
+    	if ( $request->isPost() || $request->isGet() ){
+    		$form->populate($request->getParams());
+    	}
+    	$this->view->assign('form', $form);
+    }
+
     /**
      * Affiche le formulaire de recherche actionnaire
      * @todo : style pour les pourcentages
@@ -73,9 +87,9 @@ class RechercheController extends Zend_Controller_Action
      */
 	public function annonceAction()
 	{
-		$this->view->headTitle()->append('Recherche Annonce');
+		$this->view->headTitle()->prepend('Recherche Annonce');
 
-		$session = new RechercheHistorique();
+		$session = new Scores_Session_Recherche();
 		$recherche = $session->item(0);
 		if ($recherche['type']=='annonce') {
 			$params = $recherche['params']['formA'];
@@ -91,7 +105,7 @@ class RechercheController extends Zend_Controller_Action
 		$params = $request->getParams();
 		$token = $request->getParam('token', null);
 
-		$session = new RechercheHistorique();
+		$session = new Scores_Session_Recherche();
 
 		if (array_key_exists('formA', $params)) {
 			$token = $session->save('annonce', $params);
@@ -246,7 +260,7 @@ class RechercheController extends Zend_Controller_Action
     {
     	$this->view->headTitle()->append('Liste des dernières recherches');
     	// @todo : Attention lorsqu'il n'y pas de recherche enregistré
-    	$rechercheSession = new RechercheHistorique();
+    	$rechercheSession = new Scores_Session_Recherche();
     	$derniereRecherche = $rechercheSession->item(0);
     	$params = array_merge(array('type'=> $derniereRecherche['type']), $derniereRecherche['params']);
     	$this->_forward('liste', 'recherche', null, $params);
@@ -255,7 +269,7 @@ class RechercheController extends Zend_Controller_Action
     public function listAction()
     {
         $this->view->headTitle()->append('Liste des dernières recherches');
-        $rechercheSession = new RechercheHistorique();
+        $rechercheSession = new Scores_Session_Recherche();
     	$this->view->assign('historique', $rechercheSession->liste());
     }
 
@@ -292,8 +306,7 @@ class RechercheController extends Zend_Controller_Action
 			$message.= "Prénom : ".$user->getPrenom()."<br/>";
 			$objet = "Demande d'investigation";
 
-			require_once 'Scores/Mail.php';
-			$mail = new Mail();
+			$mail = new Scores_Mail();
 			$mail->setFrom('contact');
 			$mail->addToKey('support');
 			$mail->setSubject($objet);
@@ -338,9 +351,13 @@ class RechercheController extends Zend_Controller_Action
     			$action = 'actionnaire';
     			$listParams = array('siret', 'actNomRs', 'cpVille', 'pays', 'cpVille', 'pctMin', 'pctMax');
     			break;
+    		case 'wcheck':
+    			$action = 'worldcheck';
+    			$listParams = array('dirNom', 'dirPrenom', 'dirType');
+    			break;
     	}
 
-    	$rechercheParams =  new RechercheHistorique();
+    	$rechercheParams = new Scores_Session_Recherche();
 
     	//Si le formulaire a été soumis alors on enregistre en session et on redirige
     	if ( !empty($type) ) {
@@ -348,7 +365,7 @@ class RechercheController extends Zend_Controller_Action
     		$nbField = count($listParams);
     		foreach($listParams as $key){
     			if(!empty($params[$key])){
-    				$params[$key] = strip_tags($params[$key]);
+    				$params[$key] = strip_tags($params[$key]);
     			} else {
     				$nbField--;
     			}
@@ -357,6 +374,18 @@ class RechercheController extends Zend_Controller_Action
     			$this->_redirect('/recherche/'.$action);
     		}
 
+    		//Worldcheck - Vérification si les champs demandés (NOM et TYPE) ont été saisie
+    		if ($type=='wcheck')
+    		{
+    			$required = array('dirNom', 'dirType');
+	    		foreach($required as $item){
+	    			if(empty($params[$item])){
+	    				$this->_redirect('/recherche/worldcheck');
+	    				break;
+	    			}
+	    		}
+    		}
+
     		//Redirection
     		$token = $rechercheParams->save($type, $params);
     		$this->_redirect('recherche/liste/token/'.$token);
@@ -373,16 +402,20 @@ class RechercheController extends Zend_Controller_Action
     	if( !empty($params['pays']) && $type == 'ent' ){
     		Zend_Registry::get('firebug')->info('RECHERCHE GIANT');
     		$this->_forward('search', 'giant', null, $params);
+    	//Worldcheck
+    	} elseif ($type == 'wcheck' ) {
+    		$this->_forward('index', 'worldcheck', null, $params);
     	//Recherche
     	} else {
 
     		$user = new Scores_Utilisateur();
     		$this->view->assign('IDENTITE', $user->checkPerm('IDENTITE'));
 
-			$page = $request->getParam('page', 1);
-			if ($page==0) $page = 1;
-			$page = $page-1;
-			$position = $page*$user->getNbRep();
+            //Pagination
+    		$page = $request->getParam('page', 1);
+    		if ( $page <= 0 ) $page = 1;
+    		$nbAffichage = $user->getNbRep();
+    		$position = ($page - 1 ) * $nbAffichage;
 
 			require_once 'Scores/WsScores.php';
 			$ws = new WsScores();
@@ -552,15 +585,6 @@ class RechercheController extends Zend_Controller_Action
 		    	}
 
 		    	$criteresLien = $this->view->url($params, null, true);
-		    	$info = $reponse->info;
-		    	$nbReponses = $reponse->nbReponses;
-		    	$nbReponsesTotal = $reponse->nbReponsesTotal;
-		    	if ($nbReponses < $nbReponsesTotal) {
-		    		$totPage = ceil($nbReponsesTotal/$user->getNbRep());
-					$curPage = $page+1;
-		    	} else {
-		    		$totPage = $curPage = 1;
-		    	}
 
 		    	$liste = array();
 		    	if (count($etabs)>0) {
@@ -572,6 +596,8 @@ class RechercheController extends Zend_Controller_Action
 						$item['siret'] = $etab->Siren.$etab->Nic;
 			    		$item['InfoSiret'] = $etab->Siren.' '.$etab->Nic;
 			    		$item['InfoNom'] = $etab->Nom;
+			    		$item['source'] = $etab->Source;
+			    		$item['sourceId'] = $etab->SourceId;
 
 			    		$nomDetail = '';
 			    		if ($etab->Nom2<>'' || $etab->Enseigne<>'' || $etab->Sigle<>'') {
@@ -598,7 +624,6 @@ class RechercheController extends Zend_Controller_Action
     			    		} else {
     			    			$infoEtab.= '&Eacute;tablissement secondaire ';
     			    		}
-    			    		Zend_Registry::get('firebug')->info('Nic: '.$etab->Nic.' , Siege: '.$etab->Siege);
 
     						if ($etab->Actif==1){
     							$infoEtab.= 'actif';
@@ -632,15 +657,14 @@ class RechercheController extends Zend_Controller_Action
 
 			    		$item['InfoEtab'] = $infoEtab;
 
-			    		$adresse = $etab->Adresse.'<br/>';
-			    		if (isset($etab->Adresse2) && $etab->Adresse2 != '') {
-			    			$adresse.= $etab->Adresse2.'<br/>';
+			    		$adresse = $etab->Adresse;
+			    		if ( !empty($etab->Adresse2) ) {
+			    			$adresse.= '<br/>'.$etab->Adresse2;
 						}
-			    		$adresse.= "<b>".$etab->CP." ".$etab->Ville."</b>";
-
-			    		if (null === $etab->Pays) {
-			    		    $adresse.= '<br/><b>France</b>';
-			    		} else {
+						if ( !empty($etab->Ville) && intval($etab->CP) > 0) {
+						    $adresse.= '<br/><b>'.$etab->CP." ".$etab->Ville."</b>";
+						}
+			    		if (null !== $etab->Pays) {
 			    		    $adresse.= '<br/><b>'.$etab->Pays.'</b>';
 			    		}
 
@@ -690,8 +714,8 @@ class RechercheController extends Zend_Controller_Action
 			    				if ($etab->ActActif==0){
 			    					$preDate = ', avant le ';
 			    				}
-			    				require_once 'common/dates.php';
-			    				if ($etab->ActDateLien!='') $item['InfoActionnaire'].= $preDate.WDate::dateT('Y-m-d', 'd/m/Y',$etab->ActDateLien);
+			    				$date = new Zend_Date($etab->ActDateLien, 'yyyy-MM-dd');
+			    				if ($etab->ActDateLien!='') $item['InfoActionnaire'].= $preDate.$date->toString('dd/MM/yyyy');
 			    				if ($etab->ActPmin!='') {
 			    					if($etab->ActPmin<1){
 			    						$item['InfoActionnaire'].= ', minoritaire ';
@@ -761,15 +785,38 @@ class RechercheController extends Zend_Controller_Action
 	    		$this->view->assign('blockDirToEntreprise', false);
 	    	}
 
-	    	$this->view->assign('token', $token);
-			$this->view->assign('liste', $liste);
-			$this->view->assign('totPage', $totPage);
-	    	$this->view->assign('curPage', $curPage);
+	    	$this->view->assign('liste', $liste);
+
+	    	//Calcul pagination
+	    	$nbReponses = $reponse->nbReponses;
+	    	$nbReponsesTotal = $reponse->nbReponsesTotal;
+	    	if ($nbReponses < $nbReponsesTotal) {
+                $pageTotal = ceil( $nbReponsesTotal / $nbAffichage );
+                $pageCurrent =  $page;
+                $pagePrev = $page - 1;
+                if ($pagePrev < 1) {
+                    $pagePrev = 1;
+                }
+                $pageNext = $page + 1;
+                if( $pageNext > $pageTotal ) {
+                	$pageNext = $pageTotal;
+                }
+	    	} else {
+	    	    $pageTotal = $pageCurrent = 1;
+	    	}
+	    	$this->view->assign('PageTotal', $pageTotal);
+	    	$this->view->assign('PagePrev', $pagePrev);
+	    	$this->view->assign('PageNext', $pageNext);
+	    	$this->view->assign('PageCurrent', $pageCurrent);
+
 	    	$this->view->assign('nbReponses', empty($nbReponses) ? 0 : $nbReponses);
 	    	$this->view->assign('nbReponsesTotal', empty($nbReponsesTotal) ? 0 : $nbReponsesTotal);
+
+	    	$this->view->assign('token', $token);
+
 	    	$this->view->assign('criteresTexte', $criteresTexte);
 	    	$this->view->assign('criteresLien', $criteresLien);
-	    	$this->view->assign('info', $info);
+	    	$this->view->assign('info', $reponse->info);
     	}
     }
 
@@ -893,7 +940,7 @@ class RechercheController extends Zend_Controller_Action
     	$params = $request->getParams();
     	$type = $request->getParam('type', '');
 
-    	$rechercheParams =  new RechercheHistorique();
+    	$rechercheParams = new Scores_Session_Recherche();
 
     	//Si le formulaire a été soumis alors on enregistre en session et on redirige
     	if ( !empty($type) ) {
@@ -1004,9 +1051,14 @@ class RechercheController extends Zend_Controller_Action
 					$item['source'] = $etab->Infos->source;
 					$item['ref'] = $etab->Infos->ref;
 
-					require_once 'common/dates.php';
-					$item['dateAjout'] = WDate::dateT('Y-m-d','d/m/Y',$etab->Infos->dateAjout);
-					$item['dateEnvoi'] = ($etab->Infos->dateEnvoi!='0000-00-00') ? WDate::dateT('Y-m-d','d/m/Y',$etab->Infos->dateEnvoi) : '';
+					$date = new Zend_Date($etab->Infos->dateAjout, 'yyyy-MM-dd');
+					$item['dateAjout'] = $date->toString('dd/MM/yyyy');
+					if ( $etab->Infos->dateEnvoi!='0000-00-00' ) {
+						$date = new Zend_Date($etab->Infos->dateEnvoi, 'yyyy-MM-dd');
+						$item['dateEnvoi'] = $date->toString('dd/MM/yyyy');
+					} else {
+						$item['dateEnvoi'] = '';
+					}
 
 					$liste[] = $item;
 				}
@@ -1033,7 +1085,7 @@ class RechercheController extends Zend_Controller_Action
     	$this->_helper->layout()->disableLayout();
     	$this->_helper->viewRenderer->setNoRender(true);
 
-    	$rechercheParams =  new RechercheHistorique();
+    	$rechercheParams = new Scores_Session_Recherche();
     	//On selectionne en session
     	if (count($rechercheParams->liste())>0){
     		$recherche = $rechercheParams->item(0);
@@ -1142,8 +1194,7 @@ class RechercheController extends Zend_Controller_Action
     	$c = Zend_Registry::get('config');
     	$file = $c->profil->path->files . '/'.$user->getIdClient().'-'.$user->getLogin().'-'.date('YmdHis').'.csv';
 
-    	require_once 'Scores/ExportCSV.php';
-    	$export = new ExportCSV($etabs, 'rechercheEntreprise');
+    	$export = new Scores_Export_ArrayCsv($etabs, 'rechercheEntreprise');
     	$export->writeFile($file);
 
     	$content_type = 'application/csv-tab-delimited-table';

application/controllers/SaisieController.php

@@ -1,6 +1,9 @@
 <?php
 class SaisieController extends Zend_Controller_Action
 {
+	protected $countries;
+
+	protected $currencies;
 
     /**
 	 * Enter description here ...
@@ -75,267 +78,13 @@ class SaisieController extends Zend_Controller_Action
 		'Societe' => 'STE'
 	);
 
-	/**
-	 * Liste des pays
-	 * @var array
-	 */
-	protected $selectPays = array(
-		'FRA' => "France",
-		'AND' => "Andorre",
-		'ARE' => "Emirats Arabes Unis",
-		'AFG' => "Afghanistan",
-		'ATG' => "Antigua",
-		'AIA' => "Anguilla",
-		'ALB' => "Albanie",
-		'ARM' => "Arménie",
-		'ANT' => "Antilles Néerlandaises",
-		'AGO' => "Angola",
-		'ATA' => "Antarctique",
-		'ARG' => "Argentine",
-		'ASM' => "Samoa Américaines",
-		'AUT' => "Autriche",
-		'AUS' => "Australie",
-		'ABW' => "Aruba",
-		'AZE' => "Azerbaïdjan",
-		'BIH' => "Bosnie-Herzégovine",
-		'BRB' => "Barbade",
-		'BGD' => "Bangladesh",
-		'BEL' => "Belgique",
-		'BFA' => "Burkina Faso",
-		'BGR' => "Bulgarie",
-		'BHR' => "Bahreïn",
-		'BDI' => "Burundi",
-		'BEN' => "Bénin",
-		'BMU' => "Bermudes",
-		'BRN' => "Brunei",
-		'BOL' => "Bolivie",
-		'BRA' => "Brésil",
-		'BHS' => "Bahamas",
-		'BTN' => "Bhoutan",
-		'BVT' => "Iles Bouvet",
-		'BWA' => "Botswana",
-		'BLR' => "Biélorussie",
-		'BLZ' => "Bélize",
-		'CAN' => "Canada",
-		'CCK' => "Iles Cocos",
-		'CAF' => "République Centrafricaine",
-		'COG' => "Congo",
-		'CHE' => "Suisse",
-		'CIV' => "Côte d\'Ivoire",
-		'COK' => "Iles Cook",
-		'CHL' => "Chili",
-		'CMR' => "Cameroun",
-		'CHN' => "Chine",
-		'COL' => "Colombie",
-		'CRI' => "Costa Rica",
-		'CSK' => "Tchécoslovaquie",
-		'CUB' => "Cuba",
-		'CPV' => "Cap-Vert",
-		'CXR' => "Ile Christmas",
-		'CYP' => "Chypre",
-		'CZE' => "Rébublique Tchèque",
-		'DDR' => "République Démocratique Allemande",
-		'DEU' => "Allemagne",
-		'DJI' => "Djibouti",
-		'DNK' => "Danemark",
-		'DMA' => "Dominique",
-		'DOM' => "République Dominicaine",
-		'DZA' => "Algérie",
-		'ECU' => "Equateur",
-		'EST' => "Estonie",
-		'EGY' => "Egypte",
-		'ESH' => "Sahara Occidental",
-		'ERI' => "Eritrea",
-		'ESP' => "Espagne",
-		'ETH' => "Ethiopie",
-		'FIN' => "Finlande",
-		'FJI' => "Iles Fidji",
-		'FLK' => "Iles Malouines",
-		'FSM' => "Etats Fédérés de Micronésie",
-		'FRO' => "Iles Féroé",
-		'GAB' => "Gabon",
-		'GBR' => "Royaume-Uni",
-		'GRD' => "Grenade",
-		'GEO' => "Géorgie",
-		'GUF' => "Guinée française",
-		'GHA' => "Ghana",
-		'GIB' => "Gibraltar",
-		'GRL' => "Groënland",
-		'GMB' => "Gambie",
-		'GIN' => "Guinée",
-		'GLP' => "Guadeloupe",
-		'GNQ' => "Guinée Equatoriale",
-		'GRC' => "Grèce",
-		'SGS' => "Géorgie du sud & Iles Sandwich",
-		'GTM' => "Guatemala",
-		'GUM' => "Guam",
-		'GNB' => "Guinée-Bissau",
-		'GUY' => "Guyane",
-		'HKG' => "Hong Kong",
-		'HMD' => "Iles Heard et Mc Donald",
-		'HND' => "Honduras",
-		'HRV' => "Croatie",
-		'HTI' => "Haïti",
-		'HUN' => "Hongrie",
-		'IDN' => "Indonésie",
-		'IRL' => "Irlande",
-		'ISR' => "Israël",
-		'IND' => "Inde",
-		'IOT' => "Iles Vierges Britanniques",
-		'IRQ' => "Irak",
-		'IRN' => "Iran",
-		'ISL' => "Islande",
-		'ITA' => "Italie",
-		'JAM' => "Jamaïque",
-		'JOR' => "Jordanie",
-		'JPN' => "Japon",
-		'KEN' => "Kenya",
-		'KGZ' => "Kirghizistan",
-		'KHM' => "Cambodge",
-		'KIR' => "Kiribati",
-		'COM' => "Comores",
-		'KNA' => "Saint-Kitts",
-		'PRK' => "Corée",
-		'KOR' => "République de Corée",
-		'KWT' => "Koweït",
-		'CYM' => "Iles Caïman",
-		'KAZ' => "Kazakhstan",
-		'LAO' => "Laos",
-		'LBN' => "Liban",
-		'LCA' => "Sainte-Lucie",
-		'LIE' => "Liechtenstein",
-		'LKA' => "Sri Lanka",
-		'LBR' => "Libéria",
-		'LSO' => "Lesotho",
-		'LTU' => "Lithuanie",
-		'LUX' => "Luxembourg",
-		'LVA' => "Lettonie",
-		'LBY' => "Libye",
-		'MAR' => "Maroc",
-		'MCO' => "Monaco",
-		'MDA' => "Moldavie",
-		'MDG' => "Madagascar",
-		'MHL' => "Iles Marshall",
-		'MKD' => "Macédoine",
-		'MLI' => "Mali",
-		'MMR' => "Myanmar",
-		'MNG' => "Mongolie",
-		'MAC' => "Macao",
-		'MNP' => "Iles Mariannes",
-		'MTQ' => "Martinique",
-		'MRT' => "Mauritanie",
-		'MNE' => "Monténégro",
-		'MSR' => "Montserrat",
-		'MLT' => "Malte",
-		'MUS' => "Ile Maurice",
-		'MDV' => "Maldives",
-		'MWI' => "Malawi",
-		'MEX' => "Mexique",
-		'MYS' => "Malaisie",
-		'MOZ' => "Mozambique",
-		'NAM' => "Namibie",
-		'NCL' => "Nouvelle Calédonie",
-		'NER' => "Niger",
-		'NFK' => "Iles Norfolk",
-		'NGA' => "Nigeria",
-		'NIC' => "Nicaragua",
-		'NLD' => "Pays-Bas",
-		'NOR' => "Norvège",
-		'NPL' => "Népal",
-		'NRU' => "Nauru",
-		'NTZ' => "Zone Neutre",
-		'NIU' => "Niue",
-		'NZL' => "Nouvelle Zélande",
-		'OMN' => "Oman",
-		'PAN' => "Panama",
-		'PER' => "Pérou",
-		'PYF' => "Polynésie Francaise",
-		'PNG' => "Papouasie Nouvelle-Guinée",
-		'PHL' => "Philippines",
-		'PAK' => "Pakistan",
-		'POL' => "Pologne",
-		'SPM' => "Saint Pierre et Miquelon",
-		'PCN' => "Pitcairn",
-		'PRI' => "Porto Rico",
-		'PRT' => "Portugal",
-		'PLW' => "Palau",
-		'PRY' => "Paraguay",
-		'QAT' => "Qatar",
-		'REU' => "Ile de la Réunion",
-		'ROM' => "Roumanie",
-		'RUS' => "Russie",
-		'RWA' => "Rwanda",
-		'SAU' => "Arabie Saoudite",
-		'SLB' => "Iles Salomon",
-		'SRB' => "Serbie",
-		'SYC' => "Seychelles",
-		'SDN' => "Soudan",
-		'SWE' => "Suède",
-		'SGP' => "Singapour",
-		'SHN' => "Sainte-Hélène",
-		'SVN' => "Slovénie",
-		'SJM' => "Spitsberg et lle Jan Mayen",
-		'SVK' => "Slovaquie",
-		'SLE' => "Sierra Leone",
-		'SMR' => "Saint-Marin",
-		'SEN' => "Sénégal",
-		'SOM' => "Somalie",
-		'SUR' => "Surinam",
-		'STP' => "São Tomé et Principe",
-		'SUN' => "URSS",
-		'SLV' => "Salvador",
-		'SYR' => "Syrie",
-		'SWZ' => "Swaziland",
-		'TCA' => "Iles Turques et Caïques",
-		'TCD' => "Tchad",
-		'ATF' => "Terres Australes Francaises",
-		'TGO' => "Togo",
-		'THA' => "Thaïlande",
-		'TJK' => "Tadjikistan",
-		'TKL' => "Iles Tokélaou",
-		'TKM' => "Turkménistan",
-		'TUN' => "Tunisie",
-		'TON' => "Tonga",
-		'TMP' => "Timor Oriental",
-		'TUR' => "Turquie",
-		'TTO' => "Trinité-et-Tobago",
-		'TUV' => "Tuvalu",
-		'TWN' => "Taïwan, République de Chine",
-		'TZA' => "Tanzanie",
-		'UKR' => "Ukraine",
-		'UGA' => "Ouganda",
-		'UMI' => "Iles mineures éloignées des E.U",
-		'USA' => "Etats Unis",
-		'URY' => "Uruguay",
-		'UZB' => "Ouzbékistan",
-		'VAT' => "Vatican",
-		'VCT' => "Saint Vincent et les Grenadines",
-		'VEN' => "Vénézuéla",
-		'VGB' => "Iles Vierges Britaniques",
-		'VIR' => "Iles Vierges U.S",
-		'VNM' => "Vietnam",
-		'VUT' => "Vanuatu",
-		'WLF' => "Wallis et Futuna",
-		'WSM' => "Samoa Américaines",
-		'XBA' => "Rép. Turque de Chypre",
-		'YMD' => "Yémen (République Démocratique)",
-		'YEM' => "Yemen",
-		'MYT' => "Mayotte",
-		'YUG' => "Yougoslavie",
-		'ZAF' => "Afrique du sud",
-		'ZMB' => "Zambie",
-		'ZAR' => "Zaïre",
-		'ZWE' => "Zimbabwe",
-	);
-
 	public function init()
 	{
 		require_once 'Scores/WsScores.php';
-		require_once 'Scores/SessionEntreprise.php';
 		require_once 'Scores/IdentiteEntreprise.php';
-		require_once 'common/dates.php';
 
 		$ws = new WsScores();
+		//codPays3 (index), libPays, devise
 		$countries = json_decode($ws->getCatalogCountry(),true);
 		if ($countries!==false) {
 		    $lib = array();
@@ -346,6 +95,7 @@ class SaisieController extends Zend_Controller_Action
 		    $this->countries = $countries;
 		}
 
+		//devIso (index), devNom
 		$currencies = json_decode($ws->getCatalogCurrency(),true);
 		if ($currencies!==false) {
 		    $lib = array();
@@ -362,7 +112,10 @@ class SaisieController extends Zend_Controller_Action
 	/**
 	 * Index
 	 */
-	public function indexAction(){}
+	public function indexAction()
+	{
+		//Do nothing
+	}
 
 	/**
 	 * Affichage du formulaire de saisie
@@ -386,13 +139,14 @@ class SaisieController extends Zend_Controller_Action
 		$devises = $devisesReponse->result->item;
 
 		//Mise en session
-		$session = new SessionEntreprise($siret, $id, true);
+		$session = new Scores_Session_Entreprise($siret, $id, true);
 		$session->setInfoEntrep($infos);
 
 		$sessionSaisie = new Zend_Session_Namespace('saisie');
 		$sessionSaisie->tabSaisie['tribunal'] = $infos->TribunalCode;
 
-		$this->view->assign('selectPays', $this->selectPays);
+		//@todo : Change
+		$this->view->assign('selectPays', $this->countries);
 
 		$this->view->assign('siret', $siret);
 		$this->view->assign('id', $id);
@@ -526,7 +280,7 @@ class SaisieController extends Zend_Controller_Action
 		$siret = $request->getParam('siret');
 		$id = $request->getParam('id', 0);
 
-		$session = new SessionEntreprise($siret, $id);
+		$session = new Scores_Session_Entreprise($siret, $id);
 
 		$ws = new WsScores();
 
@@ -571,9 +325,9 @@ class SaisieController extends Zend_Controller_Action
 
 		$selectEvent = array(
 			'1100', '1101' , '1200', '1201', '1300', '1301', '1302', '1303', '1304', '1305', '1306',
-		    '1307', '1308', '1309', '1310', '1311', '1312', '1408', '1411', '1412', '1413', '1414', 
-			'1415', '1511', '1502', '1506', '1503', '1512', '1600', '1601', '1999', '2102', '2100', 
-			'2202', '2206', '2319', '2315', '2313', '2305', '2307', '2303', '2306', '2901', '5500', 
+		    '1307', '1308', '1309', '1310', '1311', '1312', '1408', '1411', '1412', '1413', '1414',
+			'1415', '1511', '1502', '1506', '1503', '1512', '1600', '1601', '1999', '2102', '2100',
+			'2202', '2206', '2319', '2315', '2313', '2305', '2307', '2303', '2306', '2901', '5500',
 			'6700', '1010', '1050', '1055', '2203', '2204', '2210', '2212',
 		);
 		$eventM = new Application_Model_TabEvenements();
@@ -904,19 +658,23 @@ class SaisieController extends Zend_Controller_Action
 						}
 						if ( $isEditable && in_array($idanResult->source, array('JT', 'ANTE')))
 						{
+							$dateParution = new Zend_Date(substr($idanResult->dateSource,0,10), 'yyyy-MM-dd');
+							$dateJugement = new Zend_Date($idanResult->dateEffetFinP, 'yyyy-MM-dd');
+							$dateFinPeriode = new Zend_Date($idanResult->dateJugement, 'yyyy-MM-dd');
+
 							//Mapper idanResult dans le tableau de saisie
 							$saisie = array(
 								'source' => isset($_SESSION['source']) ? $_SESSION['source'] : $idanResult->source,
 								'dateParution' => isset($_SESSION['dateParution']) ? $_SESSION['dateParution'] :
-									WDate::dateT('Y-m-d', 'd/m/Y', substr($idanResult->dateSource,0,10)),
+									$dateParution->toString('dd/MM/yyyy'),
 								'numParution' => isset($_SESSION['numParution']) ? $_SESSION['numParution'] : '',
-								'dateJugement' => WDate::dateT('Y-m-d', 'd/m/Y', $idanResult->dateEffetFinP),
+								'dateJugement' => $dateJugement->toString('dd/MM/yyyy'),
 								'tribunal' => $idanResult->tribunal,
 								'even' => $idanResult->even->item,
 								'eventNum' => $eventLimit,
 								'comp' => $idanResult->complement,
 								'montant' => $idanResult->montant,
-								'dateFinPeriode' => WDate::dateT('Y-m-d', 'd/m/Y', $idanResult->dateJugement),
+								'dateFinPeriode' => $dateFinPeriode->toString('dd/MM/yyyy'),
 							);
 
 							$intervenants = array();
@@ -1048,7 +806,7 @@ class SaisieController extends Zend_Controller_Action
 
 			$this->view->inlineScript()->appendFile('/libs/form/jquery.form.js');
 			if ( intval($siren)==0 ) {
-				$session = new SessionEntreprise();
+				$session = new Scores_Session_Entreprise();
 				$siren = '';
 				if ( substr($session->AutreId,0,1)=='W' ) {
 					$siren = $session->AutreId;
@@ -1071,7 +829,7 @@ class SaisieController extends Zend_Controller_Action
 		$siren = substr($siret,0,9);
 		$this->view->assign('siren', $siren);
 
-		$session = new SessionEntreprise($siret, $id);
+		$session = new Scores_Session_Entreprise($siret, $id);
 		$this->view->assign('siret', $siret);
 		$this->view->assign('raisonSociale', $session->getRaisonSociale());
 
@@ -1587,11 +1345,11 @@ class SaisieController extends Zend_Controller_Action
     	    //Override session session
     	    if ( intval($result->siren) != 0 ) {
     	        $siren = $result->siren;
-    	        $session = new SessionEntreprise($siren);
+    	        $session = new Scores_Session_Entreprise($siren);
     	    }
 
 	    } elseif ($siren !== null) {
-	        $session = new SessionEntreprise($siren);
+	        $session = new Scores_Session_Entreprise($siren);
 	        $rs = $session->getRaisonSociale();
 	    }
 
@@ -1605,6 +1363,7 @@ class SaisieController extends Zend_Controller_Action
 	        'T' => 'TUP',
 	        'L' => 'Tutelle',
 	        'E' => 'Franchise',
+	    	'M' => 'Membre',
 	    );
 	    $this->view->assign('detention', $detention);
 
@@ -1643,7 +1402,8 @@ class SaisieController extends Zend_Controller_Action
 	        $this->view->assign('PDetention', $infos['PDetention']);
 	        $this->view->assign('Pvote', $infos['Pvote']);
 	        $this->view->assign('MajMin', $infos['MajMin']);
-	        $this->view->assign('dateEffetLien', WDate::dateT('Y-m-d', 'd/m/Y', $infos['dateEffetLien']));
+	        $dateEffetLien = new Zend_Date($infos['dateEffetLien'], 'yyyy-MM-dd');
+	        $this->view->assign('dateEffetLien', $dateEffetLien->toString('dd/MM/yyyy'));
 
 	    }
 	    //Mode = edit / add
@@ -1668,10 +1428,19 @@ class SaisieController extends Zend_Controller_Action
 	            $this->view->assign('id1', $infos['idAct']);
 	        }
 
+	        $dateEffetLien = new Zend_Date($infos['dateEffetLien'], 'yyyy-MM-dd');
+	        $doc = ($siren) ? $ws->getLienDoc($siren, 'Siren') : $ws->getLienDoc($lienRef, 'Entreprise');
+	        if ( $doc->item[0]->date ) {
+	        	$date = new Zend_Date($doc->item[0]->date, 'yyyy-MM-dd');
+	        	$dateEffetLienDoc = $date->toString('dd/MM/yyyy');
+	        } else {
+				$dateEffetLienDoc = $dateEffetLien->toString('dd/MM/yyyy');
+	        }
 	        $this->view->assign('PDetention', $infos['PDetention']);
 	        $this->view->assign('Pvote', $infos['Pvote']);
 	        $this->view->assign('MajMin', $infos['MajMin']);
-	        $this->view->assign('dateEffetLien', WDate::dateT('Y-m-d', 'd/m/Y', $infos['dateEffetLien']));
+	        $this->view->assign('dateEffetLien', $dateEffetLien->toString('dd/MM/yyyy'));
+	        $this->view->assign('dateEffetLienDoc', $dateEffetLienDoc);
 
 	    } else {
 
@@ -1843,16 +1612,38 @@ class SaisieController extends Zend_Controller_Action
     	        $params['nat'] = '';
     	    }
 
+    	    if (empty($params['dateCapital'])) {
+    	    	$dateCapital = '';
+    	    } else {
+    	    	$date =  new Zend_Date($params['dateCapital'], 'dd/MM/yyyy');
+    	    	$dateCapital = $date->toString('yyyyMMdd');
+    	    }
+
+    	    if (empty($params['naissance_date'])) {
+    	    	$dateNaissance = '';
+    	    } else {
+    	    	$date =  new Zend_Date($params['naissance_date'], 'dd/MM/yyyy');
+    	    	$dateNaissance = $date->toString('yyyyMMdd');
+    	    }
+
+    	    if (empty($params['dateNbActions'])) {
+    	    	$dateNbActions = '';
+    	    } else {
+    	    	$date =  new Zend_Date($params['dateNbActions'], 'dd/MM/yyyy');
+    	    	$dateNbActions = $date->toString('yyyyMMdd');
+    	    }
+
     	    $infos = array(
     	        'siren' => $params['siren'],
-    	        'actif' => 1,
+    	    	'actif' => (array_key_exists('actif', $params) && $params['actif']==0 ) ? 0 : 1,
     	        'PpPm' => $params['PpPm'],
     	        'RS' => strtoupper(trim($params['RS'])),
+    	    	'sigle' => empty($params['sigle']) ? '' : trim($params['sigle']),
     	        'civilite' => $params['civilite'],
     	        'nom' => strtoupper(trim($params['nom'])),
     	        'prenom' => ucfirst(trim($params['prenom'])),
     	        'nom_usage' => strtoupper(trim($params['nom_usage'])),
-    	        'naissance_date' => empty($params['naissance_date']) ? '' : WDate::dateT('d/m/Y','Ymd',$params['naissance_date']),
+    	        'naissance_date' => $dateNaissance,
     	        'naissance_dept_pays' => $params['naissance_dept_pays'],
     	        'naissance_lieu' => $params['naissance_lieu'],
     	        'nat' => $params['nat'],
@@ -1871,8 +1662,10 @@ class SaisieController extends Zend_Controller_Action
     	        'dateSaisie' => date('YmdHis'),
     	        'capital' => empty($params['capital']) ? '' :  trim($params['capital']),
     	        'deviseCapital' => empty($params['deviseCapital']) ? 'EUR' : $params['deviseCapital'],
-    	        'dateCapital' => empty($params['dateCapital']) ? '' : WDate::dateT('d/m/Y', 'Ymd', $params['dateCapital']),
+    	        'dateCapital' => $dateCapital,
     	        'nbActions' => empty($params['nbActions']) ? '' : $params['nbActions'],
+    	    	'dateNbActions' => $dateNbActions,
+    	    	'isin' => empty($params['isin']) ? '' : trim($params['isin']),
     	        'idLoc1Type' => $params['idLoc1Type'],
     	        'idLoc1Num' =>  trim($params['idLoc1Num']),
     	        'idLoc2Type' => $params['idLoc2Type'],
@@ -1901,6 +1694,36 @@ class SaisieController extends Zend_Controller_Action
 	    }
 	}
 
+	public function checkisinAction()
+	{
+		$this->_helper->layout()->disableLayout();
+	    $isin = $this->getRequest()->getParam('isin', '');
+
+		$letters = array(
+				'A' => 10, 'B' => 11, 'C' => 12, 'D' => 13, 'E' => 14, 'F' => 15,
+				'G' => 16, 'H' => 17, 'I' => 18, 'J' => 19, 'K' => 20, 'L' => 21,
+				'M' => 22, 'N' => 23, 'O' => 24, 'P' => 25, 'Q' => 26, 'R' => 27,
+				'S' => 28, 'T' => 29, 'U' => 30, 'V' => 31, 'W' => 32, 'X' => 33,
+				'Y' => 34, 'Z' => 35);
+
+		$digitIsin = strtr($isin, $letters);
+		$tmpIsin = str_split($digitIsin);
+		$checkDigit = end($tmpIsin);
+		unset($tmpIsin[count($tmpIsin)-1]);
+		$firstGroup = '';
+		$secondGroup = '';
+		$split = range(0, count($tmpIsin)-1, 2);
+		foreach ($split as $i)
+		{
+			$firstGroup .= $tmpIsin[$i]+$tmpIsin[$i]*(count($tmpIsin)%2);
+			$secondGroup .= $tmpIsin[$i+1]+$tmpIsin[$i+1]*((count($tmpIsin)+1)%2);
+		}
+		$firstGroupSum = array_sum(str_split($firstGroup));
+		$secondGroupSum = array_sum(str_split($secondGroup));
+		$cmp = (10 - ($firstGroupSum + $secondGroupSum)%10)%10 - $checkDigit;
+		if ($cmp != 0) $this->view->assign('error', true);
+	}
+
 	/**
 	 * Sauvegarde
 	 */
@@ -1911,9 +1734,17 @@ class SaisieController extends Zend_Controller_Action
 	    $params = $this->getRequest()->getParams();
 
 	    if ($params['mode']=='delete') {
+
+	    	if (empty($params['dateEffetLien'])) {
+	    		$dateEffetLien = '';
+	    	} else {
+	    		$date =  new Zend_Date($params['dateEffetLien'], 'dd/MM/yyyy');
+	    		$dateEffetLien = $date->toString('yyyyMMdd');
+	    	}
+
 	        $infos = array(
 	            'actif' => 0,
-	            'dateEffetLien' => empty($params['dateEffetLien']) ? date('Ymd') : WDate::dateT('d/m/Y', 'Ymd', $params['dateEffetLien']),
+	            'dateEffetLien' => $dateEffetLien,
 	            'motifUpdate' => empty($params['motifUpdate']) ? '' : $params['motifUpdate'],
 	        );
 	    } else {
@@ -1926,6 +1757,12 @@ class SaisieController extends Zend_Controller_Action
 	            $idAct = $params['id1'];
 	        }
 
+	    	if (empty($params['dateEffetLien'])) {
+	    		$date = new Zend_Date();
+	    	} else {
+	    		$date =  new Zend_Date($params['dateEffetLien'], 'dd/MM/yyyy');
+	    	}
+
     	    $infos = array(
     	        'idAct' => $idAct,
     	        'actif' => 1,
@@ -1933,7 +1770,7 @@ class SaisieController extends Zend_Controller_Action
     	        'Pvote' => ($params['Pvote']=='') ? null : $params['Pvote'],
     	        'MajMin' => $params['MajMin'],
     	        'idPar' => $idPar,
-    	        'dateEffetLien' => empty($params['dateEffetLien']) ? date('Ymd') : WDate::dateT('d/m/Y', 'Ymd', $params['dateEffetLien']),
+    	        'dateEffetLien' => $date->toString('yyyyMMdd'),
     	        'motifUpdate' => empty($params['motifUpdate']) ? '' : $params['motifUpdate'],
     	    );
 	    }
@@ -1979,6 +1816,13 @@ class SaisieController extends Zend_Controller_Action
 	        } else {
 	            $ws = new WsScores();
 	            $identite = $ws->getIdentite($siren);
+	            if (empty($identite->Bilan->Cloture)) {
+	            	$dateCapital = '';
+	            } else {
+	            	$date = new Zend_Date($identite->Bilan->Cloture, 'yyyyMMdd');
+	            	$dateCapital = $date->toString('dd/MM/yyyy');
+	            }
+
 	            $infos = array(
 	                'siren' => $siren,
 	                'actif' => 1,
@@ -1995,7 +1839,7 @@ class SaisieController extends Zend_Controller_Action
 	                'adresse_num' => $identite->AdresseNum,
 	                'adresse_btq' => $identite->AdresseBtq,
 	                'adresse_codvoie' => $identite->AdresseVoie,
-	                'adresse_libvoie' => $idenite->AdresseRue,
+	                'adresse_libvoie' => $identite->AdresseRue,
 	                'adresse_comp' => $identite->Adresse2,
 	                'adresse_cp' => $identite->CP,
 	                'adresse_ville' => $identite->Ville,
@@ -2003,8 +1847,7 @@ class SaisieController extends Zend_Controller_Action
 	                'dateSaisie' => date('YmdHis'),
 	                'capital' => $identite->Bilan->Capital,
 	                'deviseCapital' => 'EUR',
-	                'dateCapital' => empty($identite->Bilan->Cloture) ? '' :
-	                    WDate::dateT('Ymd','d/m/Y',$identite->Bilan->Cloture),
+	                'dateCapital' => $dateCapital,
 	                'nbActions' => '',
 	                'idLoc1Type' => '',
 	                'idLoc1Num' => '',
@@ -2054,8 +1897,8 @@ class SaisieController extends Zend_Controller_Action
 
 	        if (!file_exists($path)) { mkdir($path); }
 
-	        $date = WDate::dateT('d/m/Y', 'Ymd', $params['fileDate']);
-	        $name = 'INTERNE-'.$params['idNum'].'-'.$params['fileType'].'-'.$date;
+	        $date = new Zend_Date($params['fileDate'],'dd/MM/yyyy');
+	        $name = 'INTERNE-'.$params['idNum'].'-'.$params['fileType'].'-'.$date->toString('yyyyMMdd');
 
             $n = $_FILES['fichier']['name'];
             $s = $_FILES['fichier']['size'];
@@ -2076,7 +1919,7 @@ class SaisieController extends Zend_Controller_Action
                     'idNum' => $params['idNum'],
                     'periDoc' => $params['periDoc'],
                     'docRef' => $name,
-                    'dateDocRef' => $date,
+                    'dateDocRef' => $date->toString('yyyyMMdd'),
                 );
 
                 $ws = new WsScores();
@@ -2117,7 +1960,7 @@ class SaisieController extends Zend_Controller_Action
 
 	    $this->view->headTitle()->append('Saisie - '.$siret);
 
-	    $session = new SessionEntreprise($siret, $id);
+	    $session = new Scores_Session_Entreprise($siret, $id);
 	    $isin = $session->getIsin();
 
 	    $ws = new WsScores();
@@ -2156,6 +1999,7 @@ class SaisieController extends Zend_Controller_Action
 	    Zend_Registry::get('firebug')->info($result);
 
 	    $this->view->assign('nom',$result->Nom);
+	    $this->view->assign('sigle',$result->sigle);
 	    $this->view->assign('adresse_num',$result->AdresseNum);
 	    $this->view->assign('adresse_btq',$result->AdresseBtq);
 	    $this->view->assign('adresse_codvoie',$result->AdresseVoie);
@@ -2163,7 +2007,9 @@ class SaisieController extends Zend_Controller_Action
 	    $this->view->assign('adresse_comp',$result->Adresse2);
 	    $this->view->assign('adresse_cp',$result->CP);
 	    $this->view->assign('adresse_ville',$result->Ville);
+	    $this->view->assign('adresse_pays',$result->Pays);
 
+	    $this->view->assign('actif',$result->Actif);
 	    $this->view->assign('tel',$result->Tel);
 	    $this->view->assign('fax',$result->Fax);
 	    $this->view->assign('web',$result->Web);
@@ -2172,7 +2018,8 @@ class SaisieController extends Zend_Controller_Action
 	    $this->view->assign('ape',$result->NafEnt);
 	    $this->view->assign('capital',$result->Bilan->Capital);
 	    $this->view->assign('deviseCapital', 'EUR');
-	    $this->view->assign('dateCapital', Wdate::dateT('Ymd','d/m/Y',$result->Bilan->Cloture));
+	    $date = new Zend_Date($result->Bilan->Cloture, 'yyyyMMdd');
+	    $this->view->assign('dateCapital', $date->toString('dd/MM/yyyy'));
 	    $this->view->assign('bilDev', 'EUR');
 	    $this->view->assign('bilMillesime', $result->Bilan->Millesime);
 	    $this->view->assign('bilFL', $result->Bilan->CA);
@@ -2229,8 +2076,10 @@ class SaisieController extends Zend_Controller_Action
 	                case 'dateCapital':
 	                case 'dateNbActions':
 	                case 'naissance_date':
-	                    if (!empty($val) && $val!='0000-00-00')
-	                        $this->view->assign($key, WDate::dateT('Y-m-d', 'd/m/Y', $val));
+	                    if (!empty($val) && $val!='0000-00-00') {
+	                    	$date = new Zend_Date($val, 'yyyy-MM-dd');
+	                        $this->view->assign($key, $date->toString('dd/MM/yyyy'));
+	                    }
 	                    break;
 	                default:
 	                    $this->view->assign($key, $val);
@@ -2289,6 +2138,47 @@ class SaisieController extends Zend_Controller_Action
 	    }
 
 	}
+	
+	public function liendeleteAction()
+	{
+	    $this->_helper->layout()->disableLayout();
+	    
+	    $request = $this->getRequest();
+	    $id = $request->getParam('idFiche', null);
+	    $infos = array ('delete' => '1');
+	    
+	    $ws = new WsScores();
+	    
+	    if ($id===null) {
+    		$siren = $request->getParam('siren');
+    		
+    		$result = $ws->searchLienRef($siren, 'siren');
+    		if (count($result->item)>0) {
+    			foreach ($result->item as $item) {
+    				$id = $item->id;
+    				break;
+    			}
+    		}
+	    }
+ 		
+	    if ( $request->isPost() ) {
+	    	if ($id == null) {
+	    		$message = 'Fiche n\'est pas trouvée';
+	    	} else {
+	    		$checkLiens = $ws->getLiensById($id);
+	    		if ($checkLiens->actionnaires->item || $checkLiens->participations->item || $checkLiens->directions->item) {
+	    			$message = 'Presence des liens';
+	    		} else {
+					$result = $ws->setLienRef(json_encode($infos), $id);
+					$message = ($result == 1)?'Fiche supprimée':'Erreur de suppression';
+	    		}
+	    		Zend_Registry::get('firebug')->info($checkLiens->participations->item);
+	    		$this->view->assign('message', $message);
+	    	}
+	    } else {
+	    	$this->view->assign('id', $id);
+	    }
+	}
 
 	public function scorecutoffAction()
 	{
@@ -2297,12 +2187,13 @@ class SaisieController extends Zend_Controller_Action
 
 	    $request = $this->getRequest();
 	    $siren = $request->getParam('siren');
+	    $refresh = 0;
+	    $message = '';
 
 	    if ( $request->isXmlHttpRequest() ) {
 	        $this->_helper->layout()->disableLayout();
 	        if ( $request->isPost() ) {
-	            $params = $request->getParams();
-	            $message = '';
+	            $params = $request->getParams();
 	            // check values one more time
 	            $paramlist = array(
 	            		'siren' => 'Siren',
@@ -2323,11 +2214,17 @@ class SaisieController extends Zend_Controller_Action
 	            // end checking values
 
 	            if ($message == '') {
-	    	        $message = $ws->setScoreCutoff($params['siren'], $params['encours']*1000, $params['scoreSolv'], $params['scoreDir'], $params['scoreConf'], $params['remarque']);
+	    	        $message = $ws->setScoreCutoff($params['siren'], $params['encours']*1000, $params['scoreSolv'], $params['scoreDir'], $params['scoreConf'], $params['remarque'], $params['delete']);
 	    	        if (is_int($message)){
 	    	          	$message = "Cut-off mis à jour.";
+	    	          	$refresh = 1;
 	    	        }
 	            }
+
+	            if ($message == '' && $params['delete'] == 1) {
+	            	$message = "Cut-off est supprimé. Aucun Cut-off est défini, merci de remplir toutes les valeurs";
+	            	$refresh = 1;
+	            }
 	        }
 	    } else {
 	        $this->view->assign('name', "Définir un Cut-off");
@@ -2336,7 +2233,11 @@ class SaisieController extends Zend_Controller_Action
 
 	    $getcutoff = json_decode($ws->getScoreCutoff($siren), true);
 	    if(!$getcutoff) {
-	    	$message = "Aucun Cut-off est défini, merci de remplir toutes les valeurs";
+	    	if ($message == '') {
+	    		$message = "Aucun Cut-off est défini, merci de remplir toutes les valeurs";
+	    		$refresh = 0;
+	    	}
+
 	    	$getcutoff = array(
 	    			'siren' => '',
 	    			'encours' => '',
@@ -2344,8 +2245,8 @@ class SaisieController extends Zend_Controller_Action
 	    			'scoreDir' => '',
 	    			'scoreConf' => '',
 	    			'remarque' => '',
-	    			'dateInsert' => '0000-00-00',
-	    			'dateUpdate' => '0000-00-00'
+	    			'dateInsert' => '',
+	    			'dateUpdate' => ''
 	    	);
 	    }
 
@@ -2353,5 +2254,230 @@ class SaisieController extends Zend_Controller_Action
 	    $this->view->assign('siren', $siren);
 		$this->view->assign('typescore', $user->getTypeScore());
 	    $this->view->assign('message', $message);
+	    $this->view->assign('refresh', $refresh);
 	}
+
+	public function citysearchAction()
+	{
+		$this->_helper->layout()->disableLayout();
+
+		$cpVille = $this->getRequest()->getParam('cpville', null);
+		$output = array();
+
+		if ( null !== $cpVille) {
+			$city = new Application_Model_City();
+			$sql = $city->select('code, libelle');
+			if (is_numeric($cpVille) && strlen($cpVille)<6) {
+				$sql->where("code LIKE '".$cpVille."%'");
+			} else {
+				$sql->where("libelle LIKE '%".$cpVille."%'");
+			}
+			$sql->limit(20);
+			$rows = $city->fetchAll($sql);
+			if ( count($rows)>0 ) {
+				foreach ($rows as $item) {
+					$output[] = array(
+							'label' => str_pad($item->code, 5, 0, STR_PAD_LEFT).": ".$item->libelle,
+							'value' => str_pad($item->code, 5, 0, STR_PAD_LEFT),
+					);
+				}
+			}
+		}
+
+		$this->view->assign('output', $output);
+	}
+
+	/**
+	 * Edit contact information
+	 */
+	public function contactAction()
+	{
+		$request = $this->getRequest();
+		if ( $request->isXmlHttpRequest() ) {
+			$this->_helper->layout()->disableLayout();
+			if ( $request->isPost() ) {
+
+				$this->view->assign('post', true);
+
+				$message = '';
+				$mode = $request->getParam('mode');
+				if( in_array($mode, array('create', 'edit')) ) {
+					$params = $request->getParams();
+					// check values
+					$paramlist = array(
+							'siret' => 'SIRET',
+							'type' => 'Type',
+							'value' => 'Valeur',
+					);
+
+					foreach ($paramlist as $item => $val) {
+						if (!isset($params[$item])) {
+							$message .= "Valeur $val vide !<br/>";
+						}
+					}
+					// end checking values
+
+					if ($message == '') {
+						//setContactEt
+						$ws = new WsScores();
+						$result = $ws->setSaisieContactEt($siret, $type, $value, $info);
+
+						if ( is_string($result) ) {
+							$this->view->assign('msg', $result);
+						}
+
+					} else {
+						$this->view->assign('msg', $message);
+					}
+
+				} else {
+
+					$ws = new WsScores();
+					$result = $ws->delSaisieContactEt($id);
+					if ( is_string($result) ) {
+						$this->view->assign('msg', $result);
+					}
+
+				}
+
+			} else {
+
+				$mode = $request->getParam('mode');
+				$id = $request->getParam('id');
+
+				if ($mode=='delete') {
+
+					$this->view->assign('mode', 'delete');
+
+				} else {
+
+					if ( $id !== null ) {
+						$ws = new WsScores();
+						$result = $ws->getSaisieContactEt($id);
+						$data = json_decode($result);
+						Zend_Registry::get('firebug')->info($data);
+						$this->view->assign('id', $data->id);
+						$this->view->assign('siret', str_pad($data->siren,9,'0',STR_PAD_LEFT).str_pad($data->nic,5,'0',STR_PAD_LEFT));
+						$this->view->assign('type',  $data->typeTel);
+						if ($data->typeTel=='tel' ||  $data->typeTel=='fax' ) {
+							$this->view->assign('value', str_pad($data->telephone,10,'0',STR_PAD_LEFT));
+							$this->view->assign('info', $data->infoTel);
+						} else {
+							$this->view->assign('value', $data->infoTel);
+						}
+
+					} else {
+						$siret = $request->getParam('siret');
+						$this->view->assign('siret', $siret);
+					}
+
+					$this->view->telinfo = array(
+							"accueil",
+							"achats",
+							"administratif",
+							"affrètement",
+							"agence",
+							"agence commerciale",
+							"agence industries",
+							"atelier(s)",
+							"bureau",
+							"bureau d'étude",
+							"centrale à béton",
+							"centre de formation",
+							"chef d'établissement",
+							"comité d’établissement",
+							"comité d'entreprise",
+							"conseil",
+							"conseil financier",
+							"conseil immobilier",
+							"construction",
+							"coordination",
+							"cuisine",
+							"cuisine centrale",
+							"déchetterie",
+							"délégation départementale",
+							"délégation régionale",
+							"dépôt",
+							"direction",
+							"direction commerciale",
+							"direction de l'environnement",
+							"direction des ressources humaines",
+							"direction financière",
+							"direction générale",
+							"direction logistique",
+							"direction régionale",
+							"direction technique",
+							"direction usine",
+							"distribution",
+							"division surveillance",
+							"douane",
+							"entrepôt(s)",
+							"facturation",
+							"fournitures industrielles",
+							"gardien",
+							"gestion",
+							"industrie",
+							"inspection technique",
+							"laboratoire",
+							"local entretien",
+							"local syndical",
+							"magasin",
+							"matériaux",
+							"menuiserie",
+							"négoce",
+							"parking",
+							"pièces détachées",
+							"publicité",
+							"rédaction",
+							"répondeur",
+							"renseignements",
+							"salle d'exposition",
+							"secrétariat",
+							"secrétariat de direction",
+							"service après vente/SAV",
+							"service clients",
+							"service commandes",
+							"service commercial",
+							"service commercial export",
+							"service comptabilité",
+							"service comptabilité fournisseurs",
+							"service courrier",
+							"service dépannage",
+							"service entreprises",
+							"service entretien",
+							"service expéditions",
+							"service exploitation",
+							"service export",
+							"service financier",
+							"service formation",
+							"service fournisseurs",
+							"service import",
+							"service informatique",
+							"service international",
+							"service locations",
+							"service logistique",
+							"service maintenance",
+							"service maritime",
+							"service production",
+							"service qualité",
+							"service technique",
+							"service terrestre",
+							"services généraux",
+							"siège",
+							"standard",
+							"standard général",
+							"standard usine",
+							"syndicat",
+							"transitaire",
+							"transports",
+							"travaux",
+							"unité de production",
+							"usine",
+					);
+
+				}
+			}
+		}
+	}
+
 }

application/controllers/SurveillanceController.php

@@ -36,7 +36,6 @@ class SurveillanceController extends Zend_Controller_Action
 	public function init()
     {
     	require_once 'Scores/WsScores.php';
-    	require_once 'common/dates.php';
     }
 
     public function indexAction()
@@ -141,10 +140,15 @@ class SurveillanceController extends Zend_Controller_Action
 		$delete = $request->getParam('delete', false);
 		$encours = $request->getParam('encours', 0);
 
+		$validateur = new Zend_Validate_EmailAddress();
+
 		//Vérification siret / email / ref
-		if (empty($siret) || empty($email) | empty($ref)){
+		if (empty($siret) || empty($email) || empty($ref)){
 			$msg = 'Erreur email ou reférence non définie !';
 		}
+		elseif (!$validateur->isValid($email)) {
+		    $msg = "Email invalide.";
+		}
 		//Vérification de l'encours (chiffres)
 		elseif (!preg_match('/([0-9]+)/', $encours)){
 			$msg = 'Encours incorrect';
@@ -219,10 +223,11 @@ class SurveillanceController extends Zend_Controller_Action
 					$tooltipTexte = '';
 					$ref = $surv->ref;
 					$tooltipTexte.= "Ref : ".$ref;
-					$tooltipTexte.= "<br/>Date d'ajout :".WDate::dateT('Y-m-d', 'd/m/Y', $surv->dateAjout);
+					$dateAjout = new Zend_Date($surv->dateAjout, 'yyyy-MM-dd');
+					$tooltipTexte.= "<br/>Date d'ajout :".$dateAjout->toString('dd/MM/yyyy');
 					if ($surv->dateDerEnvoi!='0000-00-00 00:00:00') {
-						$tooltipTexte.= "<br/>Date de dernier envoi : ".
-							WDate::dateT('Y-m-d', 'd/m/Y', substr($surv->dateDerEnvoi,0,10));
+						$date = new Zend_Date(substr($surv->dateDerEnvoi,0,10), 'yyyy-MM-dd');
+						$tooltipTexte.= "<br/>Date de dernier envoi : ".$date->toString('dd/MM/yyyy');
 					}
 					$listSurv[] = array(
 						'tooltipTexte' => $tooltipTexte,
@@ -269,7 +274,12 @@ class SurveillanceController extends Zend_Controller_Action
 
     	$request = $this->getRequest();
 
-    	$page = $request->getParam('page', 0);
+    	//Pagination
+    	$page = $request->getParam('page', 1);
+    	if ( $page <= 0 ) $page = 1;
+    	$nbAffichage = 50;
+    	$position = ($page - 1 ) * $nbAffichage;
+
     	$source = $request->getParam('source', '');
 
     	$tri = $request->getParam('tri', 'siren');
@@ -279,14 +289,11 @@ class SurveillanceController extends Zend_Controller_Action
 		$this->view->assign('triMode', $triMode);
 
 		$q = $request->getParam('q', null);
-		if ( $q == 'Siren, Référence, Raison Sociale' ) { $q = null; }
+		if ( $q == 'Siren, Référence, Dénomination Sociale' ) { $q = null; }
 		$this->view->assign('q', $q);
 
 		$detail = true;
 
-		$nbAffichage = 50;
-		$position = $page*$nbAffichage;
-
 	    switch ( $tri ) {
 			default:
 			case 'siren': $triws = 'siren'; break;
@@ -363,18 +370,33 @@ class SurveillanceController extends Zend_Controller_Action
 		}
 
 		//Calcul pagination
-    	$nbReponses = $infos->nbReponses;
-		$nbSurveillances = $infos->nbReponsesTotal;
-		$totPage = ceil($nbSurveillances/$nbAffichage);
-		$curPage = ceil($position/$nbAffichage);
+		$nbReponses = $infos->nbReponses;
+		$nbReponsesTotal = $infos->nbReponsesTotal;
+		if ($nbReponses < $nbReponsesTotal) {
+		    $pageTotal = ceil( $nbReponsesTotal / $nbAffichage );
+		    $pageCurrent =  $page;
+		    $pagePrev = $page - 1;
+		    if ($pagePrev < 1) {
+		        $pagePrev = 1;
+		    }
+		    $pageNext = $page + 1;
+		    if( $pageNext > $pageTotal ) {
+		        $pageNext = $pageTotal;
+		    }
+		} else {
+		    $pageTotal = $pageCurrent = 1;
+		}
+		$this->view->assign('PageTotal', $pageTotal);
+		$this->view->assign('PagePrev', $pagePrev);
+		$this->view->assign('PageNext', $pageNext);
+		$this->view->assign('PageCurrent', $pageCurrent);
+
+		$this->view->assign('nbReponses', empty($nbReponses) ? 0 : $nbReponses);
+		$this->view->assign('nbSurveillances', $nbReponsesTotal);
 
 		$this->view->assign('source', $source);
 		$this->view->assign('selectTri', $selectTri);
 		$this->view->assign('listSources', $permSource);
-		$this->view->assign('nbReponses', $nbReponses);
-		$this->view->assign('nbSurveillances', $nbSurveillances);
-    	$this->view->assign('totPage', $totPage);
-    	$this->view->assign('curPage', $curPage);
     	$this->view->assign('surveillances', $listTrier);
     	$this->view->assign('source', $source);
     }
@@ -394,7 +416,12 @@ class SurveillanceController extends Zend_Controller_Action
     		->appendFile('/themes/default/scripts/surveillance.js', 'text/javascript');
 
     	$request = $this->getRequest();
-    	$page = $request->getParam('page', 0);
+
+    	//Pagination
+    	$page = $request->getParam('page', 1);
+    	if ( $page <= 0 ) $page = 1;
+    	$nbAffichage = 50;
+    	$position = ($page - 1 ) * $nbAffichage;
 
     	$siren = $request->getParam('siren', null);
     	if ( $siren == 'Siren' ) { $siren = null; }
@@ -405,14 +432,11 @@ class SurveillanceController extends Zend_Controller_Action
     	$this->view->assign('ref', $ref);
 
     	$rs = $request->getParam('rs', null);
-    	if ( $rs == 'Raison Sociale' ) { $rs = null; }
+    	if ( $rs == 'Dénomination Sociale' ) { $rs = null; }
     	$this->view->assign('rs', $rs);
 
     	$tri = $request->getParam('tri', 'siren');
 
-		$nbAffichage = 100;
-		$position = $page*$nbAffichage;
-
 		switch ( $tri ){
 			default:
 			case 'siren': 			$triws = 'siren'; 			break;
@@ -501,7 +525,8 @@ class SurveillanceController extends Zend_Controller_Action
 				if ($item->dateBilan=='0000-00-00') {
 					$tooltip.= 'Néant';
 				} else {
-					$tooltip.= 'le '.WDate::dateT('Y-m-d', 'd/m/Y',$item->dateBilan);
+					$date = new Zend_Date($item->dateBilan,'yyyy-MM-dd');
+					$tooltip.= 'le '.$date->toString('dd/MM/yyyy');
 				}
 				$tooltip.= '<br/>';
 				if ($item->sourceModif!='ajout') {
@@ -509,8 +534,6 @@ class SurveillanceController extends Zend_Controller_Action
 						$tooltip.= '- Dernière modification ';
 						if( $item->indiScoreDate=='0000-00-00') {
 							$tooltip.= '';
-						} else {
-							//$tooltip.= 'le '.WDate::dateT('Y-m-d', 'd/m/Y',$item->indiScoreDate);
 						}
 						if (!empty($item->sourceModif)) {
 							if (in_array($item->sourceModif, $dicoSource)) {
@@ -562,16 +585,31 @@ class SurveillanceController extends Zend_Controller_Action
 	    	}
     	}
 
-		//Calcul pagination
-		$nbReponses = $infos->nbReponses;
-		$nbSurveillances = $infos->nbReponsesTotal;
-		$totPage = ceil($nbSurveillances/$nbAffichage);
-		$curPage = ceil($position/$nbAffichage);
+    	//Calcul pagination
+    	$nbReponses = $infos->nbReponses;
+    	$nbReponsesTotal = $infos->nbReponsesTotal;
+    	if ($nbReponses < $nbReponsesTotal) {
+    	    $pageTotal = ceil( $nbReponsesTotal / $nbAffichage );
+    	    $pageCurrent =  $page;
+    	    $pagePrev = $page - 1;
+    	    if ($pagePrev < 1) {
+    	        $pagePrev = 1;
+    	    }
+    	    $pageNext = $page + 1;
+    	    if( $pageNext > $pageTotal ) {
+    	        $pageNext = $pageTotal;
+    	    }
+    	} else {
+    	    $pageTotal = $pageCurrent = 1;
+    	}
+    	$this->view->assign('PageTotal', $pageTotal);
+    	$this->view->assign('PagePrev', $pagePrev);
+    	$this->view->assign('PageNext', $pageNext);
+    	$this->view->assign('PageCurrent', $pageCurrent);
+
+    	$this->view->assign('nbReponses', empty($nbReponses) ? 0 : $nbReponses);
+    	$this->view->assign('nbSurveillances', $nbReponsesTotal);
 
-		$this->view->assign('nbReponses', $nbReponses);
-		$this->view->assign('nbSurveillances', $nbSurveillances);
-    	$this->view->assign('totPage', $totPage);
-    	$this->view->assign('curPage', $curPage);
     	$this->view->assign('portefeuille',$tabResult);
     }
 
@@ -661,7 +699,7 @@ class SurveillanceController extends Zend_Controller_Action
 	    	$listeFichier = array();
 	    	foreach($tabFichier as $fichier){
 	    		$tabTmp = explode('_', $fichier);
-	    		$date = Wdate::dateT('Ymd','d/m/Y', substr($tabTmp[2],0,8));
+	    		$date = new Zend_Date(substr($tabTmp[2],0,8),'yyyyMMdd');
 	    		$localfile = $path.'/'.$fichier;
 	    		$dejaLu = false;
 	    		if (!file_exists($localfile))	{
@@ -669,7 +707,7 @@ class SurveillanceController extends Zend_Controller_Action
 	     		}
 	    		$result = array(
 					'fichier' => $fichier,
-					'date' => $date,
+					'date' => $date->toString('dd/MM/yyyy'),
 					'dejaLu' => $dejaLu,
 				);
 				$listeFichier[] = $result;
@@ -718,27 +756,27 @@ class SurveillanceController extends Zend_Controller_Action
     		}
     		$this->view->assign('selectFiltre', $selectFiltre);
 
-
     		//Récupération du fichier
     		$file = $path.'/'.$nomFic;
-    		$file2 = $file.'.bz2';
     		if (!file_exists($file) || filesize($file)==0 ) {
     			//Génération du fichier
     			try {
     				$O = $client->getListeFichierSurv($user->getLogin(), $user->getPrenom(), $nomFic);
     			} catch (SoapFault $fault) {}
-    			require_once 'common/curl.php';
-    			$page = getUrl('http://78.31.45.206/csv/'.$nomFic.'.bz2', '', '', '', false);
-    			$body = $page['body'];
-    			$fp=@fopen($file2, 'w');
-    			@fwrite($fp, $body);
-    			@fclose($fp);
-    			$bz = bzopen($file2, "r") or die("Impossible d'ouvrir le fichier $file");
-    			$fp=@fopen($file, 'w');
-    			while (!feof($bz)) {
-    				@fwrite($fp, bzread($bz, 4096));
-    			}
-    			bzclose($bz);
+
+    			try {
+    				$client = new Zend_Http_Client('http://78.31.45.206/csv/'.$nomFic.'.bz2');
+    				$client->setStream();
+    				$response = $client->request('GET');
+    				if ( copy($response->getStreamName(), $file.'.bz2') ) {
+    					$bz = bzopen($file.'.bz2', "r") or die("Impossible d'ouvrir le fichier $file");
+		    			$fp=fopen($file, 'w');
+		    			while (!feof($bz)) {
+		    				fwrite($fp, bzread($bz, 4096));
+		    			}
+		    			bzclose($bz);
+    				}
+    			} catch (Zend_Http_Client_Exception $e) {}
     		}
 
     		$tab = array();
@@ -795,7 +833,8 @@ class SurveillanceController extends Zend_Controller_Action
     					$tab[$count]['Ref'] = utf8_encode($ann[$colRef]);
     					$tab[$count]['Parution'] = utf8_encode($ann[$colParution]);
     					$tab[$count]['Bodacc'] = utf8_encode($ann[$colBodacc]);
-    					$tab[$count]['DatePar'] = WDate::dateT('Ymd','d/m/Y',$ann[$colDatePar]);
+    					$date = new Zend_Date($ann[$colDatePar],'yyyyMMdd');
+    					$tab[$count]['DatePar'] = $date->toString('dd/MM/yyyy');
     					$tab[$count]['Tribunal'] = utf8_encode($ann[$colTribunal]);
     					$tab[$count]['Even'] = utf8_encode(str_replace(', ','<br/>',$ann[$colEven]));
     					$tab[$count]['TexteAnn'] = utf8_encode($ann[$colTexteAnn]);
@@ -815,25 +854,25 @@ class SurveillanceController extends Zend_Controller_Action
 
     		//Récupération du fichier
     		$file = $path.'/'.$nomFic;
-    		$file2 = $file.'.bz2';
     		if (!file_exists($file) || filesize($file)==0 ) {
     			//Génération du fichier
     			try {
     				$O = $client->getListeFichierSurv($user->getLogin(), $user->getPrenom(), $nomFic);
-    			} catch (SoapFault $fault) {
-    			}
-    			require_once 'common/curl.php';
-    			$page = getUrl('http://78.31.45.206/csv/'.$nomFic.'.bz2', '', '', '', false);
-    			$body = $page['body'];
-    			$fp=@fopen($file2, 'w');
-    			@fwrite($fp, $body);
-    			@fclose($fp);
-    			$bz = bzopen($file2, "r") or die("Impossible d'ouvrir le fichier $file");
-    			$fp=@fopen($file, 'w');
-    			while (!feof($bz)) {
-    				@fwrite($fp, bzread($bz, 4096));
-    			}
-    			bzclose($bz);
+    			} catch (SoapFault $fault) {}
+
+    			try {
+    				$client = new Zend_Http_Client('http://78.31.45.206/csv/'.$nomFic.'.bz2');
+    				$client->setStream();
+    				$response = $client->request('GET');
+    				if ( copy($response->getStreamName(), $file.'.bz2') ) {
+    					$bz = bzopen($file.'.bz2', "r") or die("Impossible d'ouvrir le fichier $file");
+		    			$fp=fopen($file, 'w');
+		    			while (!feof($bz)) {
+		    				fwrite($fp, bzread($bz, 4096));
+		    			}
+		    			bzclose($bz);
+    				}
+    			} catch (Zend_Http_Client_Exception $e) {}
     		}
 
     		$content_type = 'application/csv-tab-delimited-table';
@@ -901,25 +940,25 @@ class SurveillanceController extends Zend_Controller_Action
 
     	//Récupération du fichier
     	$file = $path.'/'.$nomFic;
-    	$file2 = $file.'.bz2';
     	if (!file_exists($file) || filesize($file)==0 ) {
     		//Génération du fichier
     		try {
     			$O = $client->getListeFichierSurv($user->getLogin(), $user->getPrenom(), $nomFic);
-    		} catch (SoapFault $fault) {
-    		}
-    		require_once 'common/curl.php';
-    		$page = getUrl('http://78.31.45.206/csv/'.$nomFic.'.bz2', '', '', '', false);
-    		$body = $page['body'];
-    		$fp=@fopen($file2, 'w');
-    		@fwrite($fp, $body);
-    		@fclose($fp);
-    		$bz = bzopen($file2, "r") or die("Impossible d'ouvrir le fichier $file");
-    		$fp=@fopen($file, 'w');
-    		while (!feof($bz)) {
-    			@fwrite($fp, bzread($bz, 4096));
-    		}
-    		bzclose($bz);
+    		} catch (SoapFault $fault) {}
+
+    		try {
+    			$client = new Zend_Http_Client('http://78.31.45.206/csv/'.$nomFic.'.bz2');
+    			$client->setStream();
+    			$response = $client->request('GET');
+    			if ( copy($response->getStreamName(), $file.'.bz2') ) {
+	    			$bz = bzopen($file.'.bz2', "r") or die("Impossible d'ouvrir le fichier $file");
+			    	$fp=fopen($file, 'w');
+			    	while (!feof($bz)) {
+			    		fwrite($fp, bzread($bz, 4096));
+			    	}
+			    	bzclose($bz);
+    			}
+    		} catch (Zend_Http_Client_Exception $e) {}
     	}
 
     	$tab = array();
@@ -976,7 +1015,8 @@ class SurveillanceController extends Zend_Controller_Action
     				$tab[$count]['Ref'] = utf8_encode($ann[$colRef]);
     	    		$tab[$count]['Parution'] = utf8_encode($ann[$colParution]);
     				$tab[$count]['Bodacc'] = utf8_encode($ann[$colBodacc]);
-    				$tab[$count]['DatePar'] = WDate::dateT('Ymd','d/m/Y',$ann[$colDatePar]);
+    				$date = new Zend_Date($ann[$colDatePar],'yyyyMMdd');
+    				$tab[$count]['DatePar'] = $date->toString('dd/MM/yyyy');
     	    		$tab[$count]['Tribunal'] = utf8_encode($ann[$colTribunal]);
     	    		$tab[$count]['Even'] = utf8_encode(str_replace(', ','<br/>',$ann[$colEven]));
     				$tab[$count]['TexteAnn'] = utf8_encode($ann[$colTexteAnn]);

application/controllers/TelechargementController.php

@@ -24,8 +24,6 @@ class TelechargementController extends Zend_Controller_Action
 	{
 		if (!is_dir($this->path)) mkdir($this->path);
 
-		require_once 'common/curl.php';
-
 	    // Recuperation du nom du fichier
 	    if ($filename===null) {
 			$tableau = explode('/', $url);
@@ -35,7 +33,9 @@ class TelechargementController extends Zend_Controller_Action
 	    }
 
 	    // Suppression du fichier si le temps de cache est depasse
-	    if (file_exists($this->path.'/'.$file)){
+	    if ( $this->filetime == 0 && file_exists($this->path.'/'.$file) ){
+	        unlink($this->path.'/'.$file);
+	    } elseif ( file_exists($this->path.'/'.$file) ) {
 	    	 $dateFile = filemtime($this->path.'/'.$file);
 	    	 $now = mktime(date('G'), date('i'), date('s'),
 	    	 	date('m') , date('d'), date('Y'));
@@ -48,29 +48,23 @@ class TelechargementController extends Zend_Controller_Action
 	    }
 
 	    // Recuperation du fichier sur le serveur
-	    if (!file_exists($this->path.'/'.$file)) {
+	    if (file_exists($this->path.'/'.$file)) {
+	    	return $file;
+	    } else {
 	        // On check si le fichier est present sur l'url
-	        Zend_Registry::get('firebug')->info('URL : '.$url);
-	        $url_tab = getUrl($url, '', '', '', false);
-	        if ($url_tab['code'] == 408 ||
-	            $url_tab['code'] == 400 ||
-	            $url_tab['code'] == 404) {
-	            // Fichier non disponible
-	            Zend_Registry::get('firebug')->info('Fichier non disponible !');
-	            return false;
-	        } else {
-	            // Ecriture du fichier sur le serveur en local
-	            $body = $url_tab['body'];
-	            Zend_Registry::get('firebug')->info('Taille fichier '.strlen($body));
-	            if ( strlen($body) ) {
-    	            $fp = fopen($this->path.'/'.$file, 'w');
-    	            fwrite($fp, $body);
-    	            fclose($fp);
-    	            Zend_Registry::get('firebug')->info('Ecriture fichier : '.$this->path.'/'.$file);
-	            }
-	        }
+	    	try {
+	    		$client = new Zend_Http_Client($url);
+	    		$client->setStream();
+	    		$response = $client->request('GET');
+	    		if ( $response->isSuccessful() && copy($response->getStreamName(), $this->path.'/'.$file) ) {
+					return $file;
+	    		} else {
+	    			return false;
+	    		}
+	    	} catch (Zend_Http_Client_Exception $e) {
+				return false;
+	    	}
 	    }
-	    return $file;
 	}
 
 	public function init()
@@ -89,7 +83,7 @@ class TelechargementController extends Zend_Controller_Action
 	 */
 	public function consommationAction()
 	{
-		$this->filetime = 1;
+		$this->filetime = 0;
 
 		$request = $this->getRequest();
 		$start = $request->getParam('start', false);

application/controllers/UserController.php

@@ -1,52 +1,6 @@
 <?php
 class UserController extends Zend_Controller_Action
 {
-	/**
-	 * Récupére les valeurs du profil depuis le webservice
-	 * @param unknown_type $login
-	 * @param unknown_type $password
-	 */
-	protected function updateProfil($login, $password)
-	{
-		Zend_Registry::get('firebug')->info('updateProfil');
-		$ws = new WsScores();
-		$utilisateur = new Scores_Utilisateur();
-		$InfosLogin = $ws->getInfosLogin($login, $_SERVER['REMOTE_ADDR']);
-		$identity = new stdClass;
-		$identity->username = $login;
-		$identity->password = $password;
-		$identity->email = $InfosLogin->result->email;
-		$identity->profil = $InfosLogin->result->profil;
-		$identity->pref = $InfosLogin->result->pref;
-		$identity->droits = $InfosLogin->result->droits;
-		$identity->droitsClients = $InfosLogin->result->droitsClients;
-		$identity->nom = $InfosLogin->result->nom;
-		$identity->prenom = $InfosLogin->result->prenom;
-		$identity->tel = $InfosLogin->result->tel;
-		$identity->fax = $InfosLogin->result->fax;
-		$identity->mobile = $InfosLogin->result->mobile;
-		$identity->id = $InfosLogin->result->id;
-		$identity->idClient = $InfosLogin->result->idClient;
-		$identity->reference = $InfosLogin->result->reference;
-		$identity->nbReponses = $InfosLogin->result->nbReponses;
-		$identity->typeScore = $InfosLogin->result->typeScore;
-		$identity->dateValidation = $InfosLogin->result->dateValidation;
-		$identity->nombreConnexions = $InfosLogin->result->nombreConnexions;
-		$identity->dateDerniereConnexion = $InfosLogin->result->dateDerniereConnexion;
-		$identity->dateDebutCompte = $InfosLogin->result->dateDebutCompte;
-		$identity->dateFinCompte = $InfosLogin->result->dateFinCompte;
-		$identity->ip = $_SERVER['REMOTE_ADDR'];
-		$identity->timeout = (!empty($InfosLogin->result->timeout)) ?
-			$InfosLogin->result->timeout : 1800;
-		$identity->time = time() + $identity->timeout;
-		$identity->modeEdition = false;
-		$identity->acceptationCGU = $InfosLogin->result->acceptationCGU;
-		$lang = in_array($InfosLogin->result->lang,array('fr','en')) ? $InfosLogin->result->lang : 'fr';
-		$identity->lang = $lang;
-		$identity->langtmp = $lang;
-		$identity->browser = $utilisateur->getBrowserInfo();
-		return $identity;
-	}
 
 	public function init()
 	{
@@ -134,7 +88,8 @@ class UserController extends Zend_Controller_Action
 	 		    //Mise à jour du profil
 	 		    if ($isProfilUpdated && $updateResult) {
 
-	 		        $identity = $this->updateProfil($identity->username, $identity->password);
+	 		    	$InfosLogin = $ws->getInfosLogin($identity->username, $_SERVER['REMOTE_ADDR']);
+	 		        $identity = $user->updateProfil($InfosLogin);
 	 		        $auth->getStorage()->write($identity);
 
 	 		    }
@@ -393,13 +348,13 @@ class UserController extends Zend_Controller_Action
     	$this->view->form = $form;
     	$request = $this->getRequest();
     	if ( $request->isPost() ) {
-    		$formData = $request->getPost ();
+    		$formData = $request->getPost();
     		if ($form->isValid($formData)) {
     			$login = $form->getValue('login');
     			$pass = $form->getValue('pass');
 
     			$auth = Zend_Auth::getInstance();
-				$authAdapter = new Scores_AuthAdapter($login, md5($login.'|'.$pass));
+    			$authAdapter = new Scores_Auth_Adapter_Ws($login, md5($login.'|'.$pass));
     			$result = $auth->authenticate($authAdapter);
 
     			//Auth is valid
@@ -445,6 +400,8 @@ class UserController extends Zend_Controller_Action
     public function logoutAction()
     {
     	Zend_Auth::getInstance()->clearIdentity();
+    	$session = new Zend_Session_Namespace('wcheck');
+    	$session->unsetAll();
     	$this->_helper->layout()->disableLayout();
 
     	$request = $this->getRequest();
@@ -646,9 +603,10 @@ class UserController extends Zend_Controller_Action
 			if ($message == '') {
 
 				$mailbody = '<style type="text/css">table {font-family:Arial, Helvetica, sans-serif; font-size: 12px; width: 550px;	border: none;}table td{padding: 4px 8px;}</style>';
-				$mailbody .= "Demande de envoi des identifiants<br /><br />";
-				$mailbody .= "S'il vous plaît envoyez-moi encore une fois l'identifiant et/ou le mot de passe qui me permettra d'avoir un accès au site.";
-				$mailbody .= "<p>Ci-dessous, les informations nécessaire pour me contacter:</p>";
+				$mailbody .= "Demande d'envoi des identifiants.<br /><br />";
+				$mailbody .= "L'un de nos clients a égaré son(ses) identifiant(s).<br />";
+				$mailbody .= "Via notre lien -identifiants oubliés- il a effectué une demande de transmission de ces codes.<br />";
+				$mailbody .= "<p>A l'aide des informations ci-dessous, merci de retrouver ces codes et les lui envoyer par email.</p>";
 				$mailbody .= "<table><tr bgcolor='#eeeeee'><td width='200px'><strong>Identifiant :</strong></td><td>".$params['identifiant']."</td></tr>";
 				$mailbody .= "<tr><td><strong>Adresse email:</strong></td><td>".$params['email']."</td></tr>";
 				$mailbody .= "<tr bgcolor='#eeeeee'><td><strong>Numéro de téléphone direct:</strong></td><td>".$params['telephone']."</td></tr>";
@@ -656,25 +614,29 @@ class UserController extends Zend_Controller_Action
 				$mailbody .= "<tr bgcolor='#eeeeee'><td><strong>Prénom:</strong></td><td>".$params['prenom']."</td></tr>";
 				$mailbody .= "<tr><td><strong>Fonction:</strong></td><td>".$params['fonction']."</td></tr>";
 				$mailbody .= "<tr bgcolor='#eeeeee'><td><strong>Service:</strong></td><td>".$params['service']."</td></tr>";
-				$mailbody .= "<tr><td><strong>Raison Sociale:</strong></td><td>".$params['rsociale']."</td></tr></table>";
+				$mailbody .= "<tr><td><strong>Dénomination Sociale:</strong></td><td>".$params['rsociale']."</td></tr></table>";
+				$mailbody .= "<p>Si les informations fournies ne permettent pas d'identifier correctement l'utilisateur, ";
+				$mailbody .= "merci d'émettre un message sur le mail communiquer en précisant que \"Les éléments confiés ne permettent pas d'identifier l'utilisateur ";
+				$mailbody .= "et par conséquence de vous délivrer les codes d'accès demandés\".<br />";
+				$mailbody .= "Aussi nous vous invitons à vous rapprocher de votre interlocuteur commercial habituel ";
+				$mailbody .= "ou de votre responsable suivi relations Scores & Décisions au sein de votre société.</p>";
 
-				require_once 'Scores/Mail.php';
-				$mail = new Mail();
-				$mail->setSubject("Demande de envoi des identifiants");
+				$mail = new Scores_Mail();
+				$mail->setSubject("Demande d'envoi des identifiants");
 				$mail->setBodyHTML($mailbody);
 				$mail->setFrom('support');
 				$mail->addToKey('support');
 				$mail->setReplyTo($params['email']);
 				try {
 					$mail->send();
-					$message = "Votre demande avec les informations suivantes a été envoyée. Nous vous contacterons prochainement.";
+					$this->view->assign('sendEmail' , true);
 				}
 				catch ( Zend_Mail_Transport_Exception $e ){
 					$message = $e->getMessage();
-				}
+				}
+
 			}
 			$this->view->assign('message', $message);
-		}
-    	$this->view->assign('params', $params);
+		}
     }
 }

application/controllers/WorldcheckController.php

@@ -0,0 +1,328 @@
+<?php
+class WorldcheckController extends Zend_Controller_Action
+{
+	protected $wcConfig;
+	
+	public function init()
+	{
+		require_once 'WorldCheck/WsWorldCheck.php';
+		require_once 'Scores/Cache.php';
+		
+		$configWC = new Zend_Config_Ini(APPLICATION_PATH . '/../library/WorldCheck/applicationWC.ini');
+		$this->wcConfig = $configWC->worldcheck->toArray();
+	}
+
+	/**
+	 * Get nameIdentifier and set all data into the session
+	 */
+	public function indexAction()
+	{
+		$request = $this->getRequest();
+		$param = new stdClass();
+		$dirNom = $request->getParam('dirNom');
+		$param->dirNom = ($dirNom)?$dirNom:$request->getParam('dirSociete');
+		$param->dirPrenom = $request->getParam('dirPrenom');
+		$param->dirType = $request->getParam('dirType');
+		
+		$entityId = $request->getParam('entityId', null);
+
+		$user = new Scores_Utilisateur();
+		$wc = new WsWorldCheck();
+		$wcLocal = new Application_Model_Worldcheck();
+
+		$param->idClient = $user->getIdClient();
+		$param->login = $user->getLogin();
+		$localDBParams = $wcLocal->getScreenerId($param);
+    	$param->matchCount = $localDBParams->matchCount;
+    	$param->nameIdentifier = $localDBParams->nameIdentifier;
+		
+		if ($entityId===null) {
+			//$this->_redirect('/worldcheck/list');
+			$params = array(
+					'nameIdentifier' => $param->nameIdentifier,
+					'matchCount' => $param->matchCount
+					);
+			$this->forward('list', null, null, $params);
+		} else {
+			$id = $request->getParam('id', null);
+			
+			$data = new stdClass();
+			$data->nameIdentifier = $param->nameIdentifier;
+			$data->matchType = 'WATCHLIST';
+			$matchArr = $wc->getMatchesArrName($data);
+
+			$paramAssoc = new stdClass();
+			$paramAssoc->matchIdentifier = $matchArr[$entityId];
+			$paramAssoc->nameType = $param->dirType;
+			
+			$nodeParam = $wc->getAssociates($paramAssoc);
+			$wcLocal->setTree($nodeParam);
+
+			$this->redirect('/worldcheck/orgchildren/entityid/'.$entityId.'/id/'.$id);
+		}
+	}
+	
+	/**
+	 * List results of WorldCheck search
+	 */
+	public function listAction()
+	{
+		$request = $this->getRequest();
+
+		$wc = new WsWorldCheck();
+		$param = new stdClass();
+		
+    	$nameIdentifier = $request->getParam('nameIdentifier');
+    	$matchCount = $request->getParam('matchCount');
+    	$dirNom = $request->getParam('dirNom');
+		$param->dirNom = ($dirNom)?$dirNom:$request->getParam('dirSociete');
+		$param->dirPrenom = $request->getParam('dirPrenom');
+		$param->dirType = $request->getParam('dirType');
+    	print_r($param);
+    	if ($matchCount!==0)
+    	{
+    		$summary = new stdClass();
+	    	$summary->nameIdentifier = $nameIdentifier;
+	    	$summary->matchType = 'WATCHLIST';
+
+	    	$cache = new Cache();
+	    	$unfilteredWC = $cache->wcCache($this->wcConfig['cachedir'], $wc, "getSummariesArr", $summary, $nameIdentifier);
+
+	    	//check if display all results (search by lastName), or filtered results (search by fullName)
+	    	$filtre = $request->getParam('filtre', 'tout');
+	    	$resultWC = $unfilteredWC;
+	    	if ($filtre=='filtered')
+	    	{
+		    	//get results by fullName (lastName and givenName)
+		    	$filteredWC = array();
+		    	foreach ($unfilteredWC as $entityId=>$shortData)
+		    	{
+		    		if (stripos($shortData->lastName, $param->dirNom)!==false || stripos($param->dirNom, $shortData->lastName)!==false) {
+		    			if (stripos($shortData->givenName, $param->dirPrenom)!==false || stripos($param->dirPrenom, $shortData->givenName)!==false) {
+		    				$filteredWC[$entityId] = $shortData;
+		    			}
+		    		}
+		    	}
+		    	//end
+	    		$resultWC = $filteredWC;
+	    	}
+
+	    	$filtres = array(
+	    			'tout' => array(
+	    					'txt'=>'Résultats par Nom',
+	    					'select'=>'',
+	    					'value' => 2,
+	    			),
+	    			'filtered' => array(
+	    					'txt'=>'Résultats précis',
+	    					'select'=>'',
+	    					'value' => 1,
+	    			)
+	    	);
+
+	    	$filtres[$filtre]['select'] = ' selected';
+
+	    	$this->view->assign('filtres', $filtres);
+	    	//end
+
+	    	//paginate results list
+	    	Zend_View_Helper_PaginationControl::setDefaultViewPartial('worldcheck/controls.phtml');
+	    	$paginator = Zend_Paginator::factory($resultWC);
+	    	$this->view->paginator = $paginator;
+	    	$itemCount = $this->wcConfig['page']['items'];
+	    	$page = $this->_getParam('page', 1);
+	    	$ol_number = ($page-1)*$itemCount+1;
+
+	    	$paginator->setCurrentPageNumber($page);
+	    	$paginator->setItemCountPerPage($itemCount);
+
+	    	$this->view->assign('ol_number', $ol_number);
+	    	$this->view->assign('itemCount', $itemCount);
+	    	//end
+
+	    	$this->view->assign('resultWC', $resultWC);
+	    	$this->view->assign('allMatches', $wc->getMatchesArrName($summary));
+	    	$this->view->assign('param', $param);
+	    }
+	}
+
+	/**
+	 * Affichage le quantite des occurences de la bdd en popup.
+	 */
+	public function occurenceAction()
+	{
+		$request = $this->getRequest();
+
+		if ( $request->isXmlHttpRequest() ) {
+			$this->_helper->layout()->disableLayout();
+			$data = new stdClass();
+			if ($request->getParam('dirType')) $data->Type = $request->getParam('dirType');
+			if ($request->getParam('dirNom')) $data->Nom = $request->getParam('dirNom');
+			if ($request->getParam('dirPrenom')) $data->Prenom = $request->getParam('dirPrenom');
+			if ($request->getParam('dirSociete')) $data->Societe = $request->getParam('dirSociete');
+			
+			$data->Soc = new stdClass();
+			if ($request->getParam('dirSocNom2')) $data->Soc->Nom2 = $request->getParam('dirSocNom2');
+			if ($request->getParam('dirSocNomLong')) $data->Soc->NomLong = $request->getParam('dirSocNomLong');
+			if ($request->getParam('dirSocCommercial')) $data->Soc->NomCommercial = $request->getParam('dirSocCommercial');
+			if ($request->getParam('dirSocSigle')) $data->Soc->Sigle = $request->getParam('dirSocSigle');
+			if ($request->getParam('dirSocSigleLong')) $data->Soc->SigleLong = $request->getParam('dirSocSigleLong');
+			if ($request->getParam('dirSocEnseigne')) $data->Soc->Enseigne = $request->getParam('dirSocEnseigne');
+			if ($request->getParam('dirSocEnseigneLong')) $data->Soc->EnseigneLong = $request->getParam('dirSocEnseigneLong');
+
+			$wcLocal = new Application_Model_Worldcheck();
+			$this->view->assign('occurrence', $wcLocal->getCount($data));
+			$this->view->assign('data', $data);
+		}
+	}
+
+	/**
+	 * Affichage le resultat de recherche en WorldCheck
+	 */
+	public function matchcontentAction()
+	{
+		$request = $this->getRequest();
+
+		$param = new stdClass();
+		$param->matchIdentifier = $request->getParam('matchIdentifier');
+		$param->nameType = $request->getParam('nameType');
+
+		$wc = new WsWorldCheck();
+		$nodeParam = $wc->getAssociates($param);
+
+		$db = new Application_Model_Worldcheck();
+		$db->setTree($nodeParam);
+		
+		$cache = new Cache();
+		$content = $cache->wcCache($this->wcConfig['cachedir'], $wc, "getDetailsContent", $param, $param->matchIdentifier);
+
+		$this->view->assign('content', $content[0]);
+		$this->view->assign('nameType', $param->nameType);
+		$this->view->assign('exportObjet', $content[0]);
+	}
+	
+	/**
+	 * le Parent de l'organigramme des associés
+	 */
+	public function organigrammeAction()
+	{
+		$this->_helper->layout()->disableLayout();
+		$wc = new WsWorldCheck();
+
+		$request = $this->getRequest();
+		$entityId = $request->getParam('entityid', null);
+		
+		$wcLocal = new Application_Model_Worldcheck();
+		$currentBranch = $wcLocal->getTree($entityId);
+
+		$primary = $currentBranch['primary'];
+
+		$parent = array();
+
+		$data = new stdClass();
+		$data->title = $primary['fullName'];
+		$data->icon = "/themes/default/images/worldcheck/".strtolower($primary['nameType']).".png";
+		
+		$attr = new stdClass();
+		$attr->id = uniqid('wc_');
+		$attr->entityId = $primary['entityId'];
+		$attr->nameType = $primary['nameType'];
+		$attr->lastName = $primary['lastName'];
+		$attr->givenName = $primary['givenName'];
+		
+		$parent[] = array(
+				"data" 		=> $data,
+				"attr"		=> $attr,
+				"state" 	=> "closed",
+				"parent" 	=> "#"
+		);
+
+		$jData = json_encode($parent);
+		$this->view->assign('data', $jData);
+	}
+
+	/**
+	 * les associés du parent de l'organigramme
+	 */
+	public function orgchildrenAction()
+	{
+		$this->_helper->layout()->disableLayout();
+		$wc = new WsWorldCheck();
+
+		$request = $this->getRequest();
+		$entityId = $request->getParam('entityid', null);
+		$id = $request->getParam('id', null);
+		
+		$wcLocal = new Application_Model_Worldcheck();
+		$currentBranch = $wcLocal->getTree($entityId);
+
+		$associates = $currentBranch['associates'];
+
+		$children = array();
+
+		foreach ($associates as $associate) {
+			
+			$data = new stdClass();
+			$data->title = $associate['fullName'];
+			$data->icon = "/themes/default/images/worldcheck/".strtolower($associate['nameType']).".png";
+			
+			$attr = new stdClass();
+			$attr->id = uniqid('wc_');
+			$attr->entityId = $associate['entityId'];
+			$attr->nameType = $associate['nameType'];
+			$attr->lastName = $associate['lastName'];
+			$attr->givenName = $associate['givenName'];
+			
+			$children[] = array(
+					"data" 		=> $data,
+					"attr"		=> $attr,
+					"state" 	=> "closed",
+					"parent"	=> $id,
+			);
+		}
+
+		$jData = json_encode($children);
+		$this->view->assign('data', $jData);
+	}
+	
+	/**
+	 * Affichage de l'information courte de chaque node dans le popup
+	 */
+	public function popupAction()
+	{
+		$this->_helper->layout()->disableLayout();
+		$request = $this->getRequest();
+		$entityId = $request->getParam('entityId', null);
+		$entityIdP = $request->getParam('entityIdP', null);
+
+		$wc = new WsWorldCheck();
+		$user = new Scores_Utilisateur();
+
+		$paramP = new stdClass();
+		$paramP->idClient = $user->getIdClient();
+		$paramP->dirNom = $request->getParam('dirNomP');
+		$paramP->dirPrenom = $request->getParam('dirPrenomP');
+		$paramP->dirType = $request->getParam('dirTypeP');
+
+		$wcLocal = new Application_Model_Worldcheck();
+		$result = $wcLocal->getScreenerId($paramP);
+
+		$data = new stdClass();
+		$data->nameIdentifier = $result->nameIdentifier;
+		$data->matchType = "WATCHLIST";
+		$matches = $wc->getMatchesArrName($data);
+
+		$param = new stdClass();
+		$param->matchIdentifier = $matches[$entityIdP];
+		$param->nameType = $paramP->dirType;
+		$associates = $wc->getAssociates($param);
+
+		foreach($associates['associates'] as $assoc)
+		{
+			if ($assoc['entityId']==$entityId)
+				break;
+		}
+
+		$this->view->assign('data', $assoc);
+	}
+}

application/languages/totranslate.php

@@ -1,31 +1,4 @@
 <?php
-//General
-$this->translate('Scores & Decisions');
-$this->translate('Page');
-$this->translate('Dernière mise à jour le');
-$this->translate('Oui');
-$this->translate('Non');
-$this->translate('Edition');
-$this->translate('Mettre sous surveillance');
-$this->translate('Néant');
-$this->translate('Aucune information');
-$this->translate('Mois');
-
-//Bouttons
-$this->translate('Recherche');
-$this->translate('Effacer');
-$this->translate('Ok');
-$this->translate('Sauver');
-$this->translate('ici');
-$this->translate('Modifier le client');
-$this->translate('Valider');
-
-//Header
-
-//Footer
-$this->translate('Mentions légales');
-$this->translate('Scores & Decisions SAS - Tous droits réservés - ');
-
 //Menu
 $this->translate('RECHERCHES');
 $this->translate('Rechercher une entreprise');
@@ -92,868 +65,4 @@ $this->translate('GESTION S&D');
 $this->translate('Gestion');
 $this->translate('Saisie / Edition');
 $this->translate('Saisie Fiche Etrangère');
-
-//Rechercher une entreprise
-$this->translate('RECHERCHE ENTREPRISE');
-$this->translate('SIREN');
-$this->translate('RAISON SOCIALE / ENSEIGNE / SIGLE');
-$this->translate('N° & Voie');
-$this->translate('CP OU DÉP. / VILLE');
-$this->translate('TÉL / FAX');
-$this->translate('NAF');
-$this->translate('Forme Juridique');
-$this->translate('Pays');
-$this->translate('Recherche par SIREN, SIRET, N° TVA intracommunautaire, N° RC, R.N.A., ISIN');
-$this->translate('Accès direct à la fiche identité (Racourci clavier : Maintenir CTRL puis ENTREE)');
-$this->translate('France');
-$this->translate('Belgique');
-$this->translate('Espagne');
-$this->translate('Royaume-Uni');
-$this->translate('Pays-Bas');
-
-//Rechercher par dirigeant
-$this->translate('RECHERCHE DIRIGEANT');
-$this->translate('PRENOM');
-$this->translate('NOM');
-$this->translate('DATE NAISSANCE');
-$this->translate('CP OU DEP. / VILLE DE NAISSANCE');
-
-//Rechercher une annonce
-$this->translate('Rechercher une annonce');
-$this->translate('Source');
-$this->translate('Bodacc');
-$this->translate('Historique jusqu\'à');
-$this->translate('Année ou Date de parution');
-$this->translate('Numéro de parution');
-$this->translate('Page');
-$this->translate('Numéro d\'annonce');
-$this->translate('BODACC / BORC');
-$this->translate('JO Association');
-$this->translate('BALO');
-$this->translate('Désélection');
-
-//Rechercher par actionnaire
-$this->translate('RECHERCHE PAR ACTIONNAIRE');
-$this->translate('SIREN');
-$this->translate('RAISON SOCIAL / NOM');
-$this->translate('CP OU DEP./VILLE');
-$this->translate('PAYS');
-$this->translate('PAR ACTION, DE');
-$this->translate('A');
-
-//Dernière recherche
-$this->translate('réponses avec les critères');
-$this->translate('résultats affichés.');
-$this->translate('Exporter les résultats de la recherche en CSV.');
-$this->translate('Si aucun résultat ne correspond à votre recherche.');
-$this->translate('Cliquez-ici.');
-$this->translate('Afficher tous les résultats');
-$this->translate('Afficher uniquement les actifs');
-$this->translate('Afficher uniquement les inactifs');
-
-//Liste des dernières recherches
-$this->translate('LISTE DE VOS DERNIÈRES RECHERCHE');
-$this->translate('RECHERCHE ENTREPRISE');
-$this->translate('Lancer la recherche');
-$this->translate('Afficher le formulaire');
-
-//Fiche d'identité
-$this->translate('FICHE D\'IDENTITÉ');
-$this->translate('Numéro identifiant Siret');
-$this->translate('Numéro de TVA Intracom.');
-$this->translate('Numéro R.C.');
-$this->translate('Etablissement actif');
-$this->translate('Situation au répertoire SIRENE');
-$this->translate('Situation juridique Actif au RCS');
-$this->translate('Raison sociale & Coordonnées');
-$this->translate('Raison Sociale');
-$this->translate('Forme juridique');
-$this->translate('Date d\'immatriculation');
-$this->translate('Création de l\'entreprise');
-$this->translate('Création de l\'établissement');
-$this->translate('Adresse');
-$this->translate('Téléphone');
-$this->translate('Fax');
-$this->translate('Site Internet');
-$this->translate('Courriel');
-$this->translate('Activité(s) & Chiffre d\'affaires');
-$this->translate('Activité de l\'entreprise');
-$this->translate('Activité de l\'établissement');
-$this->translate('Anciens codes NAF');
-$this->translate('Codes NACE');
-$this->translate('Type d\'exploitation');
-$this->translate('Nombre d\'établissements actifs');
-$this->translate('Capital');
-$this->translate('Chiffre d\'affaires estimé');
-$this->translate('Principaux Dirigeants');
-$this->translate('Effectif de l\'entreprise');
-$this->translate('Localisation géographique');
-$this->translate('Information géographique :');
-$this->translate('Latitude :');
-$this->translate('Longitude :');
-$this->translate('Afficher l\'adresse sur Google Map');
-$this->translate('Code commune / Rivoli :');
-$this->translate('Iris :');
-$this->translate('Code :');
-$this->translate('Libellé :');
-$this->translate('Information presse (Source Google News ©)');
-$this->translate('La consultation ou la réception de documents n\'entraîne aucun transfert de droit de propriété intellectuelle en faveur du Client. Ce dernier s\'engage à ne pas rediffuser ou reproduire les données fournies autrement que pour son usage dans le cadre de la relation contractuelle établie entre Scores & Decisions SAS et "le Client".');
-
-//Fiche Procédure Collective
-$this->translate('FICHE PROCÉDURE COLLECTIVES');
-$this->translate('Numéro identifiant Siret');
-$this->translate('Numéro de TVA Intracom.');
-$this->translate('Code ISIN');
-$this->translate('Capitalisation');
-$this->translate('Numéro R.C.');
-$this->translate('Etablissement actif');
-$this->translate('Raison sociale & Coordonnées');
-$this->translate('Raison Sociale');
-$this->translate('Forme juridique');
-$this->translate('Composition et répartition du capital social');
-$this->translate('Information à vérifier dans les derniers statuts');
-$this->translate('Diminution de capital');
-$this->translate('Augmentation de capital');
-$this->translate('publié au');
-$this->translate('Organes de la procédure');
-$this->translate('Types de procédure');
-$this->translate('Potentiel de récupération et réalisation d\'actifs');
-$this->translate('Dépôt des comptes annuels et des comptes consolidés');
-$this->translate('Dépôt des comptes annuels');
-$this->translate('Dépôt des comptes consolidés');
-$this->translate('Jugements de clôture');
-$this->translate('Autres événements');
-$this->translate('Procédure d\'insolvabilité européene');
-
-//Liste des établissements
-$this->translate('LISTE DES ÉTABLISSEMNTS');
-$this->translate('Actif/Inactif');
-$this->translate('Tous');
-$this->translate('Actif');
-$this->translate('Inactif');
-$this->translate('Établissements');
-$this->translate('siège actif');
-$this->translate('établ. inactif');
-$this->translate('L\'entreprise à 1 établissements actifs et 1 établissements radiés');
-
-//Liens inter-entreprises
-$this->translate('LIENS INTER-ENTREPRISES');
-$this->translate('Organigramme du groupe');
-$this->translate('Documents');
-$this->translate('Aucun document');
-$this->translate('Lier un document');
-$this->translate('organigramme du groupe');
-$this->translate('Editer la fiche');
-$this->translate('Actionnariat');
-$this->translate('Ajouter un actionnaire');
-$this->translate('PUBLIC / BOURSE');
-$this->translate('FFP');
-$this->translate('ETABLISSEMENTS %s FRERES');
-$this->translate('FAMILLE %s');
-$this->translate('Participations');
-$this->translate('Ajouter une participation');
-$this->translate('Fonctions de directions');
-$this->translate('Administrateur');
-$this->translate('Chargement...');
-$this->translate('Les données transmises sont indicatives et traitées en conformité avec les usages en vigueur. Scores & Decisions SAS agrège et fournit l\'information en l\'état et ne saurait accorder une garantie quelconque notamment pour la fiabilité, l\'actualité, l\'exhaustivité des données. La responsabilité de Scores & Decisions SAS ne pourra être engagée pour tout dommage indirect et notamment pour manque à gagner, préjudice commercial ou financier, recours de tiers, cette liste n’étant pas limitative. "Le Client" recherche, sélectionne et interprète les données sous sa propre responsabilité');
-
-//Informations Groupe
-$this->translate('Informations Groupe');
-$this->translate('Siren');
-$this->translate('TVA');
-$this->translate('RCS PARIS');
-$this->translate('ISIN');
-$this->translate('Nom du groupe');
-$this->translate('Sigle');
-$this->translate('Adresse');
-$this->translate('Code Commune');
-$this->translate('Tél.');
-$this->translate('Fax');
-$this->translate('Site Web');
-$this->translate('Année de création');
-$this->translate('Grand Groupe Français');
-$this->translate('Nombre d\'entreprises Française du groupe');
-$this->translate('Effectif salarié du groupe en France');
-$this->translate('CA France');
-$this->translate('CA Export');
-$this->translate('Organigramme du groupe');
-$this->translate('Secteurs');
-$this->translate('Nb Entrep.');
-$this->translate('CA');
-$this->translate('Effectif');
-
-//Modifications INSEE
-$this->translate('LISTE DES ÉVÉNEMENTS');
-$this->translate('Mettre sous surveillance Insee');
-$this->translate('Événements INSEE');
-
-//Liste des dirigeants
-$this->translate('DIRIGEANTS');
-$this->translate('Mettre sous surveillance Dirigeants');
-$this->translate('Consulter la liste des dirigeants opérationnels');
-$this->translate('Président du conseil de surveillance');
-$this->translate('Président du directoire');
-$this->translate('Commissaire aux comptes suppléant');
-$this->translate('Commissaire aux comptes titulaire');
-$this->translate('Liste des dirigeants actifs');
-
-//Historique des dirigeants
-$this->translate('Historique des dirigeants');
-$this->translate('Président du directoire');
-$this->translate('Membre du directoire');
-$this->translate('Membre du conseil de surveillance');
-$this->translate('Commissaire aux comptes suppléant');
-$this->translate('Commissaire aux comptes titulaire');
-
-//Synthèse
-
-//Bilans, Compte de résultat
-
-//Ratios
-
-//Flux de trésorerie
-$this->translate('Flux de Trésorerie');
-$this->translate('Type de bilans');
-$this->translate('Réel normal ou Simplifié');
-$this->translate('Consolidé');
-$this->translate('mois');
-$this->translate('ACTIVITE');
-$this->translate('INVESTISSEMENT');
-$this->translate('FINANCEMENT');
-$this->translate('VARIATION DE TRESORERIE D\'ACTIF');
-$this->translate('Chiffre d\'affaires HT & autres produits d\'exploitation');
-$this->translate('Variation des creances clients & autres creances d\'exploitation');
-$this->translate('Recettes d\'exploitation');
-$this->translate('Achats & autres charges d\'exploitation');
-$this->translate('Variation des dettes fournisseurs & autres dettes d\'exploitation');
-$this->translate('Depenses d\'exploitation');
-$this->translate('Excedent de Tresorerie d\'Exploitation');
-$this->translate('Flux lies aux operations hors exploitation');
-$this->translate('Interets bancaires');
-$this->translate('Impots sur les benefices');
-$this->translate('Flux affectes a la participation des salaries');
-$this->translate('Dividendes verses');
-$this->translate('Flux de tresorerie interne');
-$this->translate('Investissements d\'exploitation hors production immobilisee');
-$this->translate('Acquisition de participations & autres titres immobilises');
-$this->translate('Variation des autres actifs immobilises hors charges a repartir');
-$this->translate('Subventions d\'investissement recues');
-$this->translate('Variation des dettes sur immobilisations');
-$this->translate('Encaissements sur cessions d\'immobilisations');
-$this->translate('Flux d\'investissement');
-$this->translate('Augmentation-Reduction de capital');
-$this->translate('Variation des creances sur capital appele non verse');
-$this->translate('Flux du capital');
-$this->translate('Variation des emprunts');
-$this->translate('Variation de la tresorerie du passif');
-$this->translate('Flux du financement');
-$this->translate('Variation du disponible');
-$this->translate('Variation des valeurs mobilieres de placement');
-$this->translate('Variation de la tresorerie d\'actif');
-
-//Liasse fiscale
-$this->translate('Valeurs exprimées en');
-$this->translate('Millesime');
-$this->translate('Corriger le bilan sélectionné');
-$this->translate('ou Saisir une nouvelle liasse au format');
-$this->translate('Normal');
-$this->translate('Consolidé');
-$this->translate('Simplifié');
-$this->translate('Exporter en fichier Excel.');
-$this->translate('Vous possèdez un bilan plus récent');
-$this->translate('Mettre sous surveillance Bilans');
-$this->translate('Actif');
-$this->translate('Passif');
-$this->translate('Compte de résultat');
-$this->translate('Valeurs exprimées en K€');
-$this->translate('Capital souscrit non appelé');
-$this->translate('Frais d\'établissement');
-$this->translate('Frais de rech. et dév.');
-$this->translate('Immobilisations incorporelles');
-$this->translate('Concessions, brevets, ...');
-$this->translate('Fond commercial');
-$this->translate('Autres immo. incorporelles');
-$this->translate('Avances et acomptes sur immo. incorp.');
-$this->translate('Terrains');
-$this->translate('Constructions');
-$this->translate('Instal. techniques, ...');
-$this->translate('Autres immo. corp.');
-$this->translate('Immobilisations corporelles');
-$this->translate('Immo. en cours');
-$this->translate('Avances et acomptes');
-$this->translate('Participations évaluées selon la méthode de mise en équivalence');
-$this->translate('Autres participations');
-$this->translate('Créances rattachées à des participations');
-$this->translate('Autres titres immobilisés');
-$this->translate('Immobilisations financières');
-$this->translate('Prêts');
-$this->translate('Autres immo. financières');
-$this->translate('Matières 1ère, approvisionnements');
-$this->translate('En cours de production de biens');
-$this->translate('En cours de production de services');
-$this->translate('Stocks');
-$this->translate('ACTIF CIRCULANT');
-$this->translate('Produits intermédiaires et finis');
-$this->translate('Marchandises');
-$this->translate('Avances et accomp. versés sur command.');
-$this->translate('Clients et comptes rattachés');
-$this->translate('Autres créances');
-$this->translate('Créances');
-$this->translate('Capital souscrit et appelé, non versé');
-$this->translate('Valeurs mobilières de placement (dont actions propres)');
-$this->translate('Disponibilités');
-$this->translate('Divers');
-$this->translate('REGULARISATIONS 	Charges constatées d\'avance');
-$this->translate('TOTAL');
-$this->translate('');
-$this->translate('');
-
-//Bourse & Cotations
-$this->translate('INFORMATIONS BOURSIÈRES');
-$this->translate('Code Mnémo');
-$this->translate('Code Bloomberg');
-$this->translate('Code Datastream');
-$this->translate('Code Ric');
-$this->translate('Place de cotation');
-$this->translate('Marché');
-$this->translate('Nombre de titres');
-$this->translate('Éligible SRD / PEA');
-$this->translate('Logo');
-$this->translate('Coordonnées');
-$this->translate('Adresse');
-$this->translate('Date d\'introduction en bourse');
-$this->translate('Date dernière assemblée générale');
-$this->translate('Téléphone');
-$this->translate('Fax');
-$this->translate('Site Internet');
-$this->translate('Courriel');
-$this->translate('Activité(s)');
-$this->translate('Activité');
-$this->translate('Secteur');
-$this->translate('Dernier cours');
-$this->translate('Dernière cotation connue');
-$this->translate('Clôture');
-$this->translate('Ouverture');
-$this->translate('Plus haut');
-$this->translate('Plus Bas');
-$this->translate('Volume échangé');
-$this->translate('Capitalisation');
-$this->translate('Minimum historique');
-$this->translate('Maximum historique');
-$this->translate('Cours moyen');
-
-//Relations bancaires
-$this->translate('RELATIONS BANCAIRES');
-$this->translate('Liste des relations bancaires');
-
-//Annonces Légales
-
-//Information Réglementée
-
-//Compétences Territoriales
-$this->translate('Tribunaux');
-$this->translate('Administrateurs & Mandataires judiciaires');
-$this->translate('Huissiers de justice');
-$this->translate('Préfectures & Sous-préfectures');
-$this->translate('Centres de formalités des Entreprises (CCI, Greffes, Métiers, Artisanat, Agriculture, URSSAF, Impôts, etc...)');
-$this->translate('Journaux d\'Annonces Légales');
-
-//Marques déposées
-$this->translate('PROPRIÉTÉ INTELLECTUELLE');
-$this->translate('Marque(s) déposée(s)');
-$this->translate('Dépôt');
-
-//IndiScore
-$this->translate('INDISCORE');
-$this->translate('Définir un Cut-off');
-$this->translate('Mettre sous surveillance IndiScore');
-$this->translate('Saisir votre demande d\'avis credit personnalisé');
-$this->translate('Évaluation');
-$this->translate('L\'évaluation indiScore© est en partie basée sur les points notables suivants');
-$this->translate('Conformité légale :');
-$this->translate('L\'analyse de la conformité est correcte.');
-$this->translate('Dirigeance :');
-$this->translate('L\'étude de la dirigeance ne relève aucun problème.');
-$this->translate('Solvabilité :');
-$this->translate('L\'analyse de la solvabilité est Bonne');
-$this->translate('La situation financière de l\'entreprise ne peut être évaluée en détail car le dernier bilan disponible date de 2010.');
-$this->translate('Paiements');
-$this->translate('Depuis Mars 2013 : Aucune difficulté significative ne nous a été signalée Paiements à 30 jours maximum');
-$this->translate('Conclusion');
-$this->translate('Compte tenu des informations disponibles auprès des sources officielles Scores et Décisions présente la conclusion suivante :');
-$this->translate('LE SCORE EST DE 17 SUR 20 POINTS');
-$this->translate('La tendance de la note est Stable');
-$this->translate('L\'ENCOURS MAXIMUM CONSEILLÉ EST DE 500 K€');
-
-//Rapport de synthèse
-$this->translate('RAPPORT DE SYNTHESE');
-$this->translate('Numéro R.C.');
-$this->translate('Etablissement actif');
-$this->translate('Situation au répertoire SIRENE');
-$this->translate('Raison sociale & Coordonnées');
-$this->translate('Forme juridique');
-$this->translate('Date d\'immatriculation');
-$this->translate('Création de l\'établissement');
-$this->translate('Activité(s) & Chiffre d\'affaires');
-$this->translate('Activité de l\'entreprise');
-$this->translate('Anciens codes NAF');
-$this->translate('Origine du fonds');
-$this->translate('Type d\'exploitation');
-$this->translate('Capital');
-$this->translate('Chiffre d\'affaires');
-$this->translate('Liste des dirigeants actifs');
-$this->translate('Actionnariat');
-$this->translate('Ajouter un actionnaire');
-$this->translate('Ajouter une participation');
-$this->translate('Fonctions de directions');
-$this->translate('Eléments financiers');
-$this->translate('Paiement');
-$this->translate('Depuis');
-$this->translate('Aucune difficulté significative ne nous a été signalée Paiements à %s jours maximum');
-$this->translate('Procédures collectives');
-$this->translate('Situation juridique');
-$this->translate('Aucune procédure enregistrée à ce jour par nos services.');
-$this->translate('Scores et encours');
-$this->translate('Score Afdcc 2');
-$this->translate('Score Z');
-$this->translate('IndiScore');
-$this->translate('Encours conseillé');
-$this->translate('Stable');
-
-//Rapport complet
-
-//Valorisation
-$this->translate('VALORISATION');
-$this->translate('SOCIÉTÉ');
-$this->translate('COMMENTAIRES');
-$this->translate('BILAN');
-$this->translate('Situation financière');
-$this->translate('Compte de Résultat');
-$this->translate('CONCLUSION');
-$this->translate('estimation haute');
-$this->translate('estimation basse');
-$this->translate('Réserves');
-$this->translate('L\'estimation finale devrait intégrer l\'ensemble des dettes à court, moyen et long termes exigibles au moment de la cession.');
-
-//Enquête commerciale
-$this->translate('ENQUÊTE COMMERCIALE');
-$this->translate('Nos enquêtes commerciales sont réalisées par des analystes financiers.');
-$this->translate('Entreprise concernée');
-$this->translate('Téléphone / Fax');
-$this->translate('Autre téléphone');
-$this->translate('E-mail');
-$this->translate('Autre e-mail');
-$this->translate('Domiciliation bancaire');
-$this->translate('Encours demandé');
-$this->translate('Nombre d\'échéances');
-$this->translate('Avis de l\'assureur crédit');
-$this->translate('Favorable');
-$this->translate('Défavorable');
-$this->translate('Demandeur');
-$this->translate('Votre profil');
-$this->translate('Votre Identité');
-$this->translate('Votre Téléphone');
-$this->translate('Votre Fax');
-$this->translate('Votre E-mail');
-$this->translate('Votre Référence');
-$this->translate('Service Achats');
-$this->translate('Commerce');
-$this->translate('Recouvrement');
-$this->translate('Contentieux');
-$this->translate('Autre');
-$this->translate('Enquête');
-$this->translate('Type d\'enquête');
-$this->translate('Délais de livraison');
-$this->translate('Précisions sur la demande');
-$this->translate('Ancienneté de la relation');
-$this->translate('Impayées');
-$this->translate('Retard de paiement');
-$this->translate('Litiges techniques ou commerciaux');
-$this->translate('Observations ou questions spéciales');
-$this->translate('Envoyez');
-$this->translate('EXPRESS');
-$this->translate('DECISION');
-$this->translate('SECTEUR BTP');
-$this->translate('encours inférieur à');
-$this->translate('encours supérieur à');
-$this->translate('Choisissez...');
-$this->translate('Enquête sur un client (contrôl crédit)');
-$this->translate('Enquête sur un prospect (ouverture de compte)');
-$this->translate('Enquête sur un fournisseur stratégique');
-$this->translate('Enquête sur un fournisseur non stratégique');
-$this->translate('Autre type d\'enquête (Précisez...)');
-$this->translate('%s jours ou +');
-
-//Commande de Pièces
-$this->translate('COMMANDES DE PIÈCES');
-$this->translate('EXTRAIT KBIS');
-$this->translate('Visualiser/Télécharger le kbis');
-$this->translate('Recevoir le kbis par email');
-$this->translate('Recevoir le kbis original par courrier');
-$this->translate('PRIVILÉGES & NANTISSEMENTS');
-$this->translate('Privilèges de la sécurité sociale et des régimes complémentaires et Trésor Public
-(avec surveillance, retour sous 48 à 72h)');
-$this->translate('Privilèges de la sécurité sociale et des régimes complémentaires (mail sous 12h ouvrées)');
-$this->translate('Privilèges du Trésor Public (mail sous 12h ouvrées)');
-$this->translate('Nantissements du fonds de commerce ou du fonds artisanal (conventionnels et judiciaires)');
-$this->translate('Privilèges du vendeur de fonds de commerce et d\'action résolutoire');
-$this->translate('Déclarations de créances');
-
-//Comptes annuels
-$this->translate('PIÈCES OFFICIELLES');
-$this->translate('Mettre sous surveillance Actes');
-$this->translate('Compte annuels');
-$this->translate('Date de clôture');
-$this->translate('Décisions');
-$this->translate('Comptes millésime');
-
-//Actes & Status
-$this->translate('Actes & Status');
-$this->translate('EXTRAIT DE PROCES-VERBAL');
-$this->translate('Créer une commande factice');
-$this->translate('Acte modificatif');
-$this->translate('Nomination/démission des organes de gestion');
-$this->translate('Procuration');
-$this->translate('PROCES-VERBAL D\'ASSEMBLEE GENERALE ORDINAIRE ET EXTRAORDINAIRE');
-$this->translate('Augmentation de Capital');
-$this->translate('CERTIFICAT');
-$this->translate('STATUTS MIS A JOUR');
-$this->translate('DU CONSEIL DE SURVEILLANCE');
-
-//Suivi Privilèges
-$this->translate('Synthèse des inscriptions d\'endettement');
-$this->translate('Mettre sous surveillance Privilèges');
-$this->translate('Privilèges de la sécurité sociale et des régimes complémentaires');
-$this->translate('Privilèges du trésor public');
-
-//Nouveautés
-$this->translate('Nouveautés');
-$this->translate('Liste par date');
-$this->translate('Intitulé');
-$this->translate('Catégorie');
-
-//Mes options
-$this->translate('PROFIL UTILISATEUR');
-$this->translate('Identifiant utilisateur');
-$this->translate('Identité (NOM/Prénom)');
-$this->translate('Réf. facturation (service, etc...)');
-$this->translate('Adresse e-mail');
-$this->translate('Numéros de téléphone (Fixe, Fax, Mobile)');
-$this->translate('Mot de passe');
-$this->translate('Relevé de consommation');
-$this->translate('Modifier le mot de passe.');
-$this->translate('Relevé de consommation');
-$this->translate('Détails');
-$this->translate('Mois/Année');
-$this->translate('Ok');
-$this->translate('Langue de l\'interface par défaut');
-$this->translate('Informations');
-$this->translate('Type d\'appareil actuel');
-$this->translate('Résolution d\'écran actuel');
-$this->translate('Navigateur actuel');
-$this->translate('Poste de travail');
-$this->translate('Moteur de recherche');
-$this->translate('Résultats par page');
-$this->translate('Inclure');
-$this->translate('Surveillance');
-$this->translate('Supports pour les alertes');
-$this->translate('Gestion des droits');
-$this->translate('Type de profil');
-$this->translate('Droits d\'accès');
-$this->translate('Préférences');
-$this->translate('les associations');
-$this->translate('les actifs');
-$this->translate('les radiés');
-$this->translate('les établissements secondaires');
-$this->translate('SMS');
-$this->translate('Fax');
-$this->translate('Mail');
-$this->translate('Utilisateur');
-$this->translate('Administrateur');
-$this->translate('SuperAdministrateur');
-
-//Mes surveillances
-$this->translate('SURVEILLANCE');
-$this->translate('Nombre d\'entités affichées');
-$this->translate('Nombre de surveillances');
-$this->translate('Extraction des surveillances');
-$this->translate('Extraire uniquement les surveillances de type');
-$this->translate('toutes');
-$this->translate('Anonces');
-$this->translate('Insee');
-$this->translate('Bilans');
-$this->translate('Indiscore');
-$this->translate('Actes');
-$this->translate('Dirigeants');
-$this->translate('Privilèges');
-$this->translate('Paiements');
-$this->translate('Liens');
-$this->translate('Options de recherche');
-$this->translate('Afficher uniquement les suveillances de type');
-$this->translate('Tri');
-$this->translate('croissant');
-$this->translate('décroissant');
-$this->translate('par');
-$this->translate('Siren');
-$this->translate('Référence');
-$this->translate('Date d\'ajoute');
-$this->translate('Date d\'envoi');
-$this->translate('Liste des surveillances');
-$this->translate('Ajout le');
-$this->translate('Envoyé le');
-
-//Mon portefeuille
-$this->translate('PORTEFEUILLE');
-$this->translate('Nombre d\'entités affichées');
-$this->translate('Nombre de surveillances');
-$this->translate('Exportation de votre portefeuille');
-$this->translate('Exporter votre portefeuille au format CSV');
-$this->translate('Options de recherche');
-$this->translate('Tri par');
-$this->translate('Surveillance Score');
-$this->translate('Aucune surveillance Score.');
-
-//Administration
-$this->translate('ADMINISTRATION');
-$this->translate('Relevé de consommation complet');
-$this->translate('Tous les utilisateurs');
-$this->translate('Détails');
-$this->translate('Liste des profils utilisateurs');
-$this->translate('Login');
-$this->translate('Actions');
-$this->translate('Créer un profil utilisateur');
-$this->translate('Mode spéciaux');
-$this->translate('Mode Edition');
-
-//Se déconnecter
-$this->translate('Vous avez été déconnecté.');
-$this->translate('Si cette page ne disparait pas au bout de 5 seconde(s), veuillez cliquer');
-
-//Gestion
-$this->translate('Gestion Système');
-$this->translate('Gestion des clients');
-$this->translate('Gestion des commandes');
-$this->translate('Gestion des fichiers nouveautés');
-$this->translate('Statistiques');
-
-//Saisie / Edition
-$this->translate('IDENTITE DE L\'ENTREPRISE');
-$this->translate('Numéro identifiant Siret');
-$this->translate('Numéro identifiant Siret du siège');
-$this->translate('Raison Sociale');
-$this->translate('Adresse');
-$this->translate('Établissement');
-$this->translate('Activité(s) et Chiffres d\'Affaires');
-$this->translate('Code ISIN');
-$this->translate('Activité déclarée de l\'entreprise');
-$this->translate('Capital Montant');
-$this->translate('Capital Devise');
-$this->translate('BODACC');
-$this->translate('Source');
-$this->translate('Date évènement / jugement');
-$this->translate('Tribunal');
-$this->translate('Évènement / Jugement');
-$this->translate('Informations diverses');
-$this->translate('Autre siren (doublon)');
-$this->translate('Refus d’inscription au Registre du Commerce et des Sociétés');
-$this->translate('Identifiant R.N.A.');
-$this->translate('Entreprise de domiciliation');
-$this->translate('Entreprise ayant exercée son droit d\'opposition en');
-$this->translate('Sans objet');
-
-//Saisie Fiche Entrangère
-$this->translate('Adresse complément');
-$this->translate('CP');
-$this->translate('Ville');
-$this->translate('Pays');
-$this->translate('Selectionner un pays pour afficher les identifiants locaux');
-$this->translate('Téléphone');
-$this->translate('au capital de');
-$this->translate('en date du');
-$this->translate('découpé en');
-$this->translate('action(s)');
-$this->translate('(JJ/MM/AAAA)');
-
-//Gestion des clients
-$this->translate('GESTION DES CLIENTS');
-$this->translate('Créer un client');
-$this->translate('Liste des clients');
-$this->translate('Actions');
-$this->translate('Nom');
-$this->translate('Editer');
-$this->translate('Prestations fichier');
-$this->translate('Tarification');
-$this->translate('Services');
-$this->translate('Utilisateurs');
-$this->translate('EDITION CLIENT');
-$this->translate('Identification');
-$this->translate('Facturation');
-$this->translate('Livraison : Informations sur le destinataire de la livraison');
-$this->translate('Paramétrage');
-$this->translate('Divers');
-$this->translate('Obtention Raison sociale');
-$this->translate('Nic du siège');
-$this->translate('Siren');
-$this->translate('Racine des identifiants');
-$this->translate('Test');
-$this->translate('Date de signature');
-$this->translate('(AAAA-MM-YY)');
-$this->translate('Type de contrat');
-$this->translate('Commercial S&D');
-$this->translate('Contrat');
-$this->translate('Marché');
-$this->translate('Nom de l\'apporteur d\'affaire');
-$this->translate('Type d\'accès Remarques / Observations');
-$this->translate('userPassword');
-$this->translate('userPasswordIP');
-$this->translate('IP');
-$this->translate('N° de TVA');
-$this->translate('Compte client rattaché');
-$this->translate('Editer la facture automatiquement');
-$this->translate('Editer le détail de la facture');
-$this->translate('Nom du destinataire de la facture');
-$this->translate('Adresse1');
-$this->translate('Adresse2');
-$this->translate('Adresse3');
-$this->translate('RIB joint à la facture');
-$this->translate('BPOSTALE');
-$this->translate('CCOOP');
-$this->translate('CDNORD');
-$this->translate('Liste des adresses IP');
-$this->translate('Aucune IPs.');
-$this->translate('Ajouter une adresse IP');
-$this->translate('Listes des Droits');
-$this->translate('Recherche');
-$this->translate('Timeout');
-$this->translate('forfaitExtranetPeriode');
-$this->translate('forfaitExtranetMontant');
-$this->translate('reconductionAuto');
-$this->translate('Mensuel');
-$this->translate('Trimestriel');
-$this->translate('Semestriel');
-$this->translate('Nombre de pièces officielles inclues dans le forfait client');
-$this->translate('Montant du forfait des pièces officielles');
-$this->translate('Tarif unitaire en cas de dépassement');
-$this->translate('Nombre d\'investigations inclues dans le forfait client');
-$this->translate('Montant du forfait des investigations');
-$this->translate('Tarif unitaire pour les indiscore');
-$this->translate('Accès Webservice');
-$this->translate('Intersud - Login');
-$this->translate('Intersud - Mot de passe');
-$this->translate('Export des résultats de la recherche');
-$this->translate('Investigation par l\'image IparI');
-$this->translate('Historique des annonces bodacc');
-$this->translate('Investigation');
-$this->translate('Recherche Entreprise');
-$this->translate('Recherche Dirigeant');
-$this->translate('Recherche Actionnaire');
-$this->translate('Fiche d\'identité');
-$this->translate('Fiche procédure collective');
-$this->translate('Liens inter-entreprise');
-$this->translate('Liste des établissements');
-$this->translate('Informations et organigramme du groupe');
-$this->translate('Évènements INSEE');
-$this->translate('Avis de situation INSEE');
-$this->translate('Liste des dirigeants');
-$this->translate('Liste des dirigeants opérationnels');
-$this->translate('Synthèse');
-$this->translate('Ratios');
-$this->translate('Flux de trésorerie');
-$this->translate('Liasse fiscale');
-$this->translate('Export des Liasses au format XLS');
-$this->translate('Saisie de bilan');
-$this->translate('Bourse & cotations');
-$this->translate('Relations bancaires');
-$this->translate('Annonces légales');
-$this->translate('Informations réglementée');
-$this->translate('Compétences territoriales');
-$this->translate('Conventions collectives');
-$this->translate('Marques déposées');
-$this->translate('indiScore');
-$this->translate('Rapport synthetique');
-$this->translate('Rapport complet');
-$this->translate('Enquête commerciale');
-$this->translate('Avis de crédit personnalisé');
-$this->translate('Extrait RCS');
-$this->translate('Pièces officielles');
-$this->translate('Privilèges');
-$this->translate('Surveillance des annonces légales');
-$this->translate('Surveillance des événements INSEE');
-$this->translate('Surveillance des bilans');
-$this->translate('Surveillance des événements sur le score');
-$this->translate('Surveillance des actes');
-$this->translate('Surveillance des dirigeants');
-$this->translate('Surveillance des paiements');
-$this->translate('Surveillance des liens financiers');
-$this->translate('Surveillance des privilèges');
-$this->translate('Mon profil');
-$this->translate('Liste des surveillances');
-$this->translate('Portefeuille');
-$this->translate('Mode Edition');
-$this->translate('Recherche Internationale');
-$this->translate('Banque de France');
-$this->translate('Gestion des commandes kbis');
-$this->translate('Gestion des commandes greffes');
-$this->translate('Gestion des commandes KBIS');
-$this->translate('Gestion des commandes');
-$this->translate('Rechercher une commande');
-$this->translate('N° de commande ou siren');
-$this->translate('Etat');
-$this->translate('Mode');
-$this->translate('courrier S&D');
-$this->translate('e-mail');
-$this->translate('Liste des commandes');
-$this->translate('Aucunes commandes.');
-$this->translate('Gestion des nouveautés');
-$this->translate('Catégorie');
-$this->translate('Intitulé');
-$this->translate('Fichier PDF');
-$this->translate('Format AAAA-MM-JJ');
-$this->translate('Toutes les statistiques');
-$this->translate('Navigateur');
-$this->translate('Résolution d\'écran');
-$this->translate('Type d\'appareil');
-$this->translate('Ordinateur');
-$this->translate('Mobile');
-
-$this->translate('Dernière mise à jour le');
-$this->translate('Capitalisation');
-$this->translate('Forme juridique à l\'INSEE: Autre SA à directoire (5699)');
-$this->translate('France');
-$this->translate('Belgium');
-$this->translate('United Kingdom');
-$this->translate('Spain');
-$this->translate('The Netherlands');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-$this->translate('');
-
-//Dashboard controller
-$this->translate('Ordinateur');
-$this->translate('Mobile');
-$this->translate('Navigateur');
-$this->translate('Résolution d\'écran');
-$this->translate('Type d\'appareil');
 ?>

application/models/City.php

@@ -0,0 +1,5 @@
+<?php
+class Application_Model_City extends Zend_Db_Table_Abstract
+{
+	protected $_name = 'tabVilles';
+}

application/models/MonitoringGiants.php

@@ -0,0 +1,21 @@
+<?php
+/* 
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+class Application_Model_MonitoringGiants extends Zend_Db_Table_Abstract
+{
+    protected $_name = 'monitoring_giants';
+    
+    public function getRetrive($date_st)
+    {
+    	$sql = $this->select()
+    	->where('ProviderOrderId = ?', (int)$date_st)
+    	->limit(1);
+    	$result = $this->getAdapter()->fetchAll($sql);
+    	return ($result);
+    }
+    
+}
+?>

application/models/RetriveGiants.php

@@ -0,0 +1,11 @@
+<?php
+/* 
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+class Application_Model_RetriveGiants extends Zend_Db_Table_Abstract
+{
+    protected $_name = 'retrive_giants';
+}
+?>

application/models/Worldcheck.php

@@ -0,0 +1,144 @@
+<?php
+class Application_Model_Worldcheck extends Zend_Db_Table_Abstract
+{
+	protected $_name = 'worldcheck';
+	protected $tbList = 'worldcheck_list';
+	protected $tbAssoc = 'worldcheck_a';
+	
+	/**
+	 * Return nameIdentifier and matchCount from local DB if found. 
+	 * Otherwise get nameIdentifier and matchCount from WorldCheck
+	 * @param object $param
+	 * @return object
+	 */
+	public function getScreenerId($param)
+	{
+		$result = new stdClass();
+		$sql = $this->select()
+		->where("idClient='".$param->idClient."' AND name='".$param->dirNom."' AND nameType='".$param->dirType."' AND LEFT(nameIdentifier, 3)='so_'")
+		->order('dateInsert DESC');
+		if ($this->fetchRow($sql))
+		{
+			$result->nameIdentifier = $this->fetchRow($sql)->nameIdentifier;
+			$result->matchCount = $this->fetchRow($sql)->matchCount;
+		}
+		else {
+			$wc = new WsWorldCheck();
+			$data = new stdClass();
+			$data->name = $param->dirNom;
+			$data->nameType = $param->dirType;
+			$result->nameIdentifier = $wc->getScreener($data);
+			$result->matchCount = $wc->getDetailsName($result->nameIdentifier)->unresolvedMatchCount;
+			$params = array(
+					'idClient' => $param->idClient,
+					'login' => $param->login,
+					'nameIdentifier' => $result->nameIdentifier,
+					'matchCount' => $result->matchCount,
+					'name' => $param->dirNom,
+					'siren' => $param->Siren,
+					'nameType' => $param->dirType,
+					'dateInsert' => date('Y-m-d')
+			);
+			$sql = $this->insert($params);
+		}
+		return $result;
+	}
+	
+	/**
+	 * Return matchCount of name
+	 * @param object $data (Nom, Prenom, Societe, Type)
+	 * @return int
+	 */
+	public function getCount($data)
+	{
+		if (isset($data->Societe) && $data->Societe!='')
+		{
+			$nameType = 'ORGANISATION';
+			$name = $data->Societe;
+		}
+		else {
+			$nameType = 'INDIVIDUAL';
+			$name = $data->Nom;
+		}
+		
+		$sql = $this->select()
+		->where("name='".$name."' AND nameType='".$nameType."' AND LEFT(nameIdentifier, 3)='so_'")
+		->group('name');
+		
+		if ($this->fetchRow($sql))
+		{
+			$result=$this->fetchRow($sql);
+			return $result->matchCount;
+		} 
+		return false;
+	}
+	
+	/**
+	 * Set WorldCheck  associates tree data into DB
+	 * @param array $nodeParams
+	 * @param string $nodeType, value must be 'p'[parent] or 'a'[associate]
+	 */
+	public function setTree($nodeParams)
+	{
+		$primary = array(
+				'entityId'=>'',
+				'nameType'=>'',
+				'fullName'=>'',
+				'givenName'=>'',
+				'lastName'=>'');
+	
+		$assoc = array(
+				'entityIdP'=>'',
+				'entityId'=>'',
+				'nameType'=>'',
+				'fullName'=>'',
+				'givenName'=>'',
+				'lastName'=>'');
+	
+		$primary = array_intersect_key($nodeParams['primary'], $primary);
+	
+		$sql = $this->getAdapter()->select()
+		->from($this->tbList, 'entityId')
+		->where('entityId=?', $primary['entityId']);
+		if (!$this->getAdapter()->fetchRow($sql)) {
+			$this->getAdapter()->insert($this->tbList, $primary);
+		}
+
+		$associates = $nodeParams['associates'];
+	
+		foreach($associates as $associate) {
+			$associate = array_intersect_key($associate, $assoc);
+			$associate['entityIdP'] = $primary['entityId'];
+				
+			$sql = $this->getAdapter()->select()
+			->from($this->tbAssoc, array('entityId', 'entityIdP'))
+			->where('entityId=?', $associate['entityId'])
+			->where('entityIdP=?', $primary['entityId']);
+			if (!$this->getAdapter()->fetchRow($sql)) {
+				$this->getAdapter()->insert($this->tbAssoc, $associate);
+			}
+		}
+	}
+	
+	/**
+	 * Get WorldCheck associates tree data from DB
+	 * @param string $entityId
+	 * @return Ambigous <multitype:, multitype:mixed Ambigous <string, boolean, mixed> >
+	 */
+	public function getTree($entityId)
+	{
+		$sql = $this->getAdapter()->select()
+		->from(array('a' => $this->tbAssoc), array('a.entityId', 'a.fullName', 'a.givenName', 'a.lastName', 'a.nameType'))
+		->join(array('l' => $this->tbList), 'a.entityIdP = l.entityId', array())
+		->where('a.entityIdP=?', $entityId);
+		$associates = $this->getAdapter()->fetchAll($sql);
+		
+		$sql = $this->getAdapter()->select()
+		->from(array('l' => $this->tbList), array('l.entityId', 'l.fullName', 'l.givenName', 'l.lastName', 'l.nameType'))
+		->where('l.entityId=?', $entityId);
+		$primary = $this->getAdapter()->fetchRow($sql);
+		
+		$output = array('primary' => $primary, 'associates' => $associates);
+		return $output;
+	}	
+}

application/views/default/scripts/dashboard/client.phtml

@@ -118,7 +118,7 @@ $(document).ready(function(){
 <label>Siren</label>
 <div class="field">
 <input name="siren" type="text" value="<?php echo isset($this->InfosClient) ? $this->InfosClient->siren : '';?>" />
-<a href="#">Obtention Raison sociale</a>
+<a href="#">Obtention Dénomination sociale</a>
 </div>
 </div>
 

application/views/default/scripts/dashboard/commandes-greffes.phtml

@@ -81,7 +81,7 @@ $compteur++;
 			'controller' => 'dashboard',
 			'action' => 'rs',
 			'siren' => $item->siren,
-		), null, true)?>" class="rs">Raison sociale</a>
+		), null, true)?>" class="rs">Dénomination sociale</a>
 		</b>
 	</td>
 	<td width="40%">

application/views/default/scripts/debug/identite.phtml

@@ -1,16 +0,0 @@
-<?php $i = 0;?>
-<div id="inDebug">
-    <div id="debug" style="margin-bottom:2px;">
-    	<b><?php echo $this->resultat->RegisteredName;?></b>
-    </div>
-    <?php foreach($this->menu as $menu):?>
-    	<div <?php ($i > 0)?'style="margin-left:2px;"':null; ?> id="debug_menu"><center><?php echo $menu;?></center></div>
-    	<?php $i++;?>
-    <?php endforeach;?>
-    <div style="float:left" id="debug">
-    	<center><b>Objet</b></center>
-    	<div id="objet0" style="display:none"><?php echo htmlentities($this->requestXML);?></div>
-    	<div id="objet1" style="display:none"><pre><?php print_r($this->resultat);?></pre></div>
-    	<div id="objet2"><pre><?php print_r($this->resultat);?></pre></div>
-    </div>
-</div>

application/views/default/scripts/dirigeant/histo.phtml

@@ -1,15 +1,15 @@
 <div id="center">
-<h1>DIRIGEANTS</h1>
+<h1><?=$this->translate("DIRIGEANTS")?></h1>
 <div class="paragraph">
 <table class="identite">
 <tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">Num&eacute;ro identifiant Siren</td>
+    <td width="200" class="StyleInfoLib"><?=$this->translate("Num&eacute;ro identifiant Siren")?></td>
     <td width="350" class="StyleInfoData"><?=$this->SirenTexte($this->siren)?></td>
 </tr>
 <tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">Raison Sociale</td>
+    <td width="200" class="StyleInfoLib"><?=$this->translate("Dénomination Sociale")?></td>
     <td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
 </tr>
 <?php if ($this->surveillance) {?>
@@ -26,13 +26,10 @@
 </table>
 </div>
 
-<h2>Historique des dirigeants</h2>
+<h2><?=$this->translate("Historique des dirigeants")?></h2>
 <div class="paragraph">
 
 <?php if (count($this->dirigeants) > 0) {?>
-<style>
-table.data td { border:1px solid #ccc; padding:5px; }
-</style>
 <table class="data">
     <?php foreach ($this->dirigeants as $dir) {?>
     <tr>
@@ -40,13 +37,13 @@ table.data td { border:1px solid #ccc; padding:5px; }
 	<td class="StyleInfoData" width="200"><?=$dir->Societe.' '.$dir->Nom.' '.$dir->Prenom?></td>
     <td class="StyleInfoData" width="200">
     <?php if ($dir->DateFct != '') { ?>
-    Modification le
+    <?=$this->translate("Modification le")?>
 	<?php
     	if (strpos($dir->DateFct, '/') != false) {
     		echo $dir->DateFct.' ';
 		} else {
-        	$wdate = new WDate();
-            echo $wdate->dateT('Y-m-d', 'd/m/Y', $dir->DateFct);
+			$date = new Zend_Date($dir->DateFct,'yyyy-MM-dd');
+			echo $date->toString('dd/MM/yyyy');
 		}
 	}
 	?>
@@ -58,7 +55,7 @@ table.data td { border:1px solid #ccc; padding:5px; }
 <table>
 <tr>
     <td class="StyleInfoData" width="550">
-    Aucune donn&eacute;e n'est pr&eacute;sente dans notre base
+    <?=$this->translate("Aucune donn&eacute;e n'est pr&eacute;sente dans notre base")?>
     </td>
 </tr>
 </table>

application/views/default/scripts/dirigeant/liste.phtml

@@ -1,19 +1,19 @@
-<?php if (empty($this->AutrePage)):?>
+<?php if (empty($this->AutrePage)) {?>
 <div id="center">
-<?php endif;?>
+<?php }?>
 
-<?php if (empty($this->AutrePage)):?>
-<h1>DIRIGEANTS</h1>
+<?php if (empty($this->AutrePage)){?>
+<h1><?=$this->translate("DIRIGEANTS")?></h1>
 <div class="paragraph">
 <table class="identite">
 <tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">Num&eacute;ro identifiant Siren</td>
+    <td width="200" class="StyleInfoLib"><?=$this->translate("Num&eacute;ro identifiant Siren")?></td>
     <td width="350" class="StyleInfoData"><?=$this->SirenTexte($this->siren)?></td>
 </tr>
 <tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">Raison Sociale</td>
+    <td width="200" class="StyleInfoLib"><?=$this->translate("Dénomination Sociale")?></td>
     <td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
 </tr>
 <?php if ($this->surveillance) {?>
@@ -31,32 +31,31 @@
 <tr>
 	<td width="30">&nbsp;</td>
 	<td colspan="2" width="550" class="StyleInfoData">
-	<a href="<?=$this->dirigeantsop?>">Consulter la liste des dirigeants opérationnels</a>
+	<a href="<?=$this->dirigeantsop?>"><?=$this->translate("Consulter la liste des dirigeants opérationnels")?></a>
 	</td>
 </tr>
 <?php } ?>
 </table>
 </div>
-<?php endif;?>
+<?php }?>
 
-<h2>Liste des dirigeants actifs</h2>
+<h2><?=$this->translate("Liste des dirigeants actifs")?></h2>
 <div class="paragraph">
 <?php if ( count($this->dirigeants)>0 ) { ?>
-<style>
-table.data td { border:1px solid #ccc; padding:5px; }
-</style>
 <table class="data">
 <?php foreach ($this->dirigeants as $dir) {?>
     <tr>
     	<td class="StyleInfoData" width="200"><?=$dir->Titre?></td>
     	<td class="StyleInfoData" width="320">
+
     	<?php if ($dir->Societe != '') { ?>
     	<a href="<?=$this->url(array('controller' => 'recherche', 'action' => 'liste', 'type' => 'ent','raisonSociale' => $dir->Societe), null, true)?>"
-    		title="Recherche à partir de la raison sociale">
+    		title="<?=$this->translate("Recherche à partir de la dénomination sociale")?>">
             <?=$dir->Societe?>
     	</a>
     	<br/>
     	<?php }?>
+
     	<?php if ($dir->Nom != '') { ?>
     	<a href="<?=$this->url(array(
     		'controller' => 'recherche',
@@ -64,35 +63,52 @@ table.data td { border:1px solid #ccc; padding:5px; }
     		'type' => 'dir',
     		'dirNom' => $dir->Nom,
     		'dirPrenom' => $dir->Prenom,
-    		'dirNaissJJ' => substr($dir->NaissDate,0,2),
+    		'dirDateNaissJJ' => substr($dir->NaissDate,0,2),
     		'dirDateNaissMM' => substr($dir->NaissDate,3,2),
     		'dirDateNaissAAAA' => substr($dir->NaissDate,6,4),
     		'dirCpVille' => $dir->NaissVille,
-    	), null, true)?>" title="Recherche à partir du nom du dirigeant">
+    	), null, true)?>" title="<?=$this->translate("Recherche à partir du nom du dirigeant")?>">
     		<?=$dir->Nom.' '.$dir->Prenom?>
     	</a>
     	<?php
     	if (trim($dir->NaissDate) != '' && trim($dir->NaissVille.' '.$dir->NaissDepPays) != '') { ?>
     		<br/>né(e) le <?=$dir->NaissDate?> à <?=$dir->NaissVille?>
-    		<?php if (trim($dir->NaissDepPays) != '') { ?>
-    			&nbsp;(<?=$dir->NaissDepPays?>)
-    		<?php }
-    		} else if (trim($dir->NaissDate) != '') {
-    		?>
+    		<?php if (trim($dir->NaissDepPays) != '') { ?>&nbsp;(<?=$dir->NaissDepPays?>)<?php }?>
+    	<?php } else if (trim($dir->NaissDate) != '') { ?>
     		né(e) le <?=$dir->NaissDate?>
-    		<?php
-    		} else if (trim($dir->NaissVille.' '.$dir->NaissDepPays) != '') {
-    		?>
+		<?php } else if (trim($dir->NaissVille.' '.$dir->NaissDepPays) != '') { ?>
     		né(e) à <?=$dir->NaissVille?> &nbsp;(<?=$dir->NaissDepPays?>)
     	<?php } ?>
     	<?php } ?>
+
     	</td>
     	<td class="StyleInfoData" width="100" valign="top">
     	<?php if ($dir->Siren!='') {?>
-    	<a title="Consulter la fiche identité" href="<?=$this->url(array('controller'=>'identite', 'action'=>'fiche', 'siret'=>$dir->Siren))?>">
+    	<a title="<?=$this->translate("Consulter la fiche identité")?>" href="<?=$this->url(array('controller'=>'identite', 'action'=>'fiche', 'siret'=>$dir->Siren), null, true)?>">
     	<?=$this->SirenTexte($dir->Siren)?></a>
+
+    	<?php if (empty($this->AutrePage) && $this->edition) {?>
+        <div style="line-height:16px;">
+        <a class="dialog" title="<?=$this->translate("Ajouter un actionnaire")?>" href="<?=$this->url(array('controller'=>'saisie','action'=>'lien','type'=>'actionnaire','mode'=>'add','siren'=>$this->siren,'createfiche'=>$dir->Siren),null,true)?>">
+        <img style="vertical-align:middle;" src="/themes/default/images/interfaces/ajouter.png" /></a>
+        </div>
+        <?php }?>
     	<?php }?>
     	</td>
+		<?php if (empty($this->AutrePage) && $this->accessWorldCheck) {?>
+		<td>
+    		<?php if ($dir->Societe != '') { ?>
+    		<img style="cursor:pointer;" class="wcheck" data-url="<?=$this->url(array(
+    				'controller'=>'worldcheck','action'=>'occurence','siren'=>substr($this->siret,0,9),
+    				'dirType'=>'ORGANISATION','dirSociete'=>$dir->Societe),null,true);?>" src="/themes/default/images/worldcheck/wc.png"/>
+    		<?php }?>
+    	   	<?php if ($dir->Nom != '') { ?>
+			<img style="cursor:pointer;" class="wcheck" data-url="<?=$this->url(array(
+					'controller'=>'worldcheck','action'=>'occurence','siren'=>substr($this->siret,0,9),
+					'dirType'=>'INDIVIDUAL','dirNom'=>$dir->Nom,'dirPrenom'=>$dir->Prenom),null,true);?>" src="/themes/default/images/worldcheck/wc.png"/>
+    		<?php }	?>
+    	</td>
+		<?php }?>
     </tr>
     <?php } ?>
 </table>
@@ -100,14 +116,62 @@ table.data td { border:1px solid #ccc; padding:5px; }
 <table>
 <tr>
 	<td class="StyleInfoData" width="550">
-	Aucune donn&eacute;e n'est pr&eacute;sente dans notre base
+	<?=$this->translate("Aucune donn&eacute;e n'est pr&eacute;sente dans notre base")?>
 	</td>
 </tr>
 </table>
 <?php } ?>
 </div>
 
-<?php if (empty($this->AutrePage)):?>
+<?php if (empty($this->AutrePage)) {?>
 <?=$this->render('cgu.phtml', $this->cgu)?>
+<?php }?>
+
+<?php if (empty($this->AutrePage)) {?>
 </div>
-<?php endif;?>
+<?php }?>
+
+<?php if (empty($this->AutrePage) && $this->edition) {?>
+<script>
+$('a.dialog').on('click', function(){
+	var href = $(this).attr('href');
+	if (href!='#') {
+		var title = $(this).attr('title');
+		var dialogOpts = {
+			bgiframe: true,
+			title: title,
+			width: 650,
+			height: 600,
+			modal: true,
+			open: function(event, ui) {
+				$(this).html('Chargement...');
+				$(this).load(href);
+			},
+			buttons: {
+				Quitter: function() { $(this).dialog('close'); }
+			},
+			close: function() { $('#dialog').remove(); }
+		};
+		$('<div id="dialog"></div>').dialog(dialogOpts);
+		return false;
+	}
+});
+</script>
+<?php }?>
+
+<?php if (empty($this->AutrePage) && $this->accessWorldCheck) {?>
+<script>
+$('img.wcheck').each(function(){
+	$(this).qtip({
+		hide: { event: 'unfocus' },
+		show: { solo: true, delay: 500 },
+		content: {
+			button: true,
+			title: 'WorlCheck',
+			text: "Chargement...",
+			ajax: { url: $(this).data('url') } },
+		position: { my: 'right center', at: 'left center' }
+	});
+});
+</script>
+<?php }?>

application/views/default/scripts/dirigeant/op.phtml

@@ -1,23 +1,19 @@
-<?php if (empty($this->AutrePage)):?>
+<?php if (empty($this->AutrePage)){?>
 <div id="center">
-<?php endif;?>
+<?php }?>
 
-<?php if (empty($this->AutrePage)):?>
-<h1>DIRIGEANTS OP&Eacute;RATIONNELS</h1>
+<?php if (empty($this->AutrePage)){?>
+<h1><?=$this->translate("DIRIGEANTS OP&Eacute;RATIONNELS")?></h1>
 <div class="paragraph">
 <table class="identite">
   <tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">
-      Num&eacute;ro identifiant Siren
-    </td>
-    <td width="350" class="StyleInfoData">
-      <?=$this->SirenTexte($this->siren)?>
-    </td>
+    <td width="200" class="StyleInfoLib"><?=$this->translate("Num&eacute;ro identifiant Siren")?></td>
+    <td width="350" class="StyleInfoData"><?=$this->SirenTexte($this->siren)?></td>
   </tr>
   <tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">Raison Sociale</td>
+    <td width="200" class="StyleInfoLib"><?=$this->translate("Dénomination Sociale")?></td>
     <td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
   </tr>
   <?php if ($this->surveillance) {?>
@@ -33,15 +29,12 @@
   <?php }?>
 </table>
 </div>
-<?php endif;?>
+<?php }?>
 
-<h2>Liste des dirigeants actifs</h2>
+<h2><?=$this->translate("Liste des dirigeants actifs")?></h2>
 <div class="paragraph">
 
 <?php if ( count($this->dirigeants)>0 ) {?>
-<style>
-table.data td { border:1px solid #ccc; padding:5px; }
-</style>
 <table class="data">
 <?php foreach ($this->dirigeants as $dir) {?>
 <tr>
@@ -54,7 +47,7 @@ table.data td { border:1px solid #ccc; padding:5px; }
 		'type' => 'ent',
 		'raisonSociale' => $dir->Societe
 	), null, true)?>"
-		title="Recherche à partir de la raison sociale">
+		title="<?=$this->translate("Recherche à partir de la Dénomination sociale")?>">
         <?=$dir->Societe?>
 	</a>
 	&nbsp;
@@ -66,24 +59,21 @@ table.data td { border:1px solid #ccc; padding:5px; }
 		'type' => 'dir',
 		'dirNom' => $dir->Nom,
 		'dirPrenom' => $dir->Prenom,
-	), null, true)?>" title="Recherche à partir du nom du dirigeant">
+	), null, true)?>" title="<?=$this->translate("Recherche à partir du nom du dirigeant")?>">
 		<?=$dir->Nom.' '.$dir->Prenom?>
 	</a>
 	<?php } ?>
 	</td>
 	<td class="StyleInfoData" width="230">
 	<?php if (trim($dir->NaissDate) != '' && trim($dir->NaissVille.' '.$dir->NaissDepPays) != '') { ?>
-		né(e) le <?=$dir->NaissDate?> à <?=$dir->NaissVille?>
+		<?=$this->translate("né(e) le")?> <?=$dir->NaissDate?> à <?=$dir->NaissVille?>
 		<?php if (trim($dir->NaissDepPays) != '') { ?>
 			&nbsp;(<?=$dir->NaissDepPays?>)
-		<?php }
-		} else if (trim($dir->NaissDate) != '') {
-		?>
-		né(e) le <?=$dir->NaissDate?>
-		<?php
-		} else if (trim($dir->NaissVille.' '.$dir->NaissDepPays) != '') {
-		?>
-		né(e) à <?=$dir->NaissVille?> &nbsp;(<?=$dir->NaissDepPays?>)
+		<?php }?>
+	<?php } else if (trim($dir->NaissDate) != '') {?>
+		<?=$this->translate("né(e) le")?> <?=$dir->NaissDate?>
+	<?php } else if (trim($dir->NaissVille.' '.$dir->NaissDepPays) != '') { ?>
+		<?=$this->translate("né(e) à")?> <?=$dir->NaissVille?> &nbsp;(<?=$dir->NaissDepPays?>)
 	<?php } ?>
 	</td>
 </tr>
@@ -93,14 +83,14 @@ table.data td { border:1px solid #ccc; padding:5px; }
 <table>
 <tr>
     <td class="StyleInfoData" width="550">
-    Aucune donn&eacute;e n'est pr&eacute;sente dans notre base
+    <?=$this->translate("Aucune donn&eacute;e n'est pr&eacute;sente dans notre base")?>
     </td>
 </tr>
 </table>
 <?php } ?>
 </div>
 
-<?php if (empty($this->AutrePage)):?>
+<?php if (empty($this->AutrePage)){?>
 <?=$this->render('cgu.phtml', $this->cgu)?>
 </div>
-<?php endif;?>
+<?php }?>

application/views/default/scripts/evaluation/aviscredit.phtml

@@ -51,7 +51,7 @@ if($this->commande == false){
 <div class="infoTitle StyleInfoLib">Num&eacute;ro de TVA Intracom.</div>
 <div class="infoData"><?=substr($this->Etab->TvaNumero,0,2).' '.substr($this->Etab->TvaNumero,2,2).' '.substr($this->Etab->TvaNumero,-9)?></div>
 
-<div class="infoTitle StyleInfoLib">Raison Sociale</div>
+<div class="infoTitle StyleInfoLib">Dénomination Sociale</div>
 <div class="infoData"><?=$this->Etab->Nom?></div>
 
 <div class="infoTitle StyleInfoLib">Adresse</div>

application/views/default/scripts/evaluation/enquetec.phtml

@@ -61,7 +61,7 @@ if($this->commandeEnquete == false){
 <div class="infoTitle StyleInfoLib">Num&eacute;ro de TVA Intracom.</div>
 <div class="infoData"><?=substr($this->Etab->TvaNumero,0,2).' '.substr($this->Etab->TvaNumero,2,2).' '.substr($this->Etab->TvaNumero,-9)?></div>
 
-<div class="infoTitle StyleInfoLib">Raison Sociale</div>
+<div class="infoTitle StyleInfoLib">Dénomination Sociale</div>
 <div class="infoData"><?=$this->Etab->Nom?></div>
 
 <div class="infoTitle StyleInfoLib">Adresse</div>

application/views/default/scripts/evaluation/indiscore.phtml

@@ -37,12 +37,12 @@
 </div>
 <?php endif;?>
 
-<h2>Raison sociale & coordonnées</h2>
+<h2>Dénomination sociale & coordonnées</h2>
 <div class="paragraph">
 <table>
 	<tr>
 		<td width="30"></td>
-		<td width="200" class="StyleInfoLib">Raison Sociale</td>
+		<td width="200" class="StyleInfoLib">Dénomination Sociale</td>
 		<td width="350" class="StyleInfoData">
 		<?php
 		echo $this->indiscore->Nom;
@@ -80,7 +80,8 @@
 		<td width="30"></td>
 		<td width="200" class="StyleInfoLib">Date de création de l'entreprise</td>
 		<td width="350" class="StyleInfoData">
-		<?=WDate::dateT('Ymd', 'm/Y', $this->indiscore->DateCreaEn)?>
+		<?php $date = new Zend_Date($this->indiscore->DateCreaEn, 'yyyyMMdd');?>
+		<?=$date->toString('dd/MM/yyyy')?>
 		</td>
 	</tr>
 	<tr>
@@ -135,9 +136,9 @@
 	<div class="stats gradiant_pic">
 	<ul>
 	    <li>
-		<i><?=$this->indiscore->AnalyseConfor?></i>
+		<i><?=$this->indiscore->AnalyseConfor; ?></i>
 	    <div class="blocdegrade clearfix">
-	    <span class="textdegrade">Conformit&eacute;</span>
+	    <span class="textdegrade">Conformit&eacute;&nbsp;<? if ($this->edition) { echo '('.$this->indiscore->ScoreConfor.')';}?></span>
 	    <div class="imgdegrade"><img class="borderimg" src="/themes/default/images/indiscore/imgscores-<?=$this->FormatPct($this->indiscore->ScoreConfor)?>.png"/></div>
 	    <div class="regle"><img src="/themes/default/images/indiscore/sgradiant2.png" /></div>
 	    </div>
@@ -151,7 +152,7 @@
 	    <li>
 	    <i><?=$this->indiscore->AnalyseDirigeance?></i>
 	    <div class="blocdegrade clearfix">
-	    <span class="textdegrade">Dirigeance</span>
+	    <span class="textdegrade">Dirigeance&nbsp;<? if ($this->edition) { echo '('.$this->indiscore->ScoreDirigeance.')';}?></span>
 	    <div class="imgdegrade"><img class="borderimg" src="/themes/default/images/indiscore/imgscores-<?=$this->FormatPct($this->indiscore->ScoreDirigeance)?>.png"/></div>
 	    <div class="regle"><img src="/themes/default/images/indiscore/sgradiant2.png" /></div>
 	    </div>
@@ -165,7 +166,7 @@
     	<li>
         <i>L'analyse de la solvabilit&eacute; est <?=$this->indiscore->AnalyseSolvabilite?></i>
         <div class="blocdegrade clearfix">
-        <span class="textdegrade">Solvabilit&eacute;</span>
+        <span class="textdegrade">Solvabilit&eacute;&nbsp;<? if ($this->edition) { echo '('.$this->indiscore->Indiscore.')';}?></span>
         <div class="imgdegrade"><img class="borderimg" src="/themes/default/images/indiscore/imgscores-<?php echo $this->FormatPct($this->indiscore->Indiscore);?>.png"/></div>
         <div class="regle"><img src="/themes/default/images/indiscore/sgradiant2.png" /></div>
         </div>
@@ -182,8 +183,7 @@
 <tr>
 	<td width="30">&nbsp;</td>
     <td width="550" colspan="2" class="StyleInfoData">
-    A la lecture du dernier bilan, la situation financi&egrave;re de l'entreprise <?php echo $this->Nom;?> est <b><?php echo $this->indiscore->tabInfosNotations->SituationFinanciere;?></b>.<br/>
-    <!--	Cette notation financi&egrave;re est <?php echo $this->indiscore->tabInfosNotations->Notation;?>.<br/>-->
+    A la lecture du dernier bilan, cloturé le <?=substr($this->indiscore->Bilans->item[0]->Millesime,6,2).'/'.substr($this->indiscore->Bilans->item[0]->Millesime,4,2).'/'.substr($this->indiscore->Bilans->item[0]->Millesime,0,4)?>, la situation financi&egrave;re de l'entreprise <?php echo $this->Nom;?> est <b><?php echo $this->indiscore->tabInfosNotations->SituationFinanciere;?></b>.<br/>
     <?php
     	if (html_entity_decode($this->indiscore->tabInfosNotations->ProbabiliteDefaut) <> 'En défaut')
         	echo 'La probabilit&eacute; de d&eacute;faillance associ&eacute;e &agrave; cette note avoisine les '. number_format($this->indiscore->tabInfosNotations->ProbabiliteDefaut,3,',',' ') .' %';
@@ -208,7 +208,7 @@
 	<td width="550" colspan="2" class="StyleInfoData">
 	La situation financi&egrave;re de l'entreprise ne peut être évaluée en détail car
 	<?php
-	if($this->indiscore->Bilans->item[0]->Millesime < $millesimeMax && count($this->indiscore->Bilans) > 0 ) {
+	if($this->indiscore->Bilans->item[0]->Millesime < $millesimeMax && count($this->indiscore->Bilans->item) > 0 ) {
 		echo 'le dernier bilan disponible date de '.substr($this->indiscore->Bilans->item[0]->Millesime,0,4).'.';
 	} else {
     	echo 'aucun bilan n\'est disponible.';
@@ -229,7 +229,7 @@
     <?php if(!empty($this->indiscore->infoPaiement)):?>
     <?php echo html_entity_decode($this->indiscore->infoPaiement);?>
     <?php else :?>
-        Aucune information sur les paiements disponnible.
+        Aucune information sur les paiements disponible.
     <?php endif;?>
     </td>
     </tr>

application/views/default/scripts/evaluation/indiscore2.phtml

@@ -11,7 +11,7 @@ echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Actif']);
 </table>
 </div>
 
-<h2>Raison sociale &amp; Coordonnées</h2>
+<h2>Dénomination sociale &amp; Coordonnées</h2>
 <div class="paragraph">
 <table>
 <?php

application/views/default/scripts/evaluation/scoring.phtml

@@ -8,7 +8,7 @@
 </tr>
 <tr>
 	<td width="30">&nbsp;</td>
-	<td width="200" class="StyleInfoLib">Raison Sociale</td>
+	<td width="200" class="StyleInfoLib">Dénomination Sociale</td>
 	<td width="350" class="StyleInfoData"><?php echo $this->raisonSociale?></td>
 </tr>
 <tr>

application/views/default/scripts/finance/banque.phtml

@@ -1,92 +1,51 @@
-<style type="text/css">
-ul.relation {
-	list-style-type: none;
-}
-
-ul.relation li {
-	clear: both;
-}
-
-.banque {
-	text-decoration: underline;
-	width: 35%;
-	float: left;
-	margin-bottom: 10px;
-}
-
-.adresse {
-	width: 30%;
-	float: left;
-	margin-bottom: 10px;
-}
-
-.codeBanque {
-	width: 10%;
-	float: left
-}
-
-.codeGuichet {
-	width: 10%;
-	float: left;
-}
-
-.clearfix:after {
-	content: ".";
-	display: block;
-	height: 0;
-	clear: both;
-	visibility: hidden;
-}
-</style>
 <div id="center">
 <h1 class="titre">RELATIONS BANCAIRES</h1>
 <div class="paragraph">
 <table class="identite">
-  <tr>
+<tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">
-      Num&eacute;ro identifiant Siren
-    </td>
-    <td width="350" class="StyleInfoData">
-      <?=$this->SirenTexte($this->siren)?>
-    </td>
-  </tr>
-  <tr>
-    <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">Raison Sociale</td>
+    <td width="200" class="StyleInfoLib">Num&eacute;ro identifiant Siren</td>
+    <td width="350" class="StyleInfoData"><?=$this->SirenTexte($this->siren)?></td>
+</tr>
+<tr>
+	<td width="30">&nbsp;</td>
+    <td width="200" class="StyleInfoLib">Dénomination Sociale</td>
     <td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
-  </tr>
+</tr>
 </table>
 </div>
 
 <h2>Liste des relations bancaires</h2>
 <div class="paragraph">
-<?php
-if(count($this->banques)>0)
-{
-?>
-<ul class="relation clearfix">
-<?php
-foreach($this->banques as $relation)
-{
-	?>
-	<li>
-	<div class="banque"><?=$relation->libBanque?></div>
-	<div class="adresse"><?php if($relation->adresse1!='') {?>
-	<?=$relation->adresse1?><br />
-	<?php } ?> <?php if($relation->adresse2!='') {?>
-	<?=$relation->adresse2?><br />
-	<?php } ?> <?=$relation->cp?> <?=$relation->ville?></div>
-	<div class="codeBanque"><?php if( $relation->codeBanque*1!=0 ){ echo $relation->codeBanque; } ?></div>
-	<div class="codeGuichet"><?php if( $relation->codeGuichet*1!=0 ){ echo $relation->codeGuichet; }?></div>
-	</li>
-	<?php
-}
-?>
-</ul>
-<?php
-} else {
-?>
+<?php if(count($this->banques)>0) { ?>
+<table class="data">
+<thead>
+<tr>
+	<th>Nom de la Banque</th>
+	<th>Adresse</th>
+	<th>Code Banque</th>
+	<th>Code Guichet</th>
+</tr>
+</thead>
+<tbody>
+<?php foreach($this->banques as $relation) { ?>
+<tr>
+	<td valign="top" style="text-decoration:underline;"><?=$relation->libBanque?></td>
+	<td>
+	<?php if($relation->adresse1!='') {?>
+		<?=$relation->adresse1?><br />
+	<?php } ?>
+	<?php if($relation->adresse2!='') {?>
+		<?=$relation->adresse2?><br />
+	<?php } ?> <?=$relation->cp?> <?=$relation->ville?>
+	</td>
+	<td align="center"><?php if( $relation->codeBanque*1!=0 ){ echo $relation->codeBanque; } ?></td>
+	<td align="center"><?php if( $relation->codeGuichet*1!=0 ){ echo $relation->codeGuichet; }?></td>
+</tr>
+<?php } ?>
+</tbody>
+</table>
+<?php } else { ?>
 <p>Aucune information.</p>
 <?php } ?>
 </div>

application/views/default/scripts/finance/bilan.phtml

@@ -1,8 +1,8 @@
-<?php if (empty($this->AutrePage)):?>
+<?php if (empty($this->AutrePage)) {?>
 <div id="center">
-<?php endif;?>
+<?php }?>
 
-<?php if (empty($this->AutrePage)):?>
+<?php if (empty($this->AutrePage)) {?>
 <h1>ÉLÉMENTS FINANCIERS - BILANS</h1>
 <div class="paragraph">
    	<table class="identite">
@@ -17,7 +17,7 @@
 	</tr>
     <tr>
     	<td width="30">&nbsp;</td>
-		<td width="200" class="StyleInfoLib">Raison Sociale</td>
+		<td width="200" class="StyleInfoLib">Dénomination Sociale</td>
         <td width="350" class="StyleInfoData"><?php echo $this->raisonSociale;?></td>
 	</tr>
 	<?php if (isset($this->tabResultActif) && isset($this->tabResultPassif) && isset($this->tabResultSig)){?>
@@ -28,7 +28,7 @@
 	    <?php if ($this->nbBilanC==0){?>
 	    	Réel normal ou Simplifié
 	    <?php } elseif ($this->nbBilanN==0){?>
-	    	Consolidé	
+	    	Consolidé
 	    <?php } else {?>
 	    <form>
 	    	<select name="typeBilan">
@@ -42,10 +42,10 @@
 	<?php }?>
     </table>
 </div>
-<?php endif; ?>
+<?php }?>
 
 
-<?php if($this->typeBilan == 'B' and $this->typeBilan == 'A'):?>
+<?php if($this->typeBilan == 'B' || $this->typeBilan == 'A') {?>
 
 <div class="paragraph">
     <table>
@@ -56,9 +56,9 @@
     </table>
 </div>
 
-<?php else: ?>
+<?php } else { ?>
 
-	<?php if ($this->nbBilanN==0 && $this->nbBilanN==0):?>
+	<?php if ($this->nbBilanN==0 && $this->nbBilanC==0) {?>
 
 	<div class="paragraph">
     <table>
@@ -68,24 +68,137 @@
 	</tr>
     </table>
 	</div>
-		
-	<?php else:?>
+
+	<?php } else {?>
 
 	<h2>Bilan actif - passif</h2>
-	<?=$this->partial('finance/bilan/actif.phtml')?>
-	<?=$this->partial('finance/bilan/passif.phtml')?>
-	
+	<div class="paragraph">
+	<table class="bilans">
+	<thead>
+	<tr>
+	<th>Actif</th>
+	<?php foreach($this->tabResultActif as $info) { ?>
+	<th class="date" >
+	<?=$info['dateCloture']?><br/><?=$info['duree']?>
+	</th>
+	<?php }?>
+	<?php $lastDateCloture = $info['dateCloture']; ?>
+	<th>% T.B.</th>
+	</tr>
+	</thead>
+	<tbody>
+	<?php foreach($this->tabRatioActif as $idRatio => $info) { ?>
+	<tr<?php if (!empty($info['class'])) echo ' class="'.$info['class'].'"'?>>
+		<td>
+		<?=$info['titre']?></td>
+		<?php foreach($this->tabResultActif as $value) { ?>
+		<td class="left"><?=$value['entrep'][$idRatio]?></td>
+		<?php }?>
+		<td><?=$value['total'][$idRatio]?></td>
+	<?php }?>
+	</tr>
+	</tbody>
+	</table>
+	</div>
+
+	<div class="paragraph">
+	<?=$this->action('bilangraph', 'finance', null, array(
+		'type' => 'actif',
+		'typeBilan' => $this->typeBilan,
+		'dateCloture' =>  $this->lastDateCloture,
+		'siret' => $this->siret,
+		'id' => $this->id,
+	))?>
+	</div>
+
+	<div class="paragraph">
+	<table class="bilans">
+	<thead>
+	<tr>
+	<th>Passif</th>
+	<?php foreach($this->tabResultPassif as $info) { ?>
+	<th class="date" >
+	<?=$info['dateCloture']?><br/><?=$info['duree']?>
+	</th>
+	<?php }?>
+	<th>% T.B.</th>
+	</tr>
+	</thead>
+	<tbody>
+	<?php foreach($this->tabRatioPassif as $idRatio => $info) { ?>
+	<tr<?php if (!empty($info['class'])) echo ' class="'.$info['class'].'"'?>>
+		<td>
+		<?=$info['titre']?></td>
+		<?php foreach($this->tabResultPassif as $value) { ?>
+		<td class="left"><?=$value['entrep'][$idRatio]?></td>
+		<?php }?>
+		<td><?=$value['total'][$idRatio]?></td>
+	<?php }?>
+	</tr>
+	</tbody>
+	</table>
+	</div>
+
+	<div class="paragraph">
+	<?=$this->action('bilangraph', 'finance', null, array(
+		'type' => 'passif',
+		'typeBilan' => $this->typeBilan,
+		'dateCloture' =>  $this->lastDateCloture,
+		'siret' => $this->siret,
+		'id' => $this->id,
+	))?>
+	</div>
+
 	<h2>Soldes Intermédiaire de Gestion</h2>
-	<?=$this->partial('finance/bilan/sig.phtml')?>
-	
-	<?php endif;?>
-	
-<?php endif;?>
+	<div class="paragraph">
+	<table class="bilans">
+	<thead>
+	<tr>
+	<th colspan="2">SOLDES INTERMEDIAIRE DE GESTION</th>
+	<?php foreach($this->tabResultSig as $info) { ?>
+	<th class="date" >
+	<?=$info['dateCloture']?><br/><?=$info['duree']?>
+	</th>
+	<?php }?>
+	<th>% C.A.</th>
+	</tr>
+	</thead>
+	<tbody>
+	<?php foreach($this->tabRatioSig as $idRatio => $info) { ?>
+	<tr<?php if (!empty($info['class'])) echo ' class="'.$info['class'].'"'?>>
+		<?php if(empty($info['op'])){?>
+		<td colspan="2"><?=$info['titre']?></td>
+		<?php } else {?>
+		<td><?=$info['op']?></td><td><?=$info['titre']?></td>
+		<?php }?>
+		<?php foreach($this->tabResultSig as $value) { ?>
+		<td class="left"><?=$value['entrep'][$idRatio]?></td>
+		<?php }?>
+		<td><?=$value['total'][$idRatio]?></td>
+	<?php }?>
+	</tr>
+	</tbody>
+	</table>
+	</div>
 
-<?php if (empty($this->AutrePage)):?>
+	<div class="paragraph">
+	<?=$this->action('bilangraph', 'finance', null, array(
+		'type' => 'sig',
+		'typeBilan' => $this->typeBilan,
+		'dateCloture' =>  $this->lastDateCloture,
+		'siret' => $this->siret,
+		'id' => $this->id,
+	))?>
+	</div>
+
+	<?php }?>
+
+<?php }?>
+
+<?php if (empty($this->AutrePage)) {?>
 <?=$this->render('cgu.phtml', $this->cgu)?>
-<?php endif;?>
+<?php }?>
 
-<?php if (empty($this->AutrePage)):?>
+<?php if (empty($this->AutrePage)) {?>
 </div>
-<?php endif;?>
+<?php }?>

application/views/default/scripts/finance/bilan/actif.phtml

@@ -1,42 +0,0 @@
-<?php
-$tabResult = $this->partial()->view->tabResultActif;
-$tabRatio = $this->partial()->view->tabRatioActif;
-?>
-<div class="paragraph">
-<table class="bilans">
-<thead>
-<tr>
-<th>Actif</th>
-<?php foreach($tabResult as $info) { ?>
-<th class="date" >
-<?=$info['dateCloture']?><br/><?=$info['duree']?>
-</th>
-<?php }?>
-<?php $lastDateCloture = $info['dateCloture']; ?>
-<th>% T.B.</th>
-</tr>
-</thead>
-<tbody>
-<?php foreach($tabRatio as $idRatio => $info) { ?>
-<tr<?php if (!empty($info['class'])) echo ' class="'.$info['class'].'"'?>>
-	<td>
-	<?=$info['titre']?></td>
-	<?php foreach($tabResult as $value) { ?>
-	<td class="left"><?=$value['entrep'][$idRatio]?></td>
-	<?php }?>
-	<td><?=$value['total'][$idRatio]?></td>
-<?php }?>
-</tr>
-</tbody>
-</table>
-</div>
-
-<div class="paragraph">
-<?=$this->action('bilangraph', 'finance', null, array(
-	'type' => 'actif',
-	'typeBilan' => $this->partial()->view->typeBilan,
-	'dateCloture' =>  $this->partial()->view->lastDateCloture,
-	'siret' => $this->partial()->view->siret,
-	'id' => $this->partial()->view->id,
-))?>
-</div>

application/views/default/scripts/finance/bilan/passif.phtml

@@ -1,41 +0,0 @@
-<?php
-$tabResult = $this->partial()->view->tabResultPassif;
-$tabRatio = $this->partial()->view->tabRatioPassif;
-?>
-<div class="paragraph">
-<table class="bilans">
-<thead>
-<tr>
-<th>Passif</th>
-<?php foreach($tabResult as $info) { ?>
-<th class="date" >
-<?=$info['dateCloture']?><br/><?=$info['duree']?>
-</th>
-<?php }?>
-<th>% T.B.</th>
-</tr>
-</thead>
-<tbody>
-<?php foreach($tabRatio as $idRatio => $info) { ?>
-<tr<?php if (!empty($info['class'])) echo ' class="'.$info['class'].'"'?>>
-	<td>
-	<?=$info['titre']?></td>
-	<?php foreach($tabResult as $value) { ?>
-	<td class="left"><?=$value['entrep'][$idRatio]?></td>
-	<?php }?>
-	<td><?=$value['total'][$idRatio]?></td>
-<?php }?>
-</tr>
-</tbody>
-</table>
-</div>
-
-<div class="paragraph">
-<?=$this->action('bilangraph', 'finance', null, array(
-	'type' => 'passif',
-	'typeBilan' => $this->partial()->view->typeBilan,
-	'dateCloture' =>  $this->partial()->view->lastDateCloture,
-	'siret' => $this->partial()->view->siret,
-	'id' => $this->partial()->view->id,
-))?>
-</div>

application/views/default/scripts/finance/bilan/sig.phtml

@@ -1,44 +0,0 @@
-<?php
-$tabResult = $this->partial()->view->tabResultSig;
-$tabRatio = $this->partial()->view->tabRatioSig;
-?>
-<div class="paragraph">
-<table class="bilans">
-<thead>
-<tr>
-<th colspan="2">SOLDES INTERMEDIAIRE DE GESTION</th>
-<?php foreach($tabResult as $info) { ?>
-<th class="date" >
-<?=$info['dateCloture']?><br/><?=$info['duree']?>
-</th>
-<?php }?>
-<th>% C.A.</th>
-</tr>
-</thead>
-<tbody>
-<?php foreach($tabRatio as $idRatio => $info) { ?>
-<tr<?php if (!empty($info['class'])) echo ' class="'.$info['class'].'"'?>>
-	<?php if(empty($info['op'])){?>
-	<td colspan="2"><?=$info['titre']?></td>
-	<?php } else {?>
-	<td><?=$info['op']?></td><td><?=$info['titre']?></td>
-	<?php }?>
-	<?php foreach($tabResult as $value) { ?>
-	<td class="left"><?=$value['entrep'][$idRatio]?></td>
-	<?php }?>
-	<td><?=$value['total'][$idRatio]?></td>
-<?php }?>
-</tr>
-</tbody>
-</table>
-</div>
-
-<div class="paragraph">
-<?=$this->action('bilangraph', 'finance', null, array(
-	'type' => 'sig',
-	'typeBilan' => $this->partial()->view->typeBilan,
-	'dateCloture' =>  $this->partial()->view->lastDateCloture,
-	'siret' => $this->partial()->view->siret,
-	'id' => $this->partial()->view->id,
-))?>
-</div>

application/views/default/scripts/finance/bourse.phtml

@@ -13,7 +13,7 @@
 </tr>
 <tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">Raison Sociale</td>
+    <td width="200" class="StyleInfoLib">Dénomination Sociale</td>
     <td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
 </tr>
 </table>
@@ -123,7 +123,7 @@ if ($this->urlImg!='') {
 <table>
 <tr>
 	<td width="30">&nbsp;</td>
-	<td width="200" class="StyleInfoLib">Raison Sociale</td>
+	<td width="200" class="StyleInfoLib">Dénomination Sociale</td>
 	<td width="350" class="StyleInfoData"><?=empty($this->InfosBourse->RaisonSociale) ? $this->raisonSociale : $this->InfosBourse->RaisonSociale;?></td>
 </tr>
 <tr>
@@ -213,7 +213,8 @@ if ($this->urlImg!='') {
 <tr>
 	<td width="30">&nbsp;</td>
 	<td width="200" class="StyleInfoLib">Derni&egrave;re cotation connue</td>
-    <td width="350" class="StyleInfoData"><?=WDate::dateT('Y-m-d','d/m/Y',$this->InfosBourse->derCoursDate)?></td>
+	<?php $date = new Zend_Date($this->InfosBourse->derCoursDate, 'yyyy-MM-dd');?>
+    <td width="350" class="StyleInfoData"><?=$date->toString('dd/MM/yyyy')?></td>
 </tr>
 <tr>
 	<td width="30">&nbsp;</td>

application/views/default/scripts/finance/flux.phtml

@@ -9,7 +9,7 @@
 </tr>
 <tr>
 	<td width="30">&nbsp;</td>
-	<td width="200" class="StyleInfoLib">Raison Sociale</td>
+	<td width="200" class="StyleInfoLib">Dénomination Sociale</td>
 	<td width="340" class="StyleInfoData"><?=$this->raisonSociale?></td>
 </tr>
 <?php if ($this->nbBilanN > 0 || $this->nbBilanC > 0) { ?>

application/views/default/scripts/finance/liasse.phtml

@@ -9,12 +9,12 @@
 </tr>
 <tr>
 	<td width="30">&nbsp;</td>
-	<td width="200" class="StyleInfoLib">Raison Sociale</td>
+	<td width="200" class="StyleInfoLib">Dénomination Sociale</td>
 	<td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
 </tr>
 
 <?php if($this->haveLiasse):?>
-<form method="post" action="<?=$this->url(array('controller' => 'finance', 'action' => 'liasse', 'siret' => $this->siret, 'id' => $this->id))?>">
+<form method="post" action="<?=$this->url(array('controller'=>'finance','action'=>'liasse','siret'=>$this->siret,'id'=>$this->id))?>">
 <tr>
 	<td width="30">&nbsp;</td>
 	<td width="200" class="StyleInfoLib">Valeurs exprimées en</td>
@@ -31,13 +31,14 @@
    	<td width="200" class="StyleInfoLib">Millesime</td>
     <td width="350" class="StyleInfoData">
     <select name="date">
-    <?php foreach ($this->type as $champType => $name):?>
-    	<?php foreach ($this->liste[$champType] as $element):?>
+    <?php foreach ($this->type as $champType => $name) {?>
+    	<?php foreach ($this->liste[$champType] as $element) {?>
         <option value="<?=$element.':'.$champType?>"<?=($this->date == $element && $champType == $this->champType)? ' selected': '';?>>
-        <?=$this->dateFunction->dateT('Ymd', 'd/m/Y', $element).' '.$name;?>
+        <?php $date = new Zend_Date($element, 'yyyyMMdd'); ?>
+        <?=$date->toString('dd/MM/yyyy').' '.$name;?>
         </option>
-        <?php endforeach;?>
-	<?php endforeach;?>
+        <?php }?>
+	<?php }?>
     </select>
     <input type="submit" value="OK" />
     </td>
@@ -56,9 +57,6 @@
     <a href="<?=$this->url(array('controller'=>'saisie', 'action'=>'liasse', 'siret'=>$this->siren, 'selection'=>'NEW:N'))?>">Normal (2050)</a>,
     <a href="<?=$this->url(array('controller'=>'saisie', 'action'=>'liasse', 'siret'=>$this->siren, 'selection'=>'NEW:C'))?>">Consolidé (2050)</a>,
     <a href="<?=$this->url(array('controller'=>'saisie', 'action'=>'liasse', 'siret'=>$this->siren, 'selection'=>'NEW:S'))?>">Simplifié (2033)</a>
-    <script>
-    
-    </script>
 </td>
 </tr>
 <?php }?>
@@ -103,72 +101,75 @@
 	</td>
 </tr>
 <?php }?>
-<?php if ( $this->champType == 'S' ):?>
+<?php if ( $this->champType == 'S' ) {?>
 <tr>
-<td colspan="3">Ce bilan a été déposé au format réel simplifié mais vous est livré au format réel normal pour des raisons de standardisation.</td>
+	<td colspan="3">
+	Ce bilan a été déposé au format réel simplifié mais vous est livré au
+	format réel normal pour des raisons de standardisation.
+	</td>
 </tr>
-<?php endif;?>
+<?php }?>
 </table>
 </div>
 
 <div class="paragraph">
-<?php if(empty($this->date)):?>
+<?php if(empty($this->date)) {?>
 <table>
-    <tr>
-    	<td width="30">&nbsp;</td>
-        <td colspan="2" class="StyleInfoLib" width="200">Aucun bilan disponible.</td>
-	</tr>
+<tr>
+	<td width="30">&nbsp;</td>
+    <td colspan="2" class="StyleInfoLib" width="200">Aucun bilan disponible.</td>
+</tr>
 </table>
-<?php else:?>
-	
+<?php } else {?>
+
 	<div class="tabbed_area">
     <ul class="tabs">
-    <?php foreach ($this->ancres as $id => $name):?>
+    <?php foreach ($this->ancres as $id => $name) {?>
    	    <li><a  href="#<?=$id?>" title="<?=$name?>" class="tab"><?=$name?></a></li>
-	<?php endforeach;?>
+	<?php }?>
 	</ul>
 	</div>
-	
+
 	<div class="content">
-	
-	<?php if( in_array($this->champType, array('S', 'N', 'C')) ):?>
+
+	<?php if( in_array($this->champType, array('S', 'N', 'C')) ) {?>
 
 		<?php echo $this->partial('finance/liasse/2050.phtml', array(
 			'liasse' => $this->liasse,
-        	'dateCloture' => $this->dateFunction->dateT('Ymd', 'd/m/Y', $this->dateCloture),
-			'dateCloturePre' => $this->dateFunction->dateT('Ymd', 'd/m/Y', $this->dateCloturePre),
+        	'dateCloture' => $this->dateClotureD,
+			'dateCloturePre' => $this->dateCloturePreD,
         	'dureesMois' => $this->dureesMois,
         	'dureesMoisPre'=> $this->dureesMoisPre,
 			'unite'=> $this->unite,
         ));?>
-		
-	<?php elseif ($this->champType == 'B'):?>
-		
+
+	<?php } elseif ($this->champType == 'B') {?>
+
 		<?php echo $this->partial('finance/liasse/banque.phtml', array(
 			'liasse' => $this->liasse,
-        	'dateCloture' => $this->dateFunction->dateT('Ymd', 'd/m/Y', $this->dateCloture),
-        	'dateCloturePre' => $this->dateFunction->dateT('Ymd', 'd/m/Y', $this->dateCloturePre),
+        	'dateCloture' => $this->dateClotureD,
+        	'dateCloturePre' => $this->dateCloturePreD,
         	'dureesMois' => $this->dureesMois,
         	'dureesMoisPre'=> $this->dureesMoisPre,
 			'unite'=> $this->unite,
         ));?>
-		
-	<?php elseif ($this->champType == 'A'):?>
-		
+
+	<?php } elseif ($this->champType == 'A') {?>
+
 		<?php echo $this->partial('finance/liasse/assurance.phtml', array(
 			'liasse' => $this->liasse,
-			'dateCloture' => $this->dateFunction->dateT('Ymd', 'd/m/Y', $this->dateCloture),
-			'dateCloturePre' => $this->dateFunction->dateT('Ymd', 'd/m/Y', $this->dateCloturePre),
+			'dateCloture' => $this->dateClotureD,
+			'dateCloturePre' => $this->dateCloturePreD,
 			'dureesMois' => $this->dureesMois,
 			'dureesMoisPre'=> $this->dureesMoisPre,
 			'unite'=> $this->unite,
         ));?>
-		
-	<?php endif;?>
-	
+
+	<?php }?>
+
 	</div>
-	
-<?php endif;?>
+
+<?php }?>
 </div>
 <?php echo $this->render('cgu.phtml', $this->cgu);?>
 </div>

application/views/default/scripts/finance/ratios.phtml

@@ -13,7 +13,7 @@
 </tr>
 <tr>
 	<td width="30"></td>
-    <td class="StyleInfoLib" width="200">Raison Sociale</td>
+    <td class="StyleInfoLib" width="200">Dénomination Sociale</td>
     <td class="StyleInfoData" width="340"><?=$this->raisonSociale;?></td>
 </tr>
 <tr>

application/views/default/scripts/finance/subvention.phtml

@@ -0,0 +1,67 @@
+<div id="center">
+<h1 class="titre">SUBVENTIONS</h1>
+<div class="paragraph">
+<table class="identite">
+<tr>
+    <td width="30">&nbsp;</td>
+    <td width="200" class="StyleInfoLib">Num&eacute;ro identifiant Siren</td>
+    <td width="350" class="StyleInfoData"><?=$this->SirenTexte($this->siren)?></td>
+</tr>
+<tr>
+	<td width="30">&nbsp;</td>
+    <td width="200" class="StyleInfoLib">Dénomination Sociale</td>
+    <td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
+</tr>
+</table>
+</div>
+
+<h2>Détail de la subvention</h2>
+<div class="paragraph">
+<table class="data">
+<tbody>
+<tr>
+<td>Année</td>
+<td><?=$this->Millesime?></td>
+</tr>
+<tr>
+<td>Subvention versée à</td>
+<td><?=$this->AssoNom?> (<?=$this->SirenTexte($this->AssoSiren)?>)</td>
+</tr>
+<tr>
+<td>Budget</td>
+<td><?=$this->Budget?></td>
+</tr>
+<tr>
+<td>Subvention reçue de </td>
+<td><a href="<?=$this->url(array('controller'=>'identite', 'action'=>'fiche', 'siret'=>$this->OrigineSiren), null, true)?>">
+<?=$this->SirenTexte($this->OrigineSiren)?></a></td>
+</tr>
+<tr>
+<td>Origine de la subvention</td>
+<td><?=$this->OrigineLib?></td>
+</tr>
+<tr>
+<td>Imputation / Programme</td>
+<td><?=$this->Programme?></td>
+</tr>
+<tr>
+<td>Montant</td>
+<td nowrap><?=number_format($this->Montant, 2, ',', ' ')?> &euro;</td>
+</tr>
+<tr>
+<td>Objet</td>
+<td><?=$this->SubventionObjet?></td>
+</tr>
+<tr>
+<td>Evaluation</td>
+<td></td>
+</tr>
+<tr>
+<td>Mission</td>
+<td><?=$this->Mission?></td>
+</tr>
+</tbody>
+</table>
+</div>
+
+</div>

application/views/default/scripts/finance/subventions.phtml

@@ -0,0 +1,75 @@
+<div id="center">
+<h1 class="titre">SUBVENTIONS</h1>
+<div class="paragraph">
+<table class="identite">
+<tr>
+    <td width="30">&nbsp;</td>
+    <td width="200" class="StyleInfoLib">Num&eacute;ro identifiant Siren</td>
+    <td width="350" class="StyleInfoData"><?=$this->SirenTexte($this->siren)?></td>
+</tr>
+<tr>
+	<td width="30">&nbsp;</td>
+    <td width="200" class="StyleInfoLib">Dénomination Sociale</td>
+    <td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
+</tr>
+</table>
+</div>
+
+<h2>Liste des subventions</h2>
+<div class="paragraph">
+<?php if ($this->msg) {?>
+<?=$this->msg?>
+<?php } else { ?>
+
+<?php if (count($this->subventions)>0) {?>
+<table class="data">
+<thead>
+<tr>
+<th>Année</th>
+<th>Type</th>
+<th>Origine</th>
+<th>Entité subventionnée</th>
+<th>Programme</th>
+<th>Montant</th>
+</tr>
+</thead>
+<tbody>
+<?php foreach ( $this->subventions as $item ) {?>
+<tr>
+<td><?=$item->Millesime?></td>
+<td>
+<?php if ($item->Type=='IN') {?>
+Reçue
+<?php } else { ?>
+Versée
+<?php }?>
+</td>
+<td><?=$item->OrigineLib?></td>
+<td><?=$item->AssoNom?> (<?=$this->SirenTexte($item->AssoSiren)?>)</td>
+<td><a href="<?=$this->url(array('controller'=>'finance', 'action'=>'subvention', 'subventionId'=>$item->Id, 'siret'=>$this->siret, 'id'=>$this->id), null, true)?>" title="Détail de la subvention">
+<?=$item->Programme?></a></td>
+<td nowrap><?=number_format($item->Montant, 2, ',', ' ')?> &euro;</td>
+</tr>
+<?php }?>
+</tbody>
+</table>
+<?php } else {?>
+Aucune subvention.
+<?php }?>
+
+<?php }?>
+</div>
+
+<div class="paragraph">
+<?php if ($this->lienPagePrecedente) { ?>
+<a href="<?=$this->lienPagePrecedente?>" title="Page précédente...">&lt;&lt;</a>
+<?php }?>
+<?php if ($this->nbPages>1) { ?>
+<span>Page <?=$this->p?>/<?=$this->nbPages?></span>
+<?php } ?>
+<?php if ($this->lienPageSuivante) {?>
+<a href="<?=$this->lienPageSuivante?>" title="Page suivante...">&gt;&gt;</a>
+<?php }?>
+</div>
+
+</div>

application/views/default/scripts/finance/synthese.phtml

@@ -17,7 +17,7 @@
 	</tr>
 	<tr>
 	    <td width="30">&nbsp;</td>
-	    <td width="200" class="StyleInfoLib">Raison Sociale</td>
+	    <td width="200" class="StyleInfoLib">Dénomination Sociale</td>
 	    <td width="350" class="StyleInfoData"><?=$this->raisonSociale;?></td>
 	</tr>
 	<?php if (isset($this->tabResult)){?>

application/views/default/scripts/footer.phtml

@@ -10,9 +10,9 @@ pour en savoir plus cliquez-ici</a></span>
 </div>
 <![endif]-->
 <p>&copy; 2006-<?php echo date('Y')?> Scores &amp; D&eacute;cisions SAS -
-Tous droits r&eacute;serv&eacute;s -
+<?=$this->translate("Tous droits r&eacute;serv&eacute;s")?> -
 <a href="http://www.scores-decisions.com/mentions.php" target="_blank">
-Mentions l&eacute;gales</a> - 
+<?=$this->translate("Mentions l&eacute;gales")?></a> -
 <img class='flag' id='fr' src="/themes/default/images/drapeaux/fr.png"/>
 <img class='flag' id='en' src="/themes/default/images/drapeaux/en.png"/>
 </p>

application/views/default/scripts/giant/compact.phtml

@@ -1,7 +1,7 @@
 <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, 'dateFunction' => $this->dateFunction)); ?>
+		<?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">
@@ -13,6 +13,6 @@
 	</div>
 	<h2>7. Dirigeants</h2>
 	<div id="break">
-		<?php echo $this->partial('giant/partials/rapports/Dirigeant.phtml', null, array('report' => $this->report, 'dateFunction' => $this->dateFunction)); ?>
+		<?php echo $this->partial('giant/partials/rapports/Dirigeant.phtml', null, array('report' => $this->report)); ?>
 	</div>
 </div>

application/views/default/scripts/giant/full.phtml

@@ -1,7 +1,7 @@
 <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, 'dateFunction' => $this->dateFunction)); ?>
+		<?php echo $this->partial('giant/partials/rapports/InformationEntreprise.phtml', null, array('report' => $this->report)); ?>
 	</div>
 	<a name="6"></a>
 	<h2>2. Avis de crédit</h2>
@@ -26,7 +26,7 @@
 	</div>
 	<h2>7. Dirigeants</h2>
 	<div id="break">
-		<?php echo $this->partial('giant/partials/rapports/Dirigeant.phtml', null, array('report' => $this->report, 'dateFunction' => $this->dateFunction)); ?>
+		<?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">

application/views/default/scripts/giant/identite.phtml

@@ -1,11 +1,6 @@
 <div id="center">
-    <!--<span style="float:left;margin-left:6px;">
-        <a style="color:#9C093A;cursor:help;" class="tooltip" title="<?php echo htmlentities($this->listeCommandes);?>">Total commande : <?php echo $this->total; ?> euros</a>
-    </span>!-->
-	<span style="color:#9C093A;margin-right:5px;float: right;">
-		<a style="cursor:help;" class="tooltip" title="<?php echo htmlentities($this->modification);?>">Dernières modifications au <?php echo date('d/m/Y'); ?></a>
-        </span>
-	<h1>Identite<img style="margin-top:4px;float:right" src="/themes/default/images/giant/expanded.gif" ></h1>
+    
+	<h1>Identite</h1>
 	<div class="paragraph">
 		<div id="identite">
 			<table>
@@ -27,8 +22,8 @@
 				<tr id="info">
 					<td width="30px"></td>
 					<td valign="top" class="StyleInfoLib" width="250px">Adresse</td>
-					<td class="StyleInfoData" width="300px"><a href=""><?php echo $this->Adresse[0].' '.$this->Adresse[1];?><br />
-									<?php echo $this->Adresse[2].' '.$this->Adresse[3]?></a></td>
+					<td class="StyleInfoData" width="300px"><?php echo $this->Adresse[0].' '.$this->Adresse[1];?><br />
+									<?php echo $this->Adresse[2].' '.$this->Adresse[3]?></td>
 				</tr>
 				<tr id="info">
 					<td width="30px"></td>
@@ -39,21 +34,16 @@
 		</div>
 	</div>
         <?php if(!empty($this->listeRapport)):?>
-	<h1>Liste des rapports<img style="margin-top:4px;float:right" src="/themes/default/images/giant/expanded.gif" ></h1>
+	<h1>Liste des rapports</h1>
 	<div class="paragraph">
 		<div id="radio">
 		<table>
-			
 			<?php $i=1; foreach ($this->listeRapport->DataSetOptions->DataSetOption as $rapport):?>
 				<tr id="info">
 					<td class="StyleInfoLib" style="float:left;" >
-					
-					<img style="cursor:help" title="<?php echo htmlentities($this->description->Full);?>" class="tooltip" src="/themes/default/images/giant/tag_blue.png" /><input type="radio" class="radio" id="radio<?php echo $i; ?>" value="<?php echo $rapport->DataSetType->_?>" name="radio" /><label class="radio_but" for="radio<?php echo $i; ?>">Rapport de Type <?php echo $rapport->DataSetType->_?></label>
-  						
+						<?$t = $rapport->DataSetType->_;?>
+						<img style="cursor:help" title="<?php echo htmlentities($this->description->$t);?>" class="tooltip" src="/themes/default/images/giant/tag_blue.png" /><input type="radio" class="radio" id="radio<?php echo $i; ?>" value="<?php echo $rapport->DataSetType->_?>" name="radio" /><label class="radio_but" for="radio<?php echo $i; ?>">Rapport de Type <?php echo $rapport->DataSetType->_?></label>
 					</td>
-					
-					
-					
 					<td align="center" class="StyleInfoData lang_img <?=strtolower($rapport->DataSetType->_);?>">
 						<div class="lang_select">
 	                            <select class="lang_val">
@@ -66,11 +56,8 @@
 							<img class='lang'src="/themes/default/images/drapeaux/<?=$rapport->LanguageCodes->LanguageCode[0]?>.png" />
 						</div>	
 					</td>
-					
-					
-					
 					<td class="StyleInfoData lang_img <?=strtolower($rapport->DataSetType->_);?>">
-						<a id="r<?php echo $i?>" class="idpr id_cr" href="/giant/<?=strtolower($rapport->DataSetType->_)?>/Pays/<?=$this->Pays; ?>/Type/<?php echo $rapport->DataSetType->_?>/CompanyId/<?php echo $this->CompanyId;?>/Language/<?=$rapport->LanguageCodes->LanguageCode[0];?>" >Consulter le rapport en immédiat</a>
+						<a id="r<?php echo $i?>" class="idpr id_cr" href="/giant/<?=strtolower($rapport->DataSetType->_)?>/Pays/test/<?=$this->TestIndication?>/<?=$this->Pays; ?>/Type/<?php echo $rapport->DataSetType->_?>/CompanyId/<?php echo $this->CompanyId;?>/Language/<?=$rapport->LanguageCodes->LanguageCode[0];?>" >Consulter le rapport en immédiat</a>
 						<div id="pr<?php echo $i?>" class="hide" style="display:none;z-index: 1;margin-left: -340px;">
 							<center><img style="padding-top:30%" src="/themes/default/images/giant/19-1.gif" /></center>
 						</div>
@@ -81,7 +68,7 @@
 		</table>
 	</div></div>
         <?php endif; ?>
-        <?php if(!empty($this->listeRapport->InvestigationOptions)): ?>
+        <?php if(!empty($this->listeRapport->InvestigationOptions1)): ?>
 	<h1>Liste des investigations<img style="margin-top:4px;float:right" src="/themes/default/images/giant/expanded.gif" ></h1>
 	<div class="paragraph">
 		<table>
@@ -130,33 +117,5 @@
 	</div>
         <?php endif;?>
         
-        <?php if(!empty($this->modification)): ?>
-        <h1>Liste des monitoring<img style="margin-top:4px;float:right" src="/themes/default/images/giant/expanded.gif" ></h1>
-        <div class='monitor_but'>
-         <a class="dial" title="Start Monitoring" href='/giant/startmonitoring/CompanyId/<?=$this->CompanyId?>/Pays/<?=$this->Pays?>/lang/<?=serialize($this->listeRapport->MonitoringOptions->MonitoringOption[0]->LanguageCodes->LanguageCode)?>/CompanyName/<?=str_replace(' ', '+', $this->raisonSociale)?>'>Start monitoring</a>
-         <a class="dial" title="Stop Monitoring" href='/giant/stopmonitoring/CompanyId/<?=$this->CompanyId?>/Pays/<?=$this->Pays?>/CompanyName/<?=str_replace(' ', '+', $this->raisonSociale)?>'>Stop monitoring</a>
-         <a class="dial" title="Update Monitoring" href='/giant/updatemonitoring/CompanyId/<?=$this->CompanyId?>/Pays/<?=$this->Pays?>/lang/<?=serialize($this->listeRapport->MonitoringOptions->MonitoringOption[0]->LanguageCodes->LanguageCode)?>/CompanyName/<?=str_replace(' ', '+', $this->raisonSociale)?>'>Update monitoring</a>
-         <a class="retr" title="Retrive Monitoring" href='/giant/retrivemonitoring/CompanyId/<?=$this->CompanyId?>/Pays/<?=$this->Pays?>/CompanyName/<?=str_replace(' ', '+', $this->raisonSociale)?>'>Retrive monitoring</a>
-        </div>
-        <br><br><br><br>
-        
-	  <div class="dialog-form" title="Create new user">
-		  <form>
-		  <fieldset>
-		  <strong>Monitoring Type For: </strong><br />
-			<select name="EventType" class="mon_type">
-			 					 <option  value='Customer'>Customer</option>
-						  		 <option  value='Consumer'>Consumer</option>
-						  		 <option  value='Order'>Order</option>
-			</select><br /><br />
-			<strong>StartFrom: </strong><br />
-			<input type="text" name="StartFrom" value="" /> optional<br /><br />
-			<div class='int_order'><strong>InternalOrderId: </strong><br />
-			<input type="text" class='datepicker' name="InternalOrderId" value="32768032781"/> <br /><br /></div>
-		  </fieldset>
-	  </form>
-	</div>
-                       <?php echo'<pre>';print_r($this->modification); ?>
-            
-        <?php endif;?>
+       
 </div>

application/views/default/scripts/giant/partials/rapports/ComparaisonValeurs.phtml

@@ -2,46 +2,49 @@
 	<a name="20"></a>
 	<span>Comparaison des valeurs</span><br /><br />
 	<?php if(isset($this->report->ComparaisonValeurs)):?>
-	<table width="97%" class="hoverTr">
+	
+<table id="giant_synthese">
+	<thead>
 		<tr>
-			<td></td>
+			<th>&nbsp;</th>
 			<?php $date = explode('/', $this->report->ComparaisonValeurs[key($this->report->ComparaisonValeurs)]['date']);?>
-			<td><b><?php echo $date[2];?></b></td>
-			<td><b>Secteur</b></td>
-			<td class="Variation" colspan="2"><b>Variation</b></td>
+			<th align="right" class="date"><?php echo $date[2];?></th>
+			<th align="right" class="date">Secteur</th>
+			<th align="right" class="date">Variation</th>
+			<th>&nbsp;</th>
 			<?php if(isset($this->report->ComparaisonValeurs[key($this->report->ComparaisonValeurs)]['old'])):?>
 				<?php foreach($this->report->ComparaisonValeurs[key($this->report->ComparaisonValeurs)]['old'] as $date => $valeur):?>
-				<?php $dates = explode('/', $date);?>
-				<td class="align"><b><?php echo $dates[2];?></b></td>
+				<th align="right" class="date"><?php echo substr($date, 0,4);?></th>
 				<?php endforeach;?>
 			<?php endif;?>
+			
 		</tr>
+	</thead>
+	<tbody>
 		<tr>
-			<td colspan="<?php echo count($this->report->ComparaisonValeurs[key($this->report->ComparaisonValeurs)]['old'])+5?>"><hr style="border:1px dotted silver" /></td>
-		</tr>
 		<?php $i=0;foreach($this->report->ComparaisonValeurs as $name => $ComparaisonValeurs):$i++;?>
-		<?php
-		($ComparaisonValeurs['current'] != 0 and $ComparaisonValeurs['entreprise'] != 0)?
+		<?php ($ComparaisonValeurs['current'] != 0 and $ComparaisonValeurs['entreprise'] != 0)?
 		 $val = round((($ComparaisonValeurs['current']/$ComparaisonValeurs['entreprise'])*100)-100):'NC';
 		?>
-		<tr class="<?php echo ($val < 0)? 'red':'green'; ?>">
-			<td style="font-size:10px"><?php echo str_replace('_', ' ', $name);?></td>
-			<td class="align"><?php echo round($ComparaisonValeurs['current']); ?></td>
-			<td class="align"><?php echo round($ComparaisonValeurs['entreprise']); ?></td>
-			<td class="align"><?php echo $val; ?> %</td>
-			<td class="alignCenter" style="width:20px;"><img class="tooltip" title="<center><b>Evolution années précédentes</b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>.png' />" alt="icone" src="/themes/default/images/giant/<?php echo ($val > 0)? 'up': 'down';?>.png" /></td>
-			<?php if(!empty($ComparaisonValeurs['old'])):?>
+			<tr class="<?php echo ($val)? 'red':'green'; ?>">
+				<td class="head">
+					<a class="tooltip" title="<?php echo str_replace('_', ' ', $ComparaisonValeurs['name']);?>"><?php echo str_replace('_', ' ', $ComparaisonValeurs['name']);?></a>
+				</td>
+				<td class="right"><?php echo round($ComparaisonValeurs['current']); ?></td>
+				<td class="right"><?php echo round($ComparaisonValeurs['entreprise']); ?></td>
+				<td class="right"><?php echo $val; ?> %</td>
+				<td align="center"><img class="tooltip" title="<center><b>Evolution années précédentes</b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>.png' />" alt="icone" src="/themes/default/images/giant/<?php echo ($val > 0)? 'up': 'down';?>.png" /></td>
+				<?php if(!empty($ComparaisonValeurs['old'])):?>
 				<?php $i=0;foreach($ComparaisonValeurs['old'] as $valeur):$i++?>
 				<?php if($i == 4) break;?>
 					<td align="right"><?php echo round($valeur[0]->SubjectValue);?></td>
 				<?php endforeach;?>
-			<?php endif;?>
-		</tr>
-		<tr>
-			<td colspan="<?php echo count($this->report->ComparaisonValeurs[key($this->report->ComparaisonValeurs)]['old'])+5?>"><hr style="border:1px dotted silver" /></td>
-		</tr>
+				<?php endif;?>
+				
+			</tr>
 		<?php endforeach; ?>
-	</table>
+	</tbody>
+</table>
 	<?php else:?>
 		<div class="ui-state-error ui-corner-all">
 		<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>

application/views/default/scripts/giant/partials/rapports/ComportementDePaiement.phtml

@@ -1,94 +1,104 @@
 <div class="paragraph">
 	<?php if(isset($this->report->PaymentBehaviour)):?>
 	<?php if(isset($this->report->ComportementPaiement)):?>
-	<span style="font-size:16px;color:#00008C;font-weight:800">Analyse par année</span><br /><br />
-	<table style="font-size:13px;margin-left: 19px;" width="97%" class="hoverTr">
+	<span class="title">Analyse par année</span><br /><br />
+	<table id="giant_synthese">
+	<thead>
+		<tr>
+			<th class="date">Jours</th>
+			<?php foreach(current($this->report->ComportementPaiement) as $dates => $valeurs):?>
+			<? if($dates=='000030'){$dates='1000030';}else if($dates=='900000'){$dates='+90';}else if($dates=='910000'){$dates='+91';}else if($dates=='1510000'){$dates='+151';}?>
+			<?$dates = str_replace('0000', ' - ', $dates)?>
+				<th align="right" class="date"><?=$dates?></th>
+			<?php endforeach; ?>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
 		<?php foreach($this->report->ComportementPaiement as $dates => $valeurs):?>
+		<?(strlen($dates)==12)?$len=6:$len=8;preg_match('/(\d{'.$len.'})(\d{'.$len.'})/', $dates,$matches);$s = $matches[1];$e = $matches[2];?>
 		<?php $date = explode(':', $dates);?>
-		<tr>
-			<td style="font-size:12px;"><b><?php echo $date[0];?> - <?php echo $date[1];?></b></td>
-			<?php $i=0;foreach($valeurs as $valeur): $i++; ?>
-			<td style="padding:5px;font-size:12px;"><?php echo $valeur;?> %</td>
-			<?php endforeach;?>
-		</tr>
-		<tr>
-			<td colspan="7"><hr style="border:1px dotted silver" /></td>
-		</tr>
-		<?php endforeach;?>
-		<tr style="font-weight:800">
-			<td>Jours</td>
-			<td>1 - 30</td>
-			<td>31 - 60</td>
-			<td>61 - 90</td>
-			<td>91 - 120</td>
-			<td>121 - 150</td>
-			<td> + 151</td>
-		</tr>
-	</table>
+		<?php $date1 = new Zend_Date($s,yyyymmdd);$date2 = new Zend_Date($e,yyyymmdd);?>
+			<tr>
+				<td class="head">
+					<a><?php echo $date1->toString('dd/mm/yyyy');?> - <?php echo $date2->toString('dd/mm/yyyy');?></a>
+				</td>
+				<?php $i=0;foreach($valeurs as $valeur): $i++; ?>
+				<td class="right"><?php echo $valeur;?> %</td>
+				<?php endforeach; ?>
+			</tr>
+		<?php endforeach; ?>
+	</tbody>
+</table>
 	<br />
 	<center>
-		<span style="font-size:16px;color:#00008C;font-weight:800">Graphique Analyse par année</span><br /><br />
+		<span class="title">Graphique Analyse par année</span><br /><br />
 		<img src="/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-';?>ComportementPaiement.png" />
 	</center>
 	<br />
 	<?php endif;?>
 	<a name="13"></a>
-	<span style="text-decoration:underline;font-size:16px;color:#00008C;font-weight:800">Qualification de paiement</span><br /><br />
-	<table style="font-size:13px;margin-left: 19px;" width="97%" class="hoverTr">
+	<span class="title">Qualification de paiement</span><br /><br />
+<table id="giant_synthese">
+	<tbody>
 		<tr>
-			<td style="padding:5px;font-size:12px;"><b>PaymentQualification</b></td>
-			<td style="padding:5px;font-size:12px;"><?php echo (isset($this->report->PaymentBehaviour[0]->PaymentQualification))?$this->report->PaymentBehaviour[0]->PaymentQualification->Qualification:'NC';?></td>
-		</tr>
-		<tr>
-			<td colspan="2"><hr style="border:1px dotted silver" /></td>
-		</tr>
-		<tr>
-			<td style="padding:5px;font-size:12px;"><b>DebtorDays</b></td>
-			<td style="padding:5px;font-size:12px;"><?php echo (isset($this->report->PaymentBehaviour[0]->DebtorDays))?$this->report->PaymentBehaviour[0]->DebtorDays:'NC';?></td>
-		</tr>
-		<tr>
-			<td colspan="2"><hr style="border:1px dotted silver" /></td>
-		</tr>
-		<tr>
-			<td style="padding:5px;font-size:12px;"><b>CreditorDays</b></td>
-			<td style="padding:5px;font-size:12px;"><?php echo (isset($this->report->PaymentBehaviour[0]->DebtorDays))?$this->report->PaymentBehaviour[0]->CreditorDays:'NC';?></td>
-		</tr>
-		<tr>
-			<td colspan="2"><hr style="border:1px dotted silver" /></td>
-		</tr>
-	</table>
-
+			<tr >
+				<td class="head">
+					<a class="tooltip tooltipFont">PaymentQualification</a>
+				</td>
+				<td class="right"><?php echo (isset($this->report->PaymentBehaviour[0]->PaymentQualification))?$this->report->PaymentBehaviour[0]->PaymentQualification->Qualification:'NC';?></td>
+			</tr>
+			<tr >
+				<td class="head">
+					<a class="tooltip tooltipFont">DebtorDays</a>
+				</td>
+				<td class="right"><?php echo (isset($this->report->PaymentBehaviour[0]->DebtorDays))?$this->report->PaymentBehaviour[0]->DebtorDays:'NC';?></td>
+			</tr>
+			<tr >
+				<td class="head">
+					<a class="tooltip tooltipFont">CreditorDays</a>
+				</td>
+				<td class="right"><?php echo (isset($this->report->PaymentBehaviour[0]->DebtorDays))?$this->report->PaymentBehaviour[0]->CreditorDays:'NC';?></td>
+				
+			</tr>
+</tbody>
+</table>
 	<br />
 	<a name="14"></a>
-	<span style="font-size:16px;color:#00008C;font-weight:800">Analyse par sommes</span><br /><br />
+	<span class="title">Analyse par sommes</span><br /><br />
 	<?php if(isset($this->report->ByAmount)):?>
-	<table style="font-size:13px;margin-left: 19px;" width="97%" class="hoverTr">
+
+	<table id="giant_synthese">
+	<thead>
+		<tr>
+				<th class="date">Jours</th>
+				<?php foreach(current($this->report->ByAmount) as $dates => $valeurs):?>
+				<? if($dates=='000030'){$dates='1000030';}else if($dates=='900000'){$dates='+90';}else if($dates=='1510000'){$dates='+151';}?>
+				<?$dates = str_replace('0000', ' - ', $dates)?>
+				<th align="right" class="date"><?=$dates?></th>
+				<?php endforeach; ?>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
 		<?php foreach($this->report->ByAmount as $sommes => $valeurs):?>
-		<?php $somme = explode(':', $sommes);?>
-		<tr>
-			<td>entre : <b><?php echo (!empty($somme[0]))?$somme[0].'€':'0';?></b> et <b><?php echo (!empty($somme[1]))?$somme[1].'€':'plus';?></b></td>
-			<?php $i=0;foreach($valeurs as $valeur): $i++; ?>
-			<td style="padding:5px;"><?php echo $valeur;?> %</td>
-			<?php endforeach;?>
-		</tr>
-		<tr>
-			<td colspan="<?php echo $i+1;?>"><hr style="border:1px dotted silver" /></td>
-		</tr>
-		<?php endforeach;?>
-		<tr style="font-weight:800">
-			<td>Jours</td>
-			<td>1 - 30</td>
-			<td>31 - 60</td>
-			<td>61 - 90</td>
-			<td>91 - 120</td>
-			<td>121 - 150</td>
-			<td> + 151</td>
-		</tr>
-	</table>
+		<?php $somme = explode('1111', $sommes);?>
+			<tr>
+				<td class="head">
+					<a class="tooltip" title="<?php echo $date[0];?> - <?php echo $date[1];?>">entre : <?php echo (!empty($somme[0]))?$somme[0].'€':'0';?></b> et <b><?php echo (!empty($somme[1]))?$somme[1].'€':'plus';?></a>
+				</td>
+				<?php $i=0;foreach($valeurs as $valeur): $i++; ?>
+				<td class="right"><?php echo $valeur;?> %</td>
+				<?php endforeach; ?>
+			</tr>
+		<?php endforeach; ?>
+	</tbody>
+</table>
+	
 	<br />
 	<center>
 		<a name="15"></a>
-		<span style="font-size:16px;color:#00008C;font-weight:800">Graphique Analyse par année</span><br />
+		<span class="title">Graphique Analyse par année</span><br />
 		<img src="/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-';?>ComportementPaiementByAmount.png" />
 	</center>
 	<?php else: ?>

application/views/default/scripts/giant/partials/rapports/ComptesAnnuels.phtml

@@ -1,59 +1,65 @@
 <div class="paragraph compteAnnuels">
 	<?php if(!empty($this->report->AnnualAccounts)):?>
-		<table class="hoverTr bilansTAB">
-			<tr>
-				<td class="tdP"><b>Date de clôture</b></td>
+<table id="giant_synthese">
+<tbody>
+		<tr>
+			<tr >
+				<td class="head">
+					<a class="tooltip tooltipFont">Date de clôture</a>
+				</td>
 				<?php foreach($this->report->AnnualAccounts as $AnnualAccounts):$i++?>
-					 <td><?php echo (empty($AnnualAccounts->AccountsDate->_))?'NC':$AnnualAccounts->AccountsDate->_;?></td>
+				<td class="right"><?php  if(empty($AnnualAccounts->AccountsDate->_))echo'NC';else {$date = new Zend_Date($AnnualAccounts->AccountsDate->_,yyyymmdd);echo $date->toString('dd/mm/yyyy');}?></td>
 				<?php endforeach; ?>
 			</tr>
-			<tr>
-				<td colspan="<?php echo $i+2; ?>"><hr /></td>
-			</tr>
-			<tr>
-				<td class="tdP"><b>Etat de compte</b></td>
+			<tr >
+				<td class="head">
+					<a class="tooltip tooltipFont">Etat de compte</a>
+				</td>
 				<?php foreach($this->report->AnnualAccounts as $AnnualAccounts):$i++?>
-					 <td><?php echo (empty($AnnualAccounts->AccountsStatus))?'NC':$AnnualAccounts->AccountsStatus;?></td>
+				<td class="right"><?php echo (empty($AnnualAccounts->AccountsStatus))?'NC':$AnnualAccounts->AccountsStatus;?></td>
 				<?php endforeach; ?>
 			</tr>
-			<tr>
-				<td colspan="<?php echo $i+2; ?>"><hr /></td>
-			</tr>
-			<tr>
-				<td class="tdP"><b>Type de compte</b></td>
+			<tr >
+				<td class="head">
+					<a class="tooltip tooltipFont">Type de compte</a>
+				</td>
 				<?php foreach($this->report->AnnualAccounts as $AnnualAccounts):$i++?>
-					 <td><?php echo (empty($AnnualAccounts->AccountsType))?'NC':$AnnualAccounts->AccountsType;?></td>
+				<td class="right"><?php echo (empty($AnnualAccounts->AccountsType))?'NC':$AnnualAccounts->AccountsType;?></td>
 				<?php endforeach; ?>
+				
 			</tr>
-			<tr>
-				<td colspan="<?php echo $i+2; ?>"><hr /></td>
-			</tr>
-
-		</table>
+</tbody>
+</table>
 		<br />
 		<a name="7"></a>
 		<span class="title" >Actif</span><br />
-		<table class="hoverTr bilansTAB">
-			<tr>
-				<td></td>
+<table id="giant_synthese">
+	<thead>
+		<tr>
+			<th align="center">
+			</th>
 			<?php $i=0; foreach($this->report->AnnualAccounts as $AnnualAccounts): $i++?>
-				<td><b><?php echo $AnnualAccounts->AccountsDate->_; ?></b></td>
+			<?php $date = new Zend_Date($AnnualAccounts->AccountsDate->_,yyyymmdd);?>
+				<th align="right" class="date"><?php echo $date->toString('dd/mm/yyyy'); ?></th>
 			<?php endforeach; ?>
-			</tr>
-			<tr>
-				<td colspan="<?php echo $i+2; ?>"><hr /></td>
-			</tr>
-			<?php foreach($this->report->Assets as $name => $Assets):?>
+			<th>&nbsp;</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+	<?php foreach($this->report->Assets as $name => $Assets):?>
 			<?php if(!empty($this->report->Assets->{$name})){$end = end($this->report->Assets->{$name});reset($this->report->Assets->{$name});}else{$end = 0;}?>
 			<?php if(!empty($this->report->Assets->{$name})){$key = $this->report->Assets->{$name}[key($this->report->Assets->{$name})];}else{$key = 0;}?>
 			<?php $val = ($key < $end)?true:false;?>
 			<tr class="<?php echo ($val)? 'red':'green'; ?>">
-				<td class="tdP"><b><?php echo $name;?></b></td>
+				<td class="head">
+					<a class="tooltip" title="<?php echo $name;?>"><?php echo $name;?></a>
+				</td>
 				<?php foreach($this->report->AnnualAccounts as $AnnualAccounts): ?>
 				<?php (empty($firstAsset))?$firstAsset = $this->report->Assets->{$name}[$AnnualAccounts->AccountsDate->_]:EOF;?>
-				<td><?php echo number_format($this->report->Assets->{$name}[$AnnualAccounts->AccountsDate->_], 0, '', ' ');?> K€</td>
+				<td class="right"><?php echo number_format($this->report->Assets->{$name}[$AnnualAccounts->AccountsDate->_], 0, '', ' ');?> K€</td>
 				<?php endforeach; ?>
-				<td>
+				<td align="center">
 					<?php if($end > $firstAsset):?>
 						<img class="tooltip IMGprint" title="<center><b><?php echo $name;?></b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>-line.png' />" src="/themes/default/images/giant/down.png" />
 					<?php else: ?>
@@ -61,11 +67,9 @@
 					<?php endif;unset($firstAsset);?>
 				</td>
 			</tr>
-			<tr>
-				<td colspan="<?php echo $i+2; ?>"><hr /></td>
-			</tr>
-			<?php endforeach; ?>
-		</table>
+	<?php endforeach; ?>
+</tbody>
+</table>
 		<br />
 		<div class="center">
 			<span class="title">Graphique des actifs</span>
@@ -74,27 +78,34 @@
 		<br />
 		<a name="8"></a>
 		<span class="title">Passif</span><br />
-		<table class="hoverTr bilansTAB">
-			<tr>
-				<td></td>
+		<table id="giant_synthese">
+	<thead>
+		<tr>
+			<th align="center">
+			</th>
 			<?php $i=0; foreach($this->report->AnnualAccounts as $AnnualAccounts): $i++?>
-				<td><b><?php echo $AnnualAccounts->AccountsDate->_; ?></b></td>
+			<?php $date = new Zend_Date($AnnualAccounts->AccountsDate->_,yyyymmdd);?>
+				<th align="right" class="date"><?php echo $date->toString('dd/mm/yyyy'); ?></th>
 			<?php endforeach; ?>
-			</tr>
-			<tr>
-				<td colspan="<?php echo $i+2; ?>"><hr /></td>
-			</tr>
-			<?php foreach($this->report->Liabilities as $name => $Liabilities):?>
+			
+			<th>&nbsp;</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+		<?php foreach($this->report->Liabilities as $name => $Liabilities):?>
 			<?php if(!empty($this->report->Liabilities->{$name})){$end = end($this->report->Liabilities->{$name});reset($this->report->Liabilities->{$name});}else{$end = 0;}?>
 			<?php if(!empty($this->report->Liabilities->{$name})){$key = $this->report->Liabilities->{$name}[key($this->report->Liabilities->{$name})];}else{$key = 0;}?>
 			<?php $val = ($key < $end)?true:false;?>
 			<tr class="<?php echo ($val)? 'red':'green'; ?>">
-				<td class="tdP"><b><?php echo $name;?></b></td>
+				<td class="head">
+					<a class="tooltip" title="<?php echo $name;?>"><?php echo $name;?></a>
+				</td>
 				<?php foreach($this->report->AnnualAccounts as $AnnualAccounts): ?>
 				<?php (empty($firstLiabilities))?$firstLiabilities = $this->report->Liabilities->{$name}[$AnnualAccounts->AccountsDate->_]:EOF;?>
-				<td><?php echo number_format($this->report->Liabilities->{$name}[$AnnualAccounts->AccountsDate->_], 0, '', ' ');?> K€</td>
+				<td class="right"><?php echo number_format($this->report->Liabilities->{$name}[$AnnualAccounts->AccountsDate->_], 0, '', ' ');?> K€</td>
 				<?php endforeach; ?>
-				<td>
+				<td align="center">
 					<?php if($end > $firstLiabilities):?>
 						<img class="tooltip IMGprint" title="<center><b><?php echo $name;?></b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>-line.png' />" src="/themes/default/images/giant/down.png" />
 					<?php else: ?>
@@ -102,11 +113,9 @@
 					<?php endif;unset($firstLiabilities);?>
 				</td>
 			</tr>
-			<tr>
-				<td colspan="<?php echo $i+2; ?>"><hr /></td>
-			</tr>
-			<?php endforeach; ?>
-		</table>
+		<?php endforeach; ?>
+</tbody>
+</table>
 		<br />
 		<div class="center">
 			<span class="title">Graphique des passifs</span>
@@ -115,27 +124,34 @@
 		<br />
 		<a name="9"></a>
 		<span class="title">Compte de résultats</span><br />
-		<table class="hoverTr bilansTAB">
-			<tr>
-				<td></td>
+<table id="giant_synthese">
+	<thead>
+		<tr>
+			<th align="center">
+			</th>
 			<?php $i=0; foreach($this->report->AnnualAccounts as $AnnualAccounts): $i++?>
-				<td><b><?php echo $AnnualAccounts->AccountsDate->_; ?></b></td>
+			<?php $date = new Zend_Date($AnnualAccounts->AccountsDate->_,yyyymmdd);?>
+				<th align="right" class="date"><?php echo $date->toString('dd/mm/yyyy'); ?></th>
 			<?php endforeach; ?>
-			</tr>
-			<tr>
-				<td colspan="<?php echo $i+2; ?>"><hr /></td>
-			</tr>
-			<?php foreach($this->report->ProfitAndLoss as $name => $ProfitAndLoss):?>
+			
+			<th>&nbsp;</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+		<?php foreach($this->report->ProfitAndLoss as $name => $ProfitAndLoss):?>
 			<?php if(!empty($this->report->ProfitAndLoss->{$name})){$end = end($this->report->ProfitAndLoss->{$name});reset($this->report->ProfitAndLoss->{$name});}else{$end = 0;}?>
 			<?php if(!empty($this->report->ProfitAndLoss->{$name})){$key = $this->report->ProfitAndLoss->{$name}[key($this->report->ProfitAndLoss->{$name})];}else{$key = 0;}?>
 			<?php $val = ($key < $end)?true:false;?>
 			<tr class="<?php echo ($val)? 'red':'green'; ?>">
-				<td class="tdP"><b><?php echo $name;?></b></td>
+				<td class="head">
+					<a class="tooltip" title="<?php echo $name;?>"><?php echo $name;?></a>
+				</td>
 				<?php foreach($this->report->AnnualAccounts as $AnnualAccounts): ?>
 				<?php (empty($firstProfitAndLoss))?$firstProfitAndLoss = $this->report->ProfitAndLoss->{$name}[$AnnualAccounts->AccountsDate->_]:EOF;?>
-				<td><?php echo number_format($this->report->ProfitAndLoss->{$name}[$AnnualAccounts->AccountsDate->_], 0, '', ' ');?> K€</td>
+				<td class="right"><?php echo number_format($this->report->ProfitAndLoss->{$name}[$AnnualAccounts->AccountsDate->_], 0, '', ' ');?> K€</td>
 				<?php endforeach; ?>
-				<td>
+				<td align="center">
 					<?php if($end > $firstProfitAndLoss):?>
 						<img class="tooltip IMGprint" title="<center><b><?php echo $name;?></b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>-line.png' />" src="/themes/default/images/giant/down.png" />
 					<?php else: ?>
@@ -143,11 +159,9 @@
 					<?php endif;unset($firstProfitAndLoss);?>
 				</td>
 			</tr>
-			<tr>
-				<td colspan="<?php echo $i+2; ?>"><hr /></td>
-			</tr>
-			<?php endforeach; ?>
-		</table>
+		<?php endforeach; ?>
+</tbody>
+</table>
 		<br />
 		<div class="center">
 			<span class="title">Compte de resultats</span>
@@ -157,27 +171,34 @@
 		<br />
 		<a name="10"></a>
 		<span class="title">KeyCreditRatios</span><br />
-		<table class="hoverTr bilansTAB">
-			<tr>
-				<td></td>
+<table id="giant_synthese">
+	<thead>
+		<tr>
+			<th align="center">
+			</th>
 			<?php $i=0; foreach($this->report->AnnualAccounts as $AnnualAccounts): $i++?>
-				<td><b><?php echo $AnnualAccounts->AccountsDate->_; ?></b></td>
+			<?php $date = new Zend_Date($AnnualAccounts->AccountsDate->_,yyyymmdd);?>
+				<th align="right" class="date"><?php echo $date->toString('dd/mm/yyyy'); ?></th>
 			<?php endforeach; ?>
-			</tr>
-			<tr>
-				<td colspan="<?php echo $i+2; ?>"><hr /></td>
-			</tr>
-			<?php foreach($this->report->KeyCreditRatios as $name => $KeyCreditRatios):?>
+			
+			<th>&nbsp;</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+		<?php foreach($this->report->KeyCreditRatios as $name => $KeyCreditRatios):?>
 			<?php if(!empty($this->report->KeyCreditRatios->{$name})){$end = end($this->report->KeyCreditRatios->{$name});reset($this->report->KeyCreditRatios->{$name});}else{$end = 0;}?>
 			<?php if(!empty($this->report->KeyCreditRatios->{$name})){$key = $this->report->KeyCreditRatios->{$name}[key($this->report->KeyCreditRatios->{$name})];}else{$key = 0;}?>
 			<?php $val = ($key < $end)?true:false;?>
 			<tr class="<?php echo ($val)? 'red':'green'; ?>">
-				<td class="tdP"><b><?php echo $name;?></b></td>
+				<td class="head">
+					<a class="tooltip" title="<?php echo $name;?>"><?php echo $name;?></a>
+				</td>
 				<?php foreach($this->report->AnnualAccounts as $AnnualAccounts): ?>
 				<?php (empty($firstKeyCreditRatios))?$firstKeyCreditRatios = $this->report->KeyCreditRatios->{$name}[$AnnualAccounts->AccountsDate->_]:EOF;?>
-				<td><?php echo (!empty($this->report->KeyCreditRatios->{$name}[$AnnualAccounts->AccountsDate->_]))?$this->report->KeyCreditRatios->{$name}[$AnnualAccounts->AccountsDate->_].' %':'NC'?></td>
+				<td class="right"><?php echo (!empty($this->report->KeyCreditRatios->{$name}[$AnnualAccounts->AccountsDate->_]))?$this->report->KeyCreditRatios->{$name}[$AnnualAccounts->AccountsDate->_].' %':'NC'?></td>
 				<?php endforeach; ?>
-				<td>
+				<td align="center">
 					<?php if($end > $firstKeyCreditRatios):?>
 						<img class="tooltip IMGprint" title="<center><b><?php echo $name;?></b></center><br /><img src='/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-'.$name;?>-line.png' />" src="/themes/default/images/giant/down.png" />
 					<?php else: ?>
@@ -185,11 +206,9 @@
 					<?php endif;unset($firstKeyCreditRatios);?>
 				</td>
 			</tr>
-			<tr>
-				<td colspan="<?php echo $i+2; ?>"><hr /></td>
-			</tr>
-			<?php endforeach; ?>
-		</table>
+		<?php endforeach; ?>
+</tbody>
+</table>		
 	<?php else:?>
 		<div style="padding:0.7em;" class="ui-state-error ui-corner-all">
 		<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>

application/views/default/scripts/giant/partials/rapports/Dirigeant.phtml

@@ -1,21 +1,28 @@
 <div class="paragraph">
 	<a name="19"></a>
-   <span style="font-size:16px;color:#00008C;font-weight:800">Dirigeants</span><br /><br />
+   <span class="title">Dirigeants</span><br /><br />
    <?php if(isset($this->report->Dirigeant)):?>
-		<table style="font-size:13px;margin-left: 19px;" width="97%" class="hoverTr">
+		<table style="font-size:13px;margin-left: 19px;" width="97%" class="hoverTr"><pre><?//print_r($this->report->Dirigeant);?></pre>
 				<?php foreach($this->report->Dirigeant as $Dirigeants):?>
-					<?php foreach($Dirigeants as $date => $Dirigeant):?>
-					<?php $date = explode(':', $date); ?>
+					<?php foreach($Dirigeants as $date => $Dirigeant):?> 
 						<tr>
-							<td style="padding:2px;color:#00008C"><br /><br /><b><?php echo ($date[0]!='//')?$date[0]:'NC';?></b></td>
+							<td style="padding:2px;color:#2599E7"><b><?php if(!empty($Dirigeant[0]->date[0]) || !empty($Dirigeant[0]->date[1])){
+								$date1 = new Zend_Date($Dirigeant[0]->date[0],yyyymmdd);$date2 = new Zend_Date($Dirigeant[0]->date[1],yyyymmdd);
+																	echo(!empty($Dirigeant[0]->date[0]))?$date1->toString('dd/mm/yyyy'):'NC';echo' - ';
+																	 echo(!empty($Dirigeant[0]->date[1]))?$date2->toString('dd/mm/yyyy'):'NC';}else{echo 'NC';}?></b></td>
 						</tr>
 						<?php $i=0;?>
 						<?php foreach($Dirigeant as $dir):$i++;?>
 						<tr>
-						<td <?php echo (($i%2)==0)?'class="colorTr"':EOF?> style="font-size:12px;padding:5px;"><?php echo $dir->FirstName.' '.$dir->LastName.' <b>Né(e) le:</b> '.((!empty($dir->DateOfBirth->_))?$this->dateFunction->dateT('Ymd', 'd/m/Y', $dir->DateOfBirth->_):'NC').' <b>Domicilié(e) à :</b>'.
-								(($dir->PersonalAddress->HouseNumber!=0)?$dir->PersonalAddress->HouseNumber:'').' '.$dir->PersonalAddress->Street.' '.(($dir->PersonalAddress->PostCode!=0)?$dir->PersonalAddress->PostCode:'NC').' '.$dir->PersonalAddress->City;?></td>
+						<td class="line" style="font-size:12px;padding:5px;">
+						<?php $date3 = new Zend_Date($dir->DateOfBirth->_,yyyymmdd);
+							echo $dir->FirstName.' '.$dir->LastName.' 
+									<br /><b>Né(e) le:</b> '.((!empty($dir->DateOfBirth->_))?$date3->toString('dd/mm/yyyy'):'NC').
+									' <br /><b>Domicilié(e) à :</b>'.(($dir->PersonalAddress->HouseNumber!=0)?$dir->PersonalAddress->HouseNumber:'').
+									' '.$dir->PersonalAddress->Street.
+									' '.(($dir->PersonalAddress->PostCode!=0)?$dir->PersonalAddress->PostCode:'NC').
+									' '.$dir->PersonalAddress->City;?></td>
 						</tr>
-						<tr><td><hr style="border:1px dotted silver"></td></tr>
 						<?php endforeach;?>
 					<?php endforeach;?>
 			   <?php endforeach;?>

application/views/default/scripts/giant/partials/rapports/Historiques.phtml

@@ -2,7 +2,7 @@
 	<a name="21"></a>
 	<?php if(isset($this->report->Event)):?>
 	<?php foreach($this->report->Event as $name => $Events):?>
-	<span style="font-size:15px;color:#00008C;font-weight:800"><?php echo $name;?></span><br /><br />
+	<span class="title"><?php echo $this->report->EventNew[$name];?></span><br /><br />
 	<form method="POST">
 		<select name="Date" style="float:right" onchange="submit()">
 			<option value="all">Date</option>
@@ -17,40 +17,41 @@
 			<?php endforeach;?>
 		</select>
 	</form>
-	<table style="margin-left: 19px;" width="97%" class="hoverTr">
+	<table id="giant_synthese">
+	<thead>
 		<tr>
-			<td><b>Date</b></td>
-			<td><b>Description</b></td>
+			<th align="center" class="date" style='width: 142px;'>Date</th>
+			<th align="right" class="date">Description</th>
 		</tr>
+	</thead>
+	<tbody>
 		<tr>
-			<td colspan="3"><hr style="border:1px dotted silver" /></td>
-		</tr>
 		<?php foreach($Events as $date => $event): ?>
 		<?php
 			preg_match('/(\d{4})(\d{2})(\d{2})/',  $date, $matches);$y = $matches[1];$m = $matches[2];$d = $matches[3];
 			foreach($event as $val):?>
 			<?php if(!empty($_POST['Date']) and $_POST['Date'] != 'all'):?>
 				<?php if($y.'/'.$m.'/'.$d == $_POST['Date']):?>
-					<tr style="cursor:help" class="tooltip" title="<?php echo $val->FreeText; ?>">
-						<td style="padding:5px"><?php echo ($val->Date != '//')?$val->Date:$y.'/'.$m.'/'.$d;?></td>
-						<td><?php echo $val->Description;?></td>
-					</tr>
-					<tr>
-						<td colspan="3"><hr style="border:1px dotted silver" /></td>
-					</tr>
-				<?php endif;?>
-			<?php else: ?>
-				<tr style="cursor:help" class="tooltip" title="<?php echo $val->FreeText; ?>">
-					<td style="padding:5px"><?php echo ($val->Date != '//')?$val->Date:$y.'/'.$m.'/'.$d;?></td>
-					<td><?php echo $val->Description;?></td>
-				</tr>
-				<tr>
-					<td colspan="3"><hr style="border:1px dotted silver" /></td>
-				</tr>
+			<tr title="<?php echo $val->FreeText; ?>">
+				<td align="center" class="head">
+					<a style="cursor:help" class="tooltip" class="tooltip"><?php echo ($val->Date != '//')?$val->Date:$y.'/'.$m.'/'.$d;?></a>
+				</td>
+				<td class="right"><?php echo $val->Description;?></td>
+			</tr>
 			<?php endif;?>
+			<?php else: ?>
+			<tr align="center" style="cursor:help" class="tooltip" title="<?php echo $val->FreeText; ?>">
+				<td class="head">
+					<a class="tooltip"><?php echo ($val->Date != '//')?$val->Date:$y.'/'.$m.'/'.$d;?></a>
+				</td>
+				<td class="right"><?php echo $val->Description;?></td>
+			</tr>		
+				<?php endif;?>
 		<?php endforeach;?>
 		<?php endforeach;?>
-	</table><br />
+	</tbody>
+</table>
+	<br />
 	<?php endforeach;?>
 	<?php else :?>
 		<div style="padding:0.7em;" class="ui-state-error ui-corner-all">

application/views/default/scripts/giant/partials/rapports/InformationEntreprise.phtml

@@ -1,128 +1,157 @@
 <div class="paragraph">
 	<?php if(isset($this->report)) :?>
+	<?preg_match('/(\d{2})(\d{2})(\d{4})/',  $this->report->IncorporationDate, $matches);$d = $matches[1];$m = $matches[2];$y = $matches[3];?>
 	<div>
 		<a name="1"></a>
-		<span style="font-size:16px;color:#00008C;font-weight:800">Données officielles</span><br /><br />
-		<ul style="font-size:13px;margin-left:3%;list-style: none">
-			<li><b>Nom d'entreprise </b> <span style="float:right"><?php echo $this->report->CompanyName?></span></li>
-			<hr style="border:1px dotted silver" />
-			<li><b>Numéro de TVA </b> <span style="float:right"><?php echo $this->report->Vat?></span></li>
-			<hr style="border:1px dotted silver" />
-			<li><b>Forme juridique actuelle </b> <span style="float:right"><?php echo $this->report->LegalForm.' / '.$this->report->UnifiedLegalForm;?></span></li>
-			<hr style="border:1px dotted silver" />
-			<li><b>Date de constitution </b> <span style="float:right"><?php echo ($this->report->IncorporationDate != '//')?$this->report->IncorporationDate:'NC'?></span></li>
-			<hr style="border:1px dotted silver" />
-			<li><b>Etat de l'entreprise </b> <span style="float:right"><?php echo $this->report->CompanyStatus?></span></li>
-			<hr style="border:1px dotted silver" />
-			<li><b>No. Siret </b> <span style="float:right"><?php echo $this->report->CompanyId?></span></li>
-			<hr style="border:1px dotted silver" />
-		</ul>
+		<span class="title">Données officielles</span><br />
+		<table id="giant_synthese">
+		<tbody>
+					<tr >
+						<td class="head" style='width: 169px;'>
+							<a class="tooltip tooltipFont">Nom d'entreprise </a>
+						</td>
+						<td class="right"><?php echo $this->report->CompanyName?></td>
+					</tr>
+					<tr >
+						<td class="head" style='width: 169px;'>
+							<a class="tooltip tooltipFont">Numéro de TVA</a>
+						</td>
+						<td class="right"><?php echo $this->report->Vat?></td>
+					</tr>
+					<tr >
+						<td class="head" style='width: 169px;'>
+							<a class="tooltip tooltipFont">Forme juridique actuelle</a>
+						</td>
+						<td class="right"><?php echo $this->report->LegalForm.' / '.$this->report->UnifiedLegalForm;?></td>
+					</tr>
+					<tr >
+						<td class="head" style='width: 169px;'>
+							<a class="tooltip tooltipFont">Date de constitution</a>
+						</td>
+						<td class="right"><?php echo (!empty($this->report->IncorporationDate))?$d.'/'.$m.'/'.$y:'NC'?></td>
+					</tr>
+					<tr >
+						<td class="head" style='width: 169px;'>
+							<a class="tooltip tooltipFont">Etat de l'entreprise</a>
+						</td>
+						<td class="right"><?php echo $this->report->CompanyStatus?></td>
+					</tr>
+					<tr >
+						<td class="head" style='width: 169px;'>
+							<a class="tooltip tooltipFont">No. Siret</a>
+						</td>
+						<td class="right"><?php echo $this->report->CompanyId?></td>
+					</tr>
+		</tbody>
+		</table>
 	<br />
-	<a name="2"></a>
-	<span style="font-size:16px;color:#00008C;font-weight:800">Données de contact</span><br /><br />
-	<ul style="font-size:13px;margin-left:3%;list-style: none">
-		<li><b>Numéro de téléphone </b> <span style="float:right"><?php echo $this->report->TelephoneNumber?></span></li>
-		<hr style="border:1px dotted silver" />
-		<li><b>Numéro de fax </b> <span style="float:right"><?php echo $this->report->Telefax?></span></li>
-		<hr style="border:1px dotted silver" />
-		<li><b>Adresse Email </b> <span style="float:right"><?php echo $this->report->EmailAddress?></span></li>
-		<hr style="border:1px dotted silver" />
-		<li><b>Site internet </b> <span style="float:right"><?php echo $this->report->WebAddress?></span></li>
-		<hr style="border:1px dotted silver" />
-		<li><b>Adresse </b> <span style="float:right"><?php echo $this->report->CompanyAddress?></span></li>
-		<hr style="border:1px dotted silver" />
-	</ul>
+	<a name="2"></a><br />
+	<span class="title">Données de contact</span><br />
+	<table id="giant_synthese">
+		<tbody>
+					<tr >
+						<td class="head" style='width: 169px;'>
+							<a class="tooltip tooltipFont">Numéro de téléphone</a>
+						</td>
+						<td class="right"><?php echo $this->report->TelephoneNumber?></td>
+					</tr>
+					<tr >
+						<td class="head" style='width: 169px;'>
+							<a class="tooltip tooltipFont">Numéro de fax</a>
+						</td>
+						<td class="right"><?php echo $this->report->Telefax?></td>
+					</tr>
+					<tr >
+						<td class="head" style='width: 169px;'>
+							<a class="tooltip tooltipFont">Adresse Email</a>
+						</td>
+						<td class="right"><?php echo ($this->report->EmailAddress!='<a href="mailto:"></a>')?$this->report->EmailAddress:'NC'?></td>
+					</tr>
+					<tr >
+						<td class="head" style='width: 169px;'>
+							<a class="tooltip tooltipFont">Site internet</a>
+						</td>
+						<td class="right"><?php echo ($this->report->WebAddress!='<a href="http://"></a>')?$this->report->WebAddress:'NC'?></td>
+					</tr>
+					<tr >
+						<td class="head" style='width: 169px;'>
+							<a class="tooltip tooltipFont">Adresse</a>
+						</td>
+						<td class="right"><?php echo $this->report->CompanyAddress?></td>
+					</tr>
+		</tbody>
+		</table>
 	</div>
 	<br />
-	<a name="3"></a>
+	<a name="3"></a><br />
 	<?php if(!empty($this->report->activity)):?>
-		<span style="font-size:16px;color:#00008C;font-weight:800">Activités</span><br /><br />
-		<table style="margin-left: 19px;" width="97%">
+		<span class="title">Activités</span><br />
+	<table id="giant_synthese">
+	<thead>
+		<tr>
+			<th align="left" class="date">Code</th>
+			<th align="right" class="date">Activité</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+	<?php foreach($this->report->activity as $code => $activity): ?>
 			<tr>
-				<td style="font-size:13px;"><b>Code</b></td>
-				<td style="float:right;font-size:13px;padding-left:5px"><b>Activité</b></td>
-			</tr>
-			<tr>
-				<td colspan="2"><hr style="border:1px dotted silver" /></td>
-			</tr>
-			<?php foreach($this->report->activity as $code => $activity): ?>
-			<tr>
-				<td>
-					<ul style="font-size:13px;list-style: none">
-						<li><span ><?php echo $code?></span></li>
-					</ul>
-				</td>
-				<td style="padding-left:5px">
-					<ul style="font-size:13px;list-style: none;">
-						<?php if(strlen($activity) < 50): ?>
-						<li style="float:right"><span ><i><?php echo $activity?></i></span></li>
-						<?php else: ?>
-						<li style="float:right;cursor:help" class="tooltip" title="<?php echo $activity;?>" style="float:right">
-							<span ><i><?php echo substr($activity, 0, 50);?>...</i></span>
-						</li>
-						<?php endif; ?>
-					</ul>
+				<td class="head" style='width: 169px;'>
+					<a><?php echo $code?></a>
 				</td>
+						<td class="right"><?php echo $activity?></td>
 			</tr>
-			<tr>
-				<td colspan="2"><hr style="border:1px dotted silver" /></td>
-			</tr>
-			<?php endforeach;?>
-		</table>
+	<?php endforeach; ?>
+	</tbody>
+	</table>
 	<?php endif;?>
 	<br />
 	<?php if(!empty($this->report->Employees)):?>
-	<a name="4"></a>
-	<span style="font-size:16px;color:#00008C;font-weight:800">Personnel</span><br /><br />
-		<table style="font-size:13px;margin-left: 19px;" width="97%">
+	<a name="4"></a><br />
+	<span class="title">Personnel</span><br />
+		<table id="giant_synthese">
+		<thead>
 			<tr>
-				<td><b>Année</b></td>
-				<td><b>Total des travailleurs employés</b></td>
-				<td><b>Équivalent temps plein</b></td>
+				<th align="left" class="date" style='width: 169px;'>Année</th>
+				<th align="right" class="date">Total des travailleurs employés</th>
+				<th align="right" class="date">Équivalent temps plein</th>
 			</tr>
-			<?php foreach($this->report->Employees as $year => $employees): ?>
+		</thead>
+		<tbody>
 			<tr>
-				<td><?php echo $this->dateFunction->dateT('Ymd', 'd/m/Y', $year);?></td>
-				<td><?php echo $employees['TotalStaffEmployed'];?> </td>
-				<td><?php echo $employees['FulltimeEquivalent'];?> </td>
-			</tr>
-			<tr>
-				<td colspan="3"><hr style="border:1px dotted silver" /></td>
-			</tr>
-			<?php endforeach;?>
+		<?php foreach($this->report->Employees as $year => $employees): ?>
+				<tr class="<?php echo ($val)? 'red':'green'; ?>">
+						<td class="left"><?php if(strlen($year)==4)echo $year;elseif(empty($year))echo 'NC'; else {$date = new Zend_Date($year,yyyymmdd); echo $date->toString('dd/mm/yyyy');}?></td>
+						<td class="right"><?php echo $employees['TotalStaffEmployed'];?></td>
+						<td class="right"><?php echo $employees['FulltimeEquivalent'];?></td>
+				</tr>
+		<?php endforeach; ?>
+		</tbody>
 		</table>
    <?php endif;?>
 	<br />
 	<?php if(!empty($this->report->ProductName)):?>
-	<a name="5"></a>
-	<span style="font-size:16px;color:#00008C;font-weight:800">Noms de produit</span><br /><br />
-		<table style="margin-left: 19px;" width="97%">
-			<tr>
-				<td style="font-size:13px;"><b>Source</b></td>
-				<td width="100%" style="font-size:13px;padding-left:5px"><b>Produit</b></td>
-			</tr>
-			<tr>
-				<td colspan="2"><hr style="border:1px dotted silver" /></td>
-			</tr>
+	<a name="5"></a><br />
+	<span class="title">Noms de produit</span><br />
+		<table id="giant_synthese">
+			<thead>
+				<tr>
+					<th align="left" class="date">Source</th>
+					<th align="right" class="date">Produit</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
 			<?php foreach($this->report->ProductName as $ProductName): ?>
-			<tr>
-				<td style="font-size:13px;"><?php echo (empty($ProductName->source)?'NC':$ProductName->source);?></td>
-				<td style="padding-left:5px" width="100%">
-					<ul style="font-size:13px;list-style: none;">
-						<?php if(strlen($ProductName->_) < 50): ?>
-						<li style="float:right"><span ><i><?php echo $ProductName->_?></i></span></li>
-						<?php else: ?>
-						<li style="float:right;cursor:help" class="tooltip" title="<?php echo $ProductName->_;?>" style="float:right">
-							<span ><i><?php echo substr($ProductName->_, 0, 80);?>...</i></span>
-						</li>
-						<?php endif; ?>
-					</ul>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="2"><hr style="border:1px dotted silver" /></td>
-			</tr>
-			<?php endforeach;?>
+					<tr class="<?php echo ($val)? 'red':'green'; ?>">
+						<td class="head" style='width: 169px;'>
+							<a><?php echo (empty($ProductName->source)?'NC':$ProductName->source);?></a>
+						</td>
+								<td class="right"><?php echo $ProductName->_?></td>
+					</tr>
+			<?php endforeach; ?>
+			</tbody>
 		</table>
 	<?php endif;?>
 	<?php else: ?>

application/views/default/scripts/giant/partials/rapports/PositionFinanciere.phtml

@@ -1,30 +1,33 @@
 <div class="paragraph">
 <?php if(isset($this->report->FinancialSummary)):?>
 	<a name="11"></a>
-	<span style="font-size:16px;color:#00008C;font-weight:800">Informations Capital</span><br />
+	<span class="title">Informations Capital</span><br />
 	<?php if(isset($this->report->PositionFinanciere)):?>
-	<table style="font-size:13px;margin-left: 19px;" width="97%" class="hoverTr">
+	<table id="giant_synthese">
+	<thead>
 		<tr>
-			<td></td>
+			<th align="center">
+			</th>
 			<?php $i = 0; foreach($this->report->PositionFinanciereDate as $date => $val):$i++?>
-			<td><b><?php echo $date;?></b></td>
-			<?php endforeach;?>
+			<?$date1 = new Zend_Date($date,yyyymmdd);?>
+				<th align="right" class="date"><?php echo $date1->toString('dd/mm/yyyy');?></th>
+			<?php endforeach; ?>
 		</tr>
+	</thead>
+	<tbody>
 		<tr>
-			<td colspan="<?php echo $i+1; ?>"><hr style="border:1px dotted silver" /></td>
-		</tr>
 		<?php foreach($this->report->PositionFinanciere as $name => $PositionFinanciere):?>
-		<tr>
-			<td style="font-size: 12px;"><b><?php echo $name;?></b></td>
-			<?php foreach($PositionFinanciere as $element):?>
-				<td style="font-size: 12px;padding:5px;"><?php echo $element?></td>
-			<?php endforeach;?>
-		</tr>
-		<tr>
-			<td colspan="<?php echo $i+1; ?>"><hr style="border:1px dotted silver" /></td>
-		</tr>
-		<?php endforeach;?>
-	</table>
+			<tr>
+				<td class="head">
+					<a class="tooltip" title="<?php echo $name;?>"><?php echo $name;?></a>
+				</td>
+				<?php foreach($PositionFinanciere as $element):?>
+				<td class="right"><?php echo $element?></td>
+				<?php endforeach; ?>
+			</tr>
+		<?php endforeach; ?>
+</tbody>
+</table>		
 	<?php else:?>
 		<div style="padding:0.7em;" class="ui-state-error ui-corner-all">
 		<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>
@@ -35,10 +38,10 @@
 	<br />
 	<center>
 		<a name="12"></a>
-		<span style="font-size:15px;color:#00008C;font-weight:800">Evolution du capital</span><br /><br />
+		<span class="title">Evolution du capital</span><br /><br />
 		<img src="/fichier/imgcache/<?php echo $this->report->CompanyId.'-'.$this->Type.'-';?>positionFinanciere.png" />
 	</center>
-	<span style="font-size:16px;color:#00008C;font-weight:800">Relation banquaires</span><br /><br />
+	<span class="title">Relation banquaires</span><br /><br />
 	<?php if(isset($this->report->Bank)):?>
 	<table style="font-size:13px;margin-left: 19px;" width="97%" class="hoverTr">
 		<tr>

application/views/default/scripts/giant/partials/rapports/StructureEntreprise.phtml

@@ -1,30 +1,29 @@
 <div class="paragraph">
 	<?php if(isset($this->report->Associated)):?>
 	<a name="16"></a>
-	<span style="font-size:16px;color:#00008C;font-weight:800">Actionnaires</span><br /><br />
+	<span class="title">Actionnaires</span><br /><br />
 	<?php if(isset($this->report->Shareholder)):?>
-	<table style="font-size:12px;margin-left: 19px;" width="97%" class="hoverTr">
-		<tr style="font-weight:800">
-			<td>Identifiant</td>
-			<td>Nom société</td>
-			<td>Pourcentage d'actions</td>
-			<td>IsPrincipalStakeHolder</td>
-		</tr>
+	<table id="giant_synthese" style="font-size:12px;">
+	<thead>
 		<tr>
-			<td colspan="4"><hr style="border:1px dotted silver" /></td>
-		</tr>
-		<?php $i=0; foreach($this->report->Shareholder as $Shareholder):$i++;?>
-		<tr class="<?php echo ($i % 2)?'colorTr':EOF;?>">
-			<td style="color:#c12b3c" align="center"><?php echo (($Shareholder->Company->CompanyId > 0)?$Shareholder->Company->CompanyId:'-')?></td>
-			<td style="padding:5px;font-size:12px;"><?php echo $Shareholder->Company->CompanyName[0]->_?></td>
-			<td style="padding:5px;font-size:12px;"><?php echo (!empty($Shareholder->Shares->Percentage))?$Shareholder->Shares->Percentage.'%':'NC'?> </td>
-			<td style="padding:5px;font-size:12px;"><?php echo (($Shareholder>IsPrincipalStakeHolder == 1)?'Oui':'Non');?></td>
+			<th align="right">Identifiant</th>
+			<th align="right">Nom société</th>
+			<th align="right">Pourcentage d'actions</th>
+			<th align="right">IsPrincipalStakeHolder</th>
 		</tr>
+	</thead>
+	<tbody>
 		<tr>
-			<td colspan="4"><hr style="border:1px dotted silver" /></td>
-		</tr>
-		<?php endforeach;?>
-	</table>
+		<?php  foreach($this->report->Shareholder as $Shareholder):?>
+			<tr>
+				<td style="color:#c12b3c" align="center"><?php echo (($Shareholder->Company->CompanyId > 0)?$Shareholder->Company->CompanyId:'-')?></td>
+				<td class="right"><?php echo $Shareholder->Company->CompanyName[0]->_?></td>
+				<td class="right"><?php echo (!empty($Shareholder->Shares->Percentage))?$Shareholder->Shares->Percentage.'%':'NC'?> </td>
+				<td class="right"><?php echo (($Shareholder>IsPrincipalStakeHolder == 1)?'Oui':'Non');?></td>
+			</tr>
+		<?php endforeach; ?>
+	</tbody>
+</table>
 	<?php else:?>
 		<div style="padding:0.7em;" class="ui-state-error ui-corner-all">
 		<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>
@@ -34,28 +33,27 @@
 	<?php endif;?>
 	<br />
 	<a name="17"></a>
-	<span style="font-size:16px;color:#00008C;font-weight:800">Participations</span><br /><br />
+	<span class="title">Participations</span><br /><br />
 	<?php if(isset($this->report->Participation)):?>
-	<table style="font-size:12px;margin-left: 19px;" width="97%" class="hoverTr">
-		<tr style="font-weight:800">
-			<td>Identifiant</td>
-			<td>Nom société</td>
-			<td>Pourcentage d'actions</td>
-		</tr>
+	<table id="giant_synthese" style="font-size:12px;">
+	<thead>
 		<tr>
-			<td colspan="3"><hr style="border:1px dotted silver" /></td>
-		</tr>
-		<?php $i=0;foreach($this->report->Participation as $Participation):$i++;?>
-		<tr class="<?php echo ($i % 2)?'colorTr':EOF;?>">
-			<td style="color:#c12b3c" align="center"><?php echo (($Participation->Company->CompanyId > 0)?$Participation->Company->CompanyId:'-')?></td>
-			<td style="padding:5px;font-size:12px;"><?php echo $Participation->Company->CompanyName[0]->_?></td>
-			<td style="padding:5px;font-size:12px;"><?php echo (!empty($Participation->Shares->Percentage))?$Participation->Shares->Percentage.'%':'NC';?> </td>
+			<th align="right">Identifiant</th>
+			<th align="right">Nom société</th>
+			<th align="right">Pourcentage d'actions</th>
 		</tr>
+	</thead>
+	<tbody>
 		<tr>
-			<td colspan="3"><hr style="border:1px dotted silver" /></td>
-		</tr>
-		<?php endforeach;?>
-	</table>
+		<?php  foreach($this->report->Participation as $Participation):?>
+			<tr>
+				<td style="color:#c12b3c" align="center"><?php echo (($Participation->Company->CompanyId > 0)?$Participation->Company->CompanyId:'-')?></td>
+				<td class="right"><?php echo $Participation->Company->CompanyName[0]->_?></td>
+				<td class="right"><?php echo (!empty($Participation->Shares->Percentage))?$Participation->Shares->Percentage.'%':'NC'?> </td>
+			</tr>
+		<?php endforeach; ?>
+	</tbody>
+</table>
 	<?php else:?>
 		<div style="padding:0.7em;" class="ui-state-error ui-corner-all">
 		<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>
@@ -65,31 +63,32 @@
 	<?php endif;?>
 	<br />
 	<a name="18"></a>
-	<span style="font-size:16px;color:#00008C;font-weight:800">Etablissements</span><br /><br />
+	<span class="title">Etablissements</span><br /><br />
 	<?php if(isset($this->report->Branch)):?>
-	<table style="font-size:12px;margin-left: 19px;" width="97%" class="hoverTr">
-		<tr style="font-weight:800">
-			<td>Identifiant</td>
-			<td>Nom société</td>
-			<td>Adresse</td>
-		</tr>
+	
+	
+	<table id="giant_synthese" style="font-size:12px;">
+	<thead>
 		<tr>
-			<td colspan="3"><hr style="border:1px dotted silver" /></td>
+			<th align="right">Identifiant</th>
+			<th align="right">Nom société</th>
+			<th align="right">Adresse</th>
 		</tr>
-		<?php $i=0;foreach($this->report->Branch as $Branch):$i++;?>
-		<tr class="<?php echo ($i % 2)?'colorTr':EOF;?>">
-			<td style="color:#c12b3c" align="center"><?php echo (($Branch->BranchId > 0)?$Branch->BranchId:'-')?></td>
-			<td style="padding:5px;font-size:12px;"><?php echo ((isset($Branch->BranchName))?$Branch->BranchName->_:'-')?></td>
-			<td style="padding:5px;font-size:12px;"><?php echo ((isset($Branch->BranchId))?$Branch->BranchAddress[0]->HouseNumber.' '.
+	</thead>
+	<tbody>
+		<tr>
+		<?php  foreach($this->report->Branch as $Branch):?>
+			<tr>
+				<td style="color:#c12b3c" align="center"><?php echo (($Branch->BranchId > 0)?$Branch->BranchId:'-')?></td>
+				<td class="right"><?php echo ((isset($Branch->BranchName))?$Branch->BranchName->_:'-')?></td>
+				<td class="right"><?php echo ((isset($Branch->BranchId))?$Branch->BranchAddress[0]->HouseNumber.' '.
 																   $Branch->BranchAddress[0]->Street.' '.
 																   $Branch->BranchAddress[0]->PostCode.' '.
 																   $Branch->BranchAddress[0]->City:'-')?></td>
-		</tr>
-		<tr>
-			<td colspan="3"><hr style="border:1px dotted silver" /></td>
-		</tr>
-		<?php endforeach;?>
-	</table>
+			</tr>
+		<?php endforeach; ?>
+	</tbody>
+</table>
 	<?php else:?>
 		<div style="padding:0.7em;" class="ui-state-error ui-corner-all">
 		<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>

application/views/default/scripts/giant/partials/rowSearch.phtml

@@ -1,4 +1,7 @@
 <b>
+<?$address=$this->resultat->Address->HouseNumber.':'.$this->resultat->Address->Street.':'.$this->resultat->Address->PostCode.':'.$this->resultat->Address->City;
+$address=str_replace('/', '_', $address);?>
+<?if (in_array($this->resultat->CompanyId, $this->TestCompanies)):?>
     <a href="<?php echo $this->url(
         array('controller' => 'giant', 'action' => 'identite', 
             'raisonSociale' => $this->resultat->RegisteredName,
@@ -6,9 +9,34 @@
             'CompanyRegisterNumber' => $this->resultat->CompanyRegisterNumber,
             'Pays' => $this->resultat->Address->Country,
             'telephone' => $this->resultat->TelephoneNumbers->TelephoneNumber[0],
-            'Adresse' => $this->resultat->Address->HouseNumber.':'.$this->resultat->Address->Street.':'.$this->resultat->Address->PostCode.':'.$this->resultat->Address->City));?>">
+        	'test' => '0',
+            'Adresse' => $address));?>">
+        <?php echo $this->resultat->RegisteredName.' -'; ?>
+    </a>
+    <span class='testSearch'><a href="<?php echo $this->url(
+        array('controller' => 'giant', 'action' => 'identite', 
+            'raisonSociale' => $this->resultat->RegisteredName,
+            'CompanyId' => $this->resultat->CompanyId,
+            'CompanyRegisterNumber' => $this->resultat->CompanyRegisterNumber,
+            'Pays' => $this->resultat->Address->Country,
+            'telephone' => $this->resultat->TelephoneNumbers->TelephoneNumber[0],
+			'test' => '1',
+            'Adresse' => $address));?>">
+        <?php echo ' TEST MODE'; ?>
+    </a></span>
+    <?else:?>
+     <a href="<?php echo $this->url(
+        array('controller' => 'giant', 'action' => 'identite', 
+            'raisonSociale' => $this->resultat->RegisteredName,
+            'CompanyId' => $this->resultat->CompanyId,
+            'CompanyRegisterNumber' => $this->resultat->CompanyRegisterNumber,
+            'Pays' => $this->resultat->Address->Country,
+            'telephone' => $this->resultat->TelephoneNumbers->TelephoneNumber[0],
+            'test' => '0',
+			'Adresse' => $address));?>">
         <?php echo $this->resultat->RegisteredName; ?>
     </a>
+    <?endif?>
 </b>
 <br />
 <?php if(!empty($this->resultat->CompanyId)):?>

application/views/default/scripts/giant/retevents.phtml

@@ -0,0 +1,190 @@
+<?function emp_check($val){echo (empty($val))?'NC':$val;}?>
+<div id="center">
+	<div class='acord'>
+	
+			<div id="accordion">
+			<?foreach ($this->result as $report):?>
+			<?$eventCode = $report->Company->Event[0]->EventCode;?>
+				<h3><?=$report->Company->Event[0]->Date->_?></h3>
+			<div>
+			
+			<h2 class="radius">Données officielles</h2><br /><br />
+			<div class="gen_div">
+			  <div><div class="left_div"><b>ProviderEventId</b></div> <div class="right_div"><?emp_check($report->ProviderEventId)?></div></div>
+			  <div><div class="left_div"><b>InternalEventId</b></div> <div class="right_div"><?emp_check($report->InternalEventId)?></div></div>
+			  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->CompanyId)?></div></div>
+			  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->CompanyName[0]->_)?></div></div>
+			  <div><div class="left_div"><b>EventCode </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->EventCode)?></div></div>
+			  <div><div class="left_div"><b>Source </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Source->_)?></div></div>
+			  <div><div class="left_div"><b>Description </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Description->_)?></div></div>
+			  <div><div class="left_div"><b>FreeText </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->FreeText->_)?></div></div>
+			</div>
+			<br /><br />
+			<?if($eventCode=='GENERAL.COMPANY_NAME_CHANGE'||$eventCode=='GENERAL.LEGALFORM_CHANGE'||$eventCode=='GENERAL.POSITION_CHANGE'):?>
+			<h2 class="radius">Old Values</h2><br /><br />
+			<div class="gen_div">
+				<div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyId)?></div></div>
+				<div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyName[0]->_)?></div></div>
+			</div><br /><br />
+			<h2 class="radius">New Values</h2><br /><br />
+			<div class="gen_div">
+			  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CompanyId)?></div></div>
+			  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CompanyName[0]->_)?></div></div>
+			</div>
+			<?endif?>
+			<?if($eventCode=='GENERAL.ADDRESS_CHANGE'):?>
+			<h2 class="radius">Données officielles</h2><br /><br />
+			<div class="gen_div">
+			  <div><div class="left_div"><b>OldCompanyName</b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyName[0]->_)?></div></div>
+			  <div><div class="left_div"><b>NewCompanyName</b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CompanyName[0]->_)?></div></div>
+			</div><br /><br />
+			<h2 class="radius">Old Address</h2><br /><br />
+				<div class="gen_div">
+				  <div><div class="left_div"><b>Street</b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->Street)?></div></div>
+				  <div><div class="left_div"><b>HouseNumber</b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->HouseNumber)?></div></div>
+				  <div><div class="left_div"><b>PostCode </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->PostCode)?></div></div>
+				  <div><div class="left_div"><b>City </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->City)?></div></div>
+				  <div><div class="left_div"><b>Country </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->Country)?></div></div>
+				</div><br /><br />
+			<h2 class="radius">New Address</h2><br /><br />
+				<div class="gen_div">
+				  <div><div class="left_div"><b>Street</b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CompanyAddress[0]->Street)?></div></div>
+				  <div><div class="left_div"><b>HouseNumber</b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CompanyAddress[0]->HouseNumber)?></div></div>
+				  <div><div class="left_div"><b>PostCode </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CompanyAddress[0]->PostCode)?></div></div>
+				  <div><div class="left_div"><b>City </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CompanyAddress[0]->City)?></div></div>
+				  <div><div class="left_div"><b>Country </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CompanyAddress[0]->Country)?></div></div>
+				</div>
+				
+				<?elseif($eventCode=='GENERAL.LEGALFORM_CHANGE'):?>
+				<h2 class="radius">Old LegalForm</h2><br /><br />
+				<div class="gen_div">
+				  <div><div class="left_div"><b>CountryLegalForm </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->CountryLegalForm->_)?></div></div>
+				  <div><div class="left_div"><b>UnifiedLegalForm </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->UnifiedLegalForm)?></div></div>
+				  <div><div class="left_div"><b>FoundedAsLegalForm </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->FoundedAsLegalForm->_)?></div></div>
+				  <div><div class="left_div"><b>AddressLine </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->FlexibleAddress->AddressLine[0])?></div></div>
+				  <div><div class="left_div"><b>Country </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->Country)?></div></div>
+				  <div><div class="left_div"><b>IsSocial </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->IsSocial)?></div></div>
+			      <div><div class="left_div"><b>IsCivil </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->IsCivil)?></div></div>
+				</div><br /><br />
+				<h2 class="radius">New LegalForm</h2><br /><br />
+				<div class="gen_div">
+				  <div><div class="left_div"><b>CountryLegalForm </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->LegalForm[0]->CountryLegalForm->_)?></div></div>
+				  <div><div class="left_div"><b>UnifiedLegalForm </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->LegalForm[0]->UnifiedLegalForm)?></div></div>
+				  <div><div class="left_div"><b>FoundedAsLegalForm </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->LegalForm[0]->FoundedAsLegalForm->_)?></div></div>
+				  <div><div class="left_div"><b>AddressLine </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CompanyAddress[0]->FlexibleAddress->AddressLine[0])?></div></div>
+				  <div><div class="left_div"><b>Country </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->LegalForm[0]->Country)?></div></div>
+				  <div><div class="left_div"><b>IsSocial </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->LegalForm[0]->IsSocial)?></div></div>
+			      <div><div class="left_div"><b>IsCivil </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->LegalForm[0]->IsCivil)?></div></div>
+				</div>
+				<?elseif($eventCode=='GENERAL.POSITION_CHANGE'):?>
+				<h2 class="radius">Old Position</h2><br /><br />
+				<div class="gen_div">
+				  <div><div class="left_div"><b>FirstName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->Position[0]->Person->FirstName)?></div></div>
+				  <div><div class="left_div"><b>LastName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->Position[0]->Person->LastName)?></div></div>
+				  <div><div class="left_div"><b>Initials </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->Position[0]->Person->Initials)?></div></div>
+				  <div><div class="left_div"><b>Title </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->Position[0]->Person->Title)?></div></div>
+				  <div><div class="left_div"><b>Position StartDate </b></div> <div class="right_div"><?$date = new Zend_Date($report->Company->Event[0]->Value[0]->Company[0]->Position[0]->Period->StartDate->_,yyyymmdd);?><?emp_check($date->toString('dd/mm/yyyy'))?></div></div>
+				  <div><div class="left_div"><b>Position EndDate </b></div> <div class="right_div"><?$date = new Zend_Date($report->Company->Event[0]->Value[0]->Company[0]->Position[0]->Period->EndDate->_,yyyymmdd);?><?emp_check($date->toString('dd/mm/yyyy'))?></div></div>
+				  <div><div class="left_div"><b>PositionChangeReason </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->Position[0]->PositionChangeReason)?></div></div>
+				  <div><div class="left_div"><b>PositionTitle </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->Position[0]->PositionTitle->_)?></div></div>
+				  <div><div class="left_div"><b>Type </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->Position[0]->Type)?></div></div>
+				</div><br /><br />
+				<h2 class="radius">New Position</h2><br /><br />
+				<div class="gen_div">
+                  <div><div class="left_div"><b>FirstName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->Position[0]->Person->FirstName)?></div></div>
+				  <div><div class="left_div"><b>LastName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->Position[0]->Person->LastName)?></div></div>
+				  <div><div class="left_div"><b>Initials </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->Position[0]->Person->Initials)?></div></div>
+				  <div><div class="left_div"><b>Title </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->Position[0]->Person->Title)?></div></div>
+    			  <div><div class="left_div"><b>Position StartDate </b></div> <div class="right_div"><?$date = new Zend_Date($report->Company->Event[0]->Value[1]->Company[0]->Position[0]->Period->StartDate->_,yyyymmdd);?><?emp_check($date->toString('dd/mm/yyyy'))?></div></div>
+				  <div><div class="left_div"><b>Position EndDate </b></div> <div class="right_div"><?$date = new Zend_Date($report->Company->Event[0]->Value[1]->Company[0]->Position[0]->Period->EndDate->_,yyyymmdd);?><?emp_check($date->toString('dd/mm/yyyy'))?></div></div>
+				  <div><div class="left_div"><b>PositionChangeReason </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->Position[0]->PositionChangeReason)?></div></div>
+				  <div><div class="left_div"><b>PositionTitle </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->Position[0]->PositionTitle->_)?></div></div>
+				  <div><div class="left_div"><b>Type </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->Position[0]->Type)?></div></div>
+				</div><br /><br />
+				<?elseif($eventCode=='GENERAL.MERGER'):?>
+				<h2 class="radius">Parameterized Description</h2><br /><br />
+				<div class="gen_div">
+				  <div><div class="left_div"><b>ProviderEventId</b></div> <div class="right_div"><?emp_check($report->ProviderEventId)?></div></div>
+				  <div><div class="left_div"><b>DescriptionElement </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->ParameterizedDescription->DescriptionElement->_)?></div></div>
+					<?foreach ($report->Company->Event[0]->ParameterizedDescription->Parameter as $Parameter):?>
+					 <div><div class="left_div"><b>Parameter <?emp_check($Parameter->paramname)?></b></div> <div class="right_div"><?emp_check($Parameter->_)?></div></div>
+					<?endforeach;?>	
+				</div>
+				<br /><br />
+				<h2 class="radius">Values</h2><br /><br />
+				<div class="gen_div">
+				  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyId)?></div></div>
+				  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyName[0]->_)?></div></div>
+				</div><br /><br />
+				<h2 class="radius">LegalForm</h2><br /><br />
+				<div class="gen_div">
+				  <div><div class="left_div"><b>CountryLegalForm </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->CountryLegalForm->_)?></div></div>
+				  <div><div class="left_div"><b>UnifiedLegalForm </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->UnifiedLegalForm)?></div></div>
+				  <div><div class="left_div"><b>HouseNumber</b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->HouseNumber)?></div></div>
+				  <div><div class="left_div"><b>Street</b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->Street)?></div></div>
+				  <div><div class="left_div"><b>Country </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->Country)?></div></div>
+				</div><br /><br />
+				<?elseif($eventCode=='GENERAL.SPLIT_UP'):?>
+				<h2 class="radius">Parameterized Description</h2><br /><br />
+				<div class="gen_div">
+				  <div><div class="left_div"><b>ProviderEventId</b></div> <div class="right_div"><?emp_check($report->ProviderEventId)?></div></div>
+				  <div><div class="left_div"><b>DescriptionElement </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->ParameterizedDescription->DescriptionElement->_)?></div></div>
+					<?foreach ($report->Company->Event[0]->ParameterizedDescription->Parameter as $Parameter):?>
+					 <div><div class="left_div"><b>Parameter <?emp_check($Parameter->paramname)?></b></div> <div class="right_div"><?emp_check($Parameter->_)?></div></div>
+					<?endforeach;?>	
+				</div>
+				<br /><br />
+				<h2 class="radius">Old Values</h2><br /><br />
+				<div class="gen_div">
+				  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyId)?></div></div>
+				  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyName[0]->_)?></div></div>
+				</div><br /><br />
+				<h2 class="radius">Old LegalForm</h2><br /><br />
+				<div class="gen_div">
+				  <div><div class="left_div"><b>CountryLegalForm </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->CountryLegalForm->_)?></div></div>
+				  <div><div class="left_div"><b>UnifiedLegalForm </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->UnifiedLegalForm)?></div></div>
+				  <div><div class="left_div"><b>HouseNumber</b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->HouseNumber)?></div></div>
+				  <div><div class="left_div"><b>Street</b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->Street)?></div></div>
+				  <div><div class="left_div"><b>Country </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->Country)?></div></div>
+				</div><br /><br />
+					<?foreach ($report->Company->Event[0]->Value[1]->Company as $Company):?>
+					<h2 class="radius">Values</h2><br /><br />
+					<div class="gen_div">
+					  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($Company->CompanyId)?></div></div>
+					  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($Company->CompanyName[0]->_)?></div></div>
+					</div><br /><br />
+					<h2 class="radius">LegalForm</h2><br /><br />
+					<div class="gen_div">
+					  <div><div class="left_div"><b>CountryLegalForm </b></div> <div class="right_div"><?emp_check($Company->LegalForm[0]->CountryLegalForm->_)?></div></div>
+					  <div><div class="left_div"><b>UnifiedLegalForm </b></div> <div class="right_div"><?emp_check($Company->LegalForm[0]->UnifiedLegalForm)?></div></div>
+					  <div><div class="left_div"><b>HouseNumber</b></div> <div class="right_div"><?emp_check($Company->CompanyAddress[0]->HouseNumber)?></div></div>
+					  <div><div class="left_div"><b>Street</b></div> <div class="right_div"><?emp_check($Company->CompanyAddress[0]->Street)?></div></div>
+					  <div><div class="left_div"><b>Country </b></div> <div class="right_div"><?emp_check($Company->LegalForm[0]->Country)?></div></div>
+					</div><br /><br />
+					<?endforeach;?>	
+				<?elseif($eventCode=='FINANCIAL.ANNUAL_ACCOUNT_AVAILABLE' || 'FINANCIAL.ANNUAL_ACCOUNT_FILED'):?>
+				<h2 class="radius">Parameterized Description</h2><br /><br />
+				<div class="gen_div">
+				  <div><div class="left_div"><b>ProviderEventId</b></div> <div class="right_div"><?emp_check($report->ProviderEventId)?></div></div>
+				  <div><div class="left_div"><b>DescriptionElement </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->ParameterizedDescription->DescriptionElement->_)?></div></div>
+					<?foreach ($report->Company->Event[0]->ParameterizedDescription->Parameter as $Parameter):?>
+					 <div><div class="left_div"><b>Parameter</b></div> <div class="right_div"><?emp_check($Parameter->_)?></div></div>
+					<?endforeach;?>	
+				</div>
+				<br /><br />
+				<?elseif($eventCode=='FINANCIAL.CREDIT_RECOMMENDATION_CHANGE'):?>
+				<h2 class="radius">Old CreditRecommendation</h2><br /><br />
+				<div class="gen_div">
+				  <div><div class="left_div"><b>RatingName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CreditRecommendation[0]->RiskClasses->CommonRiskClass->RatingName->_)?></div></div>
+				  <div><div class="left_div"><b>RatingValue </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CreditRecommendation[0]->RiskClasses->CommonRiskClass->RatingValue)?></div></div>
+				</div><br /><br />
+				<h2 class="radius">New CreditRecommendation</h2><br /><br />
+				<div class="gen_div">
+				  <div><div class="left_div"><b>RatingName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CreditRecommendation[0]->RiskClasses->CommonRiskClass->RatingName->_)?></div></div>
+				  <div><div class="left_div"><b>RatingValue </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CreditRecommendation[0]->RiskClasses->CommonRiskClass->RatingValue)?></div></div>
+				</div><br /><br />
+				<?endif?>
+		</div><?endforeach;?>	
+	</div>
+	</div>
+</div><script>$( "#accordion" ).accordion({heightStyle: "content", collapsible: true,active: false });</script>

application/views/default/scripts/giant/retrive.phtml

@@ -0,0 +1,144 @@
+<div id="center">
+<h1 class="titre">Surveillances</h1>
+<div class="paragraph">
+<?php
+if ( empty($this->source) ){
+?>
+<table id="info">
+<tr>
+	<td width="200" class="StyleInfoLib">Nombre d'entités affichées</td>
+	<td><?=count($this->result->MonitoringEvents->MonitoringEvent)?></td>
+</tr>
+<tr>
+	<td width="200" class="StyleInfoLib">Nombre de surveillances</td>
+	<td><?=count($this->val)?></td>
+</tr>
+</table>
+<?php
+} else {
+?>
+<table id="info">
+<tr>
+	<td width="200" class="StyleInfoLib">Nombre de surveillances <?=$this->source?></td>
+	<td><?=$this->nbSurveillances?></td>
+</tr>
+</table>
+<?php
+}
+?>
+</div>
+
+
+
+ 	
+
+
+<h2>Liste des surveillances</h2>
+	<div class='monitor_but'>
+      <a class="dial" title="Start Monitoring" href='/giant/startmonitoring/CompanyId/<?=$this->CompanyId?>/Pays/<?=$this->Pays?>/lang/<?=serialize($this->listeRapport->MonitoringOptions->MonitoringOption[0]->LanguageCodes->LanguageCode)?>/CompanyName/<?=str_replace(' ', '+', $this->raisonSociale)?>'>Start New Monitoring</a>
+    </div>
+
+<div class="paragraph">
+<table class="tablesorter" id="surveillance" width="570">
+<thead>
+<tr>
+	<th width="75">Dénomination Sociale (Siret)</th>
+	<th width="110">Start Monitoring</th>
+	<th width="110">End Monitoring</th>
+	<th width="75">Lang</th>
+	<th width="75">Count</th>
+	<th width="150">Event Type</th>
+	<th width="110">Last Change</th>
+	
+</tr>
+</thead>
+<tbody><pre><? //print_r($this->val_siren);?></pre>
+<?php foreach ($this->val_siren as $monitor) {?>
+<pre><? //print_r($monitor);?></pre>
+<?
+//STORE BY ProviderOrderId
+		$merged = Array();
+		foreach ($monitor as $MonitoringEvent):
+		if ($merged[$MonitoringEvent->ProviderOrderId]){
+			array_push($merged[$MonitoringEvent->ProviderOrderId],$MonitoringEvent) ;
+		} else {
+			$merged[$MonitoringEvent->ProviderOrderId][]=$MonitoringEvent;
+		}
+		endforeach;
+		?>
+		
+	<? foreach ($merged as $MonitoringEv):
+		//STORE BY type
+		$merged_type = Array();
+		foreach ($MonitoringEv as $MonitoringType):
+		if ($merged_type[$MonitoringType->Company->Event[0]->EventCode]){
+			array_push($merged_type[$MonitoringType->Company->Event[0]->EventCode],$MonitoringType) ;
+		} else {
+			$merged_type[$MonitoringType->Company->Event[0]->EventCode][]=$MonitoringType;
+		}
+		endforeach;
+		?>
+	<?$resultDB=unserialize($this->action('ret', 'giant',null,array('date_st'=>current($merged_type)[0]->ProviderOrderId)));?>
+	<? 	$frontendOptions = array('lifetime' => $this->configVal->cache->lifetime,'automatic_serialization' => true);
+		$backendOptions = array('cache_dir' => '../data/cache/giant/');
+		$cache = Zend_Cache::factory('Output','File',$frontendOptions,$backendOptions);
+		if(($lang = $cache->load('Pays_'.$resultDB['Pays'])) === false) {
+			$lang	= 'en';
+		}
+		$language =$lang->MonitoringOptions->MonitoringOption[0]->LanguageCodes->LanguageCode;
+		?>
+	<pre><?//var_dump($resultDB);?></pre>
+<tr>
+	<td>
+    <p><?=$MonitoringEv[0]->Company->CompanyName['0']->_ ?> (<?=$MonitoringEv[0]->Company->CompanyId ?>)</p>
+      <a class="dialogsurv dial" title="Start Monitoring" href='/giant/startmonitoring/CompanyId/<?=$MonitoringEv[0]->Company->CompanyId?>/Pays/<?=$resultDB['Pays']?>/lang/<?=serialize($language)?>/CompanyName/<?=str_replace(' ', '+',$MonitoringEv[0]->Company->CompanyName['0']->_)?>'><img src="/themes/default/images/interfaces/ajouter.png"/></a>
+      <a class="dialogsurv dial" title="Stop Monitoring" href='/giant/stopmonitoring/CompanyId/<?=$MonitoringEv[0]->Company->CompanyId?>/Pays/<?=$resultDB['Pays']?>/InternalOrderId/<?=$resultDB['InternalOrderId']?>/CompanyName/<?=str_replace(' ', '+', $MonitoringEv[0]->Company->CompanyName['0']->_)?>'><img src="/themes/default/images/interfaces/supprimer.png"/></a>
+      <a class="dialogsurv dial" title="Update Monitoring" href='/giant/updatemonitoring/CompanyId/<?=$MonitoringEv[0]->Company->CompanyId?>/Pays/<?=$resultDB['Pays']?>/lang/<?=serialize($language)?>/InternalOrderId/<?=$resultDB['InternalOrderId']?>/CompanyName/<?=str_replace(' ', '+', $MonitoringEv[0]->Company->CompanyName['0']->_)?>'><img src="/themes/default/images/interfaces/editer.png"/></a>
+	</td>
+    <td>
+    <?php
+		echo "<p>".$resultDB['ActualStartDate'].'</p>';
+	?>
+    </td>
+    <td>
+    <?php
+		echo "<p>".$resultDB['ActualEndDate'].'</p>';
+	?>
+    </td>
+    <td>
+    <?php
+		echo "<p>".$resultDB['Language'].'</p>';
+	?>
+    </td>
+    <td>
+    <?php
+	   
+		foreach ($merged_type as $monitor_type) {
+			echo "<p>".count($monitor_type).'</p>';
+	 } 
+	?>
+    </td>
+    <td style='text-align: left'>
+    <?php
+     foreach ($merged_type as $monitor_type) {
+		$name = explode('.', $monitor_type[0]->Company->Event[0]->EventCode);
+		echo "<a class='ev_code' title='".$monitor_type[0]->Company->Event[0]->EventCode."' href='/giant/retevents/Type/".$monitor_type[0]->Company->Event[0]->EventCode."/Id/".$monitor_type[0]->ProviderOrderId."'><p>".$name[1]."</p></a>";
+	 } //Fin foreach?>
+    </td>
+    
+    <td>
+    <?php
+    foreach ($merged_type as $monitor_type) {
+		$dateEv= Array();
+		foreach ($monitor_type as $last_date) {
+			$dateEv[]=$last_date->Company->Event[0]->Date->_;
+    		}
+    	echo "<p style='width: 70px;'>".max($dateEv)."</p>";
+    }
+	?>
+    </td>
+<?php endforeach; } ?>
+</tbody>
+</table><br>
+</div>
+</div>

application/views/default/scripts/giant/retrivemonitoring.phtml

@@ -1,545 +0,0 @@
-<?function emp_check($val){echo (empty($val))?'NC':$val;}
-$wdate = new WDate();?>
-<div id="center">
-	<div class='acord'>
-			<div id="accordion">
-				<h3>GENERAL.ADDRESS_CHANGE</h3>
-			<div>
-				<?php if(isset($this->val['GENERAL.ADDRESS_CHANGE'])):?>
-				<?foreach ($this->val['GENERAL.ADDRESS_CHANGE'] as $report):?>
-			
-			<h2 class="radius">Données officielles</h2><br /><br />
-			<div class="gen_div">
-			  <div><div class="left_div"><b>ProviderEventId</b></div> <div class="right_div"><?emp_check($report->ProviderEventId)?></div></div>
-			  <div><div class="left_div"><b>InternalEventId</b></div> <div class="right_div"><?emp_check($report->InternalEventId)?></div></div>
-			  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->CompanyId)?></div></div>
-			  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->CompanyName[0]->_)?></div></div>
-			  <div><div class="left_div"><b>EventCode </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->EventCode)?></div></div>
-			  <div><div class="left_div"><b>Source </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Source->_)?></div></div>
-			  <div><div class="left_div"><b>Description </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Description->_)?></div></div>
-			  <div><div class="left_div"><b>FreeText </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->FreeText->_)?></div></div>
-			</div>
-			<br /><br />
-			<h2 class="radius">Données officielles</h2><br /><br />
-			<div class="gen_div">
-			  <div><div class="left_div"><b>OldCompanyName</b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyName[0]->_)?></div></div>
-			  <div><div class="left_div"><b>NewCompanyName</b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CompanyName[0]->_)?></div></div>
-			</div><br /><br />
-			<h2 class="radius">Old Address</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>Street</b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->Street)?></div></div>
-				  <div><div class="left_div"><b>HouseNumber</b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->HouseNumber)?></div></div>
-				  <div><div class="left_div"><b>PostCode </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->PostCode)?></div></div>
-				  <div><div class="left_div"><b>City </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->City)?></div></div>
-				  <div><div class="left_div"><b>Country </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->Country)?></div></div>
-				</div><br /><br />
-			<h2 class="radius">New Address</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>Street</b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CompanyAddress[0]->Street)?></div></div>
-				  <div><div class="left_div"><b>HouseNumber</b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CompanyAddress[0]->HouseNumber)?></div></div>
-				  <div><div class="left_div"><b>PostCode </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CompanyAddress[0]->PostCode)?></div></div>
-				  <div><div class="left_div"><b>City </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CompanyAddress[0]->City)?></div></div>
-				  <div><div class="left_div"><b>Country </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CompanyAddress[0]->Country)?></div></div>
-				</div>
-		<hr style="border:1px dotted silver" />
-			
-			<?endforeach;?>	
-			<? else :?>
-				<div class="ui-state-error ui-corner-all">
-				<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>
-					Aucun GENERAL.ADDRESS_CHANGE
-				</p>
-				</div>
-				<? endif; ?>
-				
-			</div>
-			<h3>GENERAL.COMPANY_NAME_CHANGE</h3>
-			<div>
-			<?php if(isset($this->val['GENERAL.COMPANY_NAME_CHANGE'])):?>
-				<?foreach ($this->val['GENERAL.COMPANY_NAME_CHANGE'] as $report):?>
-			<h2 class="radius">Données officielles</h2><br /><br />
-			<div class="gen_div">
-			  <div><div class="left_div"><b>ProviderEventId</b></div> <div class="right_div"><?emp_check($report->ProviderEventId)?></div></div>
-			  <div><div class="left_div"><b>InternalEventId</b></div> <div class="right_div"><?emp_check($report->InternalEventId)?></div></div>
-			  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->CompanyId)?></div></div>
-			  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->CompanyName[0]->_)?></div></div>
-			  <div><div class="left_div"><b>EventCode </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->EventCode)?></div></div>
-			  <div><div class="left_div"><b>Source </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Source->_)?></div></div>
-			  <div><div class="left_div"><b>Description </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Description->_)?></div></div>
-			  <div><div class="left_div"><b>FreeText </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->FreeText->_)?></div></div>
-			</div>
-			<br /><br />
-			<h2 class="radius">Old Values</h2><br /><br />
-			<div class="gen_div">
-			  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyId)?></div></div>
-			  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyName[0]->_)?></div></div>
-			</div><br /><br />
-			<h2 class="radius">New Values</h2><br /><br />
-			<div class="gen_div">
-			  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CompanyId)?></div></div>
-			  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CompanyName[0]->_)?></div></div>
-			</div>
-			<hr style="border:1px dotted silver" />
-			
-			<?endforeach;?>	
-			<? else :?>
-				<div class="ui-state-error ui-corner-all">
-				<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>
-					Aucun GENERAL.COMPANY_NAME_CHANGE
-				</p>
-				</div>
-				<? endif; ?>
-			</div>
-			<h3>GENERAL.LEGALFORM_CHANGE</h3>
-			<div>
-			<?php if(isset($this->val['GENERAL.LEGALFORM_CHANGE'])):?>
-			<?foreach ($this->val['GENERAL.LEGALFORM_CHANGE'] as $report):?>
-			<h2 class="radius">Données officielles</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>ProviderEventId</b></div> <div class="right_div"><?emp_check($report->ProviderEventId)?></div></div>
-				  <div><div class="left_div"><b>InternalEventId</b></div> <div class="right_div"><?emp_check($report->InternalEventId)?></div></div>
-				  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->CompanyId)?></div></div>
-				  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->CompanyName[0]->_)?></div></div>
-				  <div><div class="left_div"><b>EventCode </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->EventCode)?></div></div>
-				  <div><div class="left_div"><b>Source </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Source->_)?></div></div>
-				  <div><div class="left_div"><b>Description </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Description->_)?></div></div>
-				  <div><div class="left_div"><b>FreeText </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->FreeText->_)?></div></div>
-				</div>
-			<br /><br />
-			<h2 class="radius">Old Values</h2><br /><br />
-			<div class="gen_div">
-			  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyId)?></div></div>
-			  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyName[0]->_)?></div></div>
-			</div><br /><br />
-			<h2 class="radius">New Values</h2><br /><br />
-			<div class="gen_div">
-			  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CompanyId)?></div></div>
-			  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CompanyName[0]->_)?></div></div>
-			</div><br /><br />
-			<h2 class="radius">Old LegalForm</h2><br /><br />
-			<div class="gen_div">
-			  <div><div class="left_div"><b>CountryLegalForm </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->CountryLegalForm->_)?></div></div>
-			  <div><div class="left_div"><b>UnifiedLegalForm </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->UnifiedLegalForm)?></div></div>
-			  <div><div class="left_div"><b>FoundedAsLegalForm </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->FoundedAsLegalForm->_)?></div></div>
-			  <div><div class="left_div"><b>AddressLine </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->FlexibleAddress->AddressLine[0])?></div></div>
-			  <div><div class="left_div"><b>Country </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->Country)?></div></div>
-			  <div><div class="left_div"><b>IsSocial </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->IsSocial)?></div></div>
-		      <div><div class="left_div"><b>IsCivil </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->IsCivil)?></div></div>
-			</div><br /><br />
-			<h2 class="radius">New LegalForm</h2><br /><br />
-			<div class="gen_div">
-			  <div><div class="left_div"><b>CountryLegalForm </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->LegalForm[0]->CountryLegalForm->_)?></div></div>
-			  <div><div class="left_div"><b>UnifiedLegalForm </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->LegalForm[0]->UnifiedLegalForm)?></div></div>
-			  <div><div class="left_div"><b>FoundedAsLegalForm </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->LegalForm[0]->FoundedAsLegalForm->_)?></div></div>
-			  <div><div class="left_div"><b>AddressLine </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CompanyAddress[0]->FlexibleAddress->AddressLine[0])?></div></div>
-			  <div><div class="left_div"><b>Country </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->LegalForm[0]->Country)?></div></div>
-			  <div><div class="left_div"><b>IsSocial </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->LegalForm[0]->IsSocial)?></div></div>
-		      <div><div class="left_div"><b>IsCivil </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->LegalForm[0]->IsCivil)?></div></div>
-			</div>
-			<hr style="border:1px dotted silver" />
-			<?endforeach;?>	
-			<? else :?>
-				<div class="ui-state-error ui-corner-all">
-				<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>
-					Aucun GENERAL.LEGALFORM_CHANGE
-				</p>
-				</div>
-				<? endif; ?>
-				
-			</div>
-			<h3>GENERAL.POSITION_CHANGE</h3>
-			<div>
-			<?php if(isset($this->val['GENERAL.POSITION_CHANGE'])):?>
-				<?foreach ($this->val['GENERAL.POSITION_CHANGE'] as $report):?>
-				<h2 class="radius">Données officielles</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>ProviderEventId</b></div> <div class="right_div"><?emp_check($report->ProviderEventId)?></div></div>
-				  <div><div class="left_div"><b>InternalEventId</b></div> <div class="right_div"><?emp_check($report->InternalEventId)?></div></div>
-				  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->CompanyId)?></div></div>
-				  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->CompanyName[0]->_)?></div></div>
-				  <div><div class="left_div"><b>EventCode </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->EventCode)?></div></div>
-				  <div><div class="left_div"><b>Source </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Source->_)?></div></div>
-				  <div><div class="left_div"><b>Description </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Description->_)?></div></div>
-				  <div><div class="left_div"><b>FreeText </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->FreeText->_)?></div></div>
-				</div>
-				<br /><br />
-				<h2 class="radius">Old Values</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyId)?></div></div>
-				  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyName[0]->_)?></div></div>
-				</div><br /><br />
-				<h2 class="radius">New Values</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CompanyId)?></div></div>
-				  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CompanyName[0]->_)?></div></div>
-				</div><br /><br />
-					<h2 class="radius">Old Position</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>FirstName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->Position[0]->Person->FirstName)?></div></div>
-				  <div><div class="left_div"><b>LastName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->Position[0]->Person->LastName)?></div></div>
-				  <div><div class="left_div"><b>Initials </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->Position[0]->Person->Initials)?></div></div>
-				  <div><div class="left_div"><b>Title </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->Position[0]->Person->Title)?></div></div>
-				  <div><div class="left_div"><b>Position StartDate </b></div> <div class="right_div"><?emp_check($wdate->dateT('Ymd', 'd/m/Y', $report->Company->Event[0]->Value[0]->Company[0]->Position[0]->Period->StartDate->_))?></div></div>
-				  <div><div class="left_div"><b>Position EndDate </b></div> <div class="right_div"><?emp_check($wdate->dateT('Ymd', 'd/m/Y', $report->Company->Event[0]->Value[0]->Company[0]->Position[0]->Period->EndDate->_))?></div></div>
-				  <div><div class="left_div"><b>PositionChangeReason </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->Position[0]->PositionChangeReason)?></div></div>
-				  <div><div class="left_div"><b>PositionTitle </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->Position[0]->PositionTitle->_)?></div></div>
-				  <div><div class="left_div"><b>Type </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->Position[0]->Type)?></div></div>
-				</div><br /><br />
-				<h2 class="radius">New Position</h2><br /><br />
-				<div class="gen_div">
-                  <div><div class="left_div"><b>FirstName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->Position[0]->Person->FirstName)?></div></div>
-				  <div><div class="left_div"><b>LastName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->Position[0]->Person->LastName)?></div></div>
-				  <div><div class="left_div"><b>Initials </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->Position[0]->Person->Initials)?></div></div>
-				  <div><div class="left_div"><b>Title </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->Position[0]->Person->Title)?></div></div>
-    			  <div><div class="left_div"><b>Position StartDate </b></div> <div class="right_div"><?emp_check($wdate->dateT('Ymd', 'd/m/Y', $report->Company->Event[0]->Value[1]->Company[0]->Position[0]->Period->StartDate->_))?></div></div>
-				  <div><div class="left_div"><b>Position EndDate </b></div> <div class="right_div"><?emp_check($wdate->dateT('Ymd', 'd/m/Y', $report->Company->Event[0]->Value[1]->Company[0]->Position[0]->Period->EndDate->_))?></div></div>
-				  <div><div class="left_div"><b>PositionChangeReason </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->Position[0]->PositionChangeReason)?></div></div>
-				  <div><div class="left_div"><b>PositionTitle </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->Position[0]->PositionTitle->_)?></div></div>
-				  <div><div class="left_div"><b>Type </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->Position[0]->Type)?></div></div>
-				</div><br /><br />
-				<hr style="border:1px dotted silver" />
-				<?endforeach;?>	
-				<? else :?>
-				<div class="ui-state-error ui-corner-all">
-				<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>
-					Aucun GENERAL.POSITION_CHANGE
-				</p>
-				</div>
-				<? endif; ?>
-				</div>
-			<h3>GENERAL.NEWS</h3>
-			<div>
-			<?php if(isset($this->val['GENERAL.NEWS'])):?>
-				<?foreach ($this->val['GENERAL.NEWS'] as $report):?>
-				<h2 class="radius">Données officielles</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>ProviderEventId</b></div> <div class="right_div"><?emp_check($report->ProviderEventId)?></div></div>
-				  <div><div class="left_div"><b>InternalEventId</b></div> <div class="right_div"><?emp_check($report->InternalEventId)?></div></div>
-				  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->CompanyId)?></div></div>
-				  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->CompanyName[0]->_)?></div></div>
-				  <div><div class="left_div"><b>EventCode </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->EventCode)?></div></div>
-				  <div><div class="left_div"><b>Source </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Source->_)?></div></div>
-				  <div><div class="left_div"><b>Description </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Description->_)?></div></div>
-				  <div><div class="left_div"><b>FreeText </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->FreeText->_)?></div></div>
-				</div>
-				<br /><br />
-				<hr style="border:1px dotted silver" />
-				<?endforeach;?>	
-				<? else :?>
-				<div class="ui-state-error ui-corner-all">
-				<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>
-					Aucun GENERAL.NEWS
-				</p>
-				</div>
-				<? endif; ?>
-			</div>
-			<h3>GENERAL.MERGER</h3>
-			<div>
-			<?php if(isset($this->val['GENERAL.MERGER'])):?>
-				<?foreach ($this->val['GENERAL.MERGER'] as $report):?>
-				<div>
-				<h2 class="radius">Données officielles</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>ProviderEventId</b></div> <div class="right_div"><?emp_check($report->ProviderEventId)?></div></div>
-				  <div><div class="left_div"><b>InternalEventId</b></div> <div class="right_div"><?emp_check($report->InternalEventId)?></div></div>
-				  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->CompanyId)?></div></div>
-				  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->CompanyName[0]->_)?></div></div>
-				  <div><div class="left_div"><b>EventCode </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->EventCode)?></div></div>
-				  <div><div class="left_div"><b>Source </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Source->_)?></div></div>
-				  <div><div class="left_div"><b>Description </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Description->_)?></div></div>
-				  <div><div class="left_div"><b>FreeText </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->FreeText->_)?></div></div>
-				</div>
-				<br /><br />
-				<h2 class="radius">Parameterized Description</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>ProviderEventId</b></div> <div class="right_div"><?emp_check($report->ProviderEventId)?></div></div>
-				  <div><div class="left_div"><b>DescriptionElement </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->ParameterizedDescription->DescriptionElement->_)?></div></div>
-					<?foreach ($report->Company->Event[0]->ParameterizedDescription->Parameter as $Parameter):?>
-					 <div><div class="left_div"><b>Parameter <?emp_check($Parameter->paramname)?></b></div> <div class="right_div"><?emp_check($Parameter->_)?></div></div>
-					<?endforeach;?>	
-				</div>
-				<br /><br />
-				<h2 class="radius">Values</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyId)?></div></div>
-				  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyName[0]->_)?></div></div>
-				</div><br /><br />
-				<h2 class="radius">LegalForm</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>CountryLegalForm </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->CountryLegalForm->_)?></div></div>
-				  <div><div class="left_div"><b>UnifiedLegalForm </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->UnifiedLegalForm)?></div></div>
-				  <div><div class="left_div"><b>HouseNumber</b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->HouseNumber)?></div></div>
-				  <div><div class="left_div"><b>Street</b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->Street)?></div></div>
-				  <div><div class="left_div"><b>Country </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->Country)?></div></div>
-				</div><br /><br />
-				<hr style="border:1px dotted silver" />
-				</div>
-				<?endforeach;?>	
-				<? else :?>
-				<div class="ui-state-error ui-corner-all">
-				<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>
-					Aucun GENERAL.MERGER
-				</p>
-				</div>
-				<? endif; ?>
-			</div>
-			<h3>GENERAL.SPLIT_UP</h3>
-			<div>
-			<?php if(isset($this->val['GENERAL.SPLIT_UP'])):?>
-				<?foreach ($this->val['GENERAL.SPLIT_UP'] as $report):?>
-				<h2 class="radius">Données officielles</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>ProviderEventId</b></div> <div class="right_div"><?emp_check($report->ProviderEventId)?></div></div>
-				  <div><div class="left_div"><b>InternalEventId</b></div> <div class="right_div"><?emp_check($report->InternalEventId)?></div></div>
-				  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->CompanyId)?></div></div>
-				  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->CompanyName[0]->_)?></div></div>
-				  <div><div class="left_div"><b>EventCode </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->EventCode)?></div></div>
-				  <div><div class="left_div"><b>Source </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Source->_)?></div></div>
-				  <div><div class="left_div"><b>Description </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Description->_)?></div></div>
-				  <div><div class="left_div"><b>FreeText </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->FreeText->_)?></div></div>
-				</div>
-				<br /><br />
-				<h2 class="radius">Parameterized Description</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>ProviderEventId</b></div> <div class="right_div"><?emp_check($report->ProviderEventId)?></div></div>
-				  <div><div class="left_div"><b>DescriptionElement </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->ParameterizedDescription->DescriptionElement->_)?></div></div>
-					<?foreach ($report->Company->Event[0]->ParameterizedDescription->Parameter as $Parameter):?>
-					 <div><div class="left_div"><b>Parameter <?emp_check($Parameter->paramname)?></b></div> <div class="right_div"><?emp_check($Parameter->_)?></div></div>
-					<?endforeach;?>	
-				</div>
-				<br /><br />
-				<h2 class="radius">Old Values</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyId)?></div></div>
-				  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyName[0]->_)?></div></div>
-				</div><br /><br />
-				<h2 class="radius">Old LegalForm</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>CountryLegalForm </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->CountryLegalForm->_)?></div></div>
-				  <div><div class="left_div"><b>UnifiedLegalForm </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->UnifiedLegalForm)?></div></div>
-				  <div><div class="left_div"><b>HouseNumber</b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->HouseNumber)?></div></div>
-				  <div><div class="left_div"><b>Street</b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CompanyAddress[0]->Street)?></div></div>
-				  <div><div class="left_div"><b>Country </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->LegalForm[0]->Country)?></div></div>
-				</div><br /><br />
-				<?foreach ($report->Company->Event[0]->Value[1]->Company as $Company):?>
-				<h2 class="radius">Values</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($Company->CompanyId)?></div></div>
-				  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($Company->CompanyName[0]->_)?></div></div>
-				</div><br /><br />
-				<h2 class="radius">LegalForm</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>CountryLegalForm </b></div> <div class="right_div"><?emp_check($Company->LegalForm[0]->CountryLegalForm->_)?></div></div>
-				  <div><div class="left_div"><b>UnifiedLegalForm </b></div> <div class="right_div"><?emp_check($Company->LegalForm[0]->UnifiedLegalForm)?></div></div>
-				  <div><div class="left_div"><b>HouseNumber</b></div> <div class="right_div"><?emp_check($Company->CompanyAddress[0]->HouseNumber)?></div></div>
-				  <div><div class="left_div"><b>Street</b></div> <div class="right_div"><?emp_check($Company->CompanyAddress[0]->Street)?></div></div>
-				  <div><div class="left_div"><b>Country </b></div> <div class="right_div"><?emp_check($Company->LegalForm[0]->Country)?></div></div>
-				</div><br /><br />
-				<?endforeach;?>	
-				<hr style="border:1px dotted silver" />
-				<?endforeach;?>	
-				<? else :?>
-				<div class="ui-state-error ui-corner-all">
-				<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>
-					Aucun GENERAL.SPLIT_UP
-				</p>
-				</div>
-				<? endif; ?>
-			</div>
-			<h3>FINANCIAL.ANNUAL_ACCOUNT_AVAILABLE</h3>
-			<div>
-			<?php if(isset($this->val['FINANCIAL.ANNUAL_ACCOUNT_AVAILABLE'])):?>
-				<?foreach ($this->val['FINANCIAL.ANNUAL_ACCOUNT_AVAILABLE'] as $report):?>
-				<h2 class="radius">Données officielles</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>ProviderEventId</b></div> <div class="right_div"><?emp_check($report->ProviderEventId)?></div></div>
-				  <div><div class="left_div"><b>InternalEventId</b></div> <div class="right_div"><?emp_check($report->InternalEventId)?></div></div>
-				  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->CompanyId)?></div></div>
-				  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->CompanyName[0]->_)?></div></div>
-				  <div><div class="left_div"><b>EventCode </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->EventCode)?></div></div>
-				  <div><div class="left_div"><b>Source </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Source->_)?></div></div>
-				  <div><div class="left_div"><b>Description </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Description->_)?></div></div>
-				  <div><div class="left_div"><b>FreeText </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->FreeText->_)?></div></div>
-				</div>
-				<br /><br />
-				<h2 class="radius">Parameterized Description</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>ProviderEventId</b></div> <div class="right_div"><?emp_check($report->ProviderEventId)?></div></div>
-				  <div><div class="left_div"><b>DescriptionElement </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->ParameterizedDescription->DescriptionElement->_)?></div></div>
-					<?foreach ($report->Company->Event[0]->ParameterizedDescription->Parameter as $Parameter):?>
-					 <div><div class="left_div"><b>Parameter</b></div> <div class="right_div"><?emp_check($Parameter->_)?></div></div>
-					<?endforeach;?>	
-				</div>
-				<br /><br />
-				<hr style="border:1px dotted silver" />
-				<?endforeach;?>	
-				<? else :?>
-				<div class="ui-state-error ui-corner-all">
-				<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>
-					Aucun FINANCIAL.ANNUAL_ACCOUNT_AVAILABLE
-				</p>
-				</div>
-				<? endif; ?>
-			</div>
-			<h3>FINANCIAL.ANNUAL_ACCOUNT_FILED</h3>
-			<div>
-			<?php if(isset($this->val['FINANCIAL.ANNUAL_ACCOUNT_FILED'])):?>
-				<?foreach ($this->val['FINANCIAL.ANNUAL_ACCOUNT_FILED'] as $report):?>
-				<h2 class="radius">Données officielles</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>ProviderEventId</b></div> <div class="right_div"><?emp_check($report->ProviderEventId)?></div></div>
-				  <div><div class="left_div"><b>InternalEventId</b></div> <div class="right_div"><?emp_check($report->InternalEventId)?></div></div>
-				  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->CompanyId)?></div></div>
-				  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->CompanyName[0]->_)?></div></div>
-				  <div><div class="left_div"><b>EventCode </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->EventCode)?></div></div>
-				  <div><div class="left_div"><b>Source </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Source->_)?></div></div>
-				  <div><div class="left_div"><b>Description </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Description->_)?></div></div>
-				  <div><div class="left_div"><b>FreeText </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->FreeText->_)?></div></div>
-				</div>
-				<br /><br />
-				<h2 class="radius">Parameterized Description</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>ProviderEventId</b></div> <div class="right_div"><?emp_check($report->ProviderEventId)?></div></div>
-				  <div><div class="left_div"><b>DescriptionElement </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->ParameterizedDescription->DescriptionElement->_)?></div></div>
-					<?foreach ($report->Company->Event[0]->ParameterizedDescription->Parameter as $Parameter):?>
-					 <div><div class="left_div"><b>Parameter</b></div> <div class="right_div"><?emp_check($Parameter->_)?></div></div>
-					<?endforeach;?>	
-				</div>
-				<br /><br />
-				<hr style="border:1px dotted silver" /><br />
-				<?endforeach;?>	
-				<? else :?>
-				<div class="ui-state-error ui-corner-all">
-				<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>
-					Aucun FINANCIAL.ANNUAL_ACCOUNT_FILED
-				</p>
-				</div>
-				<? endif; ?>
-			</div>
-			<h3>FINANCIAL.CAPITAL_CHANGE</h3>
-			<div>
-			<?php if(isset($this->val['FINANCIAL.CAPITAL_CHANGE'])):?>
-				<?foreach ($this->val['FINANCIAL.CAPITAL_CHANGE'] as $report):?>
-				<h2 class="radius">Données officielles</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>ProviderEventId</b></div> <div class="right_div"><?emp_check($report->ProviderEventId)?></div></div>
-				  <div><div class="left_div"><b>InternalEventId</b></div> <div class="right_div"><?emp_check($report->InternalEventId)?></div></div>
-				  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->CompanyId)?></div></div>
-				  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->CompanyName[0]->_)?></div></div>
-				  <div><div class="left_div"><b>EventCode </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->EventCode)?></div></div>
-				  <div><div class="left_div"><b>Source </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Source->_)?></div></div>
-				  <div><div class="left_div"><b>Description </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Description->_)?></div></div>
-				  <div><div class="left_div"><b>FreeText </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->FreeText->_)?></div></div>
-				</div>
-				<br /><br />
-				<h2 class="radius">Parameterized Description</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>ProviderEventId</b></div> <div class="right_div"><?emp_check($report->ProviderEventId)?></div></div>
-				  <div><div class="left_div"><b>DescriptionElement </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->ParameterizedDescription->DescriptionElement->_)?></div></div>
-					<?foreach ($report->Company->Event[0]->ParameterizedDescription->Parameter as $Parameter):?>
-					 <div><div class="left_div"><b>Parameter</b></div> <div class="right_div"><?emp_check($Parameter->_)?></div></div>
-					<?endforeach;?>	
-				</div>
-				<br /><br />
-				<h2 class="radius">Old ShareCapital</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>AuthorizedCapital </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->ShareCapital->AuthorizedCapital->_)?></div></div>
-				  <div><div class="left_div"><b>Currency </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->ShareCapital->AuthorizedCapital->currency)?></div></div>
-				</div><br /><br />
-				<h2 class="radius">New ShareCapital</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>AuthorizedCapital </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->ShareCapital->AuthorizedCapital->_)?></div></div>
-				  <div><div class="left_div"><b>Currency </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->ShareCapital->AuthorizedCapital->currency)?></div></div>
-				</div><br /><br />
-				<hr style="border:1px dotted silver" /><br />
-				<?endforeach;?>	
-				<? else :?>
-				<div class="ui-state-error ui-corner-all">
-				<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>
-					Aucun FINANCIAL.CAPITAL_CHANGE
-				</p>
-				</div>
-				<? endif; ?>
-			</div>
-			<h3>FINANCIAL.CREDIT_RECOMMENDATION_CHANGE</h3>
-			<div>
-			<?php if(isset($this->val['FINANCIAL.CREDIT_RECOMMENDATION_CHANGE'])):?>
-				<?foreach ($this->val['FINANCIAL.CREDIT_RECOMMENDATION_CHANGE'] as $report):?>
-				<h2 class="radius">Données officielles</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>ProviderEventId</b></div> <div class="right_div"><?emp_check($report->ProviderEventId)?></div></div>
-				  <div><div class="left_div"><b>InternalEventId</b></div> <div class="right_div"><?emp_check($report->InternalEventId)?></div></div>
-				  <div><div class="left_div"><b>CompanyId </b></div> <div class="right_div"><?emp_check($report->Company->CompanyId)?></div></div>
-				  <div><div class="left_div"><b>CompanyName </b></div> <div class="right_div"><?emp_check($report->Company->CompanyName[0]->_)?></div></div>
-				  <div><div class="left_div"><b>EventCode </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->EventCode)?></div></div>
-				  <div><div class="left_div"><b>Source </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Source->_)?></div></div>
-				  <div><div class="left_div"><b>Description </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Description->_)?></div></div>
-				  <div><div class="left_div"><b>FreeText </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->FreeText->_)?></div></div>
-				</div>
-				<br /><br />
-				<h2 class="radius">Old CreditRecommendation</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>RatingName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CreditRecommendation[0]->RiskClasses->CommonRiskClass->RatingName->_)?></div></div>
-				  <div><div class="left_div"><b>RatingValue </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[0]->Company[0]->CreditRecommendation[0]->RiskClasses->CommonRiskClass->RatingValue)?></div></div>
-				</div><br /><br />
-				<h2 class="radius">New CreditRecommendation</h2><br /><br />
-				<div class="gen_div">
-				  <div><div class="left_div"><b>RatingName </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CreditRecommendation[0]->RiskClasses->CommonRiskClass->RatingName->_)?></div></div>
-				  <div><div class="left_div"><b>RatingValue </b></div> <div class="right_div"><?emp_check($report->Company->Event[0]->Value[1]->Company[0]->CreditRecommendation[0]->RiskClasses->CommonRiskClass->RatingValue)?></div></div>
-				</div><br /><br />
-				<hr style="border:1px dotted silver" /><br />
-				<?endforeach;?>
-				<? else :?>
-				<div class="ui-state-error ui-corner-all">
-				<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>
-					Aucun FINANCIAL.CREDIT_RECOMMENDATION_CHANGE
-				</p>
-				</div>
-				<? endif; ?>
-			</div>
-			<h3>EXCEPTION.BANKRUPTCY_OR_LIQUIDATION</h3>
-			<div>
-			<?php if(isset($this->val['EXCEPTION.BANKRUPTCY_OR_LIQUIDATION'])):?>
-				<?foreach ($this->val['EXCEPTION.BANKRUPTCY_OR_LIQUIDATION'] as $report):?>
-				<pre><?print_r($report);?></pre>
-				<?endforeach;?>	
-				<? else :?>
-				<div class="ui-state-error ui-corner-all">
-				<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>
-					Aucun EXCEPTION.BANKRUPTCY_OR_LIQUIDATION
-				</p>
-				</div>
-			<? endif; ?>
-			</div>
-			<h3>EXCEPTION.DEBT_RESTRUCTURING</h3>
-			<div>
-			<?php if(isset($this->val['EXCEPTION.DEBT_RESTRUCTURING'])):?>
-				<?foreach ($this->val['EXCEPTION.DEBT_RESTRUCTURING'] as $report):?>
-				<pre><?print_r($report);?></pre>
-				<?endforeach;?>	
-				<? else :?>
-				<div class="ui-state-error ui-corner-all">
-				<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>
-					Aucun EXCEPTION.DEBT_RESTRUCTURING
-				</p>
-				</div>
-				<? endif; ?>
-			</div>
-			<h3>EXCEPTION.PROTEST_OR_NONPAYMENT</h3>
-			<div>
-			<?php if(isset($this->val['EXCEPTION.PROTEST_OR_NONPAYMENT'])):?>
-				<?foreach ($this->val['EXCEPTION.PROTEST_OR_NONPAYMENT'] as $report):?>
-				<pre><?print_r($report);?></pre>
-				<?endforeach;?>	
-				<? else :?>
-				<div class="ui-state-error ui-corner-all">
-				<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>
-					Aucun EXCEPTION.PROTEST_OR_NONPAYMENT
-				</p>
-				</div>
-				<? endif; ?>
-			</div>
-		</div>
-	</div>
-	
-</div>

application/views/default/scripts/giant/search.phtml

@@ -6,8 +6,8 @@
         <p align="center"><b>
         <?php echo number_format($this->resultats->NumberOfHits, 0, ',', ' ')?>
         réponses avec les critères <a href="<?php echo $this->lienReferer;?>">"<?php echo $this->referer; ?>"</a>.
-         <?php echo $this->userMaxResult;?> résultats affichés.
-         Page <?php echo $this->page + 1 .'/'. $this->resultats->NumberOfHits?>.</b>
+         <?php echo ($this->resultats->NumberOfHits>$this->userMaxResult)?$this->userMaxResult:$this->resultats->NumberOfHits?> résultats affichés.
+         Page <?php echo $this->page + 1 .'/'.round($this->resultats->NumberOfHits/$this->userMaxResult)?></b>
         </p>
         <ol start="<?php echo ($this->userMaxResult * $this->page) + 1; ?>">
         <?php foreach ($this->resultats->Results->Company as $resultat) :?>
@@ -15,7 +15,7 @@
                 <?php echo $this->action('identite', 'debug', null, array('resultat' => $resultat, 'soap' => $this->soap));?>
         <?php endif;?>
             <li>
-                <?php echo $this->partial('giant/partials/rowSearch.phtml', array('resultat' => $resultat, 'pays', $this->pays));?>
+                <?php echo $this->partial('giant/partials/rowSearch.phtml', array('resultat' => $resultat, 'TestCompanies' => $this->TestCompanies, 'pays', $this->pays));?>
             </li>
         <?php endforeach;?>
         </ol>

application/views/default/scripts/giant/startmonitoring.phtml

@@ -1,13 +1,14 @@
 <div id="center">
 <form>
-<input type="hidden" name="CompanyId" value="<?=$this->CompanyId?>" />
 <input type="hidden" name="Pays" value="<?=$this->Pays?>" />
 <input type="hidden" name="action" value="<?=$this->action?>" />
+<input type="hidden" name="CompanyName" value="<?=$this->CompanyName?>" />
 <p>
-<strong>CompanyId:  </strong><?=$this->CompanyId?><br /><br />
-<strong>Company Name:  </strong><?=$this->CompanyName?><br /><br />
+
 
 <div style='width: 250px; float: left;'>
+<strong>CompanyId:  </strong><br />
+<input type="text" name="CompanyId" value="<?=$this->CompanyId?>" <?if (!empty($this->CompanyId)):?>disabled="disabled"<?endif?> required /><br /><br />
 <strong>Category Name: </strong><br />
 <select name="CategoryName" class="all_select">
 			  		 <option  value='All'>All</option>
@@ -26,6 +27,19 @@
 </select><br /><br />
 </div>
 <div>
+<strong>Country: </strong><br />
+<?if (!empty($this->CompanyId)):?>
+<?php $country = array ('FR'=>'France','BE'=>'Belgium','ES'=>'Spain','GB'=>'United Kingdom','NL'=>'The Netherlands',)?>
+<select name="Pays" class="all_select" required>
+			  		 <option value="FR"><?= $country[$this->Pays] ?></option>
+</select><br /><br />
+<?else:?>
+<select name="Pays" class="all_select" required>
+<?foreach($this->countries as $key=>$pays):?>
+	 <option value="<?=$key?>"><?=$pays?></option>
+<?endforeach?>
+</select><br /><br />
+<?endif?>
 <strong>Preferred Start Date: </strong><br />
 <input type="text" class='datepicker' name="StartDate" value=""/> optional<br /><br />
 <strong>Preferred End Date: </strong><br />
@@ -61,4 +75,5 @@
 	</div>
 	<?endif?>
 </div>
-<script type="text/javascript" src="/themes/default/scripts/giant_monitoring.js" />
+<script type="text/javascript" src="/themes/default/scripts/giant_monitoring.js" />
+<script type="text/javascript" src="/themes/default/scripts/giant.js" />

application/views/default/scripts/giant/stopmonitoring.phtml

@@ -9,7 +9,7 @@
 
 <div style='width: 250px; float: left;'>
 <strong>Internal Order Id: </strong><br />
-<input type="text" name="InternalOrderId" value="" required /><br /><br />
+<input type="text" name="InternalOrderId" value="<?=$this->InternalOrderId?>" required /><br /><br />
 </div>
 <div>
 <strong>Preferred End Date: </strong><br />

application/views/default/scripts/giant/updatemonitoring.phtml

@@ -9,7 +9,7 @@
 
 <div style='width: 250px; float: left;'>
 <strong>Internal Order Id: </strong><br />
-<input type="text" name="InternalOrderId" value="" required /><br /><br />
+<input type="text" name="InternalOrderId" value="<?=$this->InternalOrderId?>" required /><br /><br />
 <strong>New Category Name: </strong><br />
 <select name="CategoryName" class="all_select">
 					 <option  value=''></option>

application/views/default/scripts/header.phtml

@@ -7,25 +7,25 @@
 <div class="icones">
 <?php if ($this->print) {?>
 <a target="_blank" title="Impression" href="/editer/ecran/<?=$this->print.'.html'?>">
-<img alt="Impression" src="/themes/default/images/interfaces/printer.png">
+<img alt="<?=$this->translate("Impression")?>" src="/themes/default/images/interfaces/printer.png">
 </a>
 <?php }?>
 
 <?php if ($this->pdf) {?>
 <a target="_blank" title="Impression PDF" href="/editer/pdf/<?=$this->pdf.'.pdf'?>">
-<img alt="Impression" src="/themes/default/images/interfaces/pdf.png">
+<img alt="<?=$this->translate("Impression en PDF")?>" src="/themes/default/images/interfaces/pdf.png">
 </a>
 <?php }?>
 
 <?php if ($this->xml) {?>
 <a target="_blank" title="Export XML" href="/editer/xml/<?=$this->xml.'.xml'?>">
-<img alt="Export en XML" src="/themes/default/images/interfaces/xml.png">
+<img alt="<?=$this->translate("Export en XML")?>" src="/themes/default/images/interfaces/xml.png">
 </a>
 <?php }?>
 
 <?php if ($this->aide) {?>
 <a id="aideLigne" title="Aide en ligne" href="#">
-<img alt="Export en XML" src="/themes/default/images/interfaces/aideligne.png">
+<img alt="<?=$this->translate("Activer l'aide en ligne")?>" src="/themes/default/images/interfaces/aideligne.png">
 </a>
 <?php }?>
 

application/views/default/scripts/identite/carte.phtml

@@ -1,38 +1,60 @@
-<div id="carte" style="width:500px;height:500px"></div>
+<div id="carte" style="width:100%;height:500px"></div>
 <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
 <script type="text/javascript">
+<?php echo 'var marks = '.$this->marks.';'?>
 $(document).ready(function(){
-	var myOptions = {
-    	zoom: 16,
-		center: new google.maps.LatLng(<?=$this->marqueurs[0][0]?>,
-										<?=$this->marqueurs[0][1]?>),
-		mapTypeId: google.maps.MapTypeId.ROADMAP
-	}
-	var map = new google.maps.Map(document.getElementById('carte'), myOptions);
 
-	<?php for ($i = 0; $i < count($this->marqueurs); ++$i) { ?>
-	var marker = new google.maps.Marker({
-		map: map,
-		position: new google.maps.LatLng(<?=$this->marqueurs[$i][0]?>,
-                                       <?=$this->marqueurs[$i][1]?>),
-		title: "<?=$this->marqueurs[$i][4]?>",
-		icon:  "<?=$this->marqueurs[$i][5]?>"
-	});
-	google.maps.event.addListener(marker, 'click', function() {
-		var infowindow = new google.maps.InfoWindow({
-			content: "<?=$this->marqueurs[$i][3]?>"
+	var zoneMarker = new google.maps.LatLngBounds();
+
+	//Create the map
+	var geocoder = new google.maps.Geocoder();
+	var initCenter = new google.maps.LatLng(46.227638,2.213749);
+	var mapOptions = {
+    	zoom: 10,
+		center: initCenter,
+		mapTypeId: google.maps.MapTypeId.ROADMAP
+	};
+	var map = new google.maps.Map(document.getElementById('carte'), mapOptions);
+
+	var length = marks.length;
+	for (var i = 0; i < length; i++) {
+		codeAddress(marks, i);
+	}
+
+	map.fitBounds(zoneMarker);
+
+	//Bounds the maps
+	function codeAddress(marks, position) {
+		geocoder.geocode( {'address': marks[position]['address'], region:'FR'}, function(results, status) {
+			if (status == google.maps.GeocoderStatus.OK) {
+
+				var location = results[0].geometry.location;
+
+				if(position==0) {
+					map.setCenter(location);
+	    		}
+
+	    		//Create marker
+				var marker = new google.maps.Marker({
+	            	map: map,
+	            	position: location,
+	            	title: marks[position]['title'],
+	        		icon:  marks[position]['icon'],
+	        	});
+				zoneMarker.extend(marker.getPosition());
+
+	        	//Create event marker
+				google.maps.event.addListener(marker, 'click', function() {
+					var infowindow = new google.maps.InfoWindow({
+						content: marks[position]['text']
+					});
+					var pos = new google.maps.Marker({
+			    		position: location
+					});
+			    	infowindow.open(map, pos);
+				});
+			}
 		});
-		var pos = new google.maps.Marker({
-    		position: new google.maps.LatLng(<?=$this->marqueurs[$i][0]?>,
-                                         	<?=$this->marqueurs[$i][1]?>)
-		});
-    	infowindow.open(map, pos);
-	});
-    <?php } ?>
-    <?php if (count($this->marqueurs) > 1) { ?>
-	map.fitBounds(new google.maps.LatLngBounds(
-    				new google.maps.LatLng(<?=$this->min_x?>, <?=$this->min_y?>),
-					new google.maps.LatLng(<?=$this->max_x?>, <?=$this->max_y?>)));
-    <?php } ?>
+	}
 });
 </script>

application/views/default/scripts/identite/contacts.phtml

@@ -0,0 +1,164 @@
+<div id="center">
+
+<h1 class="titre">DONNEES DE CONTACTS</h1>
+
+<div class="paragraph">
+<table class="identite">
+<tr>
+    <td width="30">&nbsp;</td>
+    <td width="200" class="StyleInfoLib">Num&eacute;ro identifiant Siren</td>
+    <td width="350" class="StyleInfoData"><?=$this->SirenTexte($this->siren)?></td>
+</tr>
+<tr>
+    <td width="30">&nbsp;</td>
+    <td width="200" class="StyleInfoLib">Dénomination Sociale</td>
+    <td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
+</tr>
+</table>
+</div>
+
+<h2>Historique des données de contact</h2>
+<div class="paragraph clearfix">
+<?php if ($this->all) {?>
+<?php
+$url = $this->url(array('controller'=>'identite', 'action'=>'contacts','siret'=>$this->siret), null, true);
+?>
+<div style="float:left;">
+<a href="<?=$url?>">Uniquement les contacts de l'établissement</a>
+</div>
+<?php } else {?>
+<?php
+$url = $this->url(array(
+		'controller'=>'identite', 'action'=>'contacts',
+		'siret'=>$this->siret, 'get'=> 'all'
+), null, true);
+?>
+<div style="float:left;">
+<a href="<?=$url?>">Tous les contacts de l'entreprise</a>
+</div>
+<?php }?>
+
+<div id="radioset" style="float:right;">
+Filtre :
+<input type="radio" name="filtre" id="tel"><label <?php if($this->filter=='tel') { echo ' class="ui-state-active"'; }?>data-url="<?=$url?>" for="tel">Téléphone</label>
+<input type="radio" name="filtre" id="fax"><label <?php if($this->filter=='fax') { echo ' class="ui-state-active"'; }?>data-url="<?=$url?>" for="fax">Fax</label>
+<input type="radio" name="filtre" id="mail"><label <?php if($this->filter=='mail') { echo ' class="ui-state-active"'; }?>data-url="<?=$url?>" for="mail">e-Mail</label>
+<input type="radio" name="filtre" id="web"><label <?php if($this->filter=='web') { echo ' class="ui-state-active"'; }?>data-url="<?=$url?>" for="web">Web</label>
+<input type="radio" name="filtre" id="remove"><label data-url="<?=$url?>" for="remove">Sans filtres</label>
+</div>
+<script>
+$('#radioset').buttonset();
+$('input[name=filtre]').click(function(e){
+	e.preventDefault();
+	var label = $(this).attr('id');
+	if (label=='remove') {
+		window.location.href = $('label[for='+label+']').data('url');
+	} else if ( $('label[for='+label+']').hasClass('ui-state-active') ) {
+		window.location.href = $('label[for='+label+']').data('url')+'/filter/'+label;
+	}
+});
+</script>
+</div>
+
+<div class="paragraph clearfix">
+
+<?php if ( $this->edition ) {?>
+<div style="line-height:16px;">
+<a class="dialog" title="Ajouter un contact" href="<?=$this->url(array('controller'=>'saisie','action'=>'contact','mode'=>'add','siret'=>$this->siret), null, true)?>">
+<img style="vertical-align:middle;" src="/themes/default/images/interfaces/ajouter.png" /> Ajouter un contact</a>
+</div>
+<?php }?>
+
+<?php if ( count($this->contacts) == 0 ){?>
+Aucun contacts.
+<?php } else {?>
+
+<table class="data">
+<tr>
+	<th>SIREN / SIRET</th>
+	<th>Type</th>
+	<th>Contact</th>
+	<th>Description</th>
+	<th>Mise à jour</th>
+</tr>
+<?php foreach($this->contacts as $item) {?>
+<?php
+$class = '';
+if ($item->deleted) {
+    $class = ' class="deleted"';
+}
+?>
+<tr<?=$class?>>
+	<td><?=$this->SiretTexte($item->siren.$item->nic)?></td>
+	<td>
+	<?php
+	switch($item->type) {
+		case 'fax': echo "Fax"; break;
+		case 'mail': echo "E-mail"; break;
+		case 'tel': echo "Téléphone"; break;
+		case 'web': echo "Site Web"; break;
+		case 'mob': echo "Tel. Mobile"; break;
+	}
+	?>
+	</td>
+	<td>
+	<?php if ($item->type=='fax' || $item->type=='tel' || $item->type=='mob') {?>
+	<?=substr(chunk_split($item->value, 2, '.'), 0, -1)?>
+	<?php } else if ($item->type=='web') {?>
+	<a href="<?=$item->value?>" target="_blank"><?=$item->value?></a>
+	<?php } else if ($item->type=='mail') {?>
+	<a href="mailto:<?=$item->value?>" target="_blank"><?=$item->value?></a>
+	<?php } else {?>
+	<?=$item->value?>
+	<?php }?>
+
+	<?php if( $this->edition ) {?>
+	<div style="float:right;">
+	<a class="dialog" title="Modifier le contact" href="<?=$this->url(array('controller'=>'saisie','action'=>'contact','mode'=>'edit','id'=>$item->id), null, true)?>"><img src="/themes/default/images/interfaces/editer.png" /></a>
+    <a class="dialog" title="Supprimer le contact" href="<?=$this->url(array('controller'=>'saisie','action'=>'contact','mode'=>'delete','id'=>$item->id), null, true)?>"><img src="/themes/default/images/interfaces/supprimer.png" /></a>
+	</div>
+	<?php }?>
+	</td>
+	<td><?=$item->description?></td>
+	<td>
+	<?php
+	if (intval($item->date)>0) {
+		$date = new Zend_Date($item->date, 'yyyyMMdd');
+		echo $date->toString('dd/MM/yyyy');
+	}
+	?>
+	</td>
+</tr>
+<?php }?>
+</table>
+<?php }?>
+</div>
+
+</div>
+
+<?php if ($this->edition) {?>
+<script>
+$('a.dialog').on('click', function(){
+	var href = $(this).attr('href');
+	if (href!='#') {
+		var title = $(this).attr('title');
+		var dialogOpts = {
+			bgiframe: true,
+			title: title,
+			width: 600,
+			height: 300,
+			modal: true,
+			open: function(event, ui) {
+				$(this).html('Chargement...').load(href);
+			},
+			buttons: {
+				Quitter: function() { $(this).dialog('close'); }
+			},
+			close: function() { $('#dialog').remove(); }
+		};
+		$('<div id="dialog"></div>').dialog(dialogOpts);
+		return false;
+	}
+});
+</script>
+<?php }?>

application/views/default/scripts/identite/corporama.phtml

@@ -0,0 +1,11 @@
+<?php if ( isset($this->page) ) {?>
+
+<?=$this->page?>
+
+<?php } else {?>
+
+<div id="center" style="padding:0;">
+<iframe src="<?=$this->corporamaUrl?>" width="100%" height="1000px" style="border:0;overflow-x:hidden;"></iframe>
+</div>
+
+<?php }?>

application/views/default/scripts/identite/etablissements.phtml

@@ -1,35 +1,29 @@
 <div id="center">
-<h1>LISTE DES &Eacute;TABLISSEMNTS</h1>
+<h1><?=$this->translate("LISTE DES &Eacute;TABLISSEMNTS")?></h1>
 <div class="paragraph">
 <table class="identite">
 <tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">
-      Num&eacute;ro identifiant Siren
-    </td>
-    <td width="350" class="StyleInfoData">
-      <?=$this->SirenTexte($this->siren)?>
-    </td>
+    <td width="200" class="StyleInfoLib"><?=$this->translate("Num&eacute;ro identifiant Siren")?></td>
+    <td width="350" class="StyleInfoData"><?=$this->SirenTexte($this->siren)?></td>
 </tr>
 <tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">Raison Sociale</td>
+    <td width="200" class="StyleInfoLib"><?=$this->translate("Dénomination Sociale")?></td>
     <td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
 </tr>
-<?php
-if ($this->actif == -1 && is_array($this->etabs) && count($this->etabs)>0){
-?>
+<?php if ($this->actif == -1 && is_array($this->etabs) && count($this->etabs)>0){ ?>
 <tr>
 	<td width="30">&nbsp;</td>
 	<td colspan="2" class="StyleInfoData">
-	L'entreprise à <?=$this->nbEtabActif?> établissement<?php if ($this->nbEtabActif>0) echo 's';?> actif<?php if ($this->nbEtabActif>0) echo 's';?>
-	et <?=$this->nbEtabRadie?> établissement<?php if ($this->nbEtabRadie>0) echo 's';?> radié<?php if ($this->nbEtabRadie>0) echo 's';?>.
+	<?=$this->translate($this->translate()->getTranslator()->plural("L'entreprise a %1\$s établissement actif", "L'entreprise a %1\$s établissements actifs", $this->nbEtabActif), $this->nbEtabActif);?>
+	<?=$this->translate($this->translate()->getTranslator()->plural("et %1\$s établissement radié", "et %1\$s établissements radiés", $this->nbEtabRadie), $this->nbEtabRadie);?>
 	</td>
 </tr>
-<?php } ?>
+<?php }?>
 <tr>
 	<td width="30">&nbsp;</td>
-	<td width="200" class="StyleInfoLib">Actif/Inactif</td>
+	<td width="200" class="StyleInfoLib"><?=$this->translate("Actif")?> / <?=$this->translate("Inactif")?></td>
 	<td width="350" class="StyleInfoData">
 	<form name="options" method="post" action="<?=$this->url(array(
 				'action' => 'etablissements',
@@ -37,9 +31,9 @@ if ($this->actif == -1 && is_array($this->etabs) && count($this->etabs)>0){
 				'id' => $this->id,
 			));?>">
 	<select name="actif">
-	<option value="-1"<?=($this->actif==-1)? ' selected' : '';?>>Tous</option>
-	<option value="1"<?=($this->actif==1)? ' selected' : '';?>>Actif</option>
-	<option value="0"<?=($this->actif==0)? ' selected' : '';?>>Inactif</option>
+	<option value="-1"<?=($this->actif==-1)? ' selected' : '';?>><?=$this->translate("Tous")?></option>
+	<option value="1"<?=($this->actif==1)? ' selected' : '';?>><?=$this->translate("Actif")?></option>
+	<option value="0"<?=($this->actif==0)? ' selected' : '';?>><?=$this->translate("Inactif")?></option>
 	</select>
 	<input type="submit" name="selection" value="Ok">
 	</form>
@@ -51,7 +45,7 @@ if ($this->actif == -1 && is_array($this->etabs) && count($this->etabs)>0){
 
 <h2>&Eacute;tablissements</h2>
 <div class="paragraph">
-<table>
+<table style="width:100%;">
 <tr>
 	<td width="30">&nbsp;</td>
 	<td colspan="2" width="550" class="StyleInfoData">
@@ -63,11 +57,12 @@ if ($this->actif == -1 && is_array($this->etabs) && count($this->etabs)>0){
 		{
 			if ($etab->Siege==1)	$type = 'siège ';
 			else 					$type = 'établ. ';
+
 			if ($etab->Actif==1)	$type.= 'actif';
 			else 					$type.= 'inactif';
-	
+
 			if(intval($etab->Nic)==0 || intval($etab->Nic)>=99990) $type.=' provisoire';
-	
+
 			$href = $this->url(array(
 				'controller' => 'identite',
 				'action' => 'fiche',
@@ -77,7 +72,7 @@ if ($this->actif == -1 && is_array($this->etabs) && count($this->etabs)>0){
 			?>
 			<tr>
 			<td class="StyleInfoData" width="30">
-				<b><a title="Voir la fiche d'identité" href="<?=$href?>"><?=$etab->Nic?></a></b>
+				<b><a title="<?=$this->translate("Voir la fiche d'identité")?>" href="<?=$href?>"><?=$etab->Nic?></a></b>
 			</td>
 			<td class="StyleInfoData" width="80"><?=$type?></td>
 			<td class="StyleInfoData" width="190">

application/views/default/scripts/identite/evenements.phtml

@@ -2,42 +2,43 @@
 <h1>LISTE DES &Eacute;V&Eacute;NEMENTS</h1>
 <div class="paragraph">
 <table class="identite">
-  <tr>
+<tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">
-      Num&eacute;ro identifiant Siren
-    </td>
-    <td width="350" class="StyleInfoData">
-      <?=$this->SirenTexte($this->siren)?>
-    </td>
-  </tr>
-  <tr>
+    <td width="200" class="StyleInfoLib">Num&eacute;ro identifiant Siren</td>
+    <td width="350" class="StyleInfoData"><?=$this->SirenTexte($this->siren)?></td>
+</tr>
+<tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">Raison Sociale</td>
+    <td width="200" class="StyleInfoLib">Dénomination Sociale</td>
     <td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
-  </tr>
-  <tr>
+</tr>
+<tr>
     <td width="30">&nbsp;</td>
     <td colspan="2" width="550" class="StyleInfoData">
-     <?=$this->action('infos','surveillance', null, array(
-     	'source' => 'insee',
-     	'siret' => $this->siret
-     ))?>
-	</td>
-  </tr>
+    <?=$this->action('infos','surveillance',null,array('source' => 'insee','siret'=>$this->siret))?>
+    </td>
+</tr>
 </table>
 </div>
 
 <h2>&Eacute;v&eacute;nements INSEE</h2>
-<style>
-table.data td { border-bottom:1px solid #ccc; padding:5px; }
-</style>
+
+<?php if ( count($this->evens)==0 ) { ?>
+<div class="paragraph">
+<table class="data">
+<tr>
+    <td class="StyleInfoData" width="580">
+		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+    Aucun &eacute;v&egrave;nement n'est pr&eacute;sent dans notre base
+    </td>
+</tr>
+</table>
+</div>
+<?php } else { ?>
 <div class="paragraph">
 <table class="data">
 <?php
-if (count($this->evens)>0) {
-	foreach ($this->evens as $i=>$even)
-	{
+	foreach ($this->evens as $i=>$even) {
 		if ($even->Siege==1)	$type='siège';
 		else 					$type='établissement';
 		$lien = '<a title="Voir la fiche d\'identité" href="'.$this->url(array(
@@ -54,11 +55,13 @@ if (count($this->evens)>0) {
 		?>
 		<tr>
 		<td class="StyleInfoLib" width="80" valign="top">
-			<?=WDate::dateT('Ymd','d/m/Y',$even->DateInfo)?>
+		<?php $date = new Zend_Date($even->DateInfo, 'yyyyMMdd')?>
+		<?=$date->toString('dd/MM/yyyy')?>
 		</td>
 		<td class="StyleInfoData" width="580">
+			<?php $date = new Zend_Date($even->EvenDate, 'yyyyMMdd')?>
 			<b><?=$even->EvenLib?></b>&nbsp;<i> - NIC <?=$lien.$even->Nic.'</a>'?>
-			le <?=WDate::dateT('Ymd','d/m/Y',$even->EvenDate)?></i>
+			le <?=$date->toString('dd/MM/yyyy')?></i>
 		<?php
 		if (trim($even->EvenLibDet)<>'')
 			echo '<br/>'.str_replace(', ','<br/>', $even->EvenLibDet);
@@ -69,20 +72,24 @@ if (count($this->evens)>0) {
 		?>
 		</td>
 		</tr>
-	<?php
-	}
-} elseif ( count($evens)==0 ) {
-?>
-	<tr>
-		<td class="StyleInfoData" width="580">
-		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-		Aucun &eacute;v&egrave;nement n'est pr&eacute;sent dans notre base
-		</td>
-	</tr>
-<?php }?>
+	<?php }?>
 </table>
 </div>
 
+<?php if ($this->PageTotal>1) {?>
+<div class="paragraph">
+<div class="pagination clearfix">
+<a class="first" href="<?=$this->url(array('page'=>1))?>">&laquo;</a>
+<a class="previous" href="<?=$this->url(array('page'=>$this->PagePrev))?>">&lsaquo;</a>
+<span>Page <?=$this->PageCurrent?>/<?=$this->PageTotal?></span>
+<a class="next" href="<?=$this->url(array('page'=>$this->PageNext))?>">&rsaquo;</a>
+<a class="last" href="<?=$this->url(array('page'=>$this->PageTotal))?>">&raquo;</a>
+</div>
+</div>
+<?php }?>
+
+<?php }?>
+
 <?php if (empty($this->AutrePage)) {?>
 <?=$this->render('cgu.phtml', $this->cgu)?>
 </div>

application/views/default/scripts/identite/facade.phtml

@@ -1,92 +0,0 @@
-<?php if ($this->source == 'google'):?>
-<div id="infogeo_photo">
-	<div id="legende-photo" style="display: block;">
-    Cliché à l'approche de l'adresse postale.
-	</div>
-	<div>
-	<img id="pp-cb-thumb" src="http://cbk0.google.com/cbk?output=thumbnail&w=150&h=69&ll=<?=$this->infos->GeoLat.','.$this->infos->GeoLon?>" width="300px" height="128px" />
-	</div>
-</div>
-<script type="text/javascript" src="http://maps.google.com/maps?file=api&v=2&key=<?=$this->googleKey?>"></script>
-<script type="text/javascript">
-function affichePhoto() {
-<?php if ($this->infos->GeoPrecis < 7) {?>
-	var geoCoder = new GClientGeocoder;
-    geoCoder.getLocations("<?=$this->infos->AdresseNum.' '.
-		$this->infos->AdresseRue.' '.
-		$this->infos->CP.' '.
-        $this->infos->Ville?>", geoCodeCB);
-<?php } else { ?>
-   	var ll = new GLatLng(<?=$this->infos->GeoLat?>, <?=$this->infos->GeoLon?>);
-	doShowPanoData(ll);
-<?php } ?>
-}
-
-function geoCodeCB(reponse) {
-	if (reponse &&
-    	reponse.Status.code == 200 &&
-        reponse.Placemark.length == 1 &&
-        reponse.Placemark[0].AddressDetails.Accuracy > 5) {
-        var lat = reponse.Placemark[0].Point.coordinates[1];
-        var lon = reponse.Placemark[0].Point.coordinates[0];
-        var ll = new GLatLng(lat, lon);
-        doShowPanoData(ll);
-	}
-}
-
-function showPanoData(panoData) {
-    if (panoData.code != 200) {
-        return;
-    }
-    $('#pp-cb-thumb').replaceWith(
-    	'<div id="pp-cb-thumb"><div class="left">' +
-         '<img src="http://maps.google.fr/cbk?output=tile&panoid=' +
-               panoData.location.panoId +
-               '&zoom=1&x=0&y=0&cb_client=maps_sv" />' +
-        '</div>' +
-        '<div class="right">' +
-          '<img src="http://maps.google.fr/cbk?output=tile&panoid=' +
-               panoData.location.panoId +
-              '&zoom=1&x=1&y=0&cb_client=maps_sv" />' +
-        '</div></div>');
-
-    $('#legende-photo'  ).css('display','block');
-    $('#pp-cb-thumb'    ).css('display','block');
-}
-
-function doShowPanoData(ll) {
-    var panoClient = new GStreetviewClient();
-    panoClient.getNearestPanorama(ll, showPanoData);
-}
-
-$(document).ready(function() {
-	if ($('#pp-cb-thumb').length) {
-    	affichePhoto();
-	}
-});
-</script>
-<?php elseif ($this->source == 'mappy'):?>
-<div><img id="pp-cb-thumb" width="300px" /></div>
-<script src="<?=$this->lienJs?>"></script>
-<script type="text/javascript">
-$(document).ready(function() {
-	var photoService = new Mappy.api.visiocity.PhotoService();
-    var geo = new Mappy.api.geolocation.Geocoder();
-
-    var address = "<?=$this->adresse?>";
-	geo.geocode(address, function(result) {
-		photoService.search(result[0], "f", serviceHandler);
-	}, function(error) {});
-
-	var serviceHandler = function(result) {
-    	if (result instanceof Mappy.api.visiocity.Frontage) {
-        	var current = result.getCurrent();
-            var img = $('<img src="' + current.getURL(320, null) +
-            	'" alt="' + current.getDescription() +
-                '" width="300px" />');
-			$('#pp-cb-thumb').replaceWith(img);
-		}
-	};
-});
-</script>
-<?php endif;?>

application/views/default/scripts/identite/fiche.phtml

@@ -19,7 +19,7 @@
 <div class="paragraph" style="text-align:right;">
 	<?php if (!empty($this->dateDerMaj)) { ?>
 	<a class="datemaj" href="#">
-	Dernière mise à jour<?=$this->dateDerMaj?>
+	<?=$this->translate("Dernière mise à jour le")?> <?=$this->dateDerMaj?>
 	<span><?=$this->datemajTexte?></span>
 	</a>
 	<?php }?>
@@ -34,7 +34,7 @@
 <?php }?>
 
 <?php if ( empty($this->AutrePage) ) {?>
-<h1 class="titre">FICHE D'IDENTIT&Eacute;</h1>
+<h1 class="titre"><?=$this->translate("FICHE D'IDENTIT&Eacute;");?></h1>
 <?php }?>
 
 <div class="paragraph">
@@ -56,8 +56,42 @@ echo $this->partial('identite/fiche-item.phtml', $this->dBlock['AutreSiren']);
 </table>
 </div>
 
-<h2>Raison sociale &amp; Coordonnées</h2>
+<h2><?=$this->translate("Dénomination sociale &amp; Coordonnées")?></h2>
 <div class="paragraph">
+
+<?php if ( empty($this->AutrePage) && $this->accessWorldCheck) { ?>
+<div style="float:right;">
+<img style="cursor:pointer;" class="wcheck" data-url="<?=$this->url(array(
+	'controller'=>'worldcheck',
+	'action'=>'occurence',
+	'dirSociete'=>$this->infos->Nom,
+	'dirSocNom2'=>$this->infos->Nom2,
+	'dirSocNomLong'=>$this->infos->NomLong,
+	'dirSocCommercial'=>$this->infos->NomCommercial,
+	'dirSocSigle'=>$this->infos->Sigle,
+	'dirSocSigleLong'=>$this->infos->SigleLong,
+	'dirSocEnseigne'=>$this->infos->Enseigne,
+	'dirSocEnseigneLong'=>$this->infos->EnseigneLong,
+	'dirType' =>'ORGANISATION',
+	'siren'=>substr($this->siret, 0, 9)
+), null, true)?>" src="/themes/default/images/worldcheck/wc.png"/>
+</div>
+<script>
+$('img.wcheck').each(function(){
+	$(this).qtip({
+		hide: { event: 'unfocus' },
+		show: { solo: true, delay: 500 },
+		content: {
+			button: true,
+			title: 'WorlCheck',
+			text: "Chargement...",
+			ajax: { url: $(this).data('url') } },
+		position: { my: 'right center', at: 'left center' }
+	});
+});
+</script>
+<?php }?>
+
 <table>
 <?php
 echo $this->partial('identite/fiche-item.phtml', $this->dBlock['RaisonSociale']);
@@ -77,7 +111,7 @@ echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Mail']);
 </table>
 </div>
 
-<h2>Activité(s) &amp; Chiffre d'affaires</h2>
+<h2><?=$this->translate("Activité(s) &amp; Chiffre d'affaires")?></h2>
 <div class="paragraph">
 <table>
 <?php
@@ -107,6 +141,11 @@ echo $this->partial('identite/fiche-item.phtml', $this->dBlock['EffectifEtab']);
 <?=$this->action('geo', 'identite', null, array('infos' => $this->infos));?>
 <?=$this->action('news', 'identite');?>
 
+<div class="paragraph" style="clear:both;">
+<a href="#" title="Corporama me donne accès à toute la puissance des réseaux sociaux professionnels pour identifier rapidement un interlocuteur et accéder à ses coordonnées">
+Actualités de la société <?=$this->raisonSociale?> sur CORPORAMA</a>
+</div>
+
 <?php if ( !empty($this->surveillance) ) {?>
 <div class="paragraph" style="clear:both;">
 <?=$surveillances?>

application/views/default/scripts/identite/fichepc.phtml

@@ -2,7 +2,7 @@
 span.title { float:right; margin:0 10px; }
 </style>
 <div id="center">
-<h1>FICHE PROC&Eacute;DURE COLLECTIVES</h1>
+<h1>FICHE PROC&Eacute;DURES COLLECTIVES</h1>
 
 <span class="title"><?=date('d/m/Y H:i')?></span>
 
@@ -262,13 +262,13 @@ if(count($this->infos->Organes->item)>0) {
 <?php
 if(isset($this->infos->Identite->dateCessationPaiement) && !empty($this->infos->Identite->dateCessationPaiement) && $this->infos->Identite->dateCessationPaiement!='0000-00-00')
 {
-	$date = WDate::dateT('Y-m-d', 'd/m/Y',$this->infos->Identite->dateCessationPaiement);
+	$date = new Zend_Date($this->infos->Identite->dateCessationPaiement, 'yyyy-MM-dd');
 ?>
 <table>
 <tr>
 	<td width="30">&nbsp;</td>
 	<td width="200" valign="top" class="StyleInfoLib">Cessation des paiements, le</td>
-	<td width="300" class="StyleInfoData"><?=$date?></td>
+	<td width="300" class="StyleInfoData"><?=$date->toString('dd/MM/yyyy')?></td>
 </tr>
 </table>
 <?php

application/views/default/scripts/identite/geo.phtml

@@ -2,6 +2,7 @@
 <div class="paragraph">
 <div id="infogeo" class="clearfix">
 	<div id="infogeo_txt">
+	<?php if ( $this->infos->GeoLat && $this->infos->GeoLon ):?>
     	<span id=geolocalisation>
     		<b>Information géographique :</b><br/>
     		Latitude  : <?=$this->decLat?> (<?=$this->infos->GeoLat?>)<br />
@@ -10,12 +11,13 @@
     	<a id="lien-google" href="<?=$this->mapsHref?>" target="_blank">
             Afficher l'adresse sur Google Map &copy;</a><br/>
         <br/>
+        <?endif;?>
         <b>Code commune / Rivoli :</b><br/>
             <?=$this->infos->Dept.' '.$this->infos->codeCommune.' / '.$this->infos->Rivoli; ?>
 			<?php
 			if (count($this->infos->InfosIris)>0){
 				$InfosIris = $this->infos->InfosIris;
-				$codComIris = str_replace($InfosIris->codIris, '', $InfosIris->codComIris);	
+				$codComIris = str_replace($InfosIris->codIris, '', $InfosIris->codComIris);
 				?>
 				<br/><br/><b>Iris :</b>
 				<?php if (intval($InfosIris->codIris) == 0){ ?>
@@ -25,11 +27,42 @@
 				<br/>Libellé : <a title="Consulter le plan d'assemblage de la commune" href="<?=$this->url(array('controller'=>'identite', 'action'=>'iris', 'code'=>$codComIris), null, true)?>" target="_blank"><?=$InfosIris->libIris?></a>
 				<img title="<?=$InfosIris->typIris?>" style="vertical-align:middle;" src="/themes/default/images/info.gif">
 				<?php }?>
-			<?php }?>           
+			<?php }?>
     </div>
 
-<?php if($this->facade):?>
-<?=$this->action('facade', 'identite', null, array('infos' => $this->infos));?>
-<?php endif;?>
+	<?php if ($this->source == 'google') {?>
+
+	<div id="infogeo_photo">
+	<?=$this->action('streetview', 'identite', null, array(
+			'infos' => $this->infos,
+	));?>
+	</div>
+
+	<?php } elseif ($this->source == 'mappy') {?>
+
+	<div><img id="pp-cb-thumb" width="300px" /></div>
+	<script src="<?=$this->lienJs?>"></script>
+	<script type="text/javascript">
+	$(document).ready(function() {
+	    var serviceHandler = function(result) {
+	    	if (result instanceof Mappy.api.visiocity.Frontage) {
+	        	var current = result.getCurrent();
+	            var img = $('<img src="' + current.getURL(320, null) +
+	            	'" alt="' + current.getDescription() +
+	                '" width="300px" />');
+				$('#pp-cb-thumb').replaceWith(img);
+			}
+		};
+		var address = "<?=$this->adresse?>";
+	    var geo = new Mappy.api.geolocation.Geocoder();
+		var photoService = new Mappy.api.visiocity.PhotoService();
+		geo.geocode(address, function(result) {
+			photoService.search(result[0], 'f', serviceHandler);
+		}, function(error) {});
+	});
+	</script>
+
+	<?php }?>
+
 </div>
 </div>

application/views/default/scripts/identite/groupesarbo.phtml

@@ -1,30 +1,54 @@
-<style>
-.jstree-default a.jstree-search { color: red; }
-</style>
+<style>.jstree-default a.jstree-search { color: red; }</style>
+<div>Tête de groupe
+<select name="isin">
+<option value="1" <?php if($this->isin==1) { echo ' selected'; }?>>coté, détention minimum à 50%</option>
+<option value="0" <?php if($this->isin==0) { echo ' selected'; }?>>détention minimum à 50%</option>
+</select>
+</div>
 <div>
-<?php if ( $this->edition ) {?>
-<span style="margin:0 5px;"><input type="radio" name="pctMin" value="0"<?php
-if ($this->pctMin == 0) echo ' checked';?>> Tout</span>
+Filiales, détention minimum
+<select name="pctMin">
+<?php if( $this->edition ) {?>
+<option value="0" <?php if($this->pctMin==0) { echo ' selected'; }?>>Tout</option>
 <?php }?>
-<span style="margin:0 5px;"><input type="radio" name="pctMin" value="33"<?php
-if ($this->pctMin == 33) echo ' checked';?>> 33%</span>
-<span style="margin:0 5px;"><input type="radio" name="pctMin" value="40"<?php
-if ($this->pctMin == 40) echo ' checked';?>> 40%</span>
-<span style="margin:0 5px;"><input type="radio" name="pctMin" value="50"<?php
-if ($this->pctMin == 50) echo ' checked';?>> 50%</span>
+<option value="33" <?php if($this->pctMin==33) { echo ' selected'; }?>>33%</option>
+<option value="40" <?php if($this->pctMin==40) { echo ' selected'; }?>>40%</option>
+<option value="50" <?php if($this->pctMin==50) { echo ' selected'; }?>>50%</option>
+</select>
+<input id="filter" type="button" value="Filtrer" style="float:right;">
+</div>
+<div>
+<div>
 <input id="text" type="text" value="">
-<input id="search" type="button" value="Recherche">
+<input id="search" type="button" value="Rechercher">
 <input id="clear_search" type="button" value="Initialiser">
 </div>
 <div id="groups" class="jstree jstree-default" style="overflow:auto;"></div>
 <script src="/libs/jstree/jstree.min.js"></script>
 <script>
-$('input[name=pctMin]').on('click', function(e){
-    e.preventDefault();
-    var pct = $(this).val();
-	$('div#dialogarbo').load('<?=$this->url(array('controller'=>'identite','action'=>'groupesarbo','siret'=>$this->siret),null,true)?>/pctMin/'+pct);
-});
+$('#dialogarbo').dialog({ buttons: [
+{ text: "Imprimer", click: function() {
+	var pct = $('select[name=pctMin] option:selected').val();
+    var isin = $('select[name=isin] option:selected').val();
+	window.open('<?=$this->url(array(
+			'controller'=>'identite',
+			'action'=>'groupesarboimg',
+			'siret'=>$this->siret
+	),null,true)?>/pctMin/'+pct+'/isin/'+isin);
+} },
+{ text: "Fermer", click: function() { $(this).dialog("close"); } }
+]});
 
+$('#filter').on('click', function(e){
+    e.preventDefault();
+    var pct = $('select[name=pctMin] option:selected').val();
+    var isin = $('select[name=isin] option:selected').val();
+	$('div#dialogarbo').html('Chargement...').load('<?=$this->url(array(
+			'controller'=>'identite',
+			'action'=>'groupesarbo',
+			'siret'=>$this->siret
+	),null,true)?>/pctMin/'+pct+'/isin/'+isin);
+});
 
 $("#groups").jstree({
 	"core" : { "html_titles" : true },

application/views/default/scripts/identite/groupesarboimg.phtml

@@ -0,0 +1,87 @@
+<style>
+div#menu {display:none;}
+.jstree-default li,
+.jstree-default ins { background-image:url("/libs/jstree/themes/default/d.png"); background-repeat:no-repeat; background-color:transparent; }
+.jstree-default li { background-position:-90px 0; background-repeat:repeat-y; }
+.jstree-default li.jstree-last { background:transparent; }
+.jstree-default .jstree-open > ins { background-position:-72px 0; }
+.jstree-default .jstree-closed > ins { background-position:-54px 0; }
+.jstree-default .jstree-leaf > ins { background-position:-36px 0; }
+
+.jstree-default .jstree-hovered { background:#e7f4f9; border:1px solid #d8f0fa; padding:0 2px 0 1px; }
+.jstree-default .jstree-clicked { background:#beebff; border:1px solid #99defd; padding:0 2px 0 1px; }
+.jstree-default a .jstree-icon { background-position:-56px -19px; }
+.jstree-default a.jstree-loading .jstree-icon { background:url("/libs/jstree/themes/default/throbber.gif") center center no-repeat !important; }
+
+.jstree-default.jstree-focused { background:#ffffee; }
+
+.jstree-default .jstree-no-dots li,
+.jstree-default .jstree-no-dots .jstree-leaf > ins { background:transparent; }
+.jstree-default .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }
+.jstree-default .jstree-no-dots .jstree-closed > ins { background-position:0 0; }
+
+.jstree-default .jstree-no-icons a .jstree-icon { display:none; }
+
+.jstree-default .jstree-search { font-style:italic; }
+
+.jstree-default .jstree-no-icons .jstree-checkbox { display:inline-block; }
+.jstree-default .jstree-no-checkboxes .jstree-checkbox { display:none !important; }
+.jstree-default .jstree-checked > a > .jstree-checkbox { background-position:-38px -19px; }
+.jstree-default .jstree-unchecked > a > .jstree-checkbox { background-position:-2px -19px; }
+.jstree-default .jstree-undetermined > a > .jstree-checkbox { background-position:-20px -19px; }
+.jstree-default .jstree-checked > a > .jstree-checkbox:hover { background-position:-38px -37px; }
+.jstree-default .jstree-unchecked > a > .jstree-checkbox:hover { background-position:-2px -37px; }
+.jstree-default .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-20px -37px; }
+
+#jstree-marker.jstree-default { background:url("/libs/jstree/themes/default/d.png") -41px -57px no-repeat !important; text-indent:-100px; }
+
+.jstree-default a.jstree-search { color:aqua; }
+.jstree-default .jstree-locked a { color:silver; cursor:default; }
+</style>
+<div id="center">
+<div class="paragraph">
+
+<div id="groups" class="jstree jstree-default"></div>
+
+<div>Tête de groupe
+<?php if($this->isin==1) { ?> coté, détention minimum à 50%.<?php }?>
+<?php if($this->isin==0) { ?> détention minimum à 50%.<?php }?>
+</div>
+<div>Filiales, détention minimum à
+<?php if($this->pctMin==0)  {?> Tout<?php }?>
+<?php if($this->pctMin==33) {?> 33%<?php }?>
+<?php if($this->pctMin==40) {?> 40%<?php }?>
+<?php if($this->pctMin==50) {?> 50%<?php }?>
+</div>
+
+</div>
+</div>
+
+<script src="/libs/jstree/jstree.min.js"></script>
+<script src="/libs/html2canvas.js"></script>
+<script>
+$("#groups").jstree({
+	"core" : { "html_titles" : true },
+	"plugins" : ["themes", "json_data", "search"],
+	"json_data" : {	"data" : [<?=$this->data?>] },
+	"search" : { "show_only_matches" : true },
+	"themes" : {
+		"theme" : "default",
+		"url" : "/libs/jstree/themes/default/style.css",
+		"dots" : true,
+		"icons" : false
+	}
+});
+
+$(document).ready(function(){
+	var target = $('#groups');
+	html2canvas(target, {
+		onrendered: function(canvas) {
+			target.html(canvas);
+		},
+	});
+
+	window.print(); window.close();
+});
+</script>
+

application/views/default/scripts/identite/lienfiche.phtml

@@ -27,7 +27,7 @@
 
 <?=$this->result->raisonSociale?>
 <?php if (intval($this->result->siren)!=0) {?>(<?=$this->result->siren?>)<?php }?>
-
+<?php if ($this->result->actif==0) {?>(inactif)<?php }?>
 <?php }?>
 </div>
 
@@ -38,6 +38,7 @@ Editer la fiche</a>
 <script>
 $('a.dialogFiche').on('click', function(e){
 	e.preventDefault();
+	$('div.qtip').hide();
 	$('#dialog').remove();
 	var href = $(this).attr('href');
 	if (href!='#') {
@@ -76,6 +77,11 @@ else
 ?>
 </div>
 
+<?php if ($this->result->isin ) {?>
+<div><b>Isin:</b>
+<?=$this->result->isin;?>
+</div>
+<?php }?>
 <?php if (count($this->result->identification->item)>0) {?>
 <div><b>Identifiants nationaux</b></div>
 <?php foreach ($this->result->identification->item as $id) {?>

application/views/default/scripts/identite/liens.phtml

@@ -20,7 +20,7 @@
     <td width="350" class="StyleInfoData"><?=$this->isin?></td>
 </tr>
 <?php }?>
-<?php if (count($this->identification->item)>0) {?>
+<?php if (isset ($this->identification->item) && count($this->identification->item)>0) {?>
 <?php foreach ($this->identification->item as $id) {?>
 <tr>
     <td width="30">&nbsp;</td>
@@ -31,7 +31,7 @@
 <?php }?>
 <tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">Raison Sociale</td>
+    <td width="200" class="StyleInfoLib">Dénomination Sociale</td>
     <td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
 </tr>
 <?php if ($this->actif) {?>
@@ -86,13 +86,14 @@
     <?php
     if ($this->siren) {
         $href = $this->url(array('controller'=>'saisie', 'action'=>'lienfiche', 'siren'=>$this->siren),null,true);
+        $hrefSuppr = $this->url(array('controller'=>'saisie', 'action'=>'liendelete', 'siren'=>$this->siren),null,true);
     } else {
-        $href = $this->url(array('controller'=>'saisie', 'action'=>'lienfiche', 'idFiche'=>$this->idFiche),null,true);
+        $href = $this->url(array('controller'=>'saisie', 'action'=>'lienfiche', 'idFiche'=>$this->lienref),null,true);
+        $hrefSuppr = $this->url(array('controller'=>'saisie', 'action'=>'liendelete', 'idFiche'=>$this->lienref),null,true);
     }
     ?>
-    <a class="dialog" title="Edition fiche" href="<?=$href?>">
-    Editer la fiche
-    </a>
+    <a class="dialog" title="Edition fiche" href="<?=$href?>">Editer la fiche</a>&nbsp;&nbsp;
+    <a class="confirm" title="Fiche suppression" href="<?=$hrefSuppr; ?>">Supprimer la fiche</a>
     </td>
 </tr>
 <?php }?>
@@ -102,8 +103,6 @@
 
 <?php $liste = array('actionnaires', 'participations');?>
 <style>
-table {width:100%;}
-table.data td { border:1px solid #ccc; padding:5px; }
 a.lienNom{color:#535353;}
 a.lienNom:link{color:#535353;}
 a.lienNom:hover{color:#535353;}
@@ -163,6 +162,7 @@ Cette entreprise est une personne physique exerçant son activité en nom propre
     	elseif ($lien->MajMin=='T') echo 'TUP'; // Traiter l'affichage ou les arbres comme si %=100
     	elseif ($lien->MajMin=='L') echo 'tutelle';
     	elseif ($lien->MajMin=='E') echo 'franchise';
+    	elseif ($lien->MajMin=='M') echo 'membre';
     	// elseif ($lien->MajMin=='A') echo 'absorbant';
     	else                        echo '&nbsp;';
     	?>
@@ -174,6 +174,7 @@ Cette entreprise est une personne physique exerçant son activité en nom propre
     	<a class="lienNom" href="<?=$this->url(array('controller'=>'identite','action'=>'liens','lienref'=>$lien->idFiche), null, true)?>">
     	<?php }?>
     	<?=$lien->nom?>
+    	<?php if($lien->sigle) echo " (".$lien->sigle.")"; ?>
     	</a>
     	</td>
     	<td class="StyleInfoData" width="150">
@@ -241,7 +242,7 @@ Cette entreprise est une personne physique exerçant son activité en nom propre
 <table class="data">
 <?php foreach ($this->directions as $lien) {?>
 <tr>
-    <td class="StyleInfoData" width="100" valign="top"><?=$lien->fonction?></td>
+    <td class="StyleInfoData" width="100" valign="top"><strong><?=$lien->fonction?>&nbsp;de</strong></td>
     <td class="StyleInfoData" width="500">
     <b><?=$lien->nom?></b>
     <?php if ( $lien->dirNom!='' ) {?>
@@ -335,6 +336,26 @@ $('a.dialog').on('click', function(){
 		return false;
 	}
 });
+
+$( "a.confirm" ).on('click', function(e){
+	e.preventDefault();
+	var href = $(this).attr('href');
+	var dialogOpts = {
+		bgiframe: true,
+		resizable: false,
+		title: $(this).attr('title'),
+		height: 140,
+		modal: true,
+		open: function(event, ui) {
+   			$(this).html('Chargement...');
+   			$(this).load(href);
+   		},
+		buttons: { "Fermer": function() { $(this).dialog("close"); }},
+		close: function() { $('#confirm').remove(); }
+	};
+	$('<div id="confirm"></div>').dialog(dialogOpts);
+	return false;
+});
 <?php }?>
 </script>
 <?php }?>

application/views/default/scripts/identite/streetview.phtml

@@ -0,0 +1,24 @@
+<?php if ($this->url) {?>
+
+<div id="legende-photo">Cliché à l'approche de l'adresse postale.</div>
+<img id="pp-cb-thumb" src="<?=$this->url?>" width="320" height="320" />
+
+<?php if ($this->streetviewMode == 'gps') {?>
+<div>
+<a class="street-heading" href="<?=$this->url(array(
+		'controller'=>'identite','action'=>'streetview', 'siret'=> $this->siret,
+		'lat'=>$this->lat, 'lon'=>$this->lon, 'heading'=>$this->pagePrec), null, true)?>">&lt;</a>
+-
+<a class="street-heading" href="<?=$this->url(array(
+		'controller'=>'identite', 'action'=>'streetview', 'siret'=> $this->siret,
+		'lat'=>$this->lat, 'lon'=>$this->lon, 'heading'=>$this->pageSuiv), null, true)?>">&gt;</a>
+</div>
+<script>
+$('a.street-heading').click(function(e){
+	e.preventDefault();
+	$('#infogeo_photo').load($(this).attr('href'));
+});
+</script>
+<?php }?>
+
+<?php }?>

application/views/default/scripts/juridique/annonce.phtml

@@ -2,18 +2,14 @@
 <h1 class="titre">ANNONCES L&Eacute;GALES</h1>
 <div class="paragraph">
 <table class="identite">
-  <tr>
+<tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">
-      Num&eacute;ro identifiant Siren
-    </td>
-    <td width="350" class="StyleInfoData">
-      <?=$this->SirenTexte($this->siren)?>
-    </td>
-  </tr>
-  <tr>
+    <td width="200" class="StyleInfoLib">Num&eacute;ro identifiant Siren</td>
+    <td width="350" class="StyleInfoData"><?=$this->SirenTexte($this->siren)?></td>
+</tr>
+<tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">Raison Sociale</td>
+    <td width="200" class="StyleInfoLib">Dénomination Sociale</td>
     <td width="350" class="StyleInfoData">
     	<?=$this->raisonSociale?>
     	<?php if($this->hasModeEdition) : ?>
@@ -25,9 +21,9 @@
 		))?>">(Edition)</a>
 		<?php endif; ?>
     </td>
-  </tr>
-  <?php if ($this->surveillance) {?>
-  <tr>
+</tr>
+<?php if ($this->surveillance) {?>
+<tr>
     <td width="30">&nbsp;</td>
     <td colspan="2" width="550" class="StyleInfoData">
      <?=$this->action('infos','surveillance', null, array(
@@ -35,8 +31,8 @@
      	'siret' => $this->siret
      ))?>
 	</td>
-  </tr>
-  <?php }?>
+</tr>
+<?php }?>
 </table>
 </div>
 
@@ -153,7 +149,8 @@ $href = $this->url(array(
 	'action' => 'annonces',
 	'siret' => $this->siret,
 	'id' => $this->id,
-	'vue' => $this->vue
+	'vue' => $this->vue,
+    'page' => $this->PageCurrent,
 ), null, true);
 ?>
 <a href="<?=$href?>">Revenir à la liste des annonces</a>

application/views/default/scripts/juridique/annonces.phtml

@@ -6,20 +6,15 @@
 <h1 class="titre">ANNONCES L&Eacute;GALES</h1>
 <div class="paragraph">
 <table class="identite">
-  <tr>
+<tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">
-      Num&eacute;ro identifiant Siren
-    </td>
-    <td width="350" class="StyleInfoData">
-      <?=$this->SirenTexte($this->siren)?>
-    </td>
-  </tr>
-  <tr>
+    <td width="200" class="StyleInfoLib">Num&eacute;ro identifiant Siren</td>
+    <td width="350" class="StyleInfoData"><?=$this->SirenTexte($this->siren)?></td>
+</tr>
+<tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">Raison Sociale</td>
-    <td width="350" class="StyleInfoData">
-    	<?=$this->raisonSociale?>
+    <td width="200" class="StyleInfoLib">Dénomination Sociale</td>
+    <td width="350" class="StyleInfoData"><?=$this->raisonSociale?>
     	<?php if($this->hasModeEdition) : ?>
 		<a href="<?=$this->url(array(
 			'controller' => 'saisie',
@@ -29,9 +24,9 @@
 		))?>">(Edition)</a>
 		<?php endif ?>
     </td>
-  </tr>
-  <?php if ($this->surveillance) {?>
-  <tr>
+</tr>
+<?php if ($this->surveillance) {?>
+<tr>
     <td width="30">&nbsp;</td>
     <td colspan="2" width="550" class="StyleInfoData">
      <?=$this->action('infos','surveillance', null, array(
@@ -39,8 +34,8 @@
      	'siret' => $this->siret
      ))?>
 	</td>
-  </tr>
-  <?php }?>
+</tr>
+<?php }?>
 </table>
 </div>
 <?php endif;?>
@@ -109,8 +104,6 @@ a.lienType {
 	color: #FFFFFF;
 	font-weight:bold;
 }
-
-table.data td { border-bottom:1px solid #ccc; padding:5px; }
 </style>
 
 <div class="paragraph">
@@ -206,17 +199,19 @@ Néant
 <?php }?>
 
 <?php if (empty($this->AutrePage)) {?>
-<div style="text-align:center;">
-<?php if ($this->lienPagePrecedente) { ?>
-<a href="<?=$this->lienPagePrecedente?>" title="Page précédente...">&lt;&lt;</a>
-<?php }?>
-<?php if ($this->nbPages>1) { ?>
-<span>Page <?=$this->p?>/<?=$this->nbPages?></span>
-<?php } ?>
-<?php if ($this->lienPageSuivante) {?>
-<a href="<?=$this->lienPageSuivante?>" title="Page suivante...">&gt;&gt;</a>
-<?php }?>
+
+<?php if ($this->PageTotal>1) {?>
+<div class="paragraph">
+<div class="pagination clearfix">
+<a class="first" href="<?=$this->url(array('page'=>1))?>">&laquo;</a>
+<a class="previous" href="<?=$this->url(array('page'=>$this->PagePrev))?>">&lsaquo;</a>
+<span>Page <?=$this->PageCurrent?>/<?=$this->PageTotal?></span>
+<a class="next" href="<?=$this->url(array('page'=>$this->PageNext))?>">&rsaquo;</a>
+<a class="last" href="<?=$this->url(array('page'=>$this->PageTotal))?>">&raquo;</a>
 </div>
+</div>
+<?php }?>
+
 <?php }?>
 
 <?php if (empty($this->AutrePage)) {?>

application/views/default/scripts/juridique/competences.phtml

@@ -13,7 +13,7 @@
   </tr>
   <tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">Raison Sociale</td>
+    <td width="200" class="StyleInfoLib">Dénomination Sociale</td>
     <td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
   </tr>
 	<tr><td colspan="4" class="StyleInfoData">&nbsp;</td></tr>

application/views/default/scripts/juridique/conventions.phtml

@@ -13,7 +13,7 @@
   </tr>
   <tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">Raison Sociale</td>
+    <td width="200" class="StyleInfoLib">Dénomination Sociale</td>
     <td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
   </tr>
 </table>

application/views/default/scripts/juridique/infosreg.phtml

@@ -13,7 +13,7 @@
   </tr>
   <tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">Raison Sociale</td>
+    <td width="200" class="StyleInfoLib">Dénomination Sociale</td>
     <td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
   </tr>
 </table>
@@ -50,9 +50,6 @@
 </tr>
 </table>
 <?php } else {?>
-<style>
-table.data td { border-bottom:1px solid #ccc; padding:5px; }
-</style>
 <table class="data">
 <?php foreach($this->annonces as $item){?>
 <tr>

application/views/default/scripts/juridique/marques.phtml

@@ -13,7 +13,7 @@
   </tr>
   <tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">Raison Sociale</td>
+    <td width="200" class="StyleInfoLib">Dénomination Sociale</td>
     <td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
   </tr>
 </table>
@@ -53,9 +53,6 @@
 <?php } else {?>
 
 <h2>Marque(s) déposée(s)</h2>
-<style>
-table.data td { border-bottom:1px solid #ccc; padding:5px; }
-</style>
 <div class="paragraph">
 <table class="data">
 <?php if (count($this->marques)==0) { ?>
@@ -68,7 +65,8 @@ table.data td { border-bottom:1px solid #ccc; padding:5px; }
 <?php foreach ($this->marques as $marque) { ?>
 <tr>
 	<td width="200" class="StyleInfoData">
-	D&eacute;p&ocirc;t n&deg;<?=$marque->Depot?> du <?=WDate::dateT('Y-m-d', 'd/m/Y', $marque->Date);?>
+	<?php $date = new Zend_Date($marque->Date, 'yyyy-MM-dd'); ?>
+	D&eacute;p&ocirc;t n&deg;<?=$marque->Depot?> du <?=$date->toString('dd/MM/yyyy')?>
 	</td>
 	<td width="50">
 	<a id="<?=$marque->Depot?>" class="getmarque" href="<?=$this->url(array(

application/views/default/scripts/menu.phtml

@@ -1,30 +0,0 @@
-<ul class="navigation">
-<?php
-$html = array();
-foreach ($this->container as $page)
-{
-    $html[] = "<li>";
-    $html[] = "<h3>" . $this->menu()->htmlify($page) . "</h3>" . PHP_EOL;
-    if (!empty($page->pages))
-    {
-        $html[] = "<div>";
-    	$html[] = "<ul>";
-        foreach ($page->pages as $subpage)
-        {
-            $html[] = "<li>";
-            $href = $subpage->getHref();
-            $html[] = "<a href=\"{$href}\">";
-            $html[] = $subpage->getLabel();
-            $html[] = "</a>";
-            
-            $html[] = "</li>";
-        }
-        $html[] = "</ul>";
-        $html[] = "</div>";
-    }
-
-    $html[] = "</li>";
-}
-echo join(PHP_EOL, $html);
-?>
-</ul>

application/views/default/scripts/pieces/acte.phtml

@@ -1,13 +1,41 @@
-<div id="center">
-<?=$this->partial('pieces/header.phtml', array(
-	'siren' => $this->siren,
-	'raisonSociale' => $this->raisonSociale
-))?>
+<?php if ($this->formCmd) {?>
 
-<h2>Actes & Status</h2>
-<div class="paragraph">
+<p>Commande du document : <b><?=$this->Label?> du <?=$this->LabelActeDate?></b> (Depot n° <?=$this->depotNum?> du <?=$this->LabelDepotDate?>)</p>
 
+<p>Vous recevrez un email (sous 3/5 jours ouvrés) lorsque le document sera disponible.</p>
 
+<p>Votre email : <b><?=$this->email?></b> </p>
+
+<?php if ($this->emailValide===false) {?>
+
+<p><span class="ui-icon ui-icon-alert" style="float: left; margin-right: .3em;"></span>
+<strong>Commande impossible</strong> Votre email est invalide.</p>
+
+<?php } else {?>
+
+<div id="output">
+<form name="commande" action="<?=$this->url(array('controller'=>'pieces','action'=>'acte'),null,true)?>" method="post">
+<input type="hidden" name="mode" value="<?=$this->mode?>"/>
+<input type="hidden" name="siren" value="<?=$this->siren?>"/>
+<input type="hidden" name="depotNum" value="<?=$this->depotNum?>"/>
+<input type="hidden" name="depotDate" value="<?=$this->depotDate?>"/>
+<input type="hidden" name="acteType" value="<?=$this->acteType?>"/>
+<input type="hidden" name="acteNum" value="<?=$this->acteNum?>"/>
+<input type="hidden" name="acteDate" value="<?=$this->acteDate?>"/>
+<label>Votre référence :
+<input type="text" name="ref" value="" /> (facultatif)
+</label>
+</form>
 </div>
 
-</div>
+<?php }?>
+
+<?php } else {?>
+
+    <?php if($this->msg) {?>
+        <b><?=$this->msg?></b>
+    <?php } else {?>
+        <a href="<?=$this->url?>" target="_blank">Télécharger le fichier</a>
+    <?php }?>
+
+<?php }?>