Merge

application/Bootstrap.php

@@ -79,9 +79,9 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 
 	protected function _initDb()
 	{
-		$c = Zend_Registry::get('config');
+		$c = new Zend_Config($this->getOptions());
 		try {
-			$db = Zend_Db::factory($c->profil->db->sdv1);
+			$db = Zend_Db::factory($c->resources->db);
 			$db->getConnection();
 		} catch ( Exception $e ) {
 		    if (APPLICATION_ENV == 'development') {
@@ -105,6 +105,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 		    $profiler->setEnabled(true);
 		    $db->setProfiler($profiler);
 		}
+
+		return $db;
 	}
 
 	protected function _initCache()

application/controllers/DirigeantController.php

@@ -34,22 +34,22 @@ class DirigeantController extends Zend_Controller_Action
 
 		$dirigeants = $infos->result->item;
 
+		$user = new Scores_Utilisateur();
 		$session = new SessionEntreprise($this->siret, $this->id);
 
-		$user = new Scores_Utilisateur();
 		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());
 		$this->view->assign('dirigeants', $dirigeants);
 		$this->view->assign('exportObjet', $dirigeants);
-		$this->view->assign('idClient', $user->getIdClient());
 
 		$this->view->assign('AutrePage', $this->getRequest()->getParam('apage'));
 		$this->view->assign('surveillance', $user->checkPerm('survdirigeants'));

application/controllers/FichierController.php

@@ -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/GiantController.php

@@ -8,7 +8,8 @@ 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 +33,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 +58,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'];
@@ -63,6 +77,10 @@ class GiantController extends Zend_Controller_Action
 	{
 		$rechercheParams =  new RechercheHistorique();
 		$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 +93,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 +114,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'),
@@ -122,6 +146,10 @@ class GiantController extends Zend_Controller_Action
 
 	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'),
@@ -153,6 +181,10 @@ class GiantController extends Zend_Controller_Action
 
 	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'),
@@ -228,12 +260,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'),
@@ -256,6 +296,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 +320,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');
@@ -319,13 +361,13 @@ class GiantController extends Zend_Controller_Action
 				$this->getRequest()->getParam('CompanyName')
 		);
 		$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) ;
+			array_push($merged[$MonitoringEvent->Company->Event[0]->EventCode],$MonitoringEvent) ;
 		} else {
-			 $merged[$MonitoringEvent->Company->Event[0]->EventCode][]=$MonitoringEvent;
+			$merged[$MonitoringEvent->Company->Event[0]->EventCode][]=$MonitoringEvent;
 		}
 		endforeach;
 		$this->view->val	= $merged;
@@ -334,11 +376,23 @@ class GiantController extends Zend_Controller_Action
 	{
 		$this->view->headScript()->appendFile('/themes/default/scripts/giant_monitoring.js', 'text/javascript');
 		$giantController = new GiantControllerLib();
-		$result = $giantController->retrive(
-				1,
-				$this->TestIndication,
-				'RetrieveMonitoringEventsForCustomer'
-		);
+		$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):
@@ -349,7 +403,7 @@ class GiantController extends Zend_Controller_Action
 		}
 		endforeach;
 		$this->view->val	= $merged;
-		
+
 		$merged_siren =Array();
 		foreach ($result->MonitoringEvents->MonitoringEvent as $MonitoringEvent):
 		if ($merged_siren[$MonitoringEvent->Company->CompanyId]){
@@ -359,6 +413,55 @@ class GiantController extends Zend_Controller_Action
 		}
 		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

@@ -90,20 +90,21 @@ class IdentiteController extends Zend_Controller_Action
 		    );
 		    $datemajTexte = $dateDerMaj = '';
 		    $datemajTexte.= '<table>';
+		    $wdate = new WDate();
 		    foreach ( $tabDate as $dateId => $dateLib ) {
 		        if ( isset($infos->{$dateId})
 		                && !empty($infos->{$dateId})
 		                && $infos->{$dateId}!='0000-00-00') {
 
 		            if ( $dateId == 'DateMajID') {
-		                $dateDerMaj = ' le '.WDate::dateT('Y-m-d', 'd/m/Y', $infos->DateMajID);
+		                $dateDerMaj = ' le '.$wdate->dateT('Y-m-d', 'd/m/Y', $infos->DateMajID);
 		            }
 
 		            if ( $dateId == 'DateMajID' && !$user->checkModeEdition()) {
 		            } else {
 		                $datemajTexte.= '<tr>';
 		                $datemajTexte.= '<td>'.$dateLib.'</td>';
-		                $datemajTexte.= '<td>'.WDate::dateT('Y-m-d', 'd/m/Y', $infos->{$dateId}).'</td>';
+		                $datemajTexte.= '<td>'.$wdate->dateT('Y-m-d', 'd/m/Y', $infos->{$dateId}).'</td>';
 		                $datemajTexte.= '</tr>';
 		            }
 
@@ -172,6 +173,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;
@@ -374,85 +376,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)
@@ -1151,9 +1123,9 @@ class IdentiteController extends Zend_Controller_Action
 	public function facadeAction()
 	{
 		$request = $this->getRequest();
-		
+
 		require_once 'Scores/Mappy.php';
-		
+
 		$infos = $request->getParam('infos');
 		$source = $request->getParam('source');
 		$mappy = new Mappy();
@@ -1192,19 +1164,19 @@ class IdentiteController extends Zend_Controller_Action
 	public function streetviewAction()
 	{
 		$request = $this->getRequest();
-		
+
 		if ( $request->isXmlHttpRequest() ) {
-	        $this->_helper->layout()->disableLayout();			
+	        $this->_helper->layout()->disableLayout();
 		}
-		
+
 		$lat = $request->getParam('lat', '');
 		$lon = $request->getParam('lon', '');
 		$num = $request->getParam('heading', 0);
-			
-		$streetview = new Scores_Streetview();
-		if ( $lat != '' && $lon != '' ) {		
+
+		$streetview = new Scores_Google_Streetview();
+		if ( $lat != '' && $lon != '' ) {
 			$deg = $streetview->getNumDeg();
-			$nbImg = count($deg);			
+			$nbImg = count($deg);
 			$pagePrec = $num-1;
 			if ($pagePrec<=0) {
 				$pagePrec = $nbImg-1;
@@ -1212,19 +1184,20 @@ class IdentiteController extends Zend_Controller_Action
 			$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);
 			//$streetview->setLocationTxt($adresse);
-			$this->view->assign('url', $streetview->urlImg());
-		}		
+			$url = $this->view->url(array('controller'=>'fichier', 'action'=>'streetview', 'fichier'=> $streetview->display()), null, true);
+			$this->view->assign('url', $url);
+		}
 		$this->view->assign('lat', $lat);
 		$this->view->assign('lon', $lon);
 	}
-	
+
 	public function groupesarboAction()
 	{
 		$this->_helper->layout()->disableLayout();

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/PiecesController.php

@@ -376,7 +376,7 @@ class PiecesController extends Zend_Controller_Action
     			{
     				$infosBilan = array();
     				$infosBilan['date'] = $item['date_cloture'];
-    				$infosBilan['type'] = 'Comptes millésime '.$item['millesime'];
+    				$infosBilan['type'] = 'Comptes '.$item['type'].' millésime '.$item['millesime'];
     				$infosBilan['mode'] = $item['mode'];
     				$infos = array(
     					'date_cloture' => $item['date_cloture'],

application/controllers/PrintController.php

@@ -81,6 +81,9 @@ class PrintController extends Zend_Controller_Action
 						break;
 				}
 				break;
+			case 'worldcheck':
+				$params['matchIdentifier'] = $elements[2];
+				break;
 			default:
 				return false;
 				break;

application/controllers/RechercheController.php

@@ -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()->append('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
@@ -338,6 +352,10 @@ 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();
@@ -348,7 +366,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 +375,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,6 +403,9 @@ 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 {
 

application/controllers/SaisieController.php

@@ -3,6 +3,10 @@ class SaisieController extends Zend_Controller_Action
 {
 	protected $wDate;
 
+	protected $countries;
+
+	protected $currencies;
+
     /**
 	 * Enter description here ...
 	 * @var unknown_type
@@ -76,259 +80,6 @@ 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';
@@ -338,6 +89,7 @@ class SaisieController extends Zend_Controller_Action
 
 		$ws = new WsScores();
 		$this->wDate = new WDate();
+		//codPays3 (index), libPays, devise
 		$countries = json_decode($ws->getCatalogCountry(),true);
 		if ($countries!==false) {
 		    $lib = array();
@@ -348,6 +100,7 @@ class SaisieController extends Zend_Controller_Action
 		    $this->countries = $countries;
 		}
 
+		//devIso (index), devNom
 		$currencies = json_decode($ws->getCatalogCurrency(),true);
 		if ($currencies!==false) {
 		    $lib = array();
@@ -364,7 +117,10 @@ class SaisieController extends Zend_Controller_Action
 	/**
 	 * Index
 	 */
-	public function indexAction(){}
+	public function indexAction()
+	{
+		//Do nothing
+	}
 
 	/**
 	 * Affichage du formulaire de saisie
@@ -394,7 +150,8 @@ class SaisieController extends Zend_Controller_Action
 		$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);
@@ -573,9 +330,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();
@@ -1670,10 +1427,15 @@ class SaisieController extends Zend_Controller_Action
 	            $this->view->assign('id1', $infos['idAct']);
 	        }
 
+	        $dateEffetLien = $this->wDate->dateT('Y-m-d', 'd/m/Y', $infos['dateEffetLien']);
+	        $doc = ($siren) ? $ws->getLienDoc($siren, 'Siren') : $ws->getLienDoc($lienRef, 'Entreprise');
+	        $dateEffetLienDoc = ($doc->item[0]->date) ? $this->wDate->dateT('Y-m-d', 'd/m/Y', $doc->item[0]->date) : $dateEffetLien;
+
 	        $this->view->assign('PDetention', $infos['PDetention']);
 	        $this->view->assign('Pvote', $infos['Pvote']);
 	        $this->view->assign('MajMin', $infos['MajMin']);
-	        $this->view->assign('dateEffetLien', $this->wDate->dateT('Y-m-d', 'd/m/Y', $infos['dateEffetLien']));
+	        $this->view->assign('dateEffetLien', $dateEffetLien);
+	        $this->view->assign('dateEffetLienDoc', $dateEffetLienDoc);
 
 	    } else {
 
@@ -1876,6 +1638,7 @@ class SaisieController extends Zend_Controller_Action
     	        'dateCapital' => empty($params['dateCapital']) ? '' : $this->wDate->dateT('d/m/Y', 'Ymd', $params['dateCapital']),
     	        'nbActions' => empty($params['nbActions']) ? '' : $params['nbActions'],
     	    	'dateNbActions' => empty($params['dateNbActions']) ? '' : $this->wDate->dateT('d/m/Y', 'Ymd', $params['dateNbActions']),
+    	    	'isin' => empty($params['isin']) ? '' : trim($params['isin']),
     	        'idLoc1Type' => $params['idLoc1Type'],
     	        'idLoc1Num' =>  trim($params['idLoc1Num']),
     	        'idLoc2Type' => $params['idLoc2Type'],
@@ -1903,6 +1666,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
@@ -2333,7 +2126,7 @@ class SaisieController extends Zend_Controller_Action
 	    	          	$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;

application/controllers/UserController.php

@@ -400,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();

application/controllers/WorldcheckController.php

@@ -1,60 +1,158 @@
 <?php
 class WorldcheckController extends Zend_Controller_Action
 {
-	protected $siret;
-	protected $id;
-
+	protected $wcConfig;
+	
 	public function init()
 	{
-		require_once '/WorldCheck/WsWorldCheck.php';
+		require_once 'WorldCheck/WsWorldCheck.php';
+		require_once 'WorldCheck/SessionWorldcheck.php';
+		require_once 'Scores/Cache.php';
+		
+		$configWC = new Zend_Config_Ini(APPLICATION_PATH . '/../library/WorldCheck/applicationWC.ini');
+		$this->wcConfig = $configWC->worldcheck->toArray();
 	}
 
 	/**
-	 * 
+	 *
 	 */
 	public function indexAction()
 	{
-		$message = '';
-		$this->_helper->layout()->disableLayout();
-				
 		$request = $this->getRequest();
-		
-		$param->dirNom = 'HOLLANDE'; //$request->getParam('dirNom');
-		$param->dirPrenom = ''; //$request->getParam('dirPrenom');
-		$param->dirNaissJJ = $request->getParam('dirNaissJJ');
-		$param->dirDateNaissMM = $request->getParam('dirDateNaissMM');
-		$param->dirDateNaissAAAA = $request->getParam('dirDateNaissAAAA');
-		$param->dirCpVille = $request->getParam('dirCpVille');		
+		$param = new stdClass();
+		$dirNom = $request->getParam('dirNom');
+		$param->dirNom = ($dirNom)?$dirNom:$request->getParam('dirSociete');
+		$param->dirPrenom = $request->getParam('dirPrenom');
+		$param->dirType = $request->getParam('dirType');
+		$param->Siren = $request->getParam('siren');
 
-    	$data->customId1 = '1';
-    	$data->customId2 = '2';
-    	$data->name = $param->dirNom.' '.$param->dirPrenom;
-    	$data->nameType = 'INDIVIDUAL';
-    	
-    	$wc = new WsWorldCheck();
-    	$nameIdentifier = $wc->getScreener($data);
-    	
-    	$matchCount = new stdClass();
-    	$matchCount = $wc->getDetailsName($nameIdentifier);
-    	
-    	if ($matchCount->unresolvedMatchCount == 0) 
-    	{
-    		$message = 'Aucun résultat.';
-    	}
-    	else 
-    	{
-    		$message = 'Résultats de recherche';
-   			$matches = $wc->getMatchesName($nameIdentifier, 'WATCHLIST', 0, $matchCount->unresolvedMatchCount);
-    	}
-    	
-    	$this->view->assign('message', $message);
-    	$this->view->assign('param', $param);
-    	$this->view->assign('matches', $matches);
-    	$this->view->assign('nameIdentifier', $nameIdentifier);
+		$user = new Scores_Utilisateur();
+		$session = new SessionWorldcheck();
+		$wc = new WsWorldCheck();
+		$wcLocal = new Application_Model_Worldcheck();
+
+		//check worldcheck data correctness in the session
+		if (!$session->getName() || $session->getName()!=$param->dirNom || substr($session->getNameIdentifier(),0,3)!='so_' || $session->getNameType()!=$param->dirType)
+		{
+			$param->idClient = $user->getIdClient();
+			$param->login = $user->getLogin();
+			$localDBParams = $wcLocal->getScreenerId($param);
+	    	$param->matchCount = $localDBParams->matchCount;
+	    	$param->nameIdentifier = $localDBParams->nameIdentifier;
+	    	$session->setSession($param);
+		}
+
+    	$nameIdentifier = $session->getNameIdentifier();
+    	$matchCount = $session->getMatchCount();
+
+    	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);
+	    }
 	}
-	
-	public function matchresultAction()
+
+	/**
+	 * 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');
+
+			$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();
+		$session = new SessionWorldcheck();
+
+		$param = new stdClass();
+		$param->matchIdentifier = $request->getParam('matchIdentifier');
+		$param->nameType = $session->getNameType();
+
+		$wc = new WsWorldCheck();
 		
+		$cache = new Cache();
+		$content = $cache->wcCache($this->wcConfig['cachedir'], $wc, "getDetailsContent", $param, $param->matchIdentifier);
+
+		$this->view->assign('matchIdentifier', $param->matchIdentifier);
+		$this->view->assign('content', $content);
+		$this->view->assign('nameType', $param->nameType);
+		$this->view->assign('exportObjet', $content);
 	}
 }

application/models/MonitoringGiants.php

@@ -8,6 +8,14 @@ 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/Worldcheck.php

@@ -0,0 +1,73 @@
+<?php
+class Application_Model_Worldcheck extends Zend_Db_Table_Abstract
+{
+	protected $_name = 'worldcheck';
+	
+	/**
+	 * 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;
+	}
+}

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

@@ -30,9 +30,6 @@
 <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>

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

@@ -42,9 +42,6 @@
 <h2>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>
@@ -64,7 +61,7 @@ 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,
@@ -87,18 +84,6 @@ table.data td { border:1px solid #ccc; padding:5px; }
     	<?php } ?>
     	<?php } ?>
     	</td>
-    	<td><?php if($this->idClient==1) { ?> 
-    	<a class='wcheck' href="<?=$this->url(array(
-    			'controller' => 'worldcheck', 
-    			'action' => 'index',
-    			'dirNom' => $dir->Nom,
-	    		'dirPrenom' => $dir->Prenom,
-	    		'dirNaissJJ' => substr($dir->NaissDate,0,2),
-    			'dirDateNaissMM' => substr($dir->NaissDate,3,2),
-    			'dirDateNaissAAAA' => substr($dir->NaissDate,6,4),
-	    		'dirCpVille' => $dir->NaissVille))?>" title="WorldCheck" style="cursor: pointer;" >
-    	<img src="/themes/default/images/worldcheck/wc.png" /></a>
-    	<?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))?>">
@@ -110,9 +95,20 @@ table.data td { border:1px solid #ccc; padding:5px; }
         <img style="vertical-align:middle;" src="/themes/default/images/interfaces/ajouter.png" /></a>
         </div>
         <?php }?>
-
     	<?php }?>
     	</td>
+		<?php if (empty($this->AutrePage)) { ?>
+    	<?php if( $this->accessWorldCheck ) { ?>
+		<td>
+    		<?php if ($dir->Societe != '') { ?>
+    			<img class="wcheck" id="<?='/dirType/ORGANISATION/dirSociete/'.$dir->Societe;?>" src='/themes/default/images/worldcheck/wc.png'/>
+    		<?php }
+    	   		  if ($dir->Nom != '') { ?>
+    			<img class="wcheck" id="<?='/dirType/INDIVIDUAL/dirNom/'.$dir->Nom.'/dirPrenom/'.$dir->Prenom;?>" src='/themes/default/images/worldcheck/wc.png'/>
+    		<?php }	?>
+    	</td>
+    	<?php } ?>
+		<?php }?>
     </tr>
     <?php } ?>
 </table>
@@ -129,7 +125,6 @@ table.data td { border:1px solid #ccc; padding:5px; }
 
 <?php if (empty($this->AutrePage)) {?>
 <?=$this->render('cgu.phtml', $this->cgu)?>
-</div>
 <?php }?>
 
 <?php if (empty($this->AutrePage)) {?>
@@ -162,15 +157,14 @@ $('a.dialog').on('click', function(){
 	}
 });
 
-
-$('a.wcheck').qtip({
-	   content: 'WorldCheck',
-	   position: {
-	      corner: {
-	         target: 'topRight',
-	         tooltip: 'topLeft'
-	      }
-	   }
+$('img.wcheck').each(function(){
+	$(this).qtip({
+		hide: { event: 'unfocus' },
+		show: { solo: true, delay: 1000 },
+		content: { title: {button: true}, text: "Chargement...",
+		ajax: { url: '<?=$this->url(array('controller'=>'worldcheck','action'=>'occurence','siren'=>substr($this->siret, 0, 9)),null,true);?>'+$(this).attr('id') } },
+		position: { my: "bottom left", at: "top center" }
 	});
+});
 </script>
 <?php }?>

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

@@ -39,9 +39,6 @@
 <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>

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

@@ -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/finance/liasse.phtml

@@ -14,7 +14,7 @@
 </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>
@@ -56,9 +56,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,35 +100,38 @@
 	</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,
@@ -141,9 +141,9 @@
         	'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),
@@ -152,9 +152,9 @@
         	'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),
@@ -163,12 +163,12 @@
 			'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/giant/identite.phtml

@@ -70,7 +70,7 @@
 					
 					
 					<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>
@@ -130,9 +130,9 @@
 	</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'>
+        <?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>
@@ -150,13 +150,13 @@
 						  		 <option  value='Order'>Order</option>
 			</select><br /><br />
 			<strong>StartFrom: </strong><br />
-			<input type="text" name="StartFrom" value="" /> optional<br /><br />
+			<input type="text" name="StartFrom" value="" /><br /><br />
 			<div class='int_order'><strong>InternalOrderId: </strong><br />
-			<input type="text" class='datepicker' name="InternalOrderId" value="32768032781"/> <br /><br /></div>
+			<input type="text" name="InternalOrderId" value="32768032781"/> <br /><br /></div>
 		  </fieldset>
 	  </form>
-	</div>
-                       <?php echo'<pre>';print_r($this->modification); ?>
+	</div> -->
+                       <?php// echo'<pre>';print_r($this->modification); ?>
             
-        <?php endif;?>
+        <?php //endif;?>
 </div>

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

@@ -2,46 +2,50 @@
 	<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 $dates[2];?></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('_', ' ', $name);?>"><?php echo str_replace('_', ' ', $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,102 @@
 <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==':30'){$dates='1:30';}else if($dates=='90:'){$dates='+90';}else if($dates=='151:'){$dates='+151';}?>
+			<?$dates = str_replace(':', ' - ', $dates)?>
+				<th align="right" class="date"><?=$dates?></th>
+			<?php endforeach; ?>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
 		<?php foreach($this->report->ComportementPaiement as $dates => $valeurs):?>
 		<?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>
+			<tr>
+				<td class="head">
+					<a class="tooltip" title="<?php echo $date[0];?> - <?php echo $date[1];?>"><?php echo $date[0];?> - <?php echo $date[1];?></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==':30'){$dates='1:30';}else if($dates=='90:'){$dates='+90';}else if($dates=='151:'){$dates='+151';}?>
+				<?$dates = str_replace(':', ' - ', $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>
+			<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 echo (empty($AnnualAccounts->AccountsDate->_))?'NC':$AnnualAccounts->AccountsDate->_;?></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>
+				<th align="right" class="date"><?php echo $AnnualAccounts->AccountsDate->_; ?></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,33 @@
 		<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>
+				<th align="right" class="date"><?php echo $AnnualAccounts->AccountsDate->_; ?></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 +112,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 +123,33 @@
 		<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>
+				<th align="right" class="date"><?php echo $AnnualAccounts->AccountsDate->_; ?></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 +157,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 +169,33 @@
 		<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>
+				<th align="right" class="date"><?php echo $AnnualAccounts->AccountsDate->_; ?></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 +203,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,26 @@
 <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">
 				<?php foreach($this->report->Dirigeant as $Dirigeants):?>
+				
 					<?php foreach($Dirigeants as $date => $Dirigeant):?>
 					<?php $date = explode(':', $date); ?>
 						<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 echo ($date[0]!='//')?$date[0]:'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 echo $dir->FirstName.' '.$dir->LastName.' 
+									<br /><b>Né(e) le:</b> '.((!empty($dir->DateOfBirth->_))?$this->dateFunction->dateT('Ymd', 'd/m/Y', $dir->DateOfBirth->_):'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 $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">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

@@ -2,7 +2,7 @@
 	<?php if(isset($this->report)) :?>
 	<div>
 		<a name="1"></a>
-		<span style="font-size:16px;color:#00008C;font-weight:800">Données officielles</span><br /><br />
+		<span class="title">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" />
@@ -19,7 +19,7 @@
 		</ul>
 	<br />
 	<a name="2"></a>
-	<span style="font-size:16px;color:#00008C;font-weight:800">Données de contact</span><br /><br />
+	<span class="title">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" />
@@ -36,7 +36,7 @@
 	<br />
 	<a name="3"></a>
 	<?php if(!empty($this->report->activity)):?>
-		<span style="font-size:16px;color:#00008C;font-weight:800">Activités</span><br /><br />
+		<span class="title">Activités</span><br /><br />
 		<table style="margin-left: 19px;" width="97%">
 			<tr>
 				<td style="font-size:13px;"><b>Code</b></td>
@@ -73,7 +73,7 @@
 	<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 />
+	<span class="title">Personnel</span><br /><br />
 		<table style="font-size:13px;margin-left: 19px;" width="97%">
 			<tr>
 				<td><b>Année</b></td>
@@ -82,7 +82,7 @@
 			</tr>
 			<?php foreach($this->report->Employees as $year => $employees): ?>
 			<tr>
-				<td><?php echo $this->dateFunction->dateT('Ymd', 'd/m/Y', $year);?></td>
+				<td><?php if(strlen($year)==4)echo $year; else echo $this->dateFunction->dateT('Ymd', 'd/m/Y', $year);?></td>
 				<td><?php echo $employees['TotalStaffEmployed'];?> </td>
 				<td><?php echo $employees['FulltimeEquivalent'];?> </td>
 			</tr>
@@ -95,7 +95,7 @@
 	<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 />
+	<span class="title">Noms de produit</span><br /><br />
 		<table style="margin-left: 19px;" width="97%">
 			<tr>
 				<td style="font-size:13px;"><b>Source</b></td>

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

@@ -1,30 +1,32 @@
 <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;?>
+				<th align="right" class="date"><?php echo $date;?></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 +37,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,5 @@
 <b>
+<?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 +7,34 @@
             'CompanyRegisterNumber' => $this->resultat->CompanyRegisterNumber,
             'Pays' => $this->resultat->Address->Country,
             'telephone' => $this->resultat->TelephoneNumbers->TelephoneNumber[0],
+        	'test' => '0',
             'Adresse' => $this->resultat->Address->HouseNumber.':'.$this->resultat->Address->Street.':'.$this->resultat->Address->PostCode.':'.$this->resultat->Address->City));?>">
+        <?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' => $this->resultat->Address->HouseNumber.':'.$this->resultat->Address->Street.':'.$this->resultat->Address->PostCode.':'.$this->resultat->Address->City));?>">
+        <?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' => $this->resultat->Address->HouseNumber.':'.$this->resultat->Address->Street.':'.$this->resultat->Address->PostCode.':'.$this->resultat->Address->City));?>">
         <?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,191 @@
+<?function emp_check($val){echo (empty($val))?'NC':$val;}
+$wdate = new WDate();?>
+<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"><?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 />
+				<?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

@@ -1,5 +1,5 @@
 <div id="center">
-<h1 class="titre">SURVEILLANCE</h1>
+<h1 class="titre">Surveillances</h1>
 <div class="paragraph">
 <?php
 if ( empty($this->source) ){
@@ -30,197 +30,115 @@ if ( empty($this->source) ){
 
 
 
-<h2>Options de recherche</h2>
-
-<div class="paragraph">
-<label>Afficher uniquement les suveillances de type</label>
-<select name="type">
-<option value="">toutes</option>
-<?=$this->selectTri?>
-</select>
-</div>
-<div class="paragraph">
-Tri
-<select name="triMode">
-<option value="asc"<?=($this->triMode=='asc')? ' selected' : ''?>>croissant</option>
-<option value="desc"<?=($this->triMode=='desc')? ' selected' : ''?>>décroissant</option>
-</select>
-par
-<select name="tri">
-<option value="siren"<?=($this->tri=='siren')? ' selected' : ''?>>Siren</option>
-<option value="ref"<?=($this->tri=='ref')? ' selected' : ''?>>Référence</option>
-<option value="rs"<?=($this->tri=='rs')? ' selected' : ''?>>Raison Sociale</option>
-<option value="dateAjout"<?=($this->tri=='dateAjout')? ' selected' : ''?>>Date d'ajout</option>
-<option value="dateDerEnvoi"<?=($this->tri=='dateDerEnvoi')? ' selected' : ''?>>Date d'envoi</option>
-</select>
-</div>
-
-<div class="paragraph" id="formSurveillance">
-<form name="recherche" action="<?=$this->url(array('controller'=>'surveillance', 'action'=>'liste'))?>">
-<input type="text" name="q" class="search" value="<?=($this->q != null)? $this->q : "Siren, Référence, Raison Sociale"?>" />
-<input type="submit" value="Rechercher" class="submit"/>
-</form>
-</div>
+ 	
 
 
 <h2>Liste des surveillances</h2>
-<div class="paragraph">
-<?php if ($this->curPage>=1) { ?>
-<a class="pagination" href="<?=$this->url(array('action' => 'liste', 'page' => $this->curPage-1))?>"
-	title="Page précédente..."> &lt;&lt; </a>
-<?php } ?>
-<?php if ($this->curPage!=$this->totPage) { ?>
-<span>Page <select name="page">
-<?php for ($i=1;$i<$this->totPage+1;$i++) {?>
-<option value="<?=$this->url(array('action' => 'liste', 'page' => $i-1))?>"
- <?=($i==$this->curPage+1)? ' selected' : ''?>><?=$i?></option>
-<?php }?></select> / <?=$this->totPage?>
-</span>
-<?php } ?>
-<?php if ($this->curPage+1<$this->totPage) { ?>
-<a class="pagination" href="<?=$this->url(array('action' => 'liste', 'page' => $this->curPage+1))?>"
-	title="Page suivante..."> &gt;&gt; </a>
-<?php } ?>
-</div>
+	<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">Siren</th>
-	<th width="150">Raison Sociale</th>
-	<th width="90">Référence</th>
-	<th width="150">Surveillance</th>
-	<th width="75">Ajout le</th>
-	<th width="75">Envoyé le</th>
+	<th width="75">Raison 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>
+<tbody><pre><? //print_r($this->val_siren);?></pre>
 <?php foreach ($this->val_siren as $monitor) {?>
-<pre><? print_r($monitor);?></pre>
+<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 class="aleft">
-    <p><?=$monitor[0]->Company->CompanyId ?></p>
-	</td>
 	<td>
-	<p><?=$monitor[0]->Company->CompanyName['0']->_ ?></p>
-    </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
-    foreach ($monitor as $monitor_order) {
-    	 ?><p><?=$monitor_order->ProviderOrderId?></p><?
-    }
-    ?>
+		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 ($monitor as $monitor_type) {
-    echo "<p>".$monitor_type->Company->Event[0]->EventCode."</p>";
-	
-
+     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 ($monitor as $monitor_type) {
-    	echo "<p>".$monitor_type->Company->Event[0]->Date->_."</p>";
+    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>
-    <td>
-    <?php
-    foreach ($monitor as $monitor_type) {
-    	echo "<p>".$monitor_type->Company->Event[0]->Date->_."</p>";
-    }
-	?>
-    </td>
-<?php } ?>
+<?php endforeach; } ?>
 </tbody>
-</table>
+</table><br>
 </div>
-
-<div class="paragraph">
-<?php if ($this->curPage>=1) { ?>
-<a class="pagination" href="<?=$this->url(array('action' => 'liste', 'page' => $this->curPage-1))?>"
-	title="Page précédente..."> &lt;&lt; </a>
-<?php } ?>
-<?php if ($this->curPage!=$this->totPage) { ?>
-<span>Page <select name="page">
-<?php for ($i=1;$i<$this->totPage+1;$i++) {?>
-<option value="<?=$this->url(array('action' => 'liste', 'page' => $i-1))?>"
- <?=($i==$this->curPage+1)? ' selected' : ''?>><?=$i?></option>
-<?php }?></select> / <?=$this->totPage?>
-</span>
-<?php } ?>
-<?php if ($this->curPage+1<$this->totPage) { ?>
-<a class="pagination" href="<?=$this->url(array('action' => 'liste', 'page' => $this->curPage+1))?>"
-	title="Page suivante..."> &gt;&gt; </a>
-<?php } ?>
 </div>
-
-</div>
-
-
-<script type="text/javascript">
-function submitTri() {
-	var tri = $('select[name=tri] option:selected').val();
-	var triMode = $('select[name=triMode] option:selected').val();
-	var source = $('select[name=type] option:selected').val();
-	window.location.href = '<?=$this->url(array(
-		'controller'=>'surveillance' ,
-		'action'=>'liste',
-		'q' => $this->q,
-	), null, true)?>/source/'+source+'/tri/'+tri+'/triMode/'+triMode;
-}
-
-$(document).ready(function() {
-	$('select[name=page]').change(function(){
-		window.location.href = $(this).val();
-	});
-
-    $('select[name=type]').change(function() {
-		submitTri();
-    });
-
-    $('select[name=tri]').change(function() {
-    	submitTri();
-    });
-
-    $('input[name=q]').focusin(function(){
-    	var txt = 'Siren, Référence, Raison Sociale';
-		var val = $(this).val();
-    	if ( val == '' || val == txt ) { $(this).val(''); }
-	}).focusout(function(){
-		var txt = 'Siren, Référence, Raison Sociale';
-    	var val = $(this).val();
-		if ( val == '' ){ $(this).val(txt); }
-	});
-
-    <?php
-    if ($source == '') {
-    ?>
-    $('#surveillance').tablesorter({
-    	headers: {
-    		2: { sorter: false },
-    		3: { sorter: false },
-    		4: { sorter: false },
-    		5: { sorter: false }
-    	}
-	});
-    <?php
-    } else {
-    ?>
-    $('#surveillance').tablesorter({
-    	headers: {
-    		3: { sorter: false }
-    	}
-    });
-    <?php
-    }
-    ?>
-});
-</script>
-

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

@@ -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,14 +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>
@@ -27,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 />
@@ -62,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/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/etablissements.phtml

@@ -16,9 +16,7 @@
     <td width="200" class="StyleInfoLib">Raison 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">
@@ -51,7 +49,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">
@@ -65,9 +63,9 @@ if ($this->actif == -1 && is_array($this->etabs) && count($this->etabs)>0){
 			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',

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

@@ -29,9 +29,6 @@
 </div>
 
 <h2>&Eacute;v&eacute;nements INSEE</h2>
-<style>
-table.data td { border-bottom:1px solid #ccc; padding:5px; }
-</style>
 <div class="paragraph">
 <table class="data">
 <?php

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

@@ -58,6 +58,26 @@ echo $this->partial('identite/fiche-item.phtml', $this->dBlock['AutreSiren']);
 
 <h2>Raison sociale &amp; Coordonnées</h2>
 <div class="paragraph">
+
+<?php if ( empty($this->AutrePage) ) {?>
+<?php if($this->accessWorldCheck) { ?>
+<div style="float:right;">
+<img class="wcheck" src='/themes/default/images/worldcheck/wc.png'/>
+</div>
+<script>
+$('img.wcheck').each(function(){
+	$(this).qtip({
+		hide: { event: 'unfocus' },
+		show: { solo: true, delay: 1000 },
+		content: { title: {button: true}, text: "Chargement...",
+		ajax: { url: '<?=$this->url(array('controller'=>'worldcheck','action'=>'occurence', 'dirSociete'=>$this->infos->Nom, 'dirType' =>'ORGANISATION', 'siren'=>substr($this->siret, 0, 9)),null,true);?>' } },
+		position: { my: "bottom left", at: "top center" }
+	});
+});
+</script>
+<?php }?>
+<?php }?>
+
 <table>
 <?php
 echo $this->partial('identite/fiche-item.phtml', $this->dBlock['RaisonSociale']);

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,6 +11,7 @@
     	<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

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!='#') {

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>
@@ -87,7 +87,7 @@
     if ($this->siren) {
         $href = $this->url(array('controller'=>'saisie', 'action'=>'lienfiche', '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);
     }
     ?>
     <a class="dialog" title="Edition fiche" href="<?=$href?>">
@@ -102,8 +102,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;}
@@ -241,7 +239,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!='' ) {?>

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

@@ -109,8 +109,6 @@ a.lienType {
 	color: #FFFFFF;
 	font-weight:bold;
 }
-
-table.data td { border-bottom:1px solid #ccc; padding:5px; }
 </style>
 
 <div class="paragraph">

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

@@ -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

@@ -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) { ?>

application/views/default/scripts/layout.phtml

@@ -0,0 +1,23 @@
+<?php echo $this->doctype(); ?>
+<html>
+<head>
+	<?php echo $this->headMeta(); ?>
+	<?php echo $this->headTitle(); ?>
+	<?php echo $this->headStyle(); ?>
+	<?php echo $this->headLink(); ?>
+	<?php echo $this->headScript(); ?>
+</head>
+<body>
+	<div id="global">
+    	<?php echo $this->render('header.phtml')?>
+    	<div id="content">
+        	<?php echo $this->layout()->content?>
+        	<div id="footer">
+        	<?php echo $this->render('footer.phtml')?>
+        	</div>
+    	</div>
+	</div>
+
+	<?php echo $this->inlineScript(); ?>
+</body>
+</html>

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

@@ -31,6 +31,12 @@
 </table>
 </div>
 
+<div style="margin:5px;" class="ui-state-highlight ui-corner-all">
+<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-info"></span>
+Les éléments disponibles ci-dessous en téléchargement ou commande peuvent faire l'objet d'une facturation selon vos accords contractuels.
+</p>
+</div>
+
 <h2>Actes & Status</h2>
 <div class="paragraph">
 <?php if ($this->ErreurMessage):?>
@@ -77,13 +83,13 @@
 	?>
 	<?php if ($this->ModeEdition && $acte['mode']!='fichier'){?>
 		<br/><a href="<?=$this->url(array(
-			'controller' => 'pieces', 
+			'controller' => 'pieces',
 			'action' => 'cmdfactice',
 			'siret' => $this->siret,
 			'ref' => $acte['ref']
 		), null, true)?>" target="_blank">
 		Créer une commande factice.
-		</a>	
+		</a>
 	<?php }?>
 	</td>
 	<td class="decision"><?=$acte['decision']?></td>

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

@@ -29,6 +29,12 @@
   </tr>
   <?php }?>
 </table>
+
+<div style="margin:5px;" class="ui-state-highlight ui-corner-all">
+<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-info"></span>
+Les éléments disponibles ci-dessous en téléchargement ou commande peuvent faire l'objet d'une facturation selon vos accords contractuels.
+</p></div>
+
 </div>
 
 <h2>Compte annuels</h2>
@@ -77,14 +83,14 @@
 	?>
 	<?php if ($this->ModeEdition && $bilan['mode']!='fichier'){?>
 		<br/><a href="<?=$this->url(array(
-			'controller' => 'pieces', 
+			'controller' => 'pieces',
 			'action' => 'cmdfactice',
 			'siret' => $this->siret,
 			'ref' => $bilan['ref'],
-			
+
 		), null, true)?>" target="_blank">
 		Créer une commande factice.
-		</a>	
+		</a>
 	<?php }?>
 	</td>
 	<td class="decision"><?=$bilan['decision']?></td>

application/views/default/scripts/print/ecran.phtml

@@ -9,4 +9,4 @@ window.onload = function() {
 #global { width:auto !important;}
 #content { margin:5px; padding:0; width:auto; }
 </style>
-<?=$this->action($this->action, $this->controller, null, $this->params)?>
+<?=$this->action($this->action, $this->controller, null, $this->params)?>

application/views/default/scripts/recherche/list.phtml

@@ -113,6 +113,38 @@
 
 		<?php
 		break;
+		
+		//Affichage recherche worldcheck
+		case 'wcheck':
+			?>
+				<p>RECHERCHE WORLDCHECK :</p>
+		
+				<?php if (!empty($histo['params']['dirNom'])) {?>Nom : <?=$histo['params']['dirNom']?><br/><?php } ?>
+				<?php if (!empty($histo['params']['dirPrenom'])) {?>Prenom : <?=$histo['params']['dirPrenom']?><br/><?php } ?>
+				<?php if (!empty($histo['params']['dirType'])) {?>Type : <?=$histo['params']['dirType']?><br/><?php } ?>
+				
+				<?php if (isset($histo['consult'])) {?>
+					<a href="<?=$this->url(array(
+						'controller' => 'identite',
+						'action' => 'fiche',
+						'siret' => $histo['consult']['siret'],
+						'id' => $histo['consult']['id'],
+					))?>">Afficher la fiche identite consulter</a>
+				<?php }?>
+				
+				<a href="<?=$this->url(array_merge(
+					array('controller' => 'recherche', 'action' => 'liste'),
+					array_merge($histo['params'], array('type'=>$histo['type'])))
+				)?>">Lancer la recherche</a>
+				 - 
+				<a href="<?=$this->url(array_merge(
+					array('controller' => 'recherche', 'action' => 'worldcheck'),
+					$histo['params'])
+				)?>">Afficher le formulaire</a>
+		
+				<?php
+				break;
+				
 		case 'annonce': 
 		default: break;
 	}

application/views/default/scripts/recherche/worldcheck.phtml

@@ -0,0 +1,40 @@
+<?php
+$form = $this->form;
+?>
+<div id="center-recherche">
+<div id="recherche">
+<h3>RECHERCHE WORLDCHECK</h3>
+<form class="recherche" name="<?php echo $form->getName()?>"
+ method="<?php echo $form->getMethod()?>" action="<?php echo $form->getAction()?>">
+<?=$form->type?>
+<div class="row"><?php echo $form->dirType?>
+<img src="/themes/default/images/info.gif" title="Recherche de personne physique ou de sociétés. Les champs 'TYPE' et 'NOM' sont obligatoirs à remplir" /></div>
+<div class="row" id='nom'><?php echo $form->dirNom?></div>
+<div class="row" id='prenom'><?php echo $form->dirPrenom?></div>
+
+<div class="row submit">
+<?php echo $form->submit?>
+<?php echo $form->reset?>
+</div>
+</form>
+</div>
+</div>
+<script type="text/javascript">
+function formElements()
+{
+	if ($('select[name=dirType] option:selected').text()=='Individual')
+	{
+		$('div#prenom').show();
+	}
+	else
+	{
+		$('div#prenom').hide();
+	}
+}
+$('document').ready(function(e){
+	formElements();
+});
+$('select[name=dirType]').change(function(e){
+	formElements();
+});
+</script>

application/views/default/scripts/saisie/checkisin.phtml

@@ -0,0 +1 @@
+<?=$this->error;?>

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

@@ -98,7 +98,7 @@ else
 <div class="paragraph">
 
 <label>Code ISIN</label>
-<input type="text" name="frmSaisie[isin]" size="15" maxlength="15" value="<?=trim($this->etab->Isin)?>" />
+<input type="text" name="frmSaisie[isin]" id='isin' size="15" maxlength="15" value="<?=trim($this->etab->Isin)?>" />
 <label>Activit&eacute; d&eacute;clar&eacute;e de l'entreprise</label>
 <textarea name="frmSaisie[activite]" rows="5" cols="40"><?=$this->etab->Activite?></textarea>
 
@@ -174,4 +174,13 @@ if(substr($this->etab->FJ,0,1)=='1' || in_array($this->etab->FJ, array(2310, 232
 
 </form>
 
-</div>
+</div>
+<script>
+$('input#isin').change(function(e){
+	$.post('/saisie/checkisin', {isin: $(this).val() }, function success(data) {
+		 $('input#isin').html(data);
+		 if (data){ $('input#isin').css("border-color", "red");} 
+		 else { $('input#isin').css("border-color", "");}
+	});
+});
+</script>

application/views/default/scripts/saisie/lien.phtml

@@ -241,6 +241,7 @@ $('a#lienDoc').on('click', function(e){
 
 $('select[name=motifUpdate]').on('change', function(e){
     e.preventDefault();
+    $('input[name=dateEffetLien]').val('<?=$this->dateEffetLien;?>');
     if ($(this).val()=='TUP') {
         $('select[name=MajMin]').val('T');
     	$('input[name=PDetention]').val(0);
@@ -249,6 +250,8 @@ $('select[name=motifUpdate]').on('change', function(e){
         $('select[name=MajMin]').val('F');
     	$('input[name=PDetention]').val(0);
      	$('input[name=Pvote]').val(0);
+    } else if ($(this).val()=='Dernier rapport annuel') {
+        $('input[name=dateEffetLien]').val('<?=$this->dateEffetLienDoc;?>');
     }
 });
 

application/views/default/scripts/saisie/lienetranger.phtml

@@ -68,6 +68,13 @@ div#etranger { display:none; }
 </div>
 </div>
 
+<div class="fieldgrp">
+<label>ISIN</label>
+<div class="field">
+<input type="text" name="isin" value="<?=$this->isin?>"/>
+</div>
+</div>
+
 <div class="fieldgrp">
 <label>Pays</label>
 <div class="field">
@@ -107,7 +114,7 @@ Selectionner un pays pour afficher les identifiants locaux
 <div class="fieldgrp">
 <label>Téléphone</label>
 <div class="field">
-<input type="text" name="tel" value="<?=$this->tel?>"/> <span id="indTel"></span>
+<div style="float-left;"></div><span id="indTel"></div><div></span><input type="text" name="tel" value="<?=$this->tel?>"/></div> 
 </div>
 </div>
 
@@ -233,10 +240,17 @@ $.datepicker.setDefaults( $.datepicker.regional["fr"] );
 $('input[name=dateCapital]').datepicker({ changeMonth: true, changeYear: true });
 $('input[name=dateNbActions]').datepicker({ changeMonth: true, changeYear: true });
 
+$('input[name=isin]').change(function(e){
+	$.post('/saisie/checkisin', {isin: $(this).val() }, function success(data) {
+		 if (data){$('input[name=isin]').css("border-color", "red");} 
+		 else {$('input[name=isin]').css("border-color", "");}
+	});
+});
+
 $('select[name=adresse_pays]').change(function(e){
 	var code = $(this).val();
     //Devise, indicatif téléphone
-    $('span#indTel').html('+'+countries[code]['indTel']);
+    $('span#indTel').text('+'+countries[code]['indTel']);
     $('select[name=deviseCapital]').val(countries[code]['devise']);
     $('select[name=bilDev]').val(countries[code]['devise']);
 	//Local Id
@@ -284,4 +298,9 @@ $('a#google').on('click', function(e){
 	var val = $('input[name=nom]').val();
 	window.open('https://www.google.fr/#q='+encodeURIComponent(val));
 });
+
+$(document).ready(function(){
+	var code = $('select[name=adresse_pays]').val();
+	$('span#indTel').text('+'+countries[code]['indTel']);
+});
 </script>

application/views/default/scripts/user/index.phtml

@@ -261,8 +261,11 @@ foreach ($this->prefsLib as $code => $lib) {
 <?php }?>
 </div>
 
+</div>
+
 <?php if ( $this->options->idClient == 1 && !in_array('edition',$this->droits) ) { ?>
 <h2>Mode spéciaux</h2>
+<div class="paragraph">
 <div class="infoTitle StyleInfoLib">Mode Edition</div>
 <div class="infoData last">
 <?php
@@ -274,9 +277,9 @@ if ( $this->options->modeEdition==true ) {
 <input type="checkbox" name="modeEdition" value="1"<?=$check?> class="noborder"/>
 <span id="msgModeEdition"></span>
 </div>
+</div>
 <?php }?>
 
-</div>
 <div class="submit"><p class="submit-button"><input type="submit" class="button" value="Sauver"/></p></div>
 </form>
 

application/views/default/scripts/worldcheck/controls.phtml

@@ -0,0 +1,22 @@
+<?php if ($this->pageCount) { ?>
+
+<!-- First page link -->
+<?php if (isset($this->previous)) { ?>
+<a href="<?php echo $this->url(array('page' => $this->first)); ?>"><img src="/themes/default/images/worldcheck/first.png" title='Première page'/></a>
+<?php } ?>
+     
+<!-- Previous page link -->
+<?php if (isset($this->previous)) { ?>
+<a href="<?php echo $this->url(array('page' => $this->previous)); ?>"><img src="/themes/default/images/worldcheck/prev.png" title='Page précédente'/></a>
+<?php } ?>
+&nbsp;
+<!-- Next page link -->
+<?php if (isset($this->next)) { ?>
+<a href="<?php echo $this->url(array('page' => $this->next)); ?>"><img src="/themes/default/images/worldcheck/next.png" title='Page suivante'/></a>
+<?php } ?>
+     
+<!-- Last page link -->
+<?php if (isset($this->next)) { ?>
+<a href="<?php echo $this->url(array('page' => $this->last)); ?>"><img src="/themes/default/images/worldcheck/last.png" title='Dernière page'/></a>
+<?php } ?>
+<?php } ?>

application/views/default/scripts/worldcheck/index.phtml

@@ -1,21 +1,66 @@
-<?php 
-print_r($this->message);
-?>
-<br/>
+<div id="center">
+<h1>World-Check</h1>
+<div id="center-recherche" style='margin-left: 10px; margin-right:10px'>
+<?php if ($this->filtres) { ?>
+<?php if ($this->param->dirType =='INDIVIDUAL') {?>
+<div style='float:right;'>
+<select name="filtre">
+<?php foreach ($this->filtres as $k => $filtre) {?>
+<option value="<?=$this->url(array('filtre'=>$k, 'page'=>''))?>"<?=$filtre['select']?>><?=$filtre['txt']?></option>
+<?php }?>
+</select>
+</div>
+<?php }?>
+<?php }?>
+<script type="text/javascript">
+	$('select[name=filtre]').change(function(e){
+	window.location = $(this).val();
+	});
+</script>
+</div>
 <?php
-$result = array();
-foreach ($this->matches->match as $key => $value)
+if (!$this->resultWC)
 {
-	echo '<p>'.$this->param->dirNom.' '.$this->param->dirPrenom.'</p>';
-	$result[$key] = $value;
-	echo 'Match Found by: '.$result[$key]->matchFoundBy.'<br/>';
-	echo 'Match Resolution: '.$result[$key]->matchResolution.'<br/>';
-	echo 'Match Risk: '.$result[$key]->matchRisk.'<br/>';
-	echo 'Match Score: '.$result[$key]->matchScore.'<br/>';
-}
-//print_r($this->params);
-//print_r($this->nameIdentifier);
-
 ?>
-
-<h1></h1>
+	 <div>Aucun résultat.</div>
+<? }
+else
+{
+	require_once 'common/dates.php';
+	$wdate = new WDate();
+	$resultWC = $this->resultWC;
+	
+	$reponse = count($resultWC)==1?'réponse':'réponses';
+	$title = count($resultWC).' '.$reponse.' avec les critères "'.$this->param->dirNom.' '.$this->param->dirPrenom.'"';
+?>
+<div style='float:left; margin-left:15px;'><?=$title;?></div>
+<br/>
+<div>
+<ol start=<?=$this->ol_number; ?>>
+<?php
+foreach ($this->paginator as $entityId=>$shortData)
+{
+?>
+<li>
+<strong><a href="<?=$this->url(array('controller'=>'worldcheck', 'action'=>'matchcontent', 'matchIdentifier'=>$this->allMatches[$entityId]), null, true)?>"><?= $shortData->lastName.' '.$shortData->givenName;?></a></strong><br/>
+<table>
+<?php if (isset($shortData->description) && $shortData->description!='') {?>
+<tr>
+<td class="StyleInfoLib" width="150">Description</td>
+<td class="StyleInfoData" width="450"><?=$shortData->description;?></td>
+</tr>
+<?php } ?>
+<?php if (isset($shortData->country) && $shortData->country!='') {?>
+<tr>
+<td class="StyleInfoLib" width="150">Country</td>
+<td class="StyleInfoData" width="450"><?=ucfirst(strtolower($shortData->country));?></td>
+</tr>
+<?php } ?>
+</table>
+</li>
+<?php } ?>
+</ol>
+</div>
+<p><div id="center-recherche"><?php if (count($resultWC)>$this->itemCount) { echo $this->paginator; } ?></div></p>
+<?php } ?>
+</div>

application/views/default/scripts/worldcheck/matchcontent.phtml

@@ -0,0 +1,320 @@
+<div id="center">
+<style>
+.wrap {
+	border: none;
+	width:450px;
+	word-wrap:break-word;
+}
+</style>
+<h1>World-Check</h1>
+<?php
+require_once 'common/dates.php';
+$wdate = new WDate();
+if (!$this->content) 
+{
+?>
+<p><div style='margin-left: 10px;'>Aucune Information</div></div>
+<?php 
+}
+else 
+{
+	$content = $this->content;
+?>
+<h2><?=$this->content[0]->names->name[0]->fullName;?>
+<?php  
+if (strtolower($this->nameType)=='individual')
+{
+	$day = $month = $year = '';
+	if ($content[0]->events->event[0]->day>0) $day = $content[0]->events->event[0]->day;
+	if ($content[0]->events->event[0]->month>0) $month = $content[0]->events->event[0]->month;
+	if ($content[0]->events->event[0]->year>0) $year = $content[0]->events->event[0]->year;
+	$param = array(
+			'controller'=>'recherche',
+			'action'=>'dirigeant',
+			'dirNom'=>$content[0]->names->name[0]->lastName,
+			'dirPrenom'=>$content[0]->names->name[0]->givenName,
+			'dirDateNaissJJ' =>$day,
+			'dirDateNaissMM' =>$month,
+			'dirDateNaissAAAA' =>$year,
+			'dirCpVille' =>$content[0]->events->event[0]->address->region
+	);
+} else {
+	$param = array(
+			'controller'=>'recherche',
+			'action'=>'entreprise',
+			'siret'=>'',
+			'raisonSociale'=>$content[0]->names->name[0]->fullName,
+			'numero'=>'',
+			'voie'=>'',
+			'cpVille' =>'',
+			'telFax' =>'',
+			'naf' =>'',
+			'fj' =>'',
+			'pays'=>'',
+	);
+}
+?>
+<div style='float:right;'><a style="color:white;" href="<?=$this->url($param, null, true)?>">&nbsp;Search in Extranet&nbsp;&nbsp;</a></div>
+</h2>
+<div class="paragraph">
+<table cellpadding=3>
+<?php if (isset($content[0]->category)) { ?>
+<tr>
+<td class="StyleInfoLib" width="150">Category</td>
+<td class="StyleInfoData"><div class="wrap"><?=ucfirst(strtolower($content[0]->category));?></div></td>
+</tr>
+<?php } ?>
+<?php 
+if (isset($content[0]->names->name)){?>
+<tr>
+<td class="StyleInfoLib" width="150">All names</td>
+<td class="StyleInfoData"><div class="wrap">
+<?php 
+foreach($content[0]->names->name as $name)
+{
+	if (isset($name->fullName) && $name->fullName!='') {echo $name->fullName.'<br/>';}
+} ?>
+</div></td></tr>
+<?php } ?>
+<?php if (isset($content[0]->gender)) { ?>
+<tr><td class="StyleInfoLib" width="150">Gender</td>
+<td class="StyleInfoData"><div class="wrap"><?=ucfirst(strtolower($content[0]->gender));?></div></td></tr>
+<?php } ?>
+<?php if (isset($content[0]->events->event) && ($content[0]->events->event[0]->day>0) && ($content[0]->events->event[0]->month>0) && ($content[0]->events->event[0]->year>0)) { ?>
+<tr><td class="StyleInfoLib" width="150">Birthday</td>
+<td class="StyleInfoData"><div class="wrap"><?=$wdate->dateT('Y-m-d', 'd/m/Y', $content[0]->events->event[0]->fullDate);?></div></td></tr>
+<?php } ?>
+<?php if (isset($content[0]->events->event[0]->address->region)) { ?>
+<tr><td class="StyleInfoLib" width="150">Birth place</td>
+<td class="StyleInfoData"><div class="wrap"><?=$content[0]->events->event[0]->address->region;?></div></td></tr>
+<?php } ?>
+<?php 
+foreach($content[0]->details->detail as $detail)
+{ ?>
+<?php if (isset($detail->text)) { ?>
+<tr>
+<td class="StyleInfoLib" width="150"><?=ucfirst(strtolower($detail->detailType));?></div></td>
+<td class="StyleInfoData"><div class="wrap"><?=$detail->text;?></td>
+</tr>
+<?php }} ?>
+<?php
+if (isset($content[0]->addresses->address[0])){
+?>
+<tr><td class="StyleInfoLib" width="150">All Addresses</td>
+<td class="StyleInfoData"><div class="wrap">
+<?php 
+foreach($content[0]->addresses->address as $address) {
+	$fullAddress = array(); 
+	if (isset($address->city)) { $fullAddress[] = $address->city;}
+	if (isset($address->region)) { $fullAddress[] = $address->region;}
+	if (isset($address->country)) { $fullAddress[] = ucfirst(strtolower($address->country->name));}
+	echo implode(', ', $fullAddress);?>
+<br/>
+<?php unset($fullAddress); }?>
+</div></td></tr>
+<?php } ?>
+<?php 
+if (isset($content[0]->actionDetails->actionDetail)){
+	foreach($content[0]->actionDetails->actionDetail as $actionDetail)
+	{?>
+<tr><td class="StyleInfoLib" width="150"><?=ucfirst(strtolower($actionDetail->actionType)); ?></td>
+<td class="StyleInfoData"><div class="wrap"><?=$actionDetail->text;?></div></td></tr>
+<tr><td class="StyleInfoLib" width="150">Source</td>
+<td class="StyleInfoData"><div class="wrap"><?=$actionDetail->source->name.' ('.$actionDetail->source->abbreviation.')';?></div></td></tr>
+<?php }} ?>
+
+<?php 
+foreach($content[0]->countryLinks->countryLink as $countryLink)
+{ ?>
+<?php if (isset($countryLink->countryText)) { ?>
+<tr>
+<td class="StyleInfoLib" width="150"><?php echo ($countryLink->countryLinkType=='NATIONALITY')?'Nationality':'Registered in'?></div></td>
+<td class="StyleInfoData"><div class="wrap"><?=ucfirst(strtolower($countryLink->countryText)).' ('.$countryLink->country->code.')';?></td>
+</tr>
+<?php } ?>
+<?php } ?>
+<?php 
+if (isset($content[0]->sources->sourceDetail)){
+foreach($content[0]->sources->sourceDetail as $source)
+{ 
+	if (isset($source->name) && $source->name!='') { ?>
+<tr><td class="StyleInfoLib" width="150"><?=$source->ProviderSourceTypeDetail->category->name?></td>
+<td class="StyleInfoData"><div class="wrap"><?=$source->ProviderSourceTypeDetail->category->description;?></div></td></tr>
+<tr><td class="StyleInfoLib" width="150">Source</td>
+<td class="StyleInfoData"><div class="wrap"><?=$source->name.' ('.$source->abbreviation.')';?></div></td></tr>
+<?php }}} ?>
+<?php 
+if (isset($content[0]->roles->role)){
+foreach($content[0]->roles->role as $role)
+{ 
+	if (isset($role->title) && $role->title!='') { ?>
+<tr><td class="StyleInfoLib" width="150"><?=$role->type?></td>
+<td class="StyleInfoData"><div class="wrap"><?=$role->title;?></div></td></tr>
+<?php }}} ?>
+<?php if (isset($content[0]->weblinks->weblink)) { ?>
+<tr>
+<td class="StyleInfoLib" width="150">Weblinks</td>
+<td class="StyleInfoData"><div class="wrap">
+<?php foreach($content[0]->weblinks->weblink as $weblink)
+{ ?>
+<a href="<?=$weblink->URI;?>" target="_blank"><?=$weblink->URI;?></a><br/>
+<?php } ?>
+</div></td>
+</tr>
+<?php } ?>
+</table>
+</div>
+
+<?php 
+if (isset($content[0]->associates->associate)) {
+foreach($content[0]->associates->associate as $associate)
+{ ?>
+<h2>
+<?php  
+if ($associate->associatetype=='ASSOCIATE')
+{
+	$dirType = 'INDIVIDUAL';
+	$dirName = 'dirNom';
+	$day = $month = $year = '';
+	if ($associate->targetEntity->events->event[0]->day>0) $day = $associate->targetEntity->events->event[0]->day;
+	if ($associate->targetEntity->events->event[0]->month>0) $month = $associate->targetEntity->events->event[0]->month;
+	if ($associate->targetEntity->events->event[0]->year>0) $year = $associate->targetEntity->events->event[0]->year;
+	$param = array(
+			'controller'=>'recherche',
+			'action'=>'dirigeant',
+			'dirNom'=>$associate->targetEntity->names->name[0]->lastName,
+			'dirPrenom'=>$associate->targetEntity->names->name[0]->givenName,
+			'dirDateNaissJJ' =>$day,
+			'dirDateNaissMM' =>$month,
+			'dirDateNaissAAAA' =>$year,
+			'dirCpVille' =>$associate->targetEntity->events->event[0]->address->region
+	);
+} else {
+	$dirType = 'ORGANISATION';
+	$dirName = 'dirSociete';
+	$param = array(
+			'controller'=>'recherche',
+			'action'=>'entreprise',
+			'siret'=>'',
+			'raisonSociale'=>$associate->targetEntity->names->name[0]->fullName,
+			'numero'=>'',
+			'voie'=>'',
+			'cpVille' =>'',
+			'telFax' =>'',
+			'naf' =>'',
+			'fj' =>'',
+			'pays'=>'',
+	);
+}
+?>
+Associate: <?=$associate->targetEntity->names->name[0]->fullName;?>
+<?php $id='/dirType/'.$dirType.'/'.$dirName.'/'.$associate->targetEntity->names->name[0]->lastName.'/dirPrenom/'.$associate->targetEntity->names->name[0]->givenName;?>
+<div style='float:right;'><img class="wcheck" id="<?=$id;?>" src='/themes/default/images/worldcheck/wc-blanc.png'/></div>
+<div style='float:right;'><a style="color:white;" href="<?=$this->url($param, null, true)?>">&nbsp;Search in Extranet&nbsp;&nbsp;</a></div>
+<script>
+$('img.wcheck').each(function(){
+	$(this).qtip({
+		hide: { event: 'unfocus' },
+		show: { solo: true, delay: 1000 },
+		content: { title: {button: true}, text: "Chargement...",
+		ajax: { url: '<?=$this->url(array('controller'=>'worldcheck','action'=>'occurence'));?>'+$(this).attr('id') } },
+		position: { my: "bottom left", at: "top center" }
+	});
+});
+</script>
+</h2>
+<div class="paragraph">
+<table cellpadding=3>
+<?php if (isset($associate->targetEntity->category)) { ?>
+<tr>
+<td class="StyleInfoLib" width="150">Category</td>
+<td class="StyleInfoData"><div class="wrap"><?=ucfirst(strtolower($associate->targetEntity->category));?></div></td>
+</tr>
+<?php } ?>
+<?php if (isset($associate->targetEntity->gender)) { ?>
+<tr>
+<td class="StyleInfoLib" width="150">Gender</td>
+<td class="StyleInfoData"><div class="wrap"><?=ucfirst(strtolower($associate->targetEntity->gender));?></div></td>
+</tr>
+<?php } ?>
+<?php if (isset($associate->targetEntity->events->event) && ($associate->targetEntity->events->event[0]->day>0) && ($associate->targetEntity->events->event[0]->month>0) && ($associate->targetEntity->events->event[0]->year>0)) { ?>
+<tr>
+<td class="StyleInfoLib" width="150">Birthday</td>
+<td class="StyleInfoData"><div class="wrap"><?=$wdate->dateT('Y-m-d', 'd/m/Y', $associate->targetEntity->events->event[0]->fullDate);?></div></td>
+</tr>
+<?php } ?>
+<?php 
+foreach($associate->targetEntity->details->detail as $detailAssoc)
+{ ?>
+<?php if (isset($detailAssoc->text)) { ?>
+<tr>
+<td class="StyleInfoLib" width="150"><?=ucfirst(strtolower($detailAssoc->detailType)); ?></td>
+<td class="StyleInfoData"><div class="wrap"><?=$detailAssoc->text;?></div></td>
+</tr>
+<?php } ?>
+<?php } ?>
+<tr>
+<td class="StyleInfoLib" width="150">Adresse</td>
+<td class="StyleInfoData"><div class="wrap">
+<?php
+if (isset($associate->targetEntity->addresses->address[0])){
+foreach($associate->targetEntity->addresses->address as $address) {
+$fullAddress = array(); 
+if (isset($address->city)) { $fullAddress[] = $address->city;}
+if (isset($address->region)) { $fullAddress[] = $address->region;}
+if (isset($address->country)) { $fullAddress[] = ucfirst(strtolower($address->country->name));}
+?>
+<?=implode(', ', $fullAddress);?>
+<br/>
+<?php unset($fullAddress); }}?>
+</div></td></tr>
+<?php 
+if (isset($associate->targetEntity->actionDetails->actionDetail)){
+	foreach($associate->targetEntity->actionDetails->actionDetail as $actionDetail)
+	{?>
+<tr><td class="StyleInfoLib" width="150"><?=ucfirst(strtolower($actionDetail->actionType)); ?></td>
+<td class="StyleInfoData"><div class="wrap"><?=$actionDetail->text;?></div></td></tr>
+<tr><td class="StyleInfoLib" width="150">Source</td>
+<td class="StyleInfoData"><div class="wrap"><?=$actionDetail->source->name.' ('.$actionDetail->source->abbreviation.')';?></div></td></tr>
+<?php }} ?>
+<?php 
+foreach($associate->targetEntity->countryLinks->countryLink as $countryLink)
+{ ?>
+<?php if (isset($countryLink->countryText)) { ?>
+<tr>
+<td class="StyleInfoLib" width="150"><?php echo ($countryLink->countryLinkType=='NATIONALITY')?'Nationality':'Registered in'?></div></td>
+<td class="StyleInfoData"><div class="wrap"><?=ucfirst(strtolower($countryLink->countryText)).' ('.$countryLink->country->code.')';?></td>
+</tr>
+<?php } ?>
+<?php } ?>
+<?php 
+if (isset($associate->targetEntity->sources->sourceDetail)){
+foreach($associate->targetEntity->sources->sourceDetail as $source)
+{ 
+	if (isset($source->name) && $source->name!='') { ?>
+<tr><td class="StyleInfoLib" width="150"><?=$source->ProviderSourceTypeDetail->category->name?></td>
+<td class="StyleInfoData"><div class="wrap"><?=$source->ProviderSourceTypeDetail->category->description;?></div></td></tr>
+<tr><td class="StyleInfoLib" width="150">Source</td>
+<td class="StyleInfoData"><div class="wrap"><?=$source->name.' ('.$source->abbreviation.')';?></div></td></tr>
+<?php }}} ?>
+<?php 
+if (isset($associate->targetEntity->roles->role)){
+foreach($associate->targetEntity->roles->role as $role)
+{ 
+	if (isset($role->title) && $role->title!='') { ?>
+<tr><td class="StyleInfoLib" width="150"><?=$role->type?></td>
+<td class="StyleInfoData"><div class="wrap"><?=$role->title;?></div></td></tr>
+<?php }}} ?>
+<?php if (isset($associate->targetEntity->weblinks->weblink)) { ?>
+<tr>
+<td class="StyleInfoLib" width="150">Weblinks</td>
+<td class="StyleInfoData"><div class="wrap">
+<?php foreach($associate->targetEntity->weblinks->weblink as $weblink)
+{ ?>
+<a href="<?=$weblink->URI;?>" target="_blank"><?=$weblink->URI;?></a><br/>
+<?php } ?>
+</div></td></tr>
+<?php } ?>
+</table></div>
+<?php }}} ?>
+</div>

application/views/default/scripts/worldcheck/occurence.phtml

@@ -0,0 +1,20 @@
+<?=($this->occurrence===false) ? "WorldCheck<br/>Cliquez sur l&rsquo;icone WorldCheck" : "WorldCheck<br/>Occurrences: ".$this->occurrence;?>
+<? $param = array(
+			'controller'=>'worldcheck',
+			'action'=>'index',
+			'dirSociete'=>$this->data->Societe,
+			'dirNom'=>$this->data->Nom,
+			'dirPrenom'=>$this->data->Prenom,
+			'dirType' =>$this->data->Type,
+			'siren'=>substr($this->siret, 0, 9));
+
+foreach ($param as $key =>$val)
+{
+	if ($val=='')
+	{
+		unset($param[$key]);
+	}
+}
+	?>
+<br/>
+<a href="<?=$this->url($param, null, true)?>">Rechercher en WorldCheck</a>

data/pages/themes/default/styles/giant.css

@@ -1,256 +1,423 @@
-.compteAnnuels .tdP{
-	font-size:13px;
+.compteAnnuels .tdP {
+	font-size: 13px;
 }
 
 .compteAnnuels table {
-	width:645px;
+	width: 645px;
 	margin-left: 19px;
-	font-size:13px;
+	font-size: 13px;
 }
 
 .compteAnnuels hr {
-	border:1px dotted silver
+	border: 1px dotted silver
 }
 
 .compteAnnuels #tdP {
-	font-size:13px;
+	font-size: 13px;
 }
 
-.compteAnnuels .title {
-	font-size:16px;
-	color:#00008C;
-	font-weight:800;
+.title {
+	font-size: 16px;
+	color: #2599E7;
+	font-weight: 800;
 }
+
+.minTitle {
+	background: none repeat scroll 0 0 #B9C9FE;
+	border: 1px solid #FFF;
+	color: #039;
+	font-size: 13px;
+	font-weight: 800;
+	padding: 4px;
+}
+
 .compteAnnuels .center {
-	text-align:center;
+	text-align: center;
 }
 
 .compteAnnuels .bilansTAB td {
-	font-size:11px; !important
+	font-size: 11px;
+	!
+	important
 }
 
 #AvisDeCredit {
 	margin-left: 19px;
-	width:97%;	
+	width: 97%;
 }
+
 #AvisDeCredit td {
-	font-size:13px;
+	font-size: 13px;
 }
 
 #AvisDeCredit .float {
-	float:right;
+	float: right;
 }
+
 #AvisDeCredit hr {
-	border:1px dotted silver;
+	border: 1px dotted silver;
 }
+
 #AvisDeCredit div {
-	padding:0.7em;	
+	padding: 0.7em;
 }
+
 #AvisDeCredit div span {
-	float: left; margin-right: 0.3em;
+	float: left;
+	margin-right: 0.3em;
 }
 
 #ComparisonValeurs span {
-	font-size:16px;
-	color:#00008C;
-	font-weight:800;
+	font-size: 16px;
+	color: #2599E7;
+	font-weight: 800;
 }
+
 #ComparisonValeurs .Variation {
-	width:85px;
-	text-align:right;	
+	width: 85px;
+	text-align: right;
 }
+
 #ComparaisonValeurs hr {
-	border:1px dotted silver;	
+	border: 1px dotted silver;
 }
+
 #ComparisonValeurs div {
-	padding:0.7em;
+	padding: 0.7em;
 }
 
 .alignCenter {
-	text-align:center;
+	text-align: center;
 }
 
-#ComparaisonValeurs .align {
-	align="right"
+#ComparaisonValeurs .align {align ="right"
+	
 }
 
-#sommaire
-{
-	margin:5px;
+#sommaire {
+	margin: 5px;
 }
 
-#sommaire fieldset
-{
+#sommaire fieldset {
 	padding: 10px;
-	border:1px dotted silver;
+	border: 1px dotted silver;
 	padding-bottom: 70px;
 }
 
-#sommaire fieldset legend
-{
-	font-size:25px;
+#sommaire fieldset legend {
+	font-size: 25px;
 	font-weight: bold;
-	color:#000099;
+	color: #000099;
 }
 
-#sommaire h3
-{
-	font-size:25px;
+#sommaire h3 {
+	font-size: 25px;
 	font-weight: bold;
 	text-align: right;
 	margin-right: 10px;
 }
 
-#sommaire li
-{
-	font-size:15px;
+#sommaire li {
+	font-size: 15px;
 	list-style: none;
 	font-weight: 800;
 	margin-top: 10px;
 }
 
-#sommaire li a
-{
-	color:#000099;
+#sommaire li a {
+	color: #000099;
 	cursor: pointer;
 }
 
-#sommaire li a:hover
-{
-	color:#9C093A;
+#sommaire li a:hover {
+	color: #9C093A;
 }
 
-#sommaire span a:hover
-{
-	color:#000099;
+#sommaire span a:hover {
+	color: #000099;
 }
 
-#sommaire span a
-{
-	color:#9C093A;
+#sommaire span a {
+	color: #9C093A;
 	cursor: pointer;
 }
 
-#comportementPaiement tr td
-{
-	padding:5px;
+#comportementPaiement tr td {
+	padding: 5px;
 }
-.colorTr
-{
+
+.colorTr {
 	background-color: #EDEEF7;
 }
 /** Giant rapport **/
-#ComparisonValeurs table
-{
-	font-size:13px;
-	margin-left: 19px;
-}
-.red
-{
-	font-size:11px;
-	background-color:#FFE8E8;
+.red {
+	font-size: 11px;
+	background-color: #FFE8E8;
 }
 
-.green
-{
-	font-size:11px;
-	background-color:#E8FFE8;
+.green {
+	font-size: 11px;
+	background-color: #E8FFE8;
 }
 
-#ComparisonValeurs table tr:hover
-{
+#ComparisonValeurs table tr:hover {
 	background-color: #E0E4F8;
 }
 
-.hoverTr tr:hover
-{
-    background-color: #E0E4F8;
-    cursor: default;
+.hoverTr tr:hover {
+	background-color: #E0E4F8;
+	cursor: default;
 }
 
-.FR{background-image: url('/themes/default/images/giant/cartes/fr.png');background-repeat: no-repeat;background-position: top right;}
-.NL{ background-image: url('/themes/default/images/giant/cartes/nl.JPG');background-repeat: no-repeat;background-position: top right;}
-.BE{ background-image: url('/themes/default/images/giant/cartes/be.JPG');background-repeat: no-repeat;background-position: top right;}
-.UK{ background-image: url('/themes/default/images/giant/cartes/uk.JPG');background-repeat: no-repeat;background-position: top right;}
-.ES{ background-image: url('/themes/default/images/giant/cartes/es.JPG');background-repeat: no-repeat;background-position: top right;}
+.FR {
+	background-image: url('/themes/default/images/giant/cartes/fr.png');
+	background-repeat: no-repeat;
+	background-position: top right;
+}
 
-#carte
-{
-	width:660px;
+.NL {
+	background-image: url('/themes/default/images/giant/cartes/nl.JPG');
+	background-repeat: no-repeat;
+	background-position: top right;
+}
+
+.BE {
+	background-image: url('/themes/default/images/giant/cartes/be.JPG');
+	background-repeat: no-repeat;
+	background-position: top right;
+}
+
+.UK {
+	background-image: url('/themes/default/images/giant/cartes/uk.JPG');
+	background-repeat: no-repeat;
+	background-position: top right;
+}
+
+.ES {
+	background-image: url('/themes/default/images/giant/cartes/es.JPG');
+	background-repeat: no-repeat;
+	background-position: top right;
+}
+
+#carte {
+	width: 660px;
 	background-position: right top;
 	background-repeat: no-repeat;
 	background-color: #fcfdfe;
 }
 /** Giant Search **/
-#info td
-{
-    padding:2px;
+#info td {
+	padding: 2px;
 }
 
-.giant-search
-{
-	font-family: Arial,Helvetica,sans-serif;
+.giant-search {
+	font-family: Arial, Helvetica, sans-serif;
 	color: #535353;
 }
 
-.giant-search #Paginator
-{
-	color:black;
+.giant-search #Paginator {
+	color: black;
 }
 
-.giant-search ol
-{
-	text-align:left;
-	margin:10px;
-	padding:0 20px;
+.giant-search ol {
+	text-align: left;
+	margin: 10px;
+	padding: 0 20px;
 }
 
-.giant-search #Paginator table
-{
-	width:130px;
+.giant-search #Paginator table {
+	width: 130px;
 }
 
-.giant-search #contact
-{
-	padding-left:5px;
-}
-#inDebug
-{
-	float:left;
-}
-#debug
-{
-	background-color:#FFFFCC;
-	padding:10px;
-	border:1px solid silver;
-	width:590px;
-	overflow:auto;
+.giant-search #contact {
+	padding-left: 5px;
 }
 
-#debug_menu
-{
-	float:left;
-	background-color:#FFFFCC;
-	border:1px solid silver;
-	width:150px;
-	height:25px;
-	margin-bottom:2px;
-	padding-top:9px;
+#inDebug {
+	float: left;
 }
 
-#debug_menu:hover
-{
-	background-color:#FFFF99;
-	cursor:pointer;
+#debug {
+	background-color: #FFFFCC;
+	padding: 10px;
+	border: 1px solid silver;
+	width: 590px;
+	overflow: auto;
 }
 
-.hide 
-{
+#debug_menu {
+	float: left;
+	background-color: #FFFFCC;
+	border: 1px solid silver;
+	width: 150px;
+	height: 25px;
+	margin-bottom: 2px;
+	padding-top: 9px;
+}
+
+#debug_menu:hover {
+	background-color: #FFFF99;
+	cursor: pointer;
+}
+
+.hide {
 	background-color: silver;
-    height: 455px;
-    position: absolute;
-    top:2%;
-	left:35%;
-    width: 691px;
-	opacity:0.3;
+	height: 455px;
+	position: absolute;
+	top: 2%;
+	width: 691px;
+	opacity: 0.3;
+}
+
+.hide_monitor {
+	background-color: #C0C0C0;
+	height: 497px;
+	position: absolute;
+	top: 0%;
+	width: 714px;
+	margin-left: -14px;
+	opacity: 0.3;
+}
+
+.radio_but {
+	width: 295px;
+}
+
+.lang_img {
+	display: none;
+	float: right;
+	margin-left: 3px;
+}
+
+.lang_select {
+	float: right;
+	margin-left: 3px;
+}
+
+.brsr {
+	border-style: solid;
+	border-width: 1px;
+	border-color: red;
+}
+
+.all_select {
+	width: 140px;
+}
+
+.acord {
+	width: 671px;
+	margin: 0 auto;
+}
+
+.gen_div {
+	width: 600px;
+	margin-left: 41px;
+}
+
+.left_div {
+	float: left;
+	width: 300px;
+	padding-bottom: 15px;
+}
+
+.right_div {
+	float: left;
+	width: 300px;
+	padding-bottom: 15px;
+}
+
+.radius {
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	-khtml-border-radius: 4px;
+	-o-border-radius: 4px;
+	-ms-border-radius: 4px;
+	-icab-border-radius: 4px;
+	border-radius: 4px;
+}
+
+.monitor_but {
+	width: 448px;
+}
+
+.monitor_but a {
+	margin: 7px;
+	float: left;
+}
+
+.monitor_resp {
+	height: 16px;
+	clear: both;
+	margin: 5px;
+	padding: 5px;
+	background: #eee;
+	width: 601px;
+}
+
+.dialog-form {
+	display: none;
+}
+
+.mon_type {
+	width: 140px;
+}
+
+.testSearch a:hover {
+	text-decoration: underline;
+}
+
+.testSearch a {
+	color: #008000;
+	font-style: italic;
+}
+
+.line {
+	background: none repeat scroll 0 0 #E8EDFF;
+	border: 1px solid #FFF;
+	padding: 4px;
+}
+
+.tooltipFont {
+	color: black;
+	font-size: 12px;
+}
+
+
+#giant_synthese .head {
+	font-weight: bold;
+}
+
+#giant_synthese th {
+	background: none repeat scroll 0 0 #B9C9FE;
+	border: 1px solid #FFFFFF;
+	color: #003399;
+	font-size: 13px;
+	padding: 4px;
+}
+
+#giant_synthese td.right {
+	text-align: right;
+}
+
+#giant_synthese {
+	border-collapse: collapse;
+	clear: both;
+	font-size: 12px;
+	margin: 10px 0px 0;
+	padding: 2px;
+	text-align: left;
+	width: 100%;
+	font-family: arial, sans-serif;
+	font-size: 11px;
+}
+
+#giant_synthese td {
+	background: none repeat scroll 0 0 #E8EDFF;
+	border: 1px solid #FFFFFF;
+	color: #666699;
+	padding: 4px;
+}
+
+#giant_synthese tr:hover td {
+	background: none repeat scroll 0 0 #D0DAFD;
 }

data/pages/themes/default/styles/main.css

@@ -1,4 +1,4 @@
-/*! normalize.css v2.0.1 */
+/*! normalize.css v2.1.2 */
 
 /* ==========================================================================
    HTML5 display definitions
@@ -63,8 +63,8 @@ audio:not([controls]) {
 
 html {
     font-family: sans-serif; /* 1 */
-    -webkit-text-size-adjust: 100%; /* 2 */
     -ms-text-size-adjust: 100%; /* 2 */
+    -webkit-text-size-adjust: 100%; /* 2 */
 }
 
 /**
@@ -101,12 +101,13 @@ a:hover {
    ========================================================================== */
 
 /**
- * Address variable `h1` font size within `section` and `article` contexts in
- * Firefox 4+, Safari 5, and Chrome.
+ * Address variable `h1` font-size and margin within `section` and `article`
+ * contexts in Firefox 4+, Safari 5, and Chrome.
  */
 
 h1 {
     font-size: 2em;
+    margin: 0.67em 0;
 }
 
 /**
@@ -134,6 +135,16 @@ dfn {
     font-style: italic;
 }
 
+/**
+ * Address differences between Firefox and other browsers.
+ */
+
+hr {
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
+    height: 0;
+}
+
 /**
  * Address styling not present in IE 8/9.
  */
@@ -160,9 +171,7 @@ samp {
  */
 
 pre {
-    white-space: pre;
     white-space: pre-wrap;
-    word-wrap: break-word;
 }
 
 /**
@@ -282,6 +291,18 @@ input {
     line-height: normal;
 }
 
+/**
+ * Address inconsistent `text-transform` inheritance for `button` and `select`.
+ * All other form control elements do not inherit `text-transform` values.
+ * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+.
+ * Correct `select` style inheritance in Firefox 4+ and Opera.
+ */
+
+button,
+select {
+    text-transform: none;
+}
+
 /**
  * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
  *    and `video` controls.
@@ -380,19 +401,21 @@ body{font-family: Verdana, Arial, sans-serif;font-size: 11px;text-align: center;
 #global {width:900px; margin:0 auto; text-align:left;}
 #content {padding:0;margin:0;}
 #center {background-color:#fff;padding:5px 0;}
-div.paragraph {margin:5px;padding:5px;}
 #footer {clear:both;text-align:center;margin-top:15px;}
 #footer p {font:0.9em Arial, Helvetica, sans-serif; }
+#center h1 {clear:both;margin:5px;padding:5px; background:#606060; color:#ffffff;font:600 1.4em Arial, Verdana, Sans-serif; letter-spacing:1px; line-height:1.2em;}
+#center h2 {clear:both; margin:5px; padding:5px; background:#00008c; color:#ffffff; font:bold 1.2em Arial, Verdana, Sans-serif; }
+div.paragraph {margin:5px;padding:5px;}
 .clearfix:after {content: ".";display: block;height: 0;clear: both;visibility: hidden;zoom:1;}
 a:link {color: #9c093a; text-decoration:none;}
 a:visited {color: #0000CC; text-decoration:none;}
 a:hover {color: #000066; text-decoration:none;}
-#center h1 {clear:both;margin:5px;padding:5px; background:#606060; color:#ffffff;font:600 1.4em Arial, Verdana, Sans-serif; line-height:1.2em;}
-#center h2 {clear:both; margin:5px; padding:5px; background:#00008c; color:#ffffff; font:bold 1.2em Arial, Verdana, Sans-serif; }
-.StyleInfoLib {font-family: Arial, Helvetica, sans-serif;font-size:  11px;font-weight: bold;color:#535353;}
+.StyleInfoLib {font-family: Arial, Helvetica, sans-serif;font-size:  11px;font-weight: bold;color:#535353; vertical-align:top;}
 .StyleInfoData {font-family: Arial, Helvetica, sans-serif;font-size: 11px;color:#535353;}
 .StyleInfoDataActif {font-family: Arial, Helvetica, sans-serif;font-size: 11px;}
 table.identite {border-collapse:separate;border-spacing:4px;}
+table.data {width:100%;}
+table.data td {border:1px solid #ccc; padding:5px;}
 .confidentiel {border-top:1px solid; padding-top:5px; font-style:italic; font-size:9px;}
 .ui-dialog {text-align:left;}
 .ui-widget {font-size: 1em;}
@@ -403,6 +426,7 @@ div.ui-state-highlight a {text-decoration: underline;}
 .noborder {border:0;}
 img { vertical-align:middle; }
 
+
 /* Menu
 ----------------------------------*/
 div#menu {display:none;}
@@ -434,7 +458,7 @@ div#menu div.icones {text-align:center;margin-top:5px;}
 #recherche-info{text-align:center;}
 #recherche-page{text-align:center;}
 #recherche-page img{vertical-align:middle;}
-form.recherche{padding:20px 0; text-align:left;}
+form.recherche{padding:0; text-align:left;}
 form.recherche label {clear:both;float:left;width:250px;line-height:20px;font-weight:bold;text-align:right;padding-right:5px;}
 form.recherche div.field {float:left;}
 form.recherche div.row {clear:both;padding:5px 0;}
@@ -490,6 +514,7 @@ a.AncienSiege { background-color: #4D90FE; border: 1px solid #3079ED; color: #FF
 #ratio {clear: both;font-family: "Lucida Sans Unicode","Lucida Grande",Sans-Serif;font-size: 12px;margin: 10px 0 0;text-align: left;width: 100%;}
 #LiasseTable {border-collapse: collapse;color:#606060;margin:5px 0 10px 0;}
 #LiasseTable td {font-size:11px;font-family: arial,sans-serif;border:1px solid silver;padding:2px;}
+#LiasseTable td.amount-value {min-width:70px;}
 #liasseForm th {color:#606060;font-weight:bold;}
 #liasseForm {margin-left:30px;}
 #liasseForm td {color:#606060;}
@@ -518,10 +543,9 @@ ul.tabs li a.active {background-color:#ffffff;color:#282e32;border:1px solid #46
 
 /* Géolocalisation
 ----------------------------------*/
-#infogeo_txt {float:left;width:250px;padding:10px 0;}
-#infogeo_photo {float:left;margin:0;padding:0;width:340px;}
-#legende-photo {display:none;width:278px;margin:5px 0 10px 0;padding:10px;border:1px solid #0000ff;color:#0000ff;}
-#pp-cb-thumb {display:none;}
+#infogeo_txt {float:left;width:320px;padding:10px 0;}
+#infogeo_photo {float:left;margin:0;padding:0;width:320px;}
+#legende-photo {margin:5px 0; padding:10px;border:1px solid #0000ff;color:#0000ff;}
 #pp-cb-thumb div.left {float:left;position:relative;width:256px;height:128px;overflow:hidden;}
 #pp-cb-thumb div.right {float:left;position:relative;width:44px;height:128px;overflow:hidden;}
 #pp-cb-thumb div.left img{position:relative;left:-256px;top:-140px;}
@@ -636,12 +660,11 @@ input[type="checkbox"] { margin:0 5px 0 5px; border:0; }
 .submit {text-align:center;}
 .noborder {border:none;}
 #message {margin:10px 0 10px 30px;}
-table.greffe {width:95%; margin:5px 10px;border-collapse:collapse;}
-table.greffe th {border:1px solid #000000;padding:8px 4px 8px 4px;background-color:#eeeeee;text-align: center; }
-table.greffe .date { text-align: center; }
-table.greffe td.date { background-color:#2b2b8b;color:white;font-weight:bold;}
+table.greffe {width:100%;border-collapse:collapse;}
+table.greffe th {border:1px solid #000000;padding:8px 4px 8px 4px;background-color:#eeeeee;text-align:center; }
+table.greffe td.date {text-align:center;background-color:#2b2b8b;color:white;font-weight:bold;width:90px;}
 table.greffe td { border:1px solid #000000;padding:8px 4px 8px 4px;}
-table.greffe td.decision { width:50%; }
+table.greffe td.decision {}
 table.greffe td.type {text-align:center;}
 
 /* Kbis

data/pages/themes/default/styles/user.css

@@ -1,4 +1,4 @@
-#dialog { display:none; }
+#dialog-password { display:none; }
 #utilisateur { width:100%; border-collapse:collapse; margin:0;}
 #utilisateur tr.titre td { background-color: #D9EEF1; font-weight:bold; }
 #utilisateur tr.border td { border:1px dashed #939393; padding:5px; margin:0;}

library/Application/Form/RechercheWorldcheck.php

@@ -0,0 +1,72 @@
+<?php
+class Application_Form_RechercheWorldcheck extends Zend_Form
+{
+
+	public $elementDecorators = array(
+        'ViewHelper',
+        'Errors',
+        array('HtmlTag', array('tag' => 'div', 'class' => 'field')),
+        array('Label'),
+    );
+
+    public $buttonDecorators = array(
+        'ViewHelper'
+    );
+
+	public function init()
+	{
+		$this->setName('recherche');
+		$this->setAction('/recherche/liste');
+    	$this->setMethod('post');
+    	$this->addElement('hidden', 'type', array(
+			'value' => 'wcheck',
+			'decorators' => array('ViewHelper'),
+    	));
+    	
+		$this->addElement('select', 'dirType', array(
+			'decorators' => $this->elementDecorators,
+    	    'label' => 'TYPE',
+    	    'style' => 'width:175px;',
+    	    'required' => true,
+    	    'multiOptions' => array(
+    	        'INDIVIDUAL' => 'Individual',
+    	        'ORGANISATION' => 'Organisation'),
+    	));
+    	$this->addElement('text', 'dirNom', array(
+    		'filters' => array('StringTrim'),
+	    	'label' => 'NOM',
+    		'required' => 'true',
+    		'decorators' => $this->elementDecorators,
+    		'attribs' => array(
+    			'size' => 30,
+    			'maxlength' => 30,
+    		),
+		));
+
+    	$this->addElement('text', 'dirPrenom', array(
+    		'filters' => array('StringTrim'),
+	    	'label' => 'PRENOM',
+    		'required' => 'true',
+    		'decorators' => $this->elementDecorators,
+    		'attribs' => array(
+    			'size' => 30,
+    			'maxlength' => 30,
+    		),
+    	));
+
+    	$this->addElement('submit', 'submit', array(
+				'label' => 'Recherche',
+				'ignore' => true,
+    			'class' => 'button',
+    			'decorators' => $this->buttonDecorators,
+    	));
+
+    	$this->addElement('reset', 'reset', array(
+				'label' => 'Effacer',
+				'ignore' => true,
+    			'class' => 'button',
+				'decorators' => $this->buttonDecorators,
+    	));
+	}
+
+}

library/Finance/Liasse.php

@@ -34,15 +34,15 @@ class Liasse
 
 		//Affectaction des postes
 		foreach ($data->POSTES->item as $element){
-		    if (in_array(array(
+		    if (in_array($element->id, array(
 		        'YP', 'YP1', '376',              // Effectifs 2033 et 2050
     			'M2G', 'M2H',                    // Autres effectifs
     			'ZK', 'ZK1',                     // Taux
     			'IJ', 'JG', 'JH', 'JJ', 'ZR',    // pour holding/ste mere
     			'XP'                             //numero de centre de gestion agréé
-    			), $element->id))
+    			)))
 		    {
-		        $this->postes[$element->id] = $element->val;
+		        $this->postes[$element->id] = number_format($element->val, 0, '', ' ');
 		    } else {
 		        $this->postes[$element->id] = $this->dMontant($element->val);
 		    }
@@ -177,10 +177,10 @@ class Liasse
 			'YY'=>'374',
 			'YZ'=>'378',
 			'YP'=>'376',
-				
-			//@todo : Traiter N-1				
-				
-				
+
+			//@todo : Traiter N-1
+
+
 		);
 
 		$bilanRN=array();

library/Giant/Controllers.lib.php

@@ -5,20 +5,30 @@
 */
 require_once 'Vendors/ChartDirector/phpchartdir.php';
 require_once ('Giant/WSgiant.php');
+require_once ('Scores/WsScores.php');
 require_once ('Scores/Cache.php');
 require_once ('Partials.php');
 
 Class GiantControllerLib
 {
-	private $pathImg;
+
+	private   $pathImg;
+	protected $configVal = array();
 
 	public function __construct($companyId)
 	{
+		$this->configVal = new Zend_Config_Ini( realpath(dirname(__FILE__)).'/giant.ini' );
 		$c = Zend_Registry::get('config');
 		$this->pathImg = $c->profil->path->pages.'/imgcache/'.$companyId;
 	}
 
-
+	public function getCache($pays){
+		$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);
+		$result = $cache->load('Pays_'.$pays);
+		return ($result);
+	}
 	public function commande($CompanyId, $Type, $Pays, $Language, $TestIndication)
 	{
 		$function	 = new GiantFunction();
@@ -26,49 +36,74 @@ Class GiantControllerLib
 		$Commande    = new Commandes();
 		$Rapport     = new Rapports($Pays, $TestIndication);
 		$CommandeP   = new stdClass();
-
+		$setLog 	 = new WsScores();
+		
 		switch ($Utilisateur->getIdClient()) {
 			case '0':
-				$price = 0;
+				$price = $this->configVal->price->test;
 				break;
 			case '1':
-				$price = 7;
+				$price = $this->configVal->price->snd;
 				break;
 			default:
-				$price = 10;
+				$price = $this->configVal->price->other;
 		}
 		$id = $Rapport->getRapportExist($CompanyId, $Type, $Language);
 		if(empty($id)) {
 			$rapport = new GiantRechercheController($Pays, $TestIndication);
 			$result  = $rapport->GetRapport($CompanyId, $Type, $Language);
-			$result  = base64_encode(serialize($result));
-			$id = $Rapport->setReport($CompanyId,
-					$Type,
-					$Pays,
-					$result,
-					$Language);
+			if (!empty($result)) {
+				$result  = base64_encode(serialize($result));
+				$id = $Rapport->setReport($CompanyId,
+						$Type,
+						$Pays,
+						$result,
+						$Language);
+			}
 		}
-
+		//setLog in WS
+		$setLog->setLog('giant'.$Type, $CompanyId);
+		//////////////
 		$report_id = $Rapport->getRapportExistId($CompanyId, $Language);
-
-		$CommandeP->login      = $Utilisateur->getLogin();
-		$CommandeP->date       = date("Y-m-d");
-		$CommandeP->typeReport = $function->getTypeReport($Type);
-		$CommandeP->price      = $price;
-		$CommandeP->pays       = strtolower($Pays);
-		$CommandeP->rapportId  = $report_id[0]['id'];
-		//$CommandeP->lang  = $Utilisateur->getLang();
-		/*echo'<pre>';
-		print_r($report_id);
-		echo'</pre>';
-		if(!$Commande->getCommandeExistToday($CommandeP->login, $CommandeP->date, $CommandeP->typeReport, $CommandeP->pays)) {
-		$Commande->setCommandes($CommandeP);
-		}*/
-		$Commande->setCommandes($CommandeP);
-
+		if (!empty($report_id)) {
+			$CommandeP->login      = $Utilisateur->getLogin();
+			$CommandeP->date       = date("Y-m-d");
+			$CommandeP->typeReport = $function->getTypeReport($Type);
+			$CommandeP->price      = $price;
+			$CommandeP->pays       = strtolower($Pays);
+			$CommandeP->rapportId  = $report_id[0]['id'];
+			//$CommandeP->lang  = $Utilisateur->getLang();
+			/*echo'<pre>';
+			print_r($report_id);
+			echo'</pre>';
+			if(!$Commande->getCommandeExistToday($CommandeP->login, $CommandeP->date, $CommandeP->typeReport, $CommandeP->pays)) {
+			$Commande->setCommandes($CommandeP);
+			}*/
+			$Commande->setCommandes($CommandeP);
+		}
 		return ($id);
 	}
-
+	public function commandePays($CompanyId,$Pays,$TestIndication)
+	{
+		$frontendOptions = array(
+				'lifetime' => $this->configVal->cache->lifetime,
+				'automatic_serialization' => true
+		);
+		$path = '../data/cache/giant/';
+		if (!is_dir($path)) mkdir($path, 0777, true)
+			;
+		//No, create it
+		$backendOptions = array('cache_dir' => '../data/cache/giant/');
+		$cache = Zend_Cache::factory('Output','File',$frontendOptions,$backendOptions);
+		if(($result = $cache->load('Pays_'.$Pays)) === false) {
+			$rapport = new GiantRechercheController($Pays, $TestIndication);
+			$result  = $rapport->ListeRapport($CompanyId);
+			if (!empty($result)) {
+				$cache->save($result, 'Pays_'.$Pays);
+			}
+		}
+		return ($result);
+	}
 	public function startmonitoring($CompanyId, $CategorieName, $EventType, $PreferredStartDate, $PreferredEndDate, $Version, $LanguageCode,$Pays,$TestIndication,$CompanyName)
 	{
 		$Utilisateur = new Scores_Utilisateur();
@@ -107,15 +142,33 @@ Class GiantControllerLib
 
 	public function stopmonitoring($CompanyId, $PreferredEndDate,$InternalOrderId,$Pays,$TestIndication)
 	{
+		$Commande    = new Commandes();
+		$CommandeP   = new stdClass();
+		$CommandeP->PreferredEndDate      = $PreferredEndDate;
+		$CommandeP->InternalOrderId       = $InternalOrderId;
 		$rapport = new GiantRechercheController($Pays, $TestIndication);
 		$result  = $rapport->GetStopMonitoring($CompanyId, $PreferredEndDate,$InternalOrderId);
+		if(!empty($result)){
+			$Commande->updateMonitoring($CommandeP);
+		}
 		return ($result);
 	}
 
 	public function updatemonitoring($CompanyId, $InternalOrderId, $CategorieName, $EventType, $PreferredStartDate, $Version, $LanguageCode, $Pays,$TestIndication)
 	{
+		$Commande    = new Commandes();
+		$CommandeP   = new stdClass();
+		$CommandeP->CategorieName         = $CategorieName;
+		$CommandeP->EventType             = $EventType;
+		$CommandeP->Language              = $LanguageCode;
+		$CommandeP->PreferredStartDate    = $PreferredStartDate;
+		$CommandeP->Version               = $Version;
+		$CommandeP->InternalOrderId       = $InternalOrderId;
 		$rapport = new GiantRechercheController($Pays, $TestIndication);
 		$result  = $rapport->GetUpdateMonitoring($CompanyId, $InternalOrderId, $CategorieName, $EventType, $PreferredStartDate, $Version, $LanguageCode);
+		if(!empty($result)){
+			$Commande->updateMonitoring($CommandeP);
+		}
 		return ($result);
 	}
 	public function retrivemonitoring($CompanyId, $StartFrom,$InternalOrderId,$Pays,$TestIndication,$EventType,$CompanyName)
@@ -136,6 +189,13 @@ Class GiantControllerLib
 		$result  = $rapport->GetRetriveMonitoring($CompanyId, $StartFrom,$InternalOrderId,$EventType);
 		return ($result);
 	}
+
+	public function retrivDB($date_st)
+	{
+		$Rapport     = new Rapports();
+		$id = $Rapport->getRetrive($date_st);
+		return $id;
+	}
 	public function retrive($StartFrom,$TestIndication,$EventType)
 	{
 		$Utilisateur = new Scores_Utilisateur();
@@ -217,8 +277,8 @@ Class GiantRechercheController extends GiantFunction
 		$this->Provider                 = new stdClass();
 		$this->Provider->CountryCode    = $CountryCode;
 		$this->Provider->ProviderId     = parent::setCountryCode($CountryCode, $this->listAutorized);
-		$this->Provider->TestIndication = true;
-		$this->soapG                    = new WSgiant($this->Provider);
+		$this->Provider->TestIndication = (bool)$TestIndication;
+		$this->soapG                    = new WSgiant($this->Provider,$TestIndication);
 	}
 
 	public function Liste($parametres, $page)

library/Giant/RequestDatabase.lib.php

@@ -45,6 +45,27 @@ Class Commandes
 		);
 		$commandes->insert($data);
 	}
+	public function updateMonitoring($parametres)
+	{
+		$commandes = new Application_Model_MonitoringGiants();
+		$data = array( 
+				'Category' => $parametres->CategorieName,
+				'EventType' => $parametres->EventType,
+				'Language' => $parametres->Language,
+				'PreferredStartDate' => $parametres->PreferredStartDate,
+				'PreferredEndDate' => $parametres->PreferredEndDate,
+				'Version' => $parametres->Version,
+				'ActualStartDate' => $parametres->PreferredStartDate,
+				'ActualEndDate' => $parametres->PreferredEndDate,
+		);
+		foreach ($data as $key=>$val){
+			if (empty($val)) {
+				unset($data[$key]);
+			}
+		}
+		$where['InternalOrderId = ?'] = $parametres->InternalOrderId;
+		$commandes->update($data,$where);
+	}
 	public function setRetrive($parametres)
 	{
 		$commandes = new Application_Model_RetriveGiants();
@@ -108,19 +129,23 @@ Class Rapports
 		$report->insert($datas);
 		return ($reportSerial);
 	}
-
 	public function getRapportExist($companyId, $type, $Language)
 	{
 		$rapports = new Application_Model_RapportsGiants();
 		$id = $rapports->getReportByIdAndType($companyId, $this->enumerations[$type], $Language);
 		return ($id);
 	}
-
 	public function getRapportExistId($companyId, $Language)
 	{
 		$rapports = new Application_Model_RapportsGiants();
 		$id = $rapports->getReportById($companyId, $Language);
 		return ($id);
 	}
+	public function getRetrive($date_st)
+	{
+		$rapports = new Application_Model_MonitoringGiants();
+		$id = $rapports->getRetrive($date_st);
+		return ($id);
+	}
 }
 ?>

library/Giant/WSgiant.php

@@ -7,10 +7,12 @@ class WSgiant extends Zend_Soap_Client
 {
 	protected $wsService = array();
 	protected $header;
+	protected $TestIndication;
 
-	function __construct($parametres)
+	function __construct($parametres,$TestIndication)
 	{
 		$this->wsService = new Zend_Config_Ini( realpath(dirname(__FILE__)).'/giant.ini' );
+		$this->TestIndication = $TestIndication;
 		if($parametres InstanceOF stdClass)
 			self::init($parametres);
 	}
@@ -21,19 +23,19 @@ class WSgiant extends Zend_Soap_Client
 	 */
 	private function init($parametres)
 	{
+		$password='password'.$this->TestIndication;
 		$utilisateur 	= new Scores_Utilisateur();
 		$options 		= array(
 				'features' 		=> SOAP_USE_XSI_ARRAY_TYPE + SOAP_SINGLE_ELEMENT_ARRAYS,
 				'soapVersion' 	=> SOAP_1_1,
 				'login' 		=> $this->wsService->options->login,
-				'password' 		=> $this->wsService->options->password,
+				'password' 		=> $this->wsService->options->$password,
 				'compression' 	=> SOAP_COMPRESSION_ACCEPT
 		);
 		$this->setOptions($options);
-
 		$giantHeader                        = new stdClass();
 		$giantHeader->ConsumerId            = $this->wsService->header->ConsumerId;
-		$giantHeader->CustomerId            = '001';
+		$giantHeader->CustomerId            = $utilisateur->getLogin();
 
 		$giantHeader->Provider              = new stdClass();
 		$giantHeader->Provider->CountryCode = $parametres->CountryCode;
@@ -55,7 +57,8 @@ class WSgiant extends Zend_Soap_Client
 	 */
 	public function getAllMethodesFromWsdl($service)
 	{
-		$this->setWsdl($this->wsService->$service->wsdl);
+		$wsdl = 'wsdl'.$this->TestIndication;
+		$this->setWsdl($this->wsService->$service->$wsdl);
 		return ($this);
 	}
 }

library/Giant/giant.ini

@@ -6,16 +6,31 @@ serviceName = "ServiceHeader"
 
 [options]
 login = "006"
-;password = "mZ0kXvQ03tPC1"
-password = 'ClaudeMonet'
+password0 = "mZ0kXvQ03tPC1"
+password1 = 'ClaudeMonet'
 soap_version = SOAP_1_1
 
 [search]
-;wsdl = "https://services.giant-net.com/search/v1?wsdl"
+wsdl0 = "https://services.giant-net.com/search/v1?wsdl"
 ;wsdl = "http://194.150.14.129/search/v1?wsdl"
-wsdl = "https://services-acc.giant-net.com/search/v1?wsdl"
+wsdl1 = "https://services-acc.giant-net.com/search/v1?wsdl"
+;wsdl = "http://giant-tst.graydon.nl/search/v1?wsdl"
+
 [credit-data]
-wsdl = "https://services-acc.giant-net.com/credit-data/v1?wsdl"
+wsdl1 = "https://services-acc.giant-net.com/credit-data/v1?wsdl"
 ;wsdl = "http://194.150.14.129/credit-data/v1?wsdl"
-;wsdl = "https://services.giant-net.com/credit-data/v1?wsdl"
-;wsdl = "http://giant.sd.dev/services/wsdl/credit-data-service-provider-api-1.0.wsdl"
+wsdl0 = "https://services.giant-net.com/credit-data/v1?wsdl"
+;wsdl = "http://giant.sd.dev/services/wsdl/credit-data-service-provider-api-1.0.wsdl"
+
+[price]
+test = "0"
+snd = "7"
+other = "10"
+
+[cache]
+lifetime = "2628000"
+
+[test]
+;1 = test mode
+;0 = production
+TestIndication = '0'

library/Giant/giant_config.ini

@@ -0,0 +1,6 @@
+[price]
+test = "0"
+snd = "7"
+other = "10"
+[cache]
+lifetime = "86403"

library/Infogreffe/Infogreffe.php

@@ -547,13 +547,15 @@ class Infogreffe
 				$bilan['mode_diffusion'][] = $mode->getAttribute('type');
 			}
 
+			Zend_Registry::get('firebug')->info('Bilan : '.$bilan['date_cloture'].' '.$bilan['type_comptes']);
+
 			//Génération de l'index pour le tri
 			$date = $bilan['date_cloture_iso'];
 			if(!empty($date))
 			{
-				$datef = substr($date,0,4).substr($date,5,2).substr($date,8,2);
+				$key = substr($date,0,4).substr($date,5,2).substr($date,8,2).'-'.$bilan['num_depot'];
 				//Affectation liste générale avec un index permettant le tri
-				$bilans[$datef] = $bilan;
+				$bilans[$key] = $bilan;
 			}
 		}
 		krsort($bilans);

library/Scores/Cache.php

@@ -124,4 +124,36 @@ class Cache
 		fclose($fp);
 		return $result;
 	}
+	
+	/**
+	 * Caching WorldCheck Data using Zend_cache
+	 *
+	 * @param array $config (elements: path, name, lifetime)
+	 * @param object $class (object of calling class)
+	 * @param string $function (name of member function)
+	 * @param array $param (arguments of member function)
+	 * @param string $file_name (cache filename)
+	 * @return mixed (array object)
+	 */
+	public function wcCache($config, $class, $function, $param, $file_name)
+	{		
+		//caching
+		$cache_dir = $config['path'].$config['name'];
+		if (!is_dir($cache_dir)) mkdir($cache_dir, 0777, true);
+		
+		$frontendOptions = array(
+				'lifetime' => $config['lifetime'],
+				'automatic_serialization' => true
+		);
+		$backendOptions = array('cache_dir' => $cache_dir);
+		$cache = Zend_Cache::factory('Output','File',$frontendOptions,$backendOptions);
+		
+		if(!($cache_data = $cache->load($file_name))) {
+			$cache_data = new stdClass();
+			$cache_data = call_user_func_array(array($class, $function), array($param));
+			$cache->save($cache_data, $file_name);
+		}
+		//end
+		return $cache_data;
+	}
 }

library/Scores/ExportCSV.php

@@ -1,34 +1,34 @@
 <?php
-class ExportCSV 
+class ExportCSV
 {
 	protected $entete = array();
 	protected $enteteKey = array();
 	protected $data = array();
 	protected $type = '';
 	protected $list = array();
-	
+
 	public function __construct($data = array(), $type = '')
 	{
 		$this->data = $data;
 		$this->type = $type;
-		
-		$this->structure();		
+
+		$this->structure();
 		$this->prepareData();
 	}
-	
+
 	protected function prepareData()
 	{
 		$row = 0;
 		foreach($this->data as $itemKey => $itemVal)
-		{			
+		{
 			foreach($this->enteteKey as $key){
 				$val = html_entity_decode($itemVal->$key);
-				$this->list[$row][] = $val;				
+				$this->list[$row][] = $val;
 			}
 			$row++;
-		}		
+		}
 	}
-	
+
 	protected function structure()
 	{
 		switch($this->type) {
@@ -41,31 +41,32 @@ class ExportCSV
 					'Adresse'	=> 'Adresse',
 					'Adresse2'	=> 'Adresse2',
 					'CP'		=> 'CP',
+					'Ville'		=> 'Ville',
 					'Sigle'		=> 'Sigle',
 					'Siege' 	=> 'Siege',
 					'Actif'		=> 'Actif',
 					'FJ'		=> 'FJ',
 					'FJLib'		=> 'FJLib',
-					'NafEnt'	=> 'NafEntLib', 
-				);				
+					'NafEnt'	=> 'NafEntLib',
+				);
 				break;
-			default:				
+			default:
 				break;
 		}
 		$this->entete = array_values($structure);
 		$this->enteteKey = array_keys($structure);
 	}
-	
+
 	public function writeFile($filename)
-	{	
+	{
 		$fp = fopen($filename, 'w');
 		if (count($this->entete)>0){
 			fputcsv($fp, $this->entete);
-		}		
+		}
 		foreach ($this->list as $fields) {
 			$fields = array_map('htmlspecialchars_decode', $fields);
 			fputcsv($fp, $fields);
 		}
 		fclose($fp);
-	}	
+	}
 }

library/Scores/Google/Streetview.php

@@ -0,0 +1,185 @@
+<?php
+/**
+ * https://developers.google.com/maps/documentation/streetview/
+ * Image de 640x640 max
+ * Heading 0 à 360
+ * 0, 45, 90, 135, 180, 225, 270, 315
+ * Récup de chaque image enregistré SIRET-DEG
+ */
+class Scores_Google_Streetview
+{
+	/**
+	 * Service URL
+	 * @var string
+	 */
+	protected $url = 'http://maps.googleapis.com/maps/api/streetview?';
+
+	/**
+	 * Max size 640x640
+	 * @var string
+	 */
+	protected $size = '640x640';
+
+	/**
+	 * GPS ou Adresse
+	 * @var strign
+	 */
+	protected $location = null;
+
+	/**
+	 * Defaut 90, Max 120, represents zoom, with smaller numbers indicating a higher level of zoom
+	 * @var unknown
+	 */
+	protected $fov = 90;
+
+	/**
+	 * (default is 0) Specifies the up or down angle of the camera relative to the Street View vehicle
+	 * @var unknown
+	 */
+	protected $pitch = 0;
+
+	/**
+	 * (optional) identifies your application for quota purposes
+	 * @var string
+	 */
+	protected $key = null;
+
+	/**
+	 * always false
+	 * @var string
+	 */
+	protected $sensor = 'false';
+
+	/**
+	 * Indicates the compass heading of the camera (0 to 360)
+	 */
+	protected $heading = 0;
+
+	/**
+	 * Number of image by the circle (360°)
+	 * @var int
+	 */
+	protected $nbImage = 8;
+
+	/**
+	 * File extension
+	 * @var string
+	 */
+	protected $extension = 'jpg';
+
+	/**
+	 * Path where files are stored
+	 */
+	protected $path = '';
+
+	/**
+	 *
+	 */
+	public function __construct()
+	{
+		$this->size = '320x320';
+
+		$c = Zend_Registry::get('config');
+		$ths->path = realpath($c->profil->path->data).'/google/streetview';
+
+	}
+
+	/**
+	 *
+	 * @param unknown $lattitude
+	 * @param unknown $longitude
+	 */
+	public function setLocationGeo($lattitude, $longitude)
+	{
+		$this->location = $lattitude.','.$longitude;
+	}
+
+	/**
+	 *
+	 * @param unknown $adresse
+	 */
+	public function setLocationTxt($adresse){}
+
+	/**
+	 *
+	 * @param unknown $num
+	 */
+	public function setHeading($num)
+	{
+		$this->heading = $num;
+	}
+
+	/**
+	 *
+	 * @return multitype:number
+	 */
+	public function getNumDeg()
+	{
+		$mark = array();
+		$deg = 360/$this->nbImage;
+		$i=$calc=0;
+		while ($calc<360) {
+			$mark[$i] = $calc;
+			$calc+=$deg;
+			$i++;
+		}
+		return $mark;
+	}
+
+	/**
+	 *
+	 * @return string
+	 */
+	public function urlImg()
+	{
+		$url = '';
+
+		$params = array( 'size', 'location', 'fov', 'pitch', 'sensor', 'heading' );
+		foreach ($params as $param) {
+			if ( $this->{$param} !== null ) {
+				$url.= '&'.$param.'='. $this->{$param};
+			}
+		}
+
+		return $this->url . substr($url,1);
+	}
+
+	/**
+	 *
+	 */
+	public function getImg()
+	{
+		require_once 'common/curl.php';
+		$page = getUrl($this->url, '', '', '', false);
+
+		if ( !in_array($page['code'], array(400, 408, 403)) ) {
+			$body = $page['body'];
+			file_put_contents($this->pathImg(), $body);
+		}
+	}
+
+	/**
+	 *
+	 * @return string
+	 */
+	public function pathImg()
+	{
+		$filename = $this->siret.'-'.$this->heading . '.' . $this->extension;
+		return $this->path . DIRECTORY_SEPARATOR . $filename;
+	}
+
+	/**
+	 *
+	 * @return string
+	 */
+	public function display()
+	{
+		$file = $this->pathImg();
+		if ( !file_exists($file) ) {
+			$this->getImg();
+		}
+
+		return basename($file);
+	}
+
+}

library/Scores/Mail.php

@@ -11,17 +11,18 @@ class Mail
 	{
 		$c = Zend_Registry::get('config');
 	    $this->config = $c->profil->mail;
-	    
-	    $cnfg = array('auth' => 'login',
-	    		'username' => $this->config->username,
-	    		'password' => $this->config->password);
-		
+
 		$this->mail = new Zend_Mail();
-		
+
 		if ($this->config->method == 'smtp') {
 			$tr = new Zend_Mail_Transport_Smtp($this->config->smtp_host);
 			$this->mail->setDefaultTransport($tr);
 		} elseif ($this->config->method == 'smtpauth') {
+			$cnfg = array(
+					'auth' => 'login',
+					'username' => $this->config->username,
+					'password' => $this->config->password
+			);
 			$tr = new Zend_Mail_Transport_Smtp($this->config->smtp_host, $cnfg);
 			$this->mail->setDefaultTransport($tr);
 		} else {
@@ -29,7 +30,7 @@ class Mail
 			$this->mail->setDefaultTransport($tr);
 		}
 	}
-	
+
 	/**
 	 * Champ From en fonction de la clé de configuration
 	 * @param string $configKey
@@ -39,7 +40,7 @@ class Mail
 		$email = $this->config->email->$configKey;
 		$this->mail->setFrom($email, ucfirst($configKey));
 	}
-	
+
 	/**
 	 * Set Reply-To address
 	 * @param string $email
@@ -48,7 +49,7 @@ class Mail
 	{
 		$this->mail->setReplyTo($email);
 	}
-	
+
 	/**
 	 * Champ To en fonction de la clé de configuration
 	 * @param string $configKey
@@ -58,7 +59,7 @@ class Mail
 		$email = $this->config->email->$configKey;
 		$this->mail->addTo($email, ucfirst($configKey));
 	}
-	
+
 	/**
 	 * Ajout d'un champ To en spécifiant l'email et le nom qui doit apparaitre
 	 * @param string $email
@@ -68,7 +69,7 @@ class Mail
 	{
 		$this->mail->addTo($email, $this->txtConvert($nom));
 	}
-	
+
 	/**
 	 * Définit le sujet de l'email
 	 * @param string $texte
@@ -77,7 +78,7 @@ class Mail
 	{
 		$this->mail->setSubject($this->txtConvert($texte));
 	}
-	
+
 	/**
 	 * Définit le corps de l'email au format texte
 	 * @param string $texte
@@ -86,7 +87,7 @@ class Mail
 	{
 		$this->mail->setBodyText($this->txtConvert($texte));
 	}
-	
+
 	/**
 	 * Définit le corps de l'email au format html
 	 * @param string $html
@@ -95,7 +96,7 @@ class Mail
 	{
 		$this->mail->setBodyHtml($this->txtConvert($html));
 	}
-	
+
 	/**
 	 * Envoi de l'emai
 	 */
@@ -103,10 +104,10 @@ class Mail
 	{
 		return $this->mail->send();
 	}
-	
+
 	//We suppose that character encoding of strings is UTF-8 on PHP script.
 	protected function txtConvert($string) {
     	return mb_convert_encoding($string, 'ISO-8859-1', 'UTF-8');
 	}
-	
+
 }

library/Scores/Menu.php

@@ -33,6 +33,8 @@ class Menu
 				array('controller'=>'recherche', 'action'=>'annonceliste'),
 				array('controller'=>'recherche', 'action'=>'enquete'),
 				array('controller'=>'recherche', 'action'=>'refclientliste'),
+				array('controller'=>'worldcheck', 'action'=>'index'),
+				array('controller'=>'worldcheck', 'action'=>'matchcontent'),
 				array('controller'=>'giant', 'action'=>'search'),
 				array('controller'=>'giant', 'action'=>'identite'),
 				array('controller'=>'giant', 'action'=>'commandes'),
@@ -72,6 +74,13 @@ class Menu
 					'forceVisible' => true,
 					'permission' => 'SEARCHACT',
 				),
+				array(
+						'label' => "Recherche WorldCheck",
+						'controller' => 'recherche',
+						'action' => 'worldcheck',
+						'forceVisible' => false,
+						'permission' => 'WORLDCHECK',
+				),
 				array(
 					'label' => "Dernière recherche",
 					'controller' => 'recherche',
@@ -322,6 +331,7 @@ class Menu
 				    'label' => "Valorisation",
 				    'controller' => 'evaluation',
 				    'action' => 'valorisation',
+				    'permission' => array('VALORISATION'),
 				),
 				array(
 					'label' => "Scoring Credit Safe",
@@ -820,13 +830,6 @@ class Menu
 				break;
 			case 'evaluation':
 				switch($action){
-				    case 'valorisation':
-				        $user = new Scores_Utilisateur();
-				        if ($user->getIdClient()==1) {
-				           return true;
-				        }
-				        return false;
-				        break;
 					case 'indiscore':
 						$siretSiege = substr($this->siret, 0,9);
 						if (!empty($siretSiege) && intval($siretSiege)!=0 ){

library/Scores/PagePrint.php

@@ -3,7 +3,7 @@ class PagePrint
 {
 	protected $controller = null;
 	protected $action = null;
-	
+
 	protected $pagePRINT = array(
 		'identite-fiche' => 'siret,id',
 		'identite-fichepc' => 'siret,id',
@@ -27,14 +27,16 @@ class PagePrint
 		'evaluation-indiscore2' => 'siret,id',
 		'evaluation-indiscore3' => 'siret,id',
 		'evaluation-scoring' => 'siret,id',
+		'evaluation-valorisation' => 'siret,id',
 		'pieces-bilans' => 'siret,id',
 		'pieces-actes' => 'siret,id',
         'giant-full' => 'Pays,Type,CompanyId',
 		'giant-compact' => 'Pays,Type,CompanyId',
 		'giant-creditrecommendation' => 'Pays,Type,CompanyId',
 		'surveillance-fichier' => 'nomFic,filtre',
+		'worldcheck-matchcontent' => 'matchIdentifier',
 	);
-	
+
 	protected $pagePDF = array(
 		'identite-fiche' => 'siret,id',
 		'identite-fichepc' => 'siret,id',
@@ -58,13 +60,15 @@ class PagePrint
 		'evaluation-indiscore2' => 'siret,id',
 		'evaluation-indiscore3' => 'siret,id',
 		'evaluation-scoring' => 'siret,id',
+		'evaluation-valorisation' => 'siret,id',
 		'pieces-bilans' => 'siret,id',
 		'pieces-actes' => 'siret,id',
 		'giant-full' => 'Pays,Type,CompanyId',
 		'giant-compact' => 'Pays,Type,CompanyId',
 		'giant-creditrecommendation' => 'Pays,Type,CompanyId',
+		'worldcheck-matchcontent' => 'matchIdentifier',
 	);
-	
+
 	protected $pageXML = array(
 		'identite-fiche' => 'siret,id',
 		'identite-fichepc' => 'siret,id',
@@ -86,14 +90,16 @@ class PagePrint
 		'evaluation-indiscore' => 'siret,id',
 		'evaluation-indiscore2' => 'siret,id',
 		'evaluation-indiscore3' => 'siret,id',
+		'evaluation-valorisation' => 'siret,id',
+		'worldcheck-matchcontent' => 'matchIdentifier',
 	);
-	
+
 	public function __construct($controller, $action)
 	{
 		$this->controller = $controller;
 		$this->action = $action;
 	}
-	
+
 	protected function getTypeElement($type)
 	{
 		$element = array();
@@ -110,7 +116,7 @@ class PagePrint
 		}
 		return $element;
 	}
-	
+
 	public function exportable($type)
 	{
 		$element = $this->getTypeElement($type);
@@ -119,7 +125,7 @@ class PagePrint
 		}
 		return false;
 	}
-	
+
 	public function filename($type, $params = array())
 	{
 		$element = $this->getTypeElement($type);
@@ -135,27 +141,18 @@ class PagePrint
 		}
 		return $filename;
 	}
-	
+
 	public function objectToXML($object, $params)
 	{
-		require_once 'XML/Serializer.php';
-		$options = array (
-		   	'addDecl' => TRUE,
-		   	'encoding' => 'UTF-8',
-		   	'indent' => '	',
-		   	'rootName' => 'root',
-			'defaultTagName' => 'element',
-		);
-		// Instantiate the serializer with the options
-		$Serializer = new XML_Serializer($options);
-		// Serialize the data structure
-		$result = $Serializer->serialize($object);
-		if($result === true) {
-			$content = $Serializer->getSerializedData();
+		$serializer = new Scores_Serializer_Adapter_Xml();
+		try {
+			$content = $serializer->serialize($object);
 			$filename = $this->filename('xml', $params);
 			$c = Zend_Registry::get('config');
 			$path = realpath($c->profil->path->files).'/';
 			file_put_contents($path.$filename.'.xml', $content);
+		} catch (Zend_Serializer_Exception $e) {
+			//Error
 		}
 	}
 }

library/Scores/RechercheHistorique.php

@@ -22,6 +22,7 @@ class RechercheHistorique
 		'ent' => array('siret', 'raisonSociale', 'numero', 'voie', 'cpVille', 'telFax', 'naf', 'pays', 'fj'),
 		'dir' => array('dirNom', 'dirPrenom', 'dirDateNaissJJ', 'dirDateNaissMM', 'dirDateNaissAAAA', 'dirCpVille'),
 		'act' => array('actNomRs', 'cpVille', 'siret', 'pays', 'pctMin', 'pctMax'),
+		'wcheck' => array('dirNom', 'dirPrenom', 'dirType'),
 		'annonce' => array('formA'),
 		'refclient' => array('ref'),
 	);

library/Scores/Serializer/Adapter/Xml.php

@@ -0,0 +1,164 @@
+<?php
+class Scores_Serializer_Adapter_Xml extends Zend_Serializer_Adapter_AdapterAbstract
+{
+    /**
+     * @var array Default options
+     */
+    protected $_options = array(
+        'rootNode' => 'root',
+    );
+
+    /**
+     * Serialize PHP value to XML
+     *
+     * @param  mixed $value
+     * @param  array $opts
+     * @return string
+     * @throws Zend_Serializer_Exception on XML encoding exception
+     */
+    public function serialize($value, array $opts = array())
+    {
+        $opts = $opts + $this->_options;
+
+        try {
+            $dom = new DOMDocument('1.0', 'utf-8');
+            $root = $dom->appendChild($dom->createElement($opts['rootNode']));
+            $this->createNodes($dom, $value, $root, false);
+            return $dom->saveXml();
+        } catch (Exception $e) {
+            require_once 'Zend/Serializer/Exception.php';
+            throw new Zend_Serializer_Exception('Serialization failed', 0, $e);
+        }
+    }
+
+    /**
+     * Deserialize XML to PHP value
+     *
+     * @param  string $json
+     * @param  array $opts
+     * @return mixed
+     */
+    public function unserialize($xml, array $opts = array())
+    {
+        try {
+            Zend_Json::fromXml($xml);
+            return (array) Zend_Json::decode($json, Zend_Json::TYPE_OBJECT);
+        } catch (Exception $e) {
+            require_once 'Zend/Serializer/Exception.php';
+            throw new Zend_Serializer_Exception('Unserialization failed by previous error', 0, $e);
+        }
+    }
+
+    private function createNodes($dom, $data, &$parent)
+    {
+        switch (gettype($data)) {
+            case 'string':
+            case 'integer':
+            case 'double':
+                $parent->appendChild($dom->createTextNode($data));
+                break;
+
+            case 'boolean':
+                switch ($data) {
+                    case true:
+                        $value = 'true';
+                        break;
+
+                    case false:
+                        $value = 'false';
+                        break;
+                }
+
+                $parent->appendChild($dom->createTextNode($value));
+                break;
+
+            case 'object':
+            case 'array':
+                foreach ($data as $key => $value) {
+
+                    if (is_object($value) and $value instanceOf DOMDocument and !empty($value->firstChild)) {
+                        $node = $dom->importNode($value->firstChild, true);
+                        $parent->appendChild($node);
+                    } else {
+                        $attributes = null;
+
+                        // SimpleXMLElements can contain key with @attribute as the key name
+                        // which indicates an associated array that should be applied to the xml element
+
+                        if (is_object($value) and $value instanceOf SimpleXMLElement) {
+                            $attributes = $value->attributes();
+                            $value = (array) $value;
+                        }
+
+                        // don't emit @attribute as an element of it's own
+                        if ($key[0] !== '@')
+                        {
+                            if (gettype($value) == 'array' and !is_numeric($key)) {
+                                $child = $parent->appendChild($dom->createElement($key));
+
+                                if ($attributes)
+                                {
+                                    foreach ($attributes as $attrKey => $attrValue)
+                                    {
+                                        $child->setAttribute($attrKey, $attrValue);
+                                    }
+                                }
+
+                                $this->createNodes($dom, $value, $child);
+                            } else {
+
+                                if (is_numeric($key)) {
+                                    $key = sprintf('%s', $this->depluralize($parent->tagName));
+                                }
+
+                                $child = $parent->appendChild($dom->createElement($key));
+
+                                if ($attributes)
+                                {
+                                    foreach ($attributes as $attrKey => $attrValue)
+                                    {
+                                        $child->setAttribute($attrKey, $attrValue);
+                                    }
+                                }
+
+                                $this->createNodes($dom, $value, $child);
+                            }
+                        }
+                    }
+                }
+
+                break;
+        }
+    }
+
+    private function depluralize($word) {
+        $rules = array(
+            'ss' => false,
+            'os' => 'o',
+            'ies' => 'y',
+            'xes' => 'x',
+            'oes' => 'o',
+            'ies' => 'y',
+            'ves' => 'f',
+            's' => null
+        );
+
+        // Loop through all the rules
+        foreach(array_keys($rules) as $key) {
+            // If the end of the word doesn't match the key, it's not a candidate for replacement.
+            if (substr($word, (strlen($key) * -1)) != $key) {
+                continue;
+            }
+
+            // If the value of the key is false, stop looping  and return the original version of the word.
+            if ($key === false) {
+                return $word;
+            }
+
+            // apply the rule
+            return substr($word, 0, strlen($word) - strlen($key)) . $rules[$key];
+        }
+
+        return $word;
+    }
+}

library/Scores/Streetview.php

@@ -1,98 +0,0 @@
-<?php
-/**
- * Image de 640x640 max
- * Heading 0 à 360
- * 0, 45, 90, 135, 180, 225, 270, 315
- * Récup de chaque image enregistré SIRET-DEG
- */
-class Scores_Streetview 
-{
-		
-	protected $url = 'http://maps.googleapis.com/maps/api/streetview?';
-	
-	//Max size 640x640
-	protected $size = '640x640';
-	
-	//GPS ou Adresse
-	protected $location = null;
-	
-	//Defaut 90, Max 120, represents zoom, with smaller numbers indicating a higher level of zoom
-	protected $fov = 90;
-	
-	//(default is 0) Specifies the up or down angle of the camera relative to the Street View vehicle
-	protected $pitch = 0;
-	
-	//(optional) identifies your application for quota purposes
-	protected $key = null;
-	
-	protected $sensor = 'false';
-	
-	// Indicates the compass heading of the camera (0 to 360)
-	protected $heading = 0;	
-	
-	protected $nbImage = 8;
-	
-	protected $extension = 'jpg';
-	
-	public function __construct()
-	{
-		$this->size = '320x320';		
-	}
-	
-	public function setLocationGeo($lattitude, $longitude)
-	{
-		$this->location = $lattitude.','.$longitude;		
-	}
-	
-	public function setLocationTxt($adresse){}
-	
-	public function setHeading($num)
-	{	
-		$this->heading = $num;	
-	}
-	
-	public function getNumDeg()
-	{
-		$mark = array();
-		$deg = 360/$this->nbImage;
-		$i=$calc=0;
-		while ($calc<360) {
-			$mark[$i] = $calc;
-			$calc+=$deg;
-			$i++;
-		}
-		return $mark;
-	}	
-	
-	public function urlImg()
-	{
-		$url = '';
-				
-		$params = array( 'size', 'location', 'fov', 'pitch', 'sensor', 'heading' );
-		foreach ($params as $param) {
-			if ( $this->{$param} !== null ) {
-				$url.= '&'.$param.'='. $this->{$param};
-			}
-		}
-		
-		return $this->url . substr($url,1);
-	}
-	
-	public function getImg()
-	{
-		require_once 'common/curl.php';
-		$page = getUrl($this->url, '', '', '', false);
-				
-		if ( !in_array($page['code'], array(400, 408, 403)) ) {
-			$filename = $this->siret.'-'.$this->heading . '.' . $this->extension;
-			$body = $page['body'];
-			file_put_contents($this->path . DIRECTORY_SEPARATOR . $filename, $body);
-		}		
-	}	
-
-	public function pathImg()
-	{
-		$filename = $this->siret.'-'.$this->heading . '.' . $this->extension;
-		return $this->path . DIRECTORY_SEPARATOR . $filename;
-	}	
-}

library/Scores/Ws/Catalog.php

@@ -0,0 +1,183 @@
+<?php
+
+require_once 'Scores/Ws/Abstract.php';
+
+/**
+ *
+ */
+class Scores_Ws_Catalog extends Scores_Ws_Abstract
+{
+    public function __construct()
+    {
+        $this->setService('catalog');
+        $this->cache = false;
+        parent::__construct();
+    }
+
+    /**
+     * Get the filename for a mathod
+     * @param string $method
+     * @param array $args
+     */
+    public function getFilename($method, $args){}
+
+    /**
+     *
+     * @param unknown $id
+     * @param unknown $columns
+     */
+    public function getEvent($id, $columns)
+    {
+        $params = new stdClass();
+        $params->id = $id;
+        $params->columns = $columns;
+        $client = $this->getSoapClient();
+        try {
+            $response = $client->getEvent($params);
+            $this->response = $response->getEventResult;
+        } catch (SoapFault $fault) {
+            $this->message = $fault->faultstring;
+            if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+                $this->error = 2;
+            } else {
+                $this->error = 1;
+            }
+        }
+    }
+    
+    
+    
+    public function getCatalogCurrency()
+    {
+    	$filename = 'catalog-currency';
+    	$cache = new Cache($filename);
+    	if ( $cache->exist() ){
+    		return $cache->getBlock();
+    	}
+    
+    	$params = new stdClass();
+    	$params->id = null;
+    	$client = $this->loadClient('catalog');
+    	try {
+    		$reponse = $client->getCurrency($params);
+    		$cache->deletefile();
+    		$cache->setBlock($reponse->getCurrencyResult);
+    		return $reponse->getCurrencyResult;
+    	} catch (SoapFault $fault) {
+    		Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+    		$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+    		return false;
+    	}
+    }
+    
+    public function getCatalogCountry()
+    {
+    	$filename = 'catalog-country';
+    	$cache = new Cache($filename);
+    	if ( $cache->exist() ){
+    		return $cache->getBlock();
+    	}
+    
+    	$params = new stdClass();
+    	$params->id = null;
+    	$params->columns = array(
+    			'codPays3',
+    			'libPays',
+    			'devise',
+    			'indTel',
+    	);
+    	$client = $this->loadClient('catalog');
+    	try {
+    		$reponse = $client->getCountry($params);
+    		$cache->deletefile();
+    		$cache->setBlock($reponse->getCountryResult);
+    		return $reponse->getCountryResult;
+    	} catch (SoapFault $fault) {
+    		Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+    		$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+    		return false;
+    	}
+    }
+    
+    
+    public function getCatalogEvent($id, $columns)
+    {
+    	$params = new stdClass();
+    	$params->id = $id;
+    	$params->columns = $columns;
+    	$client = $this->loadClient('catalog');
+    	try {
+    		$reponse = $client->getEvent($params);
+    		return $reponse->getEventResult;
+    	} catch (SoapFault $fault) {
+    		if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+    			return $fault->faultstring;
+    		} else {
+    			echo $client->__getLastResponse();
+    			//$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+    			return false;
+    		}
+    	}
+    }
+    
+    public function getCatalogNaf5($id, $columns)
+    {
+    	$params = new stdClass();
+    	$params->id = $id;
+    	$params->columns =$columns;
+    	$client = $this->loadClient('catalog');
+    	try {
+    		$reponse = $client->getNaf5($params);
+    		return $reponse->getNaf5Result;
+    	} catch (SoapFault $fault) {
+    		if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+    			return $fault->faultstring;
+    		} else {
+    			echo $client->__getLastResponse();
+    			//$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+    			return false;
+    		}
+    	}
+    }
+    
+    public function getCatalogFctDir($id, $columns)
+    {
+    	$params = new stdClass();
+    	$params->id = $id;
+    	$params->columns =$columns;
+    	$client = $this->loadClient('catalog');
+    	try {
+    		$reponse = $client->getDirFonction($params);
+    		return $reponse->getDirFonctionResult;
+    	} catch (SoapFault $fault) {
+    		if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+    			return $fault->faultstring;
+    		} else {
+    			echo $client->__getLastResponse();
+    			//$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+    			return false;
+    		}
+    	}
+    }
+    
+    public function getCatalogLegalForm($id, $columns)
+    {
+    	$params = new stdClass();
+    	$params->id = $id;
+    	$params->columns =$columns;
+    	$client = $this->loadClient('catalog');
+    	try {
+    		$reponse = $client->getLegalForm($params);
+    		return $reponse->getLegalFormResult;
+    	} catch (SoapFault $fault) {
+    		if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+    			return $fault->faultstring;
+    		} else {
+    			echo $client->__getLastResponse();
+    			//$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+    			return false;
+    		}
+    	}
+    }
+
+}

library/Scores/Ws/Entreprise.php

@@ -28,12 +28,12 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function getAnnonces($siren, $filtre=0, $idAnn='', $position=0, $nbRep=100)
     {
     	$this->method = __METHOD__;
-    	 
+
     	$this->params = new StdClass();
     	$this->params->siren = $siren;
     	$this->params->filtre = $filtre;
     	$this->params->idAnn = $idAnn;
-    	 
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->getAnnonces($this->params);
@@ -42,20 +42,28 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		$this->faultcode = $fault->getCode();
     		$this->message = $fault->getMessage();
     		$this->error = 1;
-    	}    	    	
+    	}
     }
-    
+
+    /**
+     * getAnnoncesAsso
+     * @param string $siren
+     * @param string $idAnn
+     * @param string $filtre
+     * @param number $position
+     * @param number $nbRep
+     */
     public function getAnnoncesAsso($siren, $idAnn=null, $filtre=null, $position=0, $nbRep=20)
     {
     	$this->method = __METHOD__;
-    	 
+
     	$this->params = new StdClass();
     	$this->params->siren = $siren;
     	$this->params->idAnn = $idAnn;
     	$this->params->filtre = $filtre;
     	$this->params->position = $position;
     	$this->params->nbRep = $nbRep;
-    	 
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->getAnnoncesAsso($this->params);
@@ -66,7 +74,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		$this->error = 1;
     	}
     }
-    
+
     /**
      * getAnnoncesBalo
      * @param string $siren
@@ -79,14 +87,14 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function getAnnoncesBalo($siren, $idAnn=null, $filtre=null, $position=0, $nbRep=20)
     {
     	$this->method = __METHOD__;
-    	
+
     	$this->params = new StdClass();
     	$this->params->siren = $siren;
     	$this->params->idAnn = $idAnn;
     	$this->params->filtre = $filtre;
     	$this->params->position = $position;
     	$this->params->nbRep = $nbRep;
-    	
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->getAnnoncesBalo($this->params);
@@ -95,9 +103,9 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		$this->faultcode = $fault->getCode();
     		$this->message = $fault->getMessage();
     		$this->error = 1;
-    	}    	    	
+    	}
     }
-    
+
     /**
      * getAnnoncesBoamp
      * @param string $siren
@@ -110,20 +118,20 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function getAnnoncesBoamp($siren, $idAnn=null, $filtre = null, $position=0, $nbRep=20)
     {
     	$this->method = __METHOD__;
-    	 
+
     	$this->params = new StdClass();
     	$this->params->siren = $siren;
-    	$this->params->idAnn = $idAnn;    
+    	$this->params->idAnn = $idAnn;
     	$this->params->filtre = null;
     	if (!empty($filtre) && in_array($filtre,array('A','M'))) {
     		$filtreStruct = new stdClass();
     		$filtreStruct->key = 'type';
     		$filtreStruct->value = $filtre;
     		$this->params->filtre[] = $filtreStruct;
-    	}    
+    	}
     	$this->params->position = $position;
     	$this->params->nbRep = $nbRep;
-    	 
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->getAnnoncesBoamp($this->params);
@@ -134,7 +142,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		$this->error = 1;
     	}
     }
-    
+
     /**
      * getAnnoncesLegales
      * @param string $siren
@@ -147,14 +155,14 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function getAnnoncesLegales($siren, $idAnn=null, $filtre=null, $position=0, $nbRep=20)
     {
     	$this->method = __METHOD__;
-    	 
+
     	$this->params = new StdClass();
     	$this->params->siren = $siren;
     	$this->params->idAnn = $idAnn;
     	$this->params->filtre = $filtre;
     	$this->params->position = $position;
     	$this->params->nbRep = $nbRep;
-    	 
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->getAnnoncesLegales($this->params);
@@ -163,9 +171,9 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		$this->faultcode = $fault->getCode();
     		$this->message = $fault->getMessage();
     		$this->error = 1;
-    	}    	    	
+    	}
     }
-    
+
     /**
      * getAnnoncesNum
      * @param string $siren
@@ -174,11 +182,11 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function getAnnoncesNum($siren)
     {
     	$this->method = __METHOD__;
-    	
+
     	$this->params = new StdClass();
     	$this->params->siren = $siren;
 
-    	
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->getAnnoncesNum($this->params);
@@ -189,7 +197,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
 			$this->error = 1;
     	}
     }
-    
+
     /**
      * getBanques
      * @param string $siren
@@ -198,10 +206,10 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function getBanques($siren)
     {
     	$this->method = __METHOD__;
-    	 
+
     	$this->params = new StdClass();
-    	$this->params->siren = $siren;    	
-    	 
+    	$this->params->siren = $siren;
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->getBanques($this->params);
@@ -210,9 +218,9 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		$this->faultcode = $fault->getCode();
     		$this->message = $fault->getMessage();
     		$this->error = 1;
-    	}    	    	
+    	}
     }
-    
+
     /**
      * getBilan
      * @param string $siren
@@ -224,13 +232,13 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function getBilan($siren, $millesime, $typeBilan, $ref)
     {
     	$this->method = __METHOD__;
-    	
+
     	$this->params = new StdClass();
     	$this->params->siren = $siren;
     	$this->params->millesime = $millesime;
     	$this->params->typeBilan = $typeBilan;
     	$this->params->ref = $ref;
-    	
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->getBilan($this->params);
@@ -239,9 +247,9 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		$this->faultcode = $fault->getCode();
     		$this->message = $fault->getMessage();
     		$this->error = 1;
-    	}	
-    }    
-    
+    	}
+    }
+
     /**
      * getIdentiteParams
      * @void
@@ -279,7 +287,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
             }
         }
     }
-    
+
     /**
      * getIdentiteProcol
      * @param string $siret
@@ -289,11 +297,11 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function getIdentiteProcol($siret, $id = 0)
     {
     	$this->method = __METHOD__;
-    	
+
     	$this->params = new StdClass();
     	$this->params->siret = $siret;
     	$this->params->id = $id;
-    	
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->getIdentiteProcol($this->params);
@@ -302,9 +310,9 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		$this->faultcode = $fault->getCode();
     		$this->message = $fault->getMessage();
     		$this->error = 1;
-    	}   	
+    	}
     }
-    
+
     /**
      * getIndiScore
      * @param string $siren
@@ -318,7 +326,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function getIndiScore($siren, $nic=0, $niveau=2, $plus=false, $ref='', $encours=0, $email='')
     {
     	$this->method = __METHOD__;
-    	
+
     	$this->params = new StdClass();
     	$this->params->siren = $siren;
     	$this->params->nic = $nic;
@@ -327,7 +335,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     	$this->params->ref = $ref;
     	$this->params->encours = $encours;
     	$this->params->email = $email;
-    	
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->getIndiScore($this->params);
@@ -342,7 +350,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		}
     	}
     }
-    
+
     /**
      * getInfosBourse
      * @param string $siren
@@ -351,10 +359,10 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function getInfosBourse($siren)
     {
     	$this->method = __METHOD__;
-    	
+
     	$this->params = new StdClass();
     	$this->params->siren = $siren;
-    	
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->getInfosBourse($this->params);
@@ -369,7 +377,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		}
     	}
     }
-    
+
     /**
      * getInfosReg
      * @param string $siren
@@ -379,11 +387,11 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function getInfosReg($siren, $id = false)
     {
     	$this->method = __METHOD__;
-    	 
+
     	$this->params = new StdClass();
     	$this->params->siren = $siren;
     	$this->params->id = $id;
-    	 
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->getInfosReg($this->params);
@@ -408,11 +416,11 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function getDirigeants($siren, $histo=false)
     {
     	$this->method = __METHOD__;
-    	
+
     	$this->params = new StdClass();
     	$this->params->siren = $siren;
     	$this->params->histo = $histo;
-    	
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->getDirigeants($this->params);
@@ -421,9 +429,9 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		$this->faultcode = $fault->getCode();
     		$this->message = $fault->getMessage();
     		$this->error = 1;
-    	}    	    	
-    }    
-    
+    	}
+    }
+
     /**
      * getLienRef
      * @param string $id
@@ -432,10 +440,10 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function getLienRef($id)
     {
     	$this->method = __METHOD__;
-    	
+
     	$this->params = new StdClass();
     	$this->params->id = $id;
-    	
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->getLienRef($this->params);
@@ -450,7 +458,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		}
     	}
     }
-    
+
     /**
      * getLiens
      * @param string $siren
@@ -459,10 +467,10 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function getLiens($siren)
     {
     	$this->method = __METHOD__;
-    	 
+
     	$this->params = new StdClass();
     	$this->params->siren = $siren;
-    	 
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->getLiens($this->params);
@@ -475,9 +483,9 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		} else {
     			$this->error = 1;
     		}
-    	}        	
+    	}
     }
-    
+
     /**
      * getLiensById
      * @param int $id
@@ -486,10 +494,10 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function getLiensById($id)
     {
     	$this->method = __METHOD__;
-    	
+
     	$this->params = new StdClass();
     	$this->params->id = $id;
-    	
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->getLiensById($this->params);
@@ -502,9 +510,9 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		} else {
     			$this->error = 1;
     		}
-    	}    	    	    
-    }    
-    
+    	}
+    }
+
     /**
      * getListeBilans
      * @param string $siren
@@ -512,7 +520,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function getListeBilans($siren)
     {
     	$this->method = __METHOD__;
-    	
+
     	$this->params = new StdClass();
     	$this->params->siren = $siren;
 
@@ -524,9 +532,9 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		$this->faultcode = $fault->getCode();
     		$this->message = $fault->getMessage();
     		$this->error = 1;
-    	}    	    	
+    	}
     }
-    
+
     /**
      * getListeCompetences
      * @param string $siret
@@ -536,12 +544,12 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function getListeCompetences($siret, $type, $codeInsee)
     {
     	$this->method = __METHOD__;
-    	 
+
     	$this->params = new StdClass();
     	$this->params->siret = $siret;
     	$this->params->type = $type;
     	$this->params->codeInsee = $codeInsee;
-    	 
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->getListeCompetences($this->params);
@@ -552,7 +560,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		$this->error = 1;
     	}
 	}
-	
+
 	/**
 	 * getListeEtablissements
 	 * @param string $siren
@@ -561,12 +569,12 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
 	public function getListeEtablissements($siren, $actif = -1, $position = 0)
 	{
 		$this->method = __METHOD__;
-	
+
 		$this->params = new StdClass();
 		$params->siren = $siren;
 		$params->actif = $actif;
 		$params->position = $position;
-	
+
 		$client = $this->getSoapClient();
 		try {
 			$response = $client->getListeEtablissements($this->params);
@@ -577,7 +585,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
 			$this->error = 1;
 		}
 	}
-    
+
 	/**
 	 * getListeEvenements
 	 * @param string $siren
@@ -589,13 +597,13 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
 	public function getListeEvenements($siren, $nic=0, $position=0, $nbRep=200)
 	{
 		$this->method = __METHOD__;
-		
+
 		$this->params = new StdClass();
 		$params->siren = $siren;
 		$params->nic = $nic;
 		$params->position = $position;
 		$params->nbRep = $nbRep;
-		
+
 		$client = $this->getSoapClient();
 		try {
 			$response = $client->getListeEvenements($this->params);
@@ -604,9 +612,9 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
 			$this->faultcode = $fault->getCode();
 			$this->message = $fault->getMessage();
 			$this->error = 1;
-		}	
+		}
 	}
-	
+
     /**
      * getRapport
      * @param string $siren
@@ -621,7 +629,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function getRapport($siren, $niveau=3, $id=0, $plus=false, $ref='', $encours=0, $email='')
     {
     	$this->method = __METHOD__;
-    	 
+
     	$this->params = new StdClass();
     	$this->params->siren = $siren;
     	$this->params->niveau = $niveau;
@@ -630,7 +638,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     	$this->params->ref = $ref;
     	$this->params->encours = $encours;
     	$this->params->email = $email;
-    	 
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->getRapport($this->params);
@@ -641,7 +649,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
    			$this->error = 1;
     	}
     }
-    
+
     /**
      * getRatios
      * @param string $siren
@@ -650,11 +658,11 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function getRatios($siren, $page = 'ratios')
     {
     	$this->method = __METHOD__;
-    	
+
     	$this->params = new StdClass();
     	$this->params->siren = $siren;
     	$this->params->page = $page;
-    	
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->getRapport($this->params);
@@ -663,17 +671,17 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		$this->faultcode = $fault->getCode();
     		$this->message = $fault->getMessage();
     		$this->error = 1;
-    	}    	    	
+    	}
     }
-    
+
     /**
      * getSurveillancesParams
      */
     public function getSurveillancesParams()
     {
-    	$this->setCache(false);    	
+    	$this->setCache(false);
     }
-    
+
     /**
      * getSurveillances
      * @param object $filtre
@@ -684,12 +692,12 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function getSurveillances($filtre, $deb=0, $nbRep=100)
     {
     	$this->method = __METHOD__;
-    	 
+
     	$this->params = new StdClass();
     	$this->params->filtre = $filtre;
     	$this->params->position = $deb;
     	$this->params->nbRep = $nbRep;
-    	    	 
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->getSurveillances($this->params);
@@ -698,9 +706,9 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		$this->faultcode = $fault->getCode();
     		$this->message = $fault->getMessage();
     		$this->error = 1;
-    	}    	 
+    	}
     }
-    
+
     /**
      * getValo
      * @param string $siren
@@ -709,10 +717,10 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function getValo($siren)
     {
     	$this->method = __METHOD__;
-    	
+
     	$this->params = new StdClass();
     	$this->params->siren = $siren;
-    	
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->getValo($this->params);
@@ -725,9 +733,9 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		} else {
     			$this->error = 1;
     		}
-    	}	
+    	}
     }
-    
+
     /**
      * isSirenExistant
      * @param string $siren
@@ -735,10 +743,10 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function isSirenExistant($siren)
     {
     	$this->method = __METHOD__;
-    	 
+
     	$this->params = new StdClass();
     	$this->params->siren = $siren;
-    	 
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->isSirenExistant($this->params);
@@ -747,9 +755,9 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		$this->faultcode = $fault->getCode();
     		$this->message = $fault->getMessage();
 			$this->error = 1;
-    	}        	
+    	}
     }
-    
+
     /**
      * rechercheAnnonceParams
      * @void
@@ -758,7 +766,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     {
     	$this->setCache(false);
     }
-    
+
     /**
      * Recherche Annonce
      * @param string $source
@@ -769,13 +777,13 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function rechercheAnnonce($source, $dateAnnee, $numParution, $numAnnonce)
     {
     	$this->method = __METHOD__;
-    	 
+
     	$this->params = new StdClass();
     	$this->params->source = $source;
     	$this->params->dateAnnee = $dateAnnee;
     	$this->params->numParution = $numParution;
     	$this->params->numAnnonce = $numAnnonce;
-    	 
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->rechercheAnnonce($this->params);
@@ -784,9 +792,9 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		$this->faultcode = $fault->getCode();
     		$this->message = $fault->getMessage();
 			$this->error = 1;
-    	}	
+    	}
     }
-    
+
     /**
      * searchEntrepriseParams
      * @void
@@ -795,7 +803,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     {
     	$this->setCache(false);
     }
-    
+
     /**
      * searchEntreprise
      * @param array $criteres
@@ -806,7 +814,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function searchEntreprise($criteres, $position = 0, $nbRep = null)
     {
     	$this->method = __METHOD__;
-    	 
+
     	$this->params = new StdClass();
     	$this->params->criteres = new StdClass;
     	$this->params->criteres->identifiant = $criteres['identifiant'];
@@ -821,7 +829,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     	$this->params->criteres->fj = $criteres['fj'];
     	$this->params->position = $position;
     	$this->params->nbRep = empty($nbRep) ? $this->nbReponses : $nbRep ;
-    	 
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->searchEntreprise($this->params);
@@ -832,7 +840,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		$this->error = 1;
     	}
     }
-    
+
     /**
      * searchDirParams
      * @void
@@ -841,7 +849,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     {
     	$this->setCache(false);
     }
-    
+
     /**
      * Recherche par dirigeants
      * @param array $criteres
@@ -852,7 +860,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function searchDir($criteres, $deb=0, $nbRep=20, $maxRep=200)
     {
     	$this->method = __METHOD__;
-    	
+
     	$this->params = new StdClass();
     	$this->params->criteres->nom = $criteres['dirNom'];
     	$this->params->criteres->prenom = $criteres['dirPrenom'];
@@ -862,7 +870,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     	$this->params->deb = $deb;
     	$this->params->nbRep = $nbRep;
     	$this->params->maxRep = $maxRep;
-    	
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->searchDir($this->params);
@@ -873,7 +881,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		$this->error = 1;
     	}
     }
-    
+
     /**
      * searchRefClientParams
      * @void
@@ -882,7 +890,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     {
     	$this->setCache(false);
     }
-    
+
     /**
      * Recherche par référence client
      * @param string $search
@@ -892,12 +900,12 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function searchRefClient($search, $position=0, $nbRep=20)
     {
     	$this->method = __METHOD__;
-    	 
+
     	$this->params = new StdClass();
     	$this->params->search = $search;
     	$this->params->position = $position;
     	$this->params->nbRep = $nbRep;
-    	 
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->searchRefClient($this->params);
@@ -906,9 +914,9 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		$this->faultcode = $fault->getCode();
     		$this->message = $fault->getMessage();
 			$this->error = 1;
-    	}    	
+    	}
     }
-    
+
     /**
      * setSurveillance
      * @param string $siret
@@ -922,7 +930,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     public function setSurveillance($siret, $email, $ref = '', $source='annonces', $delete=false, $encoursClient=0)
     {
     	$this->method = __METHOD__;
-    	
+
     	$this->params = new StdClass();
     	$this->params->siret = $siret;
     	$this->params->email = $email;
@@ -930,7 +938,7 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     	$this->params->source = $source;
     	$this->params->delete = $delete;
     	$this->params->encoursClient = $encoursClient;
-    	
+
     	$client = $this->getSoapClient();
     	try {
     		$response = $client->setSurveillance($this->params);
@@ -939,6 +947,6 @@ class Scores_Ws_Entreprise extends Scores_Ws_Abstract
     		$this->faultcode = $fault->getCode();
     		$this->message = $fault->getMessage();
     		$this->error = 1;
-    	}    
-    }           
+    	}
+    }
 }

library/Scores/Ws/Gestion.php

@@ -0,0 +1,459 @@
+<?php
+class Scores_Ws_Gestion  extends Scores_Ws_Abstract
+{
+
+	/**
+	 * getCategory
+	 */
+	public function getCategory()
+	{
+		$filename = 'category';
+		$cache = new Cache($filename);
+		if ($cache->exist() && $this->cacheEnable ){
+			return $cache->getBlock('category');
+		}
+		try {
+			$client = $this->loadClient('gestion');
+			$reponse = $client->getCategory();
+			$cache->deletefile();
+			$cache->setBlock($reponse->getCategoryResult);
+			return $reponse->getCategoryResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			//Placer exception pour affichage message
+			return false;
+		}
+	
+	}
+	
+	
+	/**
+	 * getListeDroits
+	 */
+	public function getListeDroits()
+	{
+		$filename = 'droits';
+		$cache = new Cache($filename);
+		if ($cache->exist() && $this->cacheEnable ){
+			return $cache->getBlock('droits');
+		}
+		try {
+			$client = $this->loadClient('gestion');
+			$reponse = $client->getListeDroits();
+			$cache->deletefile();
+			$cache->setBlock($reponse->getListeDroitsResult);
+			return $reponse->getListeDroitsResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			//Placer exception pour affichage message
+			return false;
+		}
+	}
+	
+	/**
+	 * getNextLogin
+	 * @param int $idClient
+	 */
+	public function getNextLogin($idClient)
+	{
+		$params = new stdClass();
+		$params->idClient = $idClient;
+		try {
+			$client = $this->loadClient('gestion');
+			$reponse = $client->getNextLogin($params);
+			Zend_Registry::get('firebug')->info($reponse);
+			return $reponse->getNextLoginResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			Zend_Registry::get('firebug')->info($fault);
+			//Placer exception pour affichage message
+			return false;
+		}
+	}
+	
+	/**
+	 * getLogs
+	 */
+	public function getLogs()
+	{
+		$filename = 'logs';
+		$cache = new Cache($filename);
+		if ($cache->exist() && $this->cacheEnable ){
+			return $cache->getBlock('logs');
+		}
+		try {
+			$client = $this->loadClient('gestion');
+			$reponse = $client->getLogs();
+			$cache->deletefile();
+			$cache->setBlock($reponse->getLogsResult);
+			return $reponse->getLogsResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			//Placer exception pour affichage message
+			return false;
+		}
+	}
+	
+	/**
+	 * getListePrefs
+	 */
+	public function getListePrefs()
+	{
+		$filename = 'prefs';
+		$cache = new Cache($filename);
+		if ($cache->exist() && $this->cacheEnable ){
+			return $cache->getBlock('prefs');
+		}
+		try {
+			$client = $this->loadClient('gestion');
+			$reponse = $client->getListePrefs();
+			$cache->deletefile();
+			$cache->setBlock($reponse->getListePrefsResult);
+			return $reponse->getListePrefsResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			//Placer exception pour affichage message
+			return false;
+		}
+	}
+	
+	/**
+	 * Enregistre ou modifie un client
+	 * @param unknown_type $infos
+	 * @return boolean
+	 */
+	public function setClient($infos)
+	{
+		$params = new stdClass();
+		$params->infos = json_encode($infos);
+		try {
+			$client = $this->loadClient('gestion');
+			$reponse = $client->setClient($params);
+			return $reponse->setClientResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			Zend_Registry::get('firebug')->info($fault);
+			//Placer exception pour affichage message
+			return false;
+		}
+	}
+	
+	/**
+	 * setInfosLogin
+	 * @param string $login
+	 * @param string $action
+	 * @param array $infos
+	 */
+	public function setInfosLogin($login, $action, $infos = null)
+	{
+		$params = new stdClass();
+		$params->login = $login;
+		$params->action = $action;
+		if ($infos !== null ) {
+			$params->infos = json_encode($infos);
+		}
+		try {
+			$client = $this->loadClient('gestion');
+			$reponse = $client->setInfosLogin($params);
+			return $reponse->setInfosLoginResult;
+		} catch (SoapFault $fault) {
+			if (in_array($fault->getCode(),array('MSG','ERR'))) {
+				return $fault->getMessage();
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				Zend_Registry::get('firebug')->info($fault);
+				//Placer exception pour affichage message
+	
+				return false;
+			}
+		}
+	}
+	
+	/**
+	 * getInfosLogin
+	 * @param string $login
+	 * @param string $ipUtilisateur
+	 */
+	public function getInfosLogin($login, $ipUtilisateur = '')
+	{
+		$params = new stdClass();
+		$params->login = $login;
+		$params->ipUtilisateur = $ipUtilisateur;
+		try {
+			$client = $this->loadClient('gestion');
+			$reponse = $client->getInfosLogin($params);
+			return $reponse->getInfosLoginResult;
+		} catch (SoapFault $fault) {
+			if (substr($fault->faultcode,0,1)=='0'){
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	}
+	
+	/**
+	 * getListeUtilisateurs
+	 * Enter description here ...
+	 * @param string $login
+	 * @param integer $idClient
+	 */
+	public function getListeUtilisateurs($login, $idClient = -1)
+	{
+		$params = new stdClass();
+		$params->login = $login;
+		$params->idClient = $idClient;
+		$client = $this->loadClient('gestion');
+		try {
+			$reponse = $client->getListeUtilisateurs($params);
+			return $reponse->getListeUtilisateursResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * getListeClients
+	 * @param unknown_type $idClient
+	 */
+	public function getListeClients($idClient=false)
+	{
+		$params = new stdClass();
+		$params->idClient = $idClient;
+		$client = $this->loadClient('gestion');
+		try {
+			$reponse = $client->getListeClients($params);
+			return $reponse->getListeClientsResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * getLogsClients
+	 * @param unknown_type $mois
+	 * @param unknown_type $detail
+	 * @param unknown_type $idClient
+	 * @param unknown_type $login
+	 * @param unknown_type $all
+	 */
+	public function getLogsClients($mois, $detail=0, $idClient=0, $login='', $all=0)
+	{
+		$params = new stdClass();
+		$params->mois = $mois;
+		$params->detail = $detail;
+		$params->idClient = $idClient;
+		$params->login = $login;
+		$params->all = $all;
+		$client = $this->loadClient('gestion');
+		try {
+			$reponse = $client->getLogsClients($params);
+			return $reponse->getLogsClientsResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	public function setCGU()
+	{
+		$params = new stdClass();
+		$params->application ='';
+		$client = $this->loadClient('gestion');
+		try {
+			$reponse = $client->setCGU($params);
+			Zend_Registry::get('firebug')->info($reponse);
+			return $reponse->setCGUResult;
+		} catch(SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * Get all infos for a user (Admin)
+	 * @param string $login
+	 */
+	public function getUser($login)
+	{
+		$params = new stdClass();
+		$params->login = $login;
+		$client = $this->loadClient('gestion');
+		try {
+			$reponse = $client->getUser($params);
+			return $reponse->getUserResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	
+	public function getServiceUsers($idClient, $service)
+	{
+		$params = new stdClass();
+		$params->idClient = $idClient;
+		$params->serviceCode = $service;
+		$client = $this->loadClient('gestion');
+		try {
+			$reponse = $client->getServiceUsers($params);
+			Zend_Registry::get('firebug')->info($reponse);
+			return $reponse->getServiceUsersResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	}
+	
+	public function getServices($idClient)
+	{
+		$params = new stdClass();
+		$params->idClient = $idClient;
+		$client = $this->loadClient('gestion');
+		try {
+			$reponse = $client->getServices($params);
+			return $reponse->getServicesResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	}
+	
+	
+	public function setClientTarif($idClient, $log, $service, $type, $priceUnit, $limit, $date, $duree, $doublon)
+	{
+		$params = new stdClass();
+		$params->idClient = $idClient;
+		$params->tarif->log = $log;
+		$params->tarif->service = $service;
+		$params->tarif->type = $type;
+		$params->tarif->priceUnit = $priceUnit;
+		$params->tarif->limit = $limit;
+		$params->tarif->date = $date;
+		$params->tarif->duree = $duree;
+		$params->tarif->doublon = $doublon;
+		$client = $this->loadClient('gestion');
+		try {
+			$reponse = $client->setClientTarif($params);
+			return $reponse->setClientTarifResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	}
+	
+	public function getClientTarifs($idClient, $service = null)
+	{
+		$params = new stdClass();
+		$params->idClient = $idClient;
+		$params->service = $service;
+		$client = $this->loadClient('gestion');
+		try {
+			$reponse = $client->getClientTarifs($params);
+			return $reponse->getClientTarifsResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	}
+	
+	public function setService($idClient, $infos)
+	{
+		$params = new stdClass();
+		$params->idClient = $idClient;
+		$params->infos = $infos;
+		$client = $this->loadClient('gestion');
+		try {
+			$reponse = $client->setService($params);
+			return $reponse->setServiceResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	}
+	
+	public function searchLogin($idClient, $query)
+	{
+		$params = new stdClass();
+		$params->idClient = $idClient;
+		$params->query = $query;
+		$client = $this->loadClient('gestion');
+		try {
+			$reponse = $client->searchLogin($params);
+			return $reponse->searchLoginResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	public function setSurveillancesMail($login, $email)
+	{
+		$params = new stdClass();
+		$params->login = $login;
+		$params->email = $email;
+		$client = $this->loadClient('gestion');
+		try {
+			$reponse = $client->setSurveillancesMail($params);
+			return $reponse->setSurveillancesMailResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	}
+	
+	public function setUserService($login, $code)
+	{
+		$params = new stdClass();
+		$params->login = $login;
+		$params->code = $code;
+		$client = $this->loadClient('gestion');
+		try {
+			$reponse = $client->setUserService($params);
+			return $reponse->setUserServiceResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	}
+	
+}

library/Scores/Ws/Interne.php

@@ -0,0 +1,654 @@
+<?php
+class Scores_Ws_Interne  extends Scores_Ws_Abstract
+{
+
+	/**
+	 * setCmdAsso
+	 * @param unknown_type $infosCommande
+	 * @param unknown_type $infosDemandeur
+	 * @return boolean
+	 */
+	public function setCmdAsso($infosCommande, $infosDemandeur)
+	{
+		$params = new stdClass();
+		$params->infosCommande = $infosCommande;
+		$params->infosDemandeur = $infosDemandeur;
+		try {
+			$client = $this->loadClient('interne');
+			$reponse = $client->setCmdAsso($params);
+			return $reponse->setCmdAssoResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			Zend_Registry::get('firebug')->info($fault);
+			//Placer exception pour affichage message
+			return false;
+		}
+	}
+	
+	/**
+	 * getIdentiteLight
+	 * @param string $siret
+	 * @param int $id
+	 * @return mixed
+	 */
+	public function getIdentiteLight($siret, $id = 0)
+	{
+		$filename = 'identitelight-'.$siret.'-'.$id;
+	
+		if ($this->cacheWrite) {
+			$cache = new Cache($filename);
+			if ($cache->exist() && $this->cacheEnable ){
+				return $cache->getBlock();
+			}
+		}
+	
+		$params = new StdClass();
+		$params->siret = $siret;
+		$params->id = $id;
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->getIdentiteLight($params);
+			if ($this->cacheWrite) {
+				$cache->deletefile();
+				$cache->setBlock($reponse->getIdentiteLightResult);
+			}
+			return $reponse->getIdentiteLightResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * getDirigeantsOp
+	 * @param string $siren
+	 */
+	public function getDirigeantsOp($siren)
+	{
+		$filename = 'dirigeantsop-'.$siren;
+	
+		if ($this->cacheWrite) {
+			$cache = new Cache($filename);
+			if ($cache->exist() && $this->cacheEnable ){
+				return $cache->getBlock();
+			}
+		}
+	
+		$params = new StdClass();
+		$params->siren = $siren;
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->getDirigeantsOp($params);
+			if ($this->cacheWrite) {
+				$cache->deletefile();
+				$cache->setBlock($reponse->getDirigeantsOpResult);
+			}
+			return $reponse->getDirigeantsOpResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * getPortefeuille
+	 * @param object $filtre
+	 * @param integer $position
+	 * @param integer $nbAffichage
+	 */
+	public function getPortefeuille($filtre, $position = 0, $nbAffichage = 100)
+	{
+		$params = new StdClass;
+		$params->filtre = $filtre;
+		$params->deb = $position;
+		$params->nbRep = $nbAffichage;
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->getPortefeuille($params);
+			return $reponse->getPortefeuilleResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * getListeConventions
+	 * Enter description here ...
+	 * @param string $siren
+	 */
+	public function getListeConventions($siren)
+	{
+		$filename = 'conventions-'.$siren;
+	
+		if ($this->cacheWrite) {
+			$cache = new Cache($filename);
+			if ($cache->exist() && $this->cacheEnable ){
+				return $cache->getBlock();
+			}
+		}
+	
+		$params = new stdClass();
+		$params->siren = $siren;
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->getListeConventions($params);
+			if ($this->cacheWrite) {
+				$cache->deletefile();
+				$cache->setBlock($reponse->getListeConventionsResult);
+			}
+			return $reponse->getListeConventionsResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * getMarques
+	 * Enter description here ...
+	 * @param string $siren
+	 * @param integer $idDepot
+	 */
+	public function getMarques($siren, $idDepot = 0)
+	{
+		$filename = 'marques-'.$siren.'-'.$idDepot;
+	
+		if ($this->cacheWrite) {
+			$cache = new Cache($filename);
+			if ($cache->exist() && $this->cacheEnable ){
+				return $cache->getBlock();
+			}
+		}
+	
+		$params = new stdClass();
+		$params->siren = $siren;
+		$params->idDepot = $idDepot;
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->getMarques($params);
+			if ($this->cacheWrite) {
+				$cache->deletefile();
+				$cache->setBlock($reponse->getMarquesResult);
+			}
+			return $reponse->getMarquesResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * getPrivilegesDetail
+	 * Enter description here ...
+	 * @param unknown_type $siren
+	 * @param unknown_type $tabTypes
+	 */
+	public function getPrivilegesDetail($siren, $tabTypes = array() )
+	{
+		$params = new stdClass();
+		$params->siren = $siren;
+		$params->tabTypes = $tabTypes;
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->getPrivilegesDetail($params);
+			return $reponse->getPrivilegesDetailResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	
+	/**
+	 * getDevises
+	 * Enter description here ...
+	 * @param unknown_type $codeIsoDevise
+	 */
+	public function getDevises($codeIsoDevise = '')
+	{
+		$params = new stdClass();
+		$params->codeIsoDevise = $codeIsoDevise;
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->getDevises($params);
+			return $reponse->getDevisesResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * getPrivilegesCumul
+	 * Enter description here ...
+	 * @param unknown_type $siren
+	 * @param unknown_type $tabTypes
+	 */
+	public function getPrivilegesCumul($siren, $tabTypes = array() )
+	{
+		$params = new stdClass();
+		$params->siren = $siren;
+		$params->tabTypes = $tabTypes;
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->getPrivilegesCumul($params);
+			return $reponse->getPrivilegesCumulResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * getTribunaux
+	 * Enter description here ...
+	 * @param unknown_type $tabTypes
+	 */
+	public function getTribunaux($tabTypes = array())
+	{
+		$params = new stdClass();
+		$params->tabTypes = $tabTypes;
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->getTribunaux($params);
+			return $reponse->getTribunauxResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * getListeJalCollecte
+	 * Enter description here ...
+	 */
+	public function getListeJalCollecte()
+	{
+		$filename = 'listejalcollecte';
+		$cache = new Cache($filename);
+		if ($cache->exist() && $this->cacheEnable ){
+			return $cache->getBlock();
+		}
+		$params = new stdClass();
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->getListeJalCollecte();
+			$cache->deletefile();
+			$cache->setBlock($reponse->getListeJalCollecteResult);
+			return $reponse->getListeJalCollecteResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * Recherche Actionnaire
+	 * @param unknown_type $nom
+	 * @param unknown_type $cpVille
+	 * @param unknown_type $siren
+	 * @param unknown_type $pays
+	 * @param unknown_type $pctMin
+	 * @param unknown_type $pctMax
+	 * @param unknown_type $deb
+	 * @param unknown_type $nbRep
+	 * @param unknown_type $maxRep
+	 * @param unknown_type $pertinence
+	 */
+	public function searchAct($nom, $cpVille='', $siren='', $pays='', $pctMin=0, $pctMax=100, $deb=0)
+	{
+		$params = new stdClass();
+		$params->nom = $nom;
+		$params->cpVille = $cpVille;
+		$params->siren = $siren;
+		$params->pays = $pays;
+		$params->pctMin = $pctMin;
+		$params->pctMax= $pctMax;
+		$params->pertinence = false;
+		$params->deb = $deb;
+		$params->nbRep = $this->nbReponses;
+		//$params->maxRep = $maxRep;
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->searchAct($params);
+			return $reponse->searchActResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	
+	/**
+	 * Recherche Historique
+	 * @param string $recherche
+	 * @param string $annee
+	 * @param string $typeBod
+	 * @param integer $deb
+	 */
+	public function rechercheHisto($recherche, $annee, $typeBod, $deb = 0)
+	{
+		$params = new stdClass();
+		$params->recherche = $recherche;
+		$params->annee = $annee;
+		$params->typeBod = $typeBod;
+		$params->deb = $deb;
+		$params->nbRep = $this->nbReponses;
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->rechercheHisto($params);
+			return $reponse->rechercheHistoResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	
+	/**
+	 * searchMandataires
+	 * @param unknown_type $nom
+	 * @param unknown_type $type
+	 * @param unknown_type $cpDep
+	 */
+	public function searchMandataires($nom, $type=array(), $cpDep=0)
+	{
+		$params = new stdClass();
+		$params->nom = $nom;
+		$params->type = $type;
+		$params->cpDep = $cpDep;
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->searchMandataires($params);
+			return $reponse->searchMandatairesResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * setMandataire
+	 * Enter description here ...
+	 * @param unknown_type $infos
+	 */
+	public function setMandataire($infos)
+	{
+		$params = new stdClass();
+		$params->infos->id = $infos['id'];
+		$params->infos->sirenGrp = $infos['sirenGrp'];
+		$params->infos->sirenMand = $infos['sirenMand'];
+		$params->infos->Nom = $infos['Nom'];
+		$params->infos->Prenom = $infos['Prenom'];
+		$params->infos->type = $infos['type'];
+		$params->infos->stagiaire = $infos['stagiaire'];
+		$params->infos->coursAppel = $infos['coursAppel'];
+		$params->infos->coursAppel2 = $infos['coursAppel2'];
+		$params->infos->tribunal = $infos['tribunal'];
+		$params->infos->Statut = $infos['Statut'];
+		$params->infos->adresse = $infos['adresse'];
+		$params->infos->adresseComp = $infos['adresseComp'];
+		$params->infos->cp = $infos['cp'];
+		$params->infos->ville = $infos['ville'];
+		$params->infos->tel = $infos['tel'];
+		$params->infos->fax = $infos['fax'];
+		$params->infos->email = $infos['email'];
+		$params->infos->web = $infos['web'];
+		$params->infos->contact = $infos['contact'];
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->setMandataire($params);
+			return $reponse->setMandataireResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * getIdCourAppel
+	 * @param string $codeTribunal
+	 */
+	public function getIdCoursAppel($codeTribunal)
+	{
+		$params = new stdClass();
+		$params->codeTribunal = $codeTribunal;
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->getIdCoursAppel($params);
+			return $reponse->getIdCoursAppelResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * setLog
+	 * @param string $page
+	 * @param string $siret
+	 * @param string $id
+	 * @param string $ref
+	 */
+	public function setLog ($page, $siret, $id=0, $ref = '')
+	{
+		$params = new stdClass();
+		$params->page = $page;
+		$params->siret = $siret;
+		$params->id = $id;
+		$params->ref = $ref;
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->setLog($params);
+			return true;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * getListeSurveillanceCsv
+	 * @param unknown_type $source
+	 * @param unknown_type $login
+	 * @param unknown_type $idClient
+	 */
+	public function getListeSurveillancesCsv($source='', $login='', $idClient=0)
+	{
+		$params = new stdClass();
+		$params->source = $source;
+		$params->login = $login;
+		$params->idClient = $idClient;
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->getListeSurveillancesCsv($params);
+			return $reponse->getListeSurveillancesCsvResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * getPortefeuilleCsv
+	 * @param unknown_type $login
+	 * @param unknown_type $idClient
+	 */
+	public function getPortefeuilleCsv($login='', $idClient=0)
+	{
+		$params = new stdClass();
+		$params->login = $login;
+		$params->idClient = $idClient;
+	
+		//@todo : Seulement pour aider Altysis
+		$c = Zend_Registry::get('config');
+		$location = $c->profil->webservice->location;
+	
+		$cWS = new Zend_Config_Ini(realpath(dirname(__FILE__)) . '/webservices.ini');
+		$config = $cWS->toArray();
+		$this->webservices = $config[$location]['webservices'];
+		//@todo
+	
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->getPortefeuilleCsv($params);
+			return $reponse->getPortefeuilleCsvResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	
+	/**
+	 * Enter description here ...
+	 * @param string $idAnn
+	 * @param string $siret
+	 */
+	public function getAnnonceCollecte($idAnn, $siret)
+	{
+		$params = new stdClass();
+		$params->idAnn= $idAnn;
+		$params->siret = $siret;
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->getAnnonceCollecte($params);
+			return $reponse->getAnnonceCollecteResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * Enter description here ...
+	 * @param unknown_type $siren
+	 * @return Ambigous <boolean, mixed>|boolean
+	 */
+	public function getListeDepots($siren)
+	{
+		$filename = 'listedepots-'.$siren;
+	
+		if ($this->cacheWrite) {
+			$cache = new Cache($filename);
+			if ($cache->exist() && $this->cacheEnable ){
+				return $cache->getBlock();
+			}
+		}
+	
+		$params = new stdClass();
+		$params->siren = $siren;
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->getListeDepots($params);
+			if ($this->cacheWrite) {
+				$cache->deletefile();
+				$cache->setBlock($reponse->getListeDepotsResult);
+			}
+			return $reponse->getListeDepotsResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * Commande d'une enquete intersud
+	 * @param string $siren
+	 * @param array $infoEnq
+	 * @param array $infoUser
+	 */
+	public function commandeEnquete($siren, $infoEnq, $infoUser)
+	{
+		$params = new stdClass();
+		$params->siren = $siren;
+		$params->infoEnq = json_encode($infoEnq);
+		$params->infoDemande = json_encode($infoUser);
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->commandeEnquete($params);
+			return $reponse->commandeEnqueteResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * Retourne l'arborescence d'un groupe
+	 * @param string $siren
+	 * @param int pctMin
+	 * @param int $nbNiveaux
+	 */
+	public function getGroupesArbo($siren, $pctMin=33, $nbNiveaux=10)
+	{
+		$filename = 'groupesarbo-'.$siren.'-'.$pctMin;
+	
+		if ($this->cacheWrite) {
+			$cache = new Cache($filename);
+			if ($cache->exist() && $this->cacheEnable ){
+				return $cache->getBlock();
+			}
+		}
+	
+		$params = new StdClass;
+		$params->siren = $siren;
+		$params->pctMin = $pctMin;
+		$params->nbNiveaux = $nbNiveaux;
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->getGroupesArbo($params);
+			if ($this->cacheWrite) {
+				$cache->deletefile();
+				$cache->setBlock($reponse->getGroupesArboResult);
+			}
+			return $reponse->getGroupesArboResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * Retourne les infos du groupe
+	 * @param string $siren
+	 */
+	public function getGroupeInfos($siren)
+	{
+		$params = new stdClass();
+		$params->siren = $siren;
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->getGroupeInfos($params);
+			return $reponse->getGroupeInfosResult;
+		} catch (SoapFault $fault) {
+			if ( in_array($fault->faultcode, array('Error')) ){
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	}
+	
+	public function getCountryId($code)
+	{
+		$params = new stdClass();
+		$params->codeCountry = $code;
+		$client = $this->loadClient('interne');
+		try {
+			$reponse = $client->getCountryId($params);
+			return $reponse->getCountryIdResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	}
+	
+}

library/Scores/Ws/Pieces.php

@@ -0,0 +1,73 @@
+<?php
+class Scores_Ws_Pieces  extends Scores_Ws_Abstract
+{
+	/**
+	 * Récupération des kbis
+	 */
+	public function getKbis($siren)
+	{
+		$params = new StdClass;
+		$params->siren = $siren;
+		$client = $this->loadClient('pieces');
+		try {
+			$reponse = $client->getKbis($params);
+			return $reponse->getKbisResult;
+		} catch (SoapFault $fault) {
+			if ( in_array($fault->faultcode, array('0000', 'MSG')) ){
+				Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	}
+	
+	/**
+	 * Liste des bilans
+	 * @param string $siren
+	 * @todo : Cache
+	 */
+	public function getPiecesBilans($siren)
+	{
+		$params = new stdClass();
+		$params->identifiant = $siren;
+		$client = $this->loadClient('pieces');
+		try {
+			$reponse = $client->getBilans($params);
+			return $reponse->getBilansResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * Bilan URL
+	 * @param string $siren
+	 * @param string $diffusion
+	 * @param string $dateCloture
+	 * @param string $reference
+	 */
+	public function getPiecesBilan($siren, $diffusion, $dateCloture, $reference)
+	{
+		$params = new stdClass();
+		$params->identifiant = $siren;
+		$params->diffusion = $diffusion;
+		$params->dateCloture = $dateCloture;
+		$params->reference = $reference;
+		$client = $this->loadClient('pieces');
+		try {
+			$reponse = $client->getBilan($params);
+			Zend_Registry::get('firebug')->info($reponse);
+			return $reponse->getBilanResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	
+}

library/Scores/Ws/Saisie.php

@@ -0,0 +1,456 @@
+<?php
+class Scores_Ws_Saisie  extends Scores_Ws_Abstract
+{
+
+
+	/**
+	 * getMandataire
+	 * @param string $idMand
+	 */
+	public function getMandataire($idMand)
+	{
+		$params = new stdClass();
+		$params->id = $idMand;
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->getMandataire($params);
+			return $reponse->getMandataireResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * dupliqueAnnonce
+	 * @param integer $source
+	 * @param string $idAnn
+	 * @param string $siretIn
+	 * @param string $siretOut
+	 * @return boolean
+	 */
+	public function dupliqueAnnonce($source, $idAnn, $siretIn = '', $siretOut = '')
+	{
+		$params = new stdClass();
+		$params->source= $source;
+		$params->idAnn= $idAnn;
+		$params->siretIn = $siretIn;
+		$params->siretOut = $siretOut;
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->dupliqueAnnonce($params);
+			return $reponse->dupliqueAnnonceResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * Enter description here ...
+	 * @param string $siret
+	 * @param integer $id
+	 * @param array $infos
+	 * @return boolean
+	 */
+	public function setInfosEntrep($siret, $id, $infos)
+	{
+		$params = new stdClass();
+		$params->siret = $siret;
+		$params->idEntreprise = $siret;
+		$params->infos = json_encode($infos);
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->setInfosEntrep($params);
+			return $reponse->setInfosEntrepResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	
+	/**
+	 * Enter description here ...
+	 * @param unknown_type $idAnn
+	 * @param unknown_type $siret
+	 */
+	public function supprAnnonceCollecte($idAnn, $siret = '')
+	{
+		$params = new stdClass();
+		$params->idAnn= $idAnn;
+		$params->siret= $siret;
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->supprAnnonceCollecte($params);
+			return $reponse->supprAnnonceCollecteResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * supprAnnonce
+	 * @param integer $source
+	 * @param string $idAnn
+	 * @param string $siret
+	 */
+	public function supprAnnonce($source, $idAnn, $siret = '')
+	{
+		$params = new stdClass();
+		$params->source= $source;
+		$params->idAnn= $idAnn;
+		$params->siret = $siret;
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->supprAnnonce($params);
+			return $reponse->supprAnnonceResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	/**
+	 * Enter description here ...
+	 * @param unknown_type $siren
+	 * @param unknown_type $id
+	 * @param unknown_type $codeEven
+	 */
+	public function setAnnonceEven($siren, $id, $codeEven)
+	{
+		$params = new stdClass();
+		$params->siren = $siren;
+		$params->id = $id;
+		$params->codeEven = $codeEven;
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->setAnnonceEven($params);
+			return $reponse->setAnnonceEvenResult;
+		} catch (SoapFault $fault) {
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	public function setActeAsso($siren, $waldec, $type, $libelle, $date)
+	{
+		$params = new stdClass();
+		$params->siren = $siren;
+		$params->waldec = $waldec;
+		$params->type = $type;
+		$params->libelle = $libelle;
+		$params->date = $date;
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->setActeAsso($params);
+			return $reponse->setActeAssoResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	}
+	
+	public function setBilan($siren, $unite, $dateCloture, $dureeMois, $dateCloturePre, $dureeMoisPre, $typeBilan, $postes, $step = 'normal')
+	{
+		$params = new stdClass();
+		$params->siren = $siren;
+		$params->data->unite = $unite;
+		$params->data->dateCloture = $dateCloture;
+		$params->data->dureeMois = $dureeMois;
+		$params->data->dateCloturePre = $dateCloturePre;
+		$params->data->dureeMoisPre = $dureeMoisPre;
+		$params->data->typeBilan = $typeBilan;
+		$params->data->postes = $postes;
+		$params->step = $step;
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->setBilan($params);
+			return $reponse->setBilanResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	}
+	
+	public function setLienRef($infos, $id = null)
+	{
+		$params = new stdClass();
+		$params->infos = $infos;
+		$params->id = $id;
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->setLienRef($params);
+			return $reponse->setLienRefResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	}
+	
+	public function searchLienRef($query, $type = null)
+	{
+		$params = new stdClass();
+		$params->query = $query;
+		$params->type = $type;
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->searchLienRef($params);
+			return $reponse->searchLienRefResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	}
+	
+	
+	public function setLienDoc($infos, $id = null)
+	{
+		$params = new stdClass();
+		$params->infos = $infos;
+		$params->id = $id;
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->setLienDoc($params);
+			return $reponse->setLienDocResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	public function setLien($infos, $id = null)
+	{
+		$params = new stdClass();
+		$params->infos = $infos;
+		$params->id = $id;
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->setLien($params);
+			return $reponse->setLienResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	}
+	
+	public function getSaisieLienRef($id)
+	{
+		$params = new stdClass();
+		$params->id = $id;
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->getLienRef($params);
+			return $reponse->getLienRefResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	}
+	
+	
+	public function getSaisieLien($id)
+	{
+		$params = new stdClass();
+		$params->id = $id;
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->getLien($params);
+			return $reponse->getLienResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	}
+	
+	
+	public function setBourse($isin, $infos)
+	{
+		$params = new stdClass();
+		$params->isin = $isin;
+		$params->infos = $infos;
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->setBourse($params);
+			return $reponse->setBourseResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	}
+	
+	public function getSaisieBourse($isin)
+	{
+		$params = new stdClass();
+		$params->isin = $isin;
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->getBourse($params);
+			return $reponse->getBourseResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	
+	}
+	
+	/**
+	 * Get Score Cut Off
+	 * @param string $siren
+	 * @return Cutoff values or False
+	 */
+	public function getScoreCutoff($siren)
+	{
+		$params = new stdClass();
+		$params->siren = $siren;
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->getScoreCutoff($params);
+			return $reponse->getScoreCutoffResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			return $fault->faultstring;
+		}
+	}
+	
+	/**
+	 * Delete Score Cut Off
+	 * @param string $siren
+	 * @return boolean
+	 */
+	public function delScoreCutoff($siren)
+	{
+		$params = new stdClass();
+		$params->siren = $siren;
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->delScoreCutoff($params);  //change name when webservice is ready
+			return $reponse->delScoreCutoffResult; //change name when webservice is ready
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			return $fault->faultstring;
+		}
+	}
+	
+	public function setLienChange($action, $idLien, $id)
+	{
+		$params = new stdClass();
+		$params->action = $action;
+		$params->idLien = $idLien;
+		$params->id = $id;
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->setLienChange($params);
+			return $reponse->setLienChangeResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+				return $fault->faultstring;
+			} else {
+				$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+				return false;
+			}
+		}
+	}
+	
+	/**
+	 * Set Score Cut Off
+	 * @param string $siren
+	 * @param int $encours
+	 * @param int $scoreSolv
+	 * @param int $scoreDir
+	 * @param int $scoreConf
+	 * @param string $remarque
+	 * @param boolean delete
+	 * @return boolean
+	 */
+	public function setScoreCutoff($siren, $encours, $scoreSolv, $scoreDir, $scoreConf, $remarque, $delete)
+	{
+		$infos = array(
+				'siren' => $siren,
+				'encours' => $encours,
+				'scoreSolv' => $scoreSolv,
+				'scoreDir' => $scoreDir,
+				'scoreConf' => $scoreConf,
+				'remarque' => $remarque,
+		);
+		$params = new stdClass();
+		$params->infos = json_encode($infos);
+		$params->delete = $delete;
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->setScoreCutoff($params);
+			return $reponse->setScoreCutoffResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			return $fault->faultstring;
+		}
+	}
+	
+	
+	public function getLienDoc($id, $type = null, $groupe = false)
+	{
+		$params = new stdClass();
+		$params->id = $id;
+		$params->type = $type;
+		$params->groupe = $groupes;
+		$client = $this->loadClient('saisie');
+		try {
+			$reponse = $client->getLienDoc($params);
+			return $reponse->getLienDocResult;
+		} catch (SoapFault $fault) {
+			Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+			$this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+			return false;
+		}
+	}
+	
+	
+}

library/Scores/WsScores.php

@@ -304,7 +304,7 @@ class WsScores
 	        return $fault->faultstring;
 	    }
 	}
-	
+
 	/**
 	 * Get Score Cut Off
 	 * @param string $siren
@@ -323,7 +323,7 @@ class WsScores
 			return $fault->faultstring;
 		}
 	}
-	
+
 	/**
 	 * Delete Score Cut Off
 	 * @param string $siren
@@ -898,6 +898,7 @@ class WsScores
 		$params = new StdClass;
 		$params->siren = $siren;
 		$params->pctMin = $pctMin;
+		$params->stopAtIsin = false;
 		$params->nbNiveaux = $nbNiveaux;
 		$client = $this->loadClient('interne');
 		try {
@@ -2875,9 +2876,10 @@ class WsScores
 		$message.= "Detail :\n".$fault->getTraceAsString();
 		$message.= "\n\n";
 
-		$controller = Zend_Controller_Front::getInstance();
-		$message.= "Request Parameters :\n ".print_r($controller->getRequest()->getParams(), true);
-		$message.= "\n\n";
+		if ( $controller = Zend_Controller_Front::getInstance() ) {
+			$message.= "Request Parameters :\n ".print_r($controller->getRequest()->getParams(), true);
+			$message.= "\n\n";
+		}
 
 		$message.= "Referer : ".$_SERVER['HTTP_REFERER']."\n\n";
 

library/WorldCheck/SessionWorldcheck.php

@@ -0,0 +1,64 @@
+<?php
+class SessionWorldcheck
+{
+	protected $index = 'wcheck';
+	
+	public function getName()
+	{
+		return $this->get('name');
+	}
+	
+	public function getFName()
+	{
+		return $this->get('fName');
+	}
+	
+	public function getSiren()
+	{
+		return $this->get('siren');
+	}
+	
+	public function getNameIdentifier()
+	{
+		return $this->get('nameIdentifier');
+	}
+	
+	public function getMatchCount()
+	{
+		return $this->get('matchCount');
+	}
+
+	public function getNameType()
+	{
+		return $this->get('nameType');
+	}
+
+	public function getIdClient()
+	{
+		return $this->get('idClient');
+	}
+
+	public function getLogin()
+	{
+		return $this->get('login');
+	}
+	
+	public function setSession($param)
+	{
+		$session = new Zend_Session_Namespace($this->index);
+		$session->name = $param->dirNom;
+		$session->fName	= $param->dirPrenom;
+		$session->siren	= $param->Siren;
+		$session->nameIdentifier = $param->nameIdentifier;
+		$session->matchCount = $param->matchCount;
+		$session->nameType = $param->dirType;
+		$session->idClient = $param->idClient;
+		$session->login = $param->login;
+	}
+	
+	protected function get($key)
+	{
+		$session = new Zend_Session_Namespace($this->index);
+		return $session->$key;
+	}
+}

library/WorldCheck/WsWorldCheck.php

@@ -10,13 +10,13 @@ class WsWorldCheck
 	{
 		$c = Zend_Registry::get('config');
 		$location = ($c->profil->webservice->location == 'production') ? 'production' : 'pilot';
-		$cWC = new Zend_Config_Ini('/Worldcheck/webservicesWC.ini', $location);
+		$cWC = new Zend_Config_Ini(APPLICATION_PATH . '/../library/WorldCheck/webservicesWC.ini', $location);
 		$config = $cWC->toArray();
 		$this->webservices = $config['webservices'];
 
-		$configWC = new Zend_Config_Ini('/Worldcheck/applicationWC.ini');
+		$configWC = new Zend_Config_Ini(APPLICATION_PATH . '/../library/WorldCheck/applicationWC.ini');
 		$data = $configWC->toArray();
-		$this->wcData = $data['worldcheck'];
+		$this->wcData = $data['wsworldcheck'];
 	}
 
 	/**
@@ -30,23 +30,25 @@ class WsWorldCheck
 
 		$options['soap_version'] = SOAP_1_1;
 		$options['features'] = SOAP_USE_XSI_ARRAY_TYPE + SOAP_SINGLE_ELEMENT_ARRAYS;
-		$options['compression'] = SOAP_COMPRESSION_ACCEPT | SOAP_COMPRESSION_GZIP | SOAP_COMPRESSION_DEFLATE;
+		//$options['compression'] = SOAP_COMPRESSION_ACCEPT | SOAP_COMPRESSION_GZIP | SOAP_COMPRESSION_DEFLATE;
 		$options['style'] = SOAP_DOCUMENT;
 		$options['use'] = SOAP_LITERAL;
 		$options['trace'] = true;
-		$options['encoding'] = 'utf-8';
+		//$options['encoding'] = 'utf-8';
+		if (APPLICATION_ENV == 'development'){
+			$options['cache_wsdl'] = WSDL_CACHE_NONE;
+		}
 
 		$client = false;
 
 		$header = $this->headerWC();
 
 		try {
-			$client = new SoapClient($wsdl, $options);
+			$client = new SoapClient(realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . $wsdl, $options);
 			$client->__setSoapHeaders($header);
 		} catch (Exception $e) {
 			throw new Exception('Application Error');
 		}
-
 		return $client;
 	}
 
@@ -66,13 +68,14 @@ class WsWorldCheck
 		$header = new SoapHeader($this->wcData['namespace'], $this->wcData['securityType'], $headerVar, true);
 		return $header;
 	}
-	
+
 	//**** SCREENER WSDL ****//
 
 	/**
-	 * getScreener
+	 * The initial request of Worldcheck to get nameIdentifier.
+	 * nameType available values: 'INDIVIDUAL', 'ORGANISATION'
 	 * @param object $data
-	 * @return NameIdentifier
+	 * @return NameIdentifier (Unique for each request, begins with so_n_)
 	 */
 	public function getScreener($data)
 	{
@@ -80,21 +83,28 @@ class WsWorldCheck
 		$params->screenRequest = $data;
 		$params->screenRequest->groupIdentifier = $this->wcData['groupIdentifier'];
 		$params->screenRequest->assigneeIdentifier = $this->wcData['assigneeIdentifier'];
+		$params->screenRequest->customId1 = '1';
+		$params->screenRequest->customId2 = '2';
 		$client = $this->loadClientWC('screener');
 		try {
-			return $client->screen($params)->return;
+			$response = $client->screen($params);
+			//echo $client->__getLastRequest();
+			//echo $client->__getLastResponse();
+			return $response->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
-				return $fault->faultstring;
+
+			if ($fault->faultcode){
+				echo $fault->faultstring;
+				return false;
 			} else {
 				echo $client->__getLastResponse();
 				return false;
 			}
 		}
 	}
-	
+
 	//**** CONTENT WSDL ****//
-	
+
 	/**
 	 * getContentSources
 	 * @return Content Sources
@@ -105,7 +115,7 @@ class WsWorldCheck
 		try {
 			return $client->getContentSources()->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -113,21 +123,23 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * getDetails
-	 * @param string matchIdentifier
+	 * @param object: matchIdentifier, nameType
 	 * @return object content
 	 */
-	public function getDetailsContent($matchIdentifier)
+	public function getDetailsContent($params)
 	{
 		$client = $this->loadClientWC('content');
 		$param = new stdClass();
-		$param->matchIdentifier = $matchIdentifier;
+		$nameType = strtolower($params->nameType);
+		$param->matchIdentifier = $params->matchIdentifier;
 		try {
-			return $client->getDetails($param)->return;
+			if ($nameType=='individual') return $client->getDetails($param)->return->entitySet->entities->individual;
+			else return $client->getDetails($param)->return->entitySet->entities->organisation;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -135,7 +147,7 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * getSummaries
 	 * @param object
@@ -145,15 +157,15 @@ class WsWorldCheck
 	{
 		$client = $this->loadClientWC('content');
 		$param = new stdClass();
-		$param->matchIdentifier = $data->matchIdentifier;
+		$param->nameIdentifier = $data->nameIdentifier;
 		$param->matchType = $data->matchType; // value must be watchlist
-		$param->start = $data->start;
-		$param->limit = $data->limit;
-		
+		$param->start = $this->wcData['response']['start'];
+		$param->limit = $this->wcData['response']['limit'];
+
 		try {
 			return $client->getSummaries($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -161,7 +173,50 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
+	/**
+	 * return an array, where key=entityId, and value=fullName according to nameIdentifier
+	 * @param object
+	 * @return array
+	 */
+	public function getSummariesArr($data)
+	{
+		$allMatches = array();
+		$client = $this->loadClientWC('content');
+		$param = new stdClass();
+		$param->nameIdentifier = $data->nameIdentifier;
+		$param->matchType = $data->matchType; // value must be watchlist
+		$param->start = $this->wcData['response']['start'];
+		$param->limit = $this->wcData['response']['limit'];
+
+		try {
+			$category = $client->getSummaries($param)->return->entitySummaries->categories;
+			foreach ($category->category as $category)
+			{
+				foreach($category->summaries->summary as $summary)
+				{
+					$key = $summary->entityId->entityId;
+					$shortData = new stdClass();
+					$shortData->givenName = $summary->names->name[0]->givenName;
+					$shortData->lastName = $summary->names->name[0]->lastName;
+					$shortData->description = $summary->groups->group[0]->details->detail[0]->description;
+					if (isset($summary->countryLinks->countryLink)){
+						$shortData->country = $summary->countryLinks->countryLink[0]->countryText;
+					}
+					$allMatches[$key] = $shortData;
+				}
+			}
+			return $allMatches;
+		} catch (SoapFault $fault) {
+			if ($fault->faultcode){
+				return $fault->faultstring;
+			} else {
+				echo $client->__getLastResponse();
+				return false;
+			}
+		}
+	}
+
 	/**
 	 * getSummariesForMatch
 	 * @param string matchIdentifier
@@ -175,7 +230,7 @@ class WsWorldCheck
 		try {
 			return $client->getSummariesForMatch($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -183,7 +238,32 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
+	/**
+	 * return object with entityId and fullName according to matchIdentifier
+	 * @param string matchIdentifier
+	 * @return object
+	 */
+	public function getSummariesForMatchEntityId($matchIdentifier)
+	{
+		$data = new stdClass();
+		$client = $this->loadClientWC('content');
+		$param = new stdClass();
+		$param->matchIdentifier = $matchIdentifier;
+		try {
+			$data->entityId = $client->getSummariesForMatch($param)->return->entitySummaries->categories->category[0]->summaries->summary[0]->entityId->entityId;
+			$data->fullName = $client->getSummariesForMatch($param)->return->entitySummaries->categories->category[0]->summaries->summary[0]->names->name[0]->fullName;
+			return $data;
+		} catch (SoapFault $fault) {
+			if ($fault->faultcode){
+				return $fault->faultstring;
+			} else {
+				echo $client->__getLastResponse();
+				return false;
+			}
+		}
+	}
+
 	/**
 	 * getTitles
 	 * @param object
@@ -195,13 +275,13 @@ class WsWorldCheck
 		$param = new stdClass();
 		$param->matchIdentifier = $data->matchIdentifier;
 		$param->matchType = $data->matchType; // value must be watchlist
-		$param->start = $data->start;
-		$param->limit = $data->limit;
-	
+		$param->start = $this->wcData['response']['start'];
+		$param->limit = $this->wcData['response']['limit'];
+
 		try {
 			return $client->getTitles($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -209,7 +289,7 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * getTitlesForMatch
 	 * @param string matchIdentifier
@@ -223,7 +303,7 @@ class WsWorldCheck
 		try {
 			return $client->getTitlesForMatch($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -231,9 +311,9 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	//**** USER WSDL ****//
-	
+
 	/**
 	 * change My Password
 	 * @param string new password
@@ -247,15 +327,15 @@ class WsWorldCheck
 		try {
 			return $client->changeMyPassword($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
 				return false;
-			}	
+			}
 		}
 	}
-	
+
 	/**
 	 * reset Password
 	 * @param string username
@@ -269,7 +349,7 @@ class WsWorldCheck
 		try {
 			return $client->resetPassword($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -277,7 +357,7 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * get Usernames
 	 * @param string userIdentifier
@@ -291,7 +371,7 @@ class WsWorldCheck
 		try {
 			return $client->getUserNames($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -299,9 +379,9 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	//**** PREFERENCE WSDL ****//
-	
+
 	/**
 	 * getAllGroupConfingVariables
 	 * @param string groupIdentifier
@@ -315,7 +395,7 @@ class WsWorldCheck
 		try {
 			return $client->getAllGroupConfingVariables($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -323,7 +403,7 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * getGroupConfigVariable
 	 * @param string groupIdentifier
@@ -338,7 +418,7 @@ class WsWorldCheck
 		try {
 			return $client->getGroupConfigVariable($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -346,7 +426,7 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * getGroupConfigVariables
 	 * @param string groupIdentifier
@@ -359,11 +439,11 @@ class WsWorldCheck
 		$param = new stdClass();
 		$param->groupIdentifier = $groupIdentifier;
 		$param->groupConfigVariableTypeSet->groupConfigVariableTypes->groupConfigVariableType = $groupConfigVariableType;
-		
+
 		try {
 			return $client->getGroupConfigVariables($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -371,9 +451,9 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	//**** STOREDNAME WSDL ****//
-	
+
 	/**
 	 * getStoredNameModel
 	 * @param string groupIdentifier
@@ -384,11 +464,11 @@ class WsWorldCheck
 		$client = $this->loadClientWC('storedName');
 		$param = new stdClass();
 		$param->groupIdentifier = $groupIdentifier;
-	
+
 		try {
 			return $client->getStoredNameModel($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -396,7 +476,7 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * getStoredNameModelForAllGroups
 	 * @return object
@@ -404,11 +484,11 @@ class WsWorldCheck
 	public function getStoredNameModelForAllGroups()
 	{
 		$client = $this->loadClientWC('storedName');
-	
+
 		try {
 			return $client->getStoredNameModelForAllGroups()->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -416,7 +496,7 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * getStoredNameModelGroups
 	 * @return object
@@ -424,11 +504,11 @@ class WsWorldCheck
 	public function getStoredNameModelGroups()
 	{
 		$client = $this->loadClientWC('storedName');
-	
+
 		try {
 			return $client->getStoredNameModelGroups()->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -436,7 +516,7 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * getUserFilters
 	 * @return object
@@ -444,11 +524,11 @@ class WsWorldCheck
 	public function getUserFilters()
 	{
 		$client = $this->loadClientWC('storedName');
-	
+
 		try {
 			return $client->getUserFilters()->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -456,9 +536,9 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	//**** NAME WSDL ****//
-	
+
 	/**
 	 * addNote
 	 * @param string nameIdentifier
@@ -471,11 +551,11 @@ class WsWorldCheck
 		$param = new stdClass();
 		$param->nameIdentifierList->nameIdentifiers->nameIdentifier = $nameIdentifier;
 		$param->note = $note;
-	
+
 		try {
 			return $client->addNote($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -483,7 +563,7 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * archive
 	 * @param string nameIdentifier
@@ -494,11 +574,11 @@ class WsWorldCheck
 		$client = $this->loadClientWC('name');
 		$param = new stdClass();
 		$param->nameIdentifierList->nameIdentifiers->nameIdentifier = $nameIdentifier;
-	
+
 		try {
 			return $client->archive($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -506,7 +586,7 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * delete
 	 * @param string nameIdentifier
@@ -517,11 +597,11 @@ class WsWorldCheck
 		$client = $this->loadClientWC('name');
 		$param = new stdClass();
 		$param->nameIdentifierList->nameIdentifiers->nameIdentifier = $nameIdentifier;
-	
+
 		try {
 			return $client->delete($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -529,7 +609,7 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * assign
 	 * @param string nameIdentifier
@@ -542,11 +622,11 @@ class WsWorldCheck
 		$param = new stdClass();
 		$param->nameIdentifierList->nameIdentifiers->nameIdentifier = $nameIdentifier;
 		$param->assigneeIdentifier = $assigneeIdentifier;
-	
+
 		try {
 			return $client->assign($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -564,11 +644,11 @@ class WsWorldCheck
 		$client = $this->loadClientWC('name');
 		$param = new stdClass();
 		$param->nameIdentifierList->nameIdentifiers->nameIdentifier = $nameIdentifier;
-	
+
 		try {
 			return $client->unassign($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -576,7 +656,7 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * changeOwner
 	 * @param string nameIdentifier
@@ -589,11 +669,11 @@ class WsWorldCheck
 		$param = new stdClass();
 		$param->nameIdentifierList->nameIdentifiers->nameIdentifier = $nameIdentifier;
 		$param->ownerIdentifier = $ownerIdentifier;
-	
+
 		try {
 			return $client->changeOwner($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -601,7 +681,7 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * getDetailsName
 	 * @param string nameIdentifier
@@ -612,11 +692,11 @@ class WsWorldCheck
 		$client = $this->loadClientWC('name');
 		$param = new stdClass();
 		$param->nameIdentifier = $nameIdentifier;
-	
+
 		try {
 			return $client->getDetails($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -629,23 +709,21 @@ class WsWorldCheck
 	 * getMatches
 	 * @param string nameIdentifier
 	 * @param string matchType
-	 * @param int start
-	 * @param int limit
 	 * @return object
 	 */
-	public function getMatchesName($nameIdentifier, $matchType, $start, $limit)
+	public function getMatchesName($nameIdentifier, $matchType)
 	{
 		$client = $this->loadClientWC('name');
 		$param = new stdClass();
 		$param->nameIdentifier = $nameIdentifier;
 		$param->matchType = $matchType;
-		$param->start = $start;
-		$param->limit = $limit;
-	
+		$param->start = $this->wcData['response']['start'];
+		$param->limit = $this->wcData['response']['limit'];
+
 		try {
 			return $client->getMatches($param)->return->matches;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -653,7 +731,39 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
+	/**
+	 * Returns array where key=entityId, and value=matchIdentifier according to nameIdentifier
+	 * @param object data (contains nameIdentifier, matchType)
+	 * @return array
+	 */
+	public function getMatchesArrName($data)
+	{
+		$allMatches = array();
+		$client = $this->loadClientWC('name');
+		$param = new stdClass();
+		$param->nameIdentifier = $data->nameIdentifier;
+		$param->matchType = $data->matchType; // value must be watchlist
+		$param->start = $this->wcData['response']['start'];
+		$param->limit = $this->wcData['response']['limit'];
+
+		try {
+			$matches = $client->getMatches($param)->return->matches;
+			foreach ($matches->match as $matchData)
+			{
+				$allMatches[$matchData->matchEntityIdentifier] = $matchData->matchIdentifier;
+			}
+			return $allMatches;
+		} catch (SoapFault $fault) {
+			if ($fault->faultcode){
+				return $fault->faultstring;
+			} else {
+				echo $client->__getLastResponse();
+				return false;
+			}
+		}
+	}
+
 	/**
 	 * getSelectableAssignees
 	 * @param string groupIdentifier
@@ -664,11 +774,11 @@ class WsWorldCheck
 		$client = $this->loadClientWC('name');
 		$param = new stdClass();
 		$param->groupIdentifier = $groupIdentifier;
-	
+
 		try {
 			return $client->getSelectableAssignees($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -676,7 +786,7 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * getSelectableGroups
 	 * @return object
@@ -684,11 +794,11 @@ class WsWorldCheck
 	public function getSelectableGroups()
 	{
 		$client = $this->loadClientWC('name');
-	
+
 		try {
 			return $client->getSelectableGroups()->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -707,11 +817,11 @@ class WsWorldCheck
 		$param = new stdClass();
 		$param->groupIdentifier = $groupIdentifier;
 		$param->nameSystemStatus = $nameSystemStatus;
-	
+
 		try {
 			return $client->getSelectableOwners($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -719,7 +829,7 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * saveForOngoingScreening
 	 * @param string nameIdentifier
@@ -731,11 +841,11 @@ class WsWorldCheck
 		$client = $this->loadClientWC('name');
 		$param = new stdClass();
 		$param->nameIdentifierList->nameIdentifiers->nameIdentifier = $nameIdentifier;
-	
+
 		try {
 			return $client->saveForOngoingScreening($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -743,9 +853,9 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	//**** MATCH WSDL ****//
-	
+
 	/**
 	 * acknoledge
 	 * @param string matchIdentifier
@@ -758,11 +868,11 @@ class WsWorldCheck
 		$param = new stdClass();
 		$param->matchIdentifierList->matchIdentifiers->matchIdentifier = $matchIdentifier;
 		$param->note = $note;
-	
+
 		try {
 			return $client->acknoledge($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -770,7 +880,7 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * addNote
 	 * @param string matchIdentifier
@@ -785,11 +895,11 @@ class WsWorldCheck
 		$param->matchIdentifierList->matchIdentifiers = new stdClass();
 		$param->matchIdentifierList->matchIdentifiers->matchIdentifier = $matchIdentifier;
 		$param->note = $note;
-	
+
 		try {
 			return $client->addNote($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -797,7 +907,7 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * getDetailsMatch
 	 * @param string matchIdentifier
@@ -808,11 +918,11 @@ class WsWorldCheck
 		$client = $this->loadClientWC('match');
 		$param = new stdClass();
 		$param->matchIdentifier = $matchIdentifier;
-	
+
 		try {
 			return $client->getDetails($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -820,7 +930,7 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * getNewUpdatedNameModel
 	 * @param string groupIdentifier
@@ -831,11 +941,11 @@ class WsWorldCheck
 		$client = $this->loadClientWC('match');
 		$param = new stdClass();
 		$param->groupIdentifier = $groupIdentifier;
-	
+
 		try {
 			return $client->getNewUpdatedNameModel($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -843,7 +953,7 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * getNewUpdatedNameModelForAllGroups
 	 * @return object
@@ -851,11 +961,11 @@ class WsWorldCheck
 	public function getNewUpdatedNameModelForAllGroups()
 	{
 		$client = $this->loadClientWC('match');
-	
+
 		try {
 			return $client->getNewUpdatedNameModelForAllGroups()->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -863,7 +973,7 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * getNewUpdatedNameModelGroups
 	 * @return object
@@ -871,11 +981,11 @@ class WsWorldCheck
 	public function getNewUpdatedNameModelGroups()
 	{
 		$client = $this->loadClientWC('match');
-	
+
 		try {
 			return $client->getNewUpdatedNameModelGroups()->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -883,7 +993,7 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * getNewUpdatedNames
 	 * @param object $data
@@ -894,11 +1004,11 @@ class WsWorldCheck
 		$client = $this->loadClientWC('match');
 		$param = new stdClass();
 		//to be continued
-	
+
 		try {
 			return $client->getNewUpdatedNames($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();
@@ -906,7 +1016,7 @@ class WsWorldCheck
 			}
 		}
 	}
-	
+
 	/**
 	 * resolve
 	 * @param object $data
@@ -920,11 +1030,11 @@ class WsWorldCheck
 		$param->matchRisk = $data->matchRisk;
 		$param->matchStatus = $data->matchStatus;
 		$param->note = $data->note;
-	
+
 		try {
 			return $client->resolve($param)->return;
 		} catch (SoapFault $fault) {
-			if ( in_array($fault->faultcode, array('ERR', 'MSG')) ){
+			if ($fault->faultcode){
 				return $fault->faultstring;
 			} else {
 				echo $client->__getLastResponse();

library/WorldCheck/applicationWC.ini

@@ -1,7 +1,13 @@
-worldcheck.username = ylenaour@scores-decisions.com
-worldcheck.password = accelus
-worldcheck.passwordType = http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText
-worldcheck.namespace = http://screening.complinet.com/
-worldcheck.securityType = Security
-worldcheck.groupIdentifier = cng_so_64
-worldcheck.assigneeIdentifier = cnu_so_77
+wsworldcheck.username = ylenaour@scores-decisions.com
+wsworldcheck.password = accelus
+wsworldcheck.passwordType = http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText
+wsworldcheck.namespace = http://screening.complinet.com/
+wsworldcheck.securityType = Security
+wsworldcheck.groupIdentifier = cng_so_64
+wsworldcheck.assigneeIdentifier = cnu_so_77
+wsworldcheck.response.limit = 200
+wsworldcheck.response.start = 0
+worldcheck.page.items = 15
+worldcheck.cachedir.path = ../data/cache/
+worldcheck.cachedir.name = worldcheck
+worldcheck.cachedir.lifetime = 86400

library/WorldCheck/webservicesWC.ini

@@ -1,25 +1,25 @@
 [pilot]
-webservices.actionLog.wsdl = "https://screeningpilot.accelus.com/pilot-v1/actionLog?wsdl"
-webservices.batch.wsdl = "https://screeningpilot.accelus.com/pilot-v1/batch?wsdl"
-webservices.name.wsdl = "https://screeningpilot.accelus.com/pilot-v1/name?wsdl"
-webservices.screener.wsdl = "https://screeningpilot.accelus.com/pilot-v1/screener?wsdl"
-webservices.storedName.wsdl = "https://screeningpilot.accelus.com/pilot-v1/storedName?wsdl"
-webservices.content.wsdl = "https://screeningpilot.accelus.com/pilot-v1/content?wsdl"
-webservices.group.wsdl = "https://screeningpilot.accelus.com/pilot-v1/group?wsdl"
-webservices.preference.wsdl = "https://screeningpilot.accelus.com/pilot-v1/preference?wsdl"
-webservices.role.wsdl = "https://screeningpilot.accelus.com/pilot-v1/role?wsdl"
-webservices.user.wsdl = "https://screeningpilot.accelus.com/pilot-v1/user?wsdl"
-webservices.match.wsdl = "https://screeningpilot.accelus.com/pilot-v1/match?wsdl"
+webservices.actionLog.wsdl = "wsdl/pilot/actionLog.wsdl"
+webservices.batch.wsdl = "wsdl/pilot/batch.wsdl"
+webservices.name.wsdl = "wsdl/pilot/name.wsdl"
+webservices.screener.wsdl = "wsdl/pilot/screener.wsdl"
+webservices.storedName.wsdl = "wsdl/pilot/storedName.wsdl"
+webservices.content.wsdl = "wsdl/pilot/content.wsdl"
+webservices.group.wsdl = "wsdl/pilot/group.wsdl"
+webservices.preference.wsdl = "wsdl/pilot/preference.wsdl"
+webservices.role.wsdl = "wsdl/pilot/role.wsdl"
+webservices.user.wsdl = "wsdl/pilot/user.wsdl"
+webservices.match.wsdl = "wsdl/pilot/match.wsdl"
 
 [production]
-webservices.actionLog.wsdl = "https://screening.complinet.com/soap/v1/actionLog?wsdl"
-webservices.batch.wsdl = "https://screening.complinet.com/soap/v1/batch?wsdl"
-webservices.name.wsdl = "https://screening.complinet.com/soap/v1/name?wsdl"
-webservices.screener.wsdl = "https://screening.complinet.com/soap/v1/screener?wsdl"
-webservices.storedName.wsdl = "https://screening.complinet.com/soap/v1/storedName?wsdl"
-webservices.content.wsdl = "https://screening.complinet.com/soap/v1/content?wsdl"
-webservices.group.wsdl = "https://screening.complinet.com/soap/v1/group?wsdl"
-webservices.preference.wsdl = "https://screening.complinet.com/soap/v1/preference?wsdl"
-webservices.role.wsdl = "https://screening.complinet.com/soap/v1/role?wsdl"
-webservices.user.wsdl = "https://screening.complinet.com/soap/v1/user?wsdl"
-webservices.match.wsdl = "https://screening.complinet.com/soap/v1/match?wsdl"
+webservices.actionLog.wsdl = "wsdl/production/actionLog.wsdl"
+webservices.batch.wsdl = "wsdl/production/batch.wsdl"
+webservices.name.wsdl = "wsdl/production/name.wsdl"
+webservices.screener.wsdl = "wsdl/production/screener.wsdl"
+webservices.storedName.wsdl = "wsdl/production/storedName.wsdl"
+webservices.content.wsdl = "wsdl/production/content.wsdl"
+webservices.group.wsdl = "wsdl/production/group.wsdl"
+webservices.preference.wsdl = "wsdl/production/preference.wsdl"
+webservices.role.wsdl = "wsdl/production/role.wsdl"
+webservices.user.wsdl = "wsdl/production/user.wsdl"
+webservices.match.wsdl = "wsdl/production/match.wsdl"

library/WorldCheck/wsdl/pilot/actionLog.wsdl

@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="ActionLogWebService" targetNamespace="http://screening.complinet.com/" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://screening.complinet.com/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <wsdl:types>
+<xs:schema elementFormDefault="unqualified" targetNamespace="http://screening.complinet.com/" version="1.0" xmlns:tns="http://screening.complinet.com/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:element name="actionLog" type="tns:actionLogV1"/>
+<xs:element name="actionLogList" type="tns:actionLogListV1"/>
+<xs:element name="getActionLogs" type="tns:getActionLogs"/>
+<xs:element name="getActionLogsResponse" type="tns:getActionLogsResponse"/>
+<xs:element name="paginationCriteria" type="tns:paginationCriteriaV1"/>
+<xs:element name="searchFilterRequest" type="tns:searchFilterRequestV1"/>
+<xs:element name="sortingCriterion" type="tns:sortingCriterionV1"/>
+<xs:complexType name="getActionLogs">
+<xs:sequence>
+<xs:element minOccurs="0" name="searchFilter" type="tns:searchFilterRequestV1"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="searchFilterRequestV1">
+<xs:sequence>
+<xs:element minOccurs="0" name="atomicFilters">
+<xs:complexType>
+<xs:sequence>
+<xs:element maxOccurs="unbounded" minOccurs="0" name="atomicFilter" type="tns:atomicFilter"/>
+</xs:sequence>
+</xs:complexType>
+</xs:element>
+<xs:element minOccurs="0" name="filterName" type="xs:string"/>
+<xs:element minOccurs="0" name="paginationCriteria" type="tns:paginationCriteriaV1"/>
+<xs:element minOccurs="0" name="sortingCriteria" type="tns:sortingCriterionV1"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="atomicFilter">
+<xs:sequence>
+<xs:element minOccurs="0" name="description" type="xs:string"/>
+<xs:choice minOccurs="0">
+<xs:element name="actionLogFilterType" type="tns:actionLogFilterType"/>
+<xs:element name="batchFilterType" type="tns:batchFilterType"/>
+<xs:element name="newUpdatedNameFilterType" type="tns:newUpdatedNameFilterType"/>
+<xs:element name="storedNameFilterType" type="tns:storedNameFilterType"/>
+<xs:element name="userFilterType" type="tns:userFilterType"/>
+</xs:choice>
+<xs:element name="value" type="xs:string"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="paginationCriteriaV1">
+<xs:sequence>
+<xs:element name="pageSize" type="xs:int"/>
+<xs:element name="pageStart" type="xs:int"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="sortingCriterionV1">
+<xs:sequence>
+<xs:choice minOccurs="0">
+<xs:element name="actionLogFilterType" type="tns:actionLogFilterType"/>
+<xs:element name="batchFilterType" type="tns:batchFilterType"/>
+<xs:element name="newUpdatedNameFilterType" type="tns:newUpdatedNameFilterType"/>
+<xs:element name="storedNameFilterType" type="tns:storedNameFilterType"/>
+<xs:element name="userFilterType" type="tns:userFilterType"/>
+</xs:choice>
+<xs:element name="descending" type="xs:boolean"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="getActionLogsResponse">
+<xs:sequence>
+<xs:element minOccurs="0" name="return" type="tns:actionLogListV1"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="actionLogListV1">
+<xs:sequence>
+<xs:element name="actionLogCount" type="xs:long"/>
+<xs:element minOccurs="0" name="actionLogs">
+<xs:complexType>
+<xs:sequence>
+<xs:element maxOccurs="unbounded" minOccurs="0" name="actionLog" type="tns:actionLogV1"/>
+</xs:sequence>
+</xs:complexType>
+</xs:element>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="actionLogV1">
+<xs:sequence>
+<xs:element minOccurs="0" name="actionType" type="tns:actionType"/>
+<xs:element minOccurs="0" name="batchIdentifier" type="xs:string"/>
+<xs:element minOccurs="0" name="data" type="xs:string"/>
+<xs:element minOccurs="0" name="date" type="xs:dateTime"/>
+<xs:element minOccurs="0" name="matchIdentifier" type="xs:string"/>
+<xs:element minOccurs="0" name="nameIdentifier" type="xs:string"/>
+<xs:element minOccurs="0" name="note" type="xs:string"/>
+<xs:element minOccurs="0" name="userIdentifier" type="xs:string"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="batchIdentifier">
+<xs:complexContent>
+<xs:extension base="tns:screeningOnlineIdentifier">
+<xs:sequence/>
+</xs:extension>
+</xs:complexContent>
+</xs:complexType>
+<xs:complexType abstract="true" name="screeningOnlineIdentifier">
+<xs:complexContent>
+<xs:extension base="tns:universalContentIdentifier">
+<xs:sequence/>
+</xs:extension>
+</xs:complexContent>
+</xs:complexType>
+<xs:complexType abstract="true" name="universalContentIdentifier">
+<xs:sequence/>
+</xs:complexType>
+<xs:complexType name="nameIdentifier">
+<xs:complexContent>
+<xs:extension base="tns:screeningOnlineIdentifier">
+<xs:sequence/>
+</xs:extension>
+</xs:complexContent>
+</xs:complexType>
+<xs:complexType name="matchIdentifier">
+<xs:complexContent>
+<xs:extension base="tns:screeningOnlineIdentifier">
+<xs:sequence/>
+</xs:extension>
+</xs:complexContent>
+</xs:complexType>
+<xs:simpleType name="actionLogFilterType">
+<xs:restriction base="xs:string">
+<xs:enumeration value="ACTION_NOTE"/>
+<xs:enumeration value="BATCH_IDENTIFIER"/>
+<xs:enumeration value="ACTION_TYPE"/>
+<xs:enumeration value="DATE_FROM"/>
+<xs:enumeration value="DATE_TO"/>
+<xs:enumeration value="INCLUDE_ALL"/>
+<xs:enumeration value="MATCH_IDENTIFIER"/>
+<xs:enumeration value="NAME_IDENTIFIER"/>
+</xs:restriction>
+</xs:simpleType>
+<xs:simpleType name="batchFilterType">
+<xs:restriction base="xs:string">
+<xs:enumeration value="BATCH_IDENTIFIER"/>
+<xs:enumeration value="BATCH_SCREENING_STATUS"/>
+<xs:enumeration value="BATCH_STATUS"/>
+<xs:enumeration value="DATE_FROM"/>
+<xs:enumeration value="DATE_TO"/>
+<xs:enumeration value="GROUP"/>
+<xs:enumeration value="GROUP_IDENTIFIER"/>
+<xs:enumeration value="NAME"/>
+<xs:enumeration value="OWNER"/>
+<xs:enumeration value="OWNER_IDENTIFIER"/>
+</xs:restriction>
+</xs:simpleType>
+<xs:simpleType name="newUpdatedNameFilterType">
+<xs:restriction base="xs:string">
+<xs:enumeration value="ALERT_TYPE"/>
+<xs:enumeration value="ASSIGNEE"/>
+<xs:enumeration value="ASSIGNEE_IDENTIFIER"/>
+<xs:enumeration value="CUSTOM_ID1"/>
+<xs:enumeration value="CUSTOM_ID2"/>
+<xs:enumeration value="FILTER_MODE"/>
+<xs:enumeration value="GROUP"/>
+<xs:enumeration value="GROUP_IDENTIFIER"/>
+<xs:enumeration value="MATCH_SUBTYPE"/>
+<xs:enumeration value="MATCH_TYPE"/>
+<xs:enumeration value="MODIFIED"/>
+<xs:enumeration value="NAME"/>
+<xs:enumeration value="OWNER"/>
+<xs:enumeration value="OWNER_IDENTIFIER"/>
+<xs:enumeration value="UNRESOLVED_MATCHES_COUNT"/>
+<xs:enumeration value="UPDATED_MATCHES_COUNT"/>
+</xs:restriction>
+</xs:simpleType>
+<xs:simpleType name="storedNameFilterType">
+<xs:restriction base="xs:string">
+<xs:enumeration value="NAME_IDENTIFIER"/>
+<xs:enumeration value="NAME"/>
+<xs:enumeration value="GROUP"/>
+<xs:enumeration value="GROUP_IDENTIFIER"/>
+<xs:enumeration value="OWNER"/>
+<xs:enumeration value="OWNER_IDENTIFIER"/>
+<xs:enumeration value="ASSIGNEE_IDENTIFIER"/>
+<xs:enumeration value="ASSIGNEE"/>
+<xs:enumeration value="CUSTOM_ID1"/>
+<xs:enumeration value="CUSTOM_ID2"/>
+<xs:enumeration value="UNRESOLVED_MATCHES_FLAG"/>
+<xs:enumeration value="UPDATED_MATCHES_FLAG"/>
+<xs:enumeration value="NAME_STATUS"/>
+<xs:enumeration value="NAME_SYSTEM_STATUS"/>
+<xs:enumeration value="BATCH_FLAG"/>
+<xs:enumeration value="DATE_FROM"/>
+<xs:enumeration value="DATE_TO"/>
+</xs:restriction>
+</xs:simpleType>
+<xs:simpleType name="userFilterType">
+<xs:restriction base="xs:string">
+<xs:enumeration value="USER_IDENTIFIER"/>
+<xs:enumeration value="ROLE_TYPE"/>
+<xs:enumeration value="USERNAME"/>
+<xs:enumeration value="FAMILY_NAME"/>
+<xs:enumeration value="GIVEN_NAME"/>
+<xs:enumeration value="EXCLUDE_ARCHIVED"/>
+</xs:restriction>
+</xs:simpleType>
+<xs:simpleType name="actionType">
+<xs:restriction base="xs:string">
+<xs:enumeration value="ASSIGN"/>
+<xs:enumeration value="BATCH_CHANGE_STATUS"/>
+<xs:enumeration value="BATCH_UPDATE"/>
+<xs:enumeration value="CHANGE_CLIENT_STATUS"/>
+<xs:enumeration value="CHANGE_CLIENT_SYSTEM_FIELD"/>
+<xs:enumeration value="CHANGE_CLIENT_SYSTEM_STATUS"/>
+<xs:enumeration value="CHANGE_MATCH_RESOLUTION"/>
+<xs:enumeration value="CHANGE_MATCH_RISK"/>
+<xs:enumeration value="CHANGE_MATCH_STATUS"/>
+<xs:enumeration value="CHANGE_NAME_OWNER"/>
+<xs:enumeration value="MATCH_ENTITY_ACKNOWLEDGED"/>
+<xs:enumeration value="MATCH_ENTITY_UPDATED"/>
+<xs:enumeration value="NEW_BATCH"/>
+<xs:enumeration value="NEW_MATCH"/>
+<xs:enumeration value="NEW_NAME"/>
+<xs:enumeration value="NEW_NOTE"/>
+</xs:restriction>
+</xs:simpleType>
+</xs:schema>
+  </wsdl:types>
+  <wsdl:message name="getActionLogsResponse">
+    <wsdl:part element="tns:getActionLogsResponse" name="parameters">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="getActionLogs">
+    <wsdl:part element="tns:getActionLogs" name="parameters">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:portType name="ActionLogWebService">
+    <wsdl:operation name="getActionLogs">
+      <wsdl:input message="tns:getActionLogs" name="getActionLogs">
+    </wsdl:input>
+      <wsdl:output message="tns:getActionLogsResponse" name="getActionLogsResponse">
+    </wsdl:output>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="ActionLogWebServiceSoapBinding" type="tns:ActionLogWebService">
+    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <wsdl:operation name="getActionLogs">
+      <soap:operation soapAction="" style="document"/>
+      <wsdl:input name="getActionLogs">
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="getActionLogsResponse">
+        <soap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="ActionLogWebService">
+    <wsdl:port binding="tns:ActionLogWebServiceSoapBinding" name="ActionLogWebServicePort">
+      <soap:address location="https://screeningpilot.accelus.com/pilot-v1/actionLog"/>
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>

library/WorldCheck/wsdl/pilot/batch.wsdl

@@ -0,0 +1,658 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="BatchWebService" targetNamespace="http://screening.complinet.com/" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://screening.complinet.com/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <wsdl:types>
+<xs:schema elementFormDefault="unqualified" targetNamespace="http://screening.complinet.com/" version="1.0" xmlns:tns="http://screening.complinet.com/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:element name="createInitial" type="tns:createInitial"/>
+<xs:element name="createInitialResponse" type="tns:createInitialResponse"/>
+<xs:element name="createOngoing" type="tns:createOngoing"/>
+<xs:element name="createOngoingResponse" type="tns:createOngoingResponse"/>
+<xs:element name="getBatchModel" type="tns:getBatchModel"/>
+<xs:element name="getBatchModelForAllGroups" type="tns:getBatchModelForAllGroups"/>
+<xs:element name="getBatchModelForAllGroupsResponse" type="tns:getBatchModelForAllGroupsResponse"/>
+<xs:element name="getBatchModelGroups" type="tns:getBatchModelGroups"/>
+<xs:element name="getBatchModelGroupsResponse" type="tns:getBatchModelGroupsResponse"/>
+<xs:element name="getBatchModelResponse" type="tns:getBatchModelResponse"/>
+<xs:element name="getBatches" type="tns:getBatches"/>
+<xs:element name="getBatchesResponse" type="tns:getBatchesResponse"/>
+<xs:element name="getDetails" type="tns:getDetails"/>
+<xs:element name="getDetailsResponse" type="tns:getDetailsResponse"/>
+<xs:element name="getNames" type="tns:getNames"/>
+<xs:element name="getNamesResponse" type="tns:getNamesResponse"/>
+<xs:element name="groupNameList" type="tns:groupNameListV1"/>
+<xs:element name="paginationCriteria" type="tns:paginationCriteriaV1"/>
+<xs:element name="rescreen" type="tns:rescreen"/>
+<xs:element name="rescreenResponse" type="tns:rescreenResponse"/>
+<xs:element name="searchFilterRequest" type="tns:searchFilterRequestV1"/>
+<xs:element name="sortingCriterion" type="tns:sortingCriterionV1"/>
+<xs:element name="userName" type="tns:userNameV1"/>
+<xs:complexType name="getDetails">
+<xs:sequence>
+<xs:element minOccurs="0" name="batchIdentifier" type="xs:string"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="batchIdentifier">
+<xs:complexContent>
+<xs:extension base="tns:screeningOnlineIdentifier">
+<xs:sequence/>
+</xs:extension>
+</xs:complexContent>
+</xs:complexType>
+<xs:complexType abstract="true" name="screeningOnlineIdentifier">
+<xs:complexContent>
+<xs:extension base="tns:universalContentIdentifier">
+<xs:sequence/>
+</xs:extension>
+</xs:complexContent>
+</xs:complexType>
+<xs:complexType abstract="true" name="universalContentIdentifier">
+<xs:sequence/>
+</xs:complexType>
+<xs:complexType name="getDetailsResponse">
+<xs:sequence>
+<xs:element minOccurs="0" name="return" type="tns:batch"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="batch">
+<xs:sequence>
+<xs:element name="batchIdentifier" type="xs:string"/>
+<xs:element name="batchName" type="xs:string"/>
+<xs:element name="batchScreeningStatus" type="tns:batchScreeningStatus"/>
+<xs:element name="batchStatus" type="tns:batchStatus"/>
+<xs:element name="created" type="xs:dateTime"/>
+<xs:element name="groupIdentifier" type="xs:string"/>
+<xs:element name="lastModified" type="xs:dateTime"/>
+<xs:element minOccurs="0" name="nameCount" type="xs:int"/>
+<xs:element minOccurs="0" name="ownerIdentifier" type="xs:string"/>
+<xs:element minOccurs="0" name="screenStart" type="xs:dateTime"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="getBatchModelForAllGroups">
+<xs:sequence/>
+</xs:complexType>
+<xs:complexType name="getBatchModelForAllGroupsResponse">
+<xs:sequence>
+<xs:element minOccurs="0" name="return" type="tns:batchModel"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="batchModel">
+<xs:sequence>
+<xs:element name="batchStatuses">
+<xs:complexType>
+<xs:sequence>
+<xs:element maxOccurs="unbounded" name="batchStatus" type="tns:batchStatus"/>
+</xs:sequence>
+</xs:complexType>
+</xs:element>
+<xs:element name="owners">
+<xs:complexType>
+<xs:sequence>
+<xs:element maxOccurs="unbounded" name="owner" type="tns:userNameV1"/>
+</xs:sequence>
+</xs:complexType>
+</xs:element>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="userNameV1">
+<xs:sequence>
+<xs:element minOccurs="0" name="archived" type="xs:dateTime"/>
+<xs:element name="companyName" type="tns:groupName"/>
+<xs:element name="familyName" type="xs:string"/>
+<xs:element name="givenName" type="xs:string"/>
+<xs:element minOccurs="0" name="userIdentifier" type="xs:string"/>
+<xs:element name="username" type="xs:string"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="groupName">
+<xs:sequence>
+<xs:element name="groupIdentifier" type="xs:string"/>
+<xs:element name="name" type="xs:string"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="rescreen">
+<xs:sequence>
+<xs:element minOccurs="0" name="batchIdentifier" type="xs:string"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="rescreenResponse">
+<xs:sequence>
+<xs:element minOccurs="0" name="return" type="xs:boolean"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="getNames">
+<xs:sequence>
+<xs:element minOccurs="0" name="batchIdentifier" type="xs:string"/>
+<xs:element minOccurs="0" name="start" type="xs:int"/>
+<xs:element minOccurs="0" name="limit" type="xs:int"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="getNamesResponse">
+<xs:sequence>
+<xs:element minOccurs="0" name="return" type="tns:nameList"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="nameList">
+<xs:sequence>
+<xs:element name="nameCount" type="xs:long"/>
+<xs:element minOccurs="0" name="names">
+<xs:complexType>
+<xs:sequence>
+<xs:element maxOccurs="unbounded" minOccurs="0" name="name" type="tns:name"/>
+</xs:sequence>
+</xs:complexType>
+</xs:element>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="name">
+<xs:sequence>
+<xs:element minOccurs="0" name="assigneeIdentifier" type="xs:string"/>
+<xs:element minOccurs="0" name="batchIdentifier" type="xs:string"/>
+<xs:element minOccurs="0" name="createdBy" type="xs:string"/>
+<xs:element name="createdDate" type="xs:dateTime"/>
+<xs:element minOccurs="0" name="customId1" type="xs:string"/>
+<xs:element minOccurs="0" name="customId2" type="xs:string"/>
+<xs:element minOccurs="0" name="customUniqueId" type="xs:string"/>
+<xs:element minOccurs="0" name="groupIdentifier" type="xs:string"/>
+<xs:element minOccurs="0" name="modifiedBy" type="xs:string"/>
+<xs:element name="modifiedDate" type="xs:dateTime"/>
+<xs:element name="name" type="xs:string"/>
+<xs:element name="nameIdentifier" type="xs:string"/>
+<xs:element name="nameImportSource" type="tns:nameImportSource"/>
+<xs:element name="nameStatus" type="tns:nameStatus"/>
+<xs:element name="nameSystemStatus" type="tns:nameSystemStatus"/>
+<xs:element name="nameType" type="tns:nameType"/>
+<xs:element minOccurs="0" name="ownerIdentifier" type="xs:string"/>
+<xs:element name="unresolvedMatchCount" type="xs:int"/>
+<xs:element name="updatedEntitiesCount" type="xs:int"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="nameIdentifier">
+<xs:complexContent>
+<xs:extension base="tns:screeningOnlineIdentifier">
+<xs:sequence/>
+</xs:extension>
+</xs:complexContent>
+</xs:complexType>
+<xs:complexType name="getBatchModel">
+<xs:sequence>
+<xs:element minOccurs="0" name="groupIdentifier" type="xs:string"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="getBatchModelResponse">
+<xs:sequence>
+<xs:element minOccurs="0" name="return" type="tns:batchModel"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="createInitial">
+<xs:sequence>
+<xs:element minOccurs="0" name="batch" type="tns:createBatchRequest"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="createBatchRequest">
+<xs:sequence>
+<xs:element name="assigneeIdentifier" type="xs:string"/>
+<xs:element name="batchNames">
+<xs:complexType>
+<xs:sequence>
+<xs:element maxOccurs="unbounded" name="batchName" type="tns:batchName"/>
+</xs:sequence>
+</xs:complexType>
+</xs:element>
+<xs:element name="groupIdentifier" type="xs:string"/>
+<xs:element name="name" type="xs:string"/>
+<xs:element name="ownerIdentifier" type="xs:string"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="batchName">
+<xs:sequence>
+<xs:element minOccurs="0" name="customId1" type="xs:string"/>
+<xs:element minOccurs="0" name="customId2" type="xs:string"/>
+<xs:element name="name" type="xs:string"/>
+<xs:element name="nameType" type="tns:nameType"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="createInitialResponse">
+<xs:sequence>
+<xs:element minOccurs="0" name="return" type="xs:string"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="getBatchModelGroups">
+<xs:sequence/>
+</xs:complexType>
+<xs:complexType name="getBatchModelGroupsResponse">
+<xs:sequence>
+<xs:element minOccurs="0" name="return" type="tns:groupNameListV1"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="groupNameListV1">
+<xs:sequence>
+<xs:element minOccurs="0" name="groupNames">
+<xs:complexType>
+<xs:sequence>
+<xs:element maxOccurs="unbounded" minOccurs="0" name="groupName" type="tns:groupName"/>
+</xs:sequence>
+</xs:complexType>
+</xs:element>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="createOngoing">
+<xs:sequence>
+<xs:element minOccurs="0" name="batch" type="tns:createBatchRequest"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="createOngoingResponse">
+<xs:sequence>
+<xs:element minOccurs="0" name="return" type="xs:string"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="getBatches">
+<xs:sequence>
+<xs:element minOccurs="0" name="searchFilter" type="tns:searchFilterRequestV1"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="searchFilterRequestV1">
+<xs:sequence>
+<xs:element minOccurs="0" name="atomicFilters">
+<xs:complexType>
+<xs:sequence>
+<xs:element maxOccurs="unbounded" minOccurs="0" name="atomicFilter" type="tns:atomicFilter"/>
+</xs:sequence>
+</xs:complexType>
+</xs:element>
+<xs:element minOccurs="0" name="filterName" type="xs:string"/>
+<xs:element minOccurs="0" name="paginationCriteria" type="tns:paginationCriteriaV1"/>
+<xs:element minOccurs="0" name="sortingCriteria" type="tns:sortingCriterionV1"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="atomicFilter">
+<xs:sequence>
+<xs:element minOccurs="0" name="description" type="xs:string"/>
+<xs:choice minOccurs="0">
+<xs:element name="actionLogFilterType" type="tns:actionLogFilterType"/>
+<xs:element name="batchFilterType" type="tns:batchFilterType"/>
+<xs:element name="newUpdatedNameFilterType" type="tns:newUpdatedNameFilterType"/>
+<xs:element name="storedNameFilterType" type="tns:storedNameFilterType"/>
+<xs:element name="userFilterType" type="tns:userFilterType"/>
+</xs:choice>
+<xs:element name="value" type="xs:string"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="paginationCriteriaV1">
+<xs:sequence>
+<xs:element name="pageSize" type="xs:int"/>
+<xs:element name="pageStart" type="xs:int"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="sortingCriterionV1">
+<xs:sequence>
+<xs:choice minOccurs="0">
+<xs:element name="actionLogFilterType" type="tns:actionLogFilterType"/>
+<xs:element name="batchFilterType" type="tns:batchFilterType"/>
+<xs:element name="newUpdatedNameFilterType" type="tns:newUpdatedNameFilterType"/>
+<xs:element name="storedNameFilterType" type="tns:storedNameFilterType"/>
+<xs:element name="userFilterType" type="tns:userFilterType"/>
+</xs:choice>
+<xs:element name="descending" type="xs:boolean"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="getBatchesResponse">
+<xs:sequence>
+<xs:element minOccurs="0" name="return" type="tns:batchList"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="batchList">
+<xs:sequence>
+<xs:element name="batchCount" type="xs:long"/>
+<xs:element minOccurs="0" name="batches">
+<xs:complexType>
+<xs:sequence>
+<xs:element maxOccurs="unbounded" minOccurs="0" name="batch" type="tns:batch"/>
+</xs:sequence>
+</xs:complexType>
+</xs:element>
+</xs:sequence>
+</xs:complexType>
+<xs:simpleType name="batchScreeningStatus">
+<xs:restriction base="xs:string">
+<xs:enumeration value="COMPLETED"/>
+<xs:enumeration value="FAILED"/>
+<xs:enumeration value="PENDING"/>
+<xs:enumeration value="RUNNING"/>
+<xs:enumeration value="WAITING"/>
+</xs:restriction>
+</xs:simpleType>
+<xs:simpleType name="batchStatus">
+<xs:restriction base="xs:string">
+<xs:enumeration value="LIVE"/>
+<xs:enumeration value="SINGLE"/>
+<xs:enumeration value="TEMPORARY"/>
+</xs:restriction>
+</xs:simpleType>
+<xs:simpleType name="nameImportSource">
+<xs:restriction base="xs:string">
+<xs:enumeration value="BATCH"/>
+<xs:enumeration value="SERVICE"/>
+<xs:enumeration value="SNC"/>
+<xs:enumeration value="SYSTEM"/>
+</xs:restriction>
+</xs:simpleType>
+<xs:simpleType name="nameStatus">
+<xs:restriction base="xs:string">
+<xs:enumeration value="CLEAR"/>
+<xs:enumeration value="INVESTIGATE"/>
+<xs:enumeration value="NEW"/>
+<xs:enumeration value="SUSPEND"/>
+</xs:restriction>
+</xs:simpleType>
+<xs:simpleType name="nameSystemStatus">
+<xs:restriction base="xs:string">
+<xs:enumeration value="ARCHIVE"/>
+<xs:enumeration value="INITIAL"/>
+<xs:enumeration value="ONGOING"/>
+<xs:enumeration value="SINGLE"/>
+</xs:restriction>
+</xs:simpleType>
+<xs:simpleType name="nameType">
+<xs:restriction base="xs:string">
+<xs:enumeration value="INDIVIDUAL"/>
+<xs:enumeration value="ORGANISATION"/>
+<xs:enumeration value="UNSPECIFIED"/>
+<xs:enumeration value="VESSEL"/>
+</xs:restriction>
+</xs:simpleType>
+<xs:simpleType name="actionLogFilterType">
+<xs:restriction base="xs:string">
+<xs:enumeration value="ACTION_NOTE"/>
+<xs:enumeration value="BATCH_IDENTIFIER"/>
+<xs:enumeration value="ACTION_TYPE"/>
+<xs:enumeration value="DATE_FROM"/>
+<xs:enumeration value="DATE_TO"/>
+<xs:enumeration value="INCLUDE_ALL"/>
+<xs:enumeration value="MATCH_IDENTIFIER"/>
+<xs:enumeration value="NAME_IDENTIFIER"/>
+</xs:restriction>
+</xs:simpleType>
+<xs:simpleType name="batchFilterType">
+<xs:restriction base="xs:string">
+<xs:enumeration value="BATCH_IDENTIFIER"/>
+<xs:enumeration value="BATCH_SCREENING_STATUS"/>
+<xs:enumeration value="BATCH_STATUS"/>
+<xs:enumeration value="DATE_FROM"/>
+<xs:enumeration value="DATE_TO"/>
+<xs:enumeration value="GROUP"/>
+<xs:enumeration value="GROUP_IDENTIFIER"/>
+<xs:enumeration value="NAME"/>
+<xs:enumeration value="OWNER"/>
+<xs:enumeration value="OWNER_IDENTIFIER"/>
+</xs:restriction>
+</xs:simpleType>
+<xs:simpleType name="newUpdatedNameFilterType">
+<xs:restriction base="xs:string">
+<xs:enumeration value="ALERT_TYPE"/>
+<xs:enumeration value="ASSIGNEE"/>
+<xs:enumeration value="ASSIGNEE_IDENTIFIER"/>
+<xs:enumeration value="CUSTOM_ID1"/>
+<xs:enumeration value="CUSTOM_ID2"/>
+<xs:enumeration value="FILTER_MODE"/>
+<xs:enumeration value="GROUP"/>
+<xs:enumeration value="GROUP_IDENTIFIER"/>
+<xs:enumeration value="MATCH_SUBTYPE"/>
+<xs:enumeration value="MATCH_TYPE"/>
+<xs:enumeration value="MODIFIED"/>
+<xs:enumeration value="NAME"/>
+<xs:enumeration value="OWNER"/>
+<xs:enumeration value="OWNER_IDENTIFIER"/>
+<xs:enumeration value="UNRESOLVED_MATCHES_COUNT"/>
+<xs:enumeration value="UPDATED_MATCHES_COUNT"/>
+</xs:restriction>
+</xs:simpleType>
+<xs:simpleType name="storedNameFilterType">
+<xs:restriction base="xs:string">
+<xs:enumeration value="NAME_IDENTIFIER"/>
+<xs:enumeration value="NAME"/>
+<xs:enumeration value="GROUP"/>
+<xs:enumeration value="GROUP_IDENTIFIER"/>
+<xs:enumeration value="OWNER"/>
+<xs:enumeration value="OWNER_IDENTIFIER"/>
+<xs:enumeration value="ASSIGNEE_IDENTIFIER"/>
+<xs:enumeration value="ASSIGNEE"/>
+<xs:enumeration value="CUSTOM_ID1"/>
+<xs:enumeration value="CUSTOM_ID2"/>
+<xs:enumeration value="UNRESOLVED_MATCHES_FLAG"/>
+<xs:enumeration value="UPDATED_MATCHES_FLAG"/>
+<xs:enumeration value="NAME_STATUS"/>
+<xs:enumeration value="NAME_SYSTEM_STATUS"/>
+<xs:enumeration value="BATCH_FLAG"/>
+<xs:enumeration value="DATE_FROM"/>
+<xs:enumeration value="DATE_TO"/>
+</xs:restriction>
+</xs:simpleType>
+<xs:simpleType name="userFilterType">
+<xs:restriction base="xs:string">
+<xs:enumeration value="USER_IDENTIFIER"/>
+<xs:enumeration value="ROLE_TYPE"/>
+<xs:enumeration value="USERNAME"/>
+<xs:enumeration value="FAMILY_NAME"/>
+<xs:enumeration value="GIVEN_NAME"/>
+<xs:enumeration value="EXCLUDE_ARCHIVED"/>
+</xs:restriction>
+</xs:simpleType>
+</xs:schema>
+  </wsdl:types>
+  <wsdl:message name="getBatchModel">
+    <wsdl:part element="tns:getBatchModel" name="parameters">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="getNamesResponse">
+    <wsdl:part element="tns:getNamesResponse" name="parameters">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="getBatchModelResponse">
+    <wsdl:part element="tns:getBatchModelResponse" name="parameters">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="getBatchModelGroups">
+    <wsdl:part element="tns:getBatchModelGroups" name="parameters">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="createInitial">
+    <wsdl:part element="tns:createInitial" name="parameters">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="getBatchModelGroupsResponse">
+    <wsdl:part element="tns:getBatchModelGroupsResponse" name="parameters">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="rescreen">
+    <wsdl:part element="tns:rescreen" name="parameters">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="createOngoing">
+    <wsdl:part element="tns:createOngoing" name="parameters">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="getNames">
+    <wsdl:part element="tns:getNames" name="parameters">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="createInitialResponse">
+    <wsdl:part element="tns:createInitialResponse" name="parameters">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="rescreenResponse">
+    <wsdl:part element="tns:rescreenResponse" name="parameters">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="getBatchesResponse">
+    <wsdl:part element="tns:getBatchesResponse" name="parameters">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="getDetailsResponse">
+    <wsdl:part element="tns:getDetailsResponse" name="parameters">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="getBatches">
+    <wsdl:part element="tns:getBatches" name="parameters">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="createOngoingResponse">
+    <wsdl:part element="tns:createOngoingResponse" name="parameters">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="getBatchModelForAllGroupsResponse">
+    <wsdl:part element="tns:getBatchModelForAllGroupsResponse" name="parameters">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="getBatchModelForAllGroups">
+    <wsdl:part element="tns:getBatchModelForAllGroups" name="parameters">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="getDetails">
+    <wsdl:part element="tns:getDetails" name="parameters">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:portType name="BatchWebService">
+    <wsdl:operation name="getDetails">
+      <wsdl:input message="tns:getDetails" name="getDetails">
+    </wsdl:input>
+      <wsdl:output message="tns:getDetailsResponse" name="getDetailsResponse">
+    </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getBatchModelForAllGroups">
+      <wsdl:input message="tns:getBatchModelForAllGroups" name="getBatchModelForAllGroups">
+    </wsdl:input>
+      <wsdl:output message="tns:getBatchModelForAllGroupsResponse" name="getBatchModelForAllGroupsResponse">
+    </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="rescreen">
+      <wsdl:input message="tns:rescreen" name="rescreen">
+    </wsdl:input>
+      <wsdl:output message="tns:rescreenResponse" name="rescreenResponse">
+    </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getNames">
+      <wsdl:input message="tns:getNames" name="getNames">
+    </wsdl:input>
+      <wsdl:output message="tns:getNamesResponse" name="getNamesResponse">
+    </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getBatchModel">
+      <wsdl:input message="tns:getBatchModel" name="getBatchModel">
+    </wsdl:input>
+      <wsdl:output message="tns:getBatchModelResponse" name="getBatchModelResponse">
+    </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="createInitial">
+      <wsdl:input message="tns:createInitial" name="createInitial">
+    </wsdl:input>
+      <wsdl:output message="tns:createInitialResponse" name="createInitialResponse">
+    </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getBatchModelGroups">
+      <wsdl:input message="tns:getBatchModelGroups" name="getBatchModelGroups">
+    </wsdl:input>
+      <wsdl:output message="tns:getBatchModelGroupsResponse" name="getBatchModelGroupsResponse">
+    </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="createOngoing">
+      <wsdl:input message="tns:createOngoing" name="createOngoing">
+    </wsdl:input>
+      <wsdl:output message="tns:createOngoingResponse" name="createOngoingResponse">
+    </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getBatches">
+      <wsdl:input message="tns:getBatches" name="getBatches">
+    </wsdl:input>
+      <wsdl:output message="tns:getBatchesResponse" name="getBatchesResponse">
+    </wsdl:output>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="BatchWebServiceSoapBinding" type="tns:BatchWebService">
+    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <wsdl:operation name="getBatchModelForAllGroups">
+      <soap:operation soapAction="" style="document"/>
+      <wsdl:input name="getBatchModelForAllGroups">
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="getBatchModelForAllGroupsResponse">
+        <soap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getDetails">
+      <soap:operation soapAction="" style="document"/>
+      <wsdl:input name="getDetails">
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="getDetailsResponse">
+        <soap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getNames">
+      <soap:operation soapAction="" style="document"/>
+      <wsdl:input name="getNames">
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="getNamesResponse">
+        <soap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="rescreen">
+      <soap:operation soapAction="" style="document"/>
+      <wsdl:input name="rescreen">
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="rescreenResponse">
+        <soap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="createInitial">
+      <soap:operation soapAction="" style="document"/>
+      <wsdl:input name="createInitial">
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="createInitialResponse">
+        <soap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getBatchModel">
+      <soap:operation soapAction="" style="document"/>
+      <wsdl:input name="getBatchModel">
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="getBatchModelResponse">
+        <soap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="createOngoing">
+      <soap:operation soapAction="" style="document"/>
+      <wsdl:input name="createOngoing">
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="createOngoingResponse">
+        <soap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getBatchModelGroups">
+      <soap:operation soapAction="" style="document"/>
+      <wsdl:input name="getBatchModelGroups">
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="getBatchModelGroupsResponse">
+        <soap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="getBatches">
+      <soap:operation soapAction="" style="document"/>
+      <wsdl:input name="getBatches">
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="getBatchesResponse">
+        <soap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="BatchWebService">
+    <wsdl:port binding="tns:BatchWebServiceSoapBinding" name="BatchWebServicePort">
+      <soap:address location="https://screeningpilot.accelus.com/pilot-v1/batch"/>
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>