Prepare for release

application/controllers/FinanceController.php

@@ -924,8 +924,15 @@ class FinanceController extends Zend_Controller_Action
 
     	        $date = new Zend_Date($infoLiasse->getInfo('dateCloture'), 'yyyyMMdd');
     	        $this->view->assign('dateClotureD', $date->toString('dd/MM/yyyy'));
-    	        $date = new Zend_Date($infoLiasse->getInfo('dateCloturePre'), 'yyyyMMdd');
-    	        $this->view->assign('dateCloturePreD', $date->toString('dd/MM/yyyy'));
+
+    	        Zend_Registry::get('firebug')->info('test:'.$infoLiasse->getInfo('dateCloturePre'));
+    	        $dateCloturePre = $infoLiasse->getInfo('dateCloturePre');
+    	        if ( $dateCloturePre == '' ) {
+    	            $this->view->assign('dateCloturePreD', '-');
+    	        } else {
+    	            $date = new Zend_Date($dateCloturePre, 'yyyyMMdd');
+    	            $this->view->assign('dateCloturePreD', $date->toString('dd/MM/yyyy'));
+    	        }
 
     	        $this->view->assign('dureesMois', $infoLiasse->getInfo('dureeMois'));
     	        $this->view->assign('dureesMoisPre', $infoLiasse->getInfo('dureeMoisPre'));

application/controllers/RechercheController.php

@@ -665,19 +665,14 @@ class RechercheController extends Zend_Controller_Action
 
 			    		$item['InfoEtab'] = $infoEtab;
 
-			    		$adresse = $etab->Adresse.'<br/>';
-			    		if (isset($etab->Adresse2) && $etab->Adresse2 != '') {
-			    			$adresse.= $etab->Adresse2.'<br/>';
+			    		$adresse = $etab->Adresse;
+			    		if ( !empty($etab->Adresse2) ) {
+			    			$adresse.= '<br/>'.$etab->Adresse2;
 						}
-			    		$adresse.= '<b>';
-						if ( intval($etab->CP) > 0) {
-							$adresse.= $etab->CP." ";
+						if ( !empty($etab->Ville) && intval($etab->CP) > 0) {
+						    $adresse.= '<br/><b>'.$etab->CP." ".$etab->Ville."</b>";
 						}
-						$adresse.= $etab->Ville."</b>";
-
-			    		if (null === $etab->Pays) {
-			    		    $adresse.= '<br/><b>France</b>';
-			    		} else {
+			    		if (null !== $etab->Pays) {
 			    		    $adresse.= '<br/><b>'.$etab->Pays.'</b>';
 			    		}
 

application/controllers/UserController.php

@@ -637,7 +637,6 @@ class UserController extends Zend_Controller_Action
 
 			}
 			$this->view->assign('message', $message);
-		}
-    	$this->view->assign('params', $params);
+		}
     }
 }

application/controllers/WorldcheckController.php

@@ -14,7 +14,7 @@ class WorldcheckController extends Zend_Controller_Action
 	}
 
 	/**
-	 *
+	 * Get nameIdentifier and set all data into the session
 	 */
 	public function indexAction()
 	{
@@ -24,7 +24,8 @@ class WorldcheckController extends Zend_Controller_Action
 		$param->dirNom = ($dirNom)?$dirNom:$request->getParam('dirSociete');
 		$param->dirPrenom = $request->getParam('dirPrenom');
 		$param->dirType = $request->getParam('dirType');
-		$param->Siren = $request->getParam('siren');
+		
+		$entityId = $request->getParam('entityId', null);
 
 		$user = new Scores_Utilisateur();
 		$session = new SessionWorldcheck();
@@ -41,10 +42,45 @@ class WorldcheckController extends Zend_Controller_Action
 	    	$param->nameIdentifier = $localDBParams->nameIdentifier;
 	    	$session->setSession($param);
 		}
+		
+		if ($entityId===null) {
+			$this->_redirect('/worldcheck/list');
+		} else {
+			$id = $request->getParam('id', null);
+			
+			$data = new stdClass();
+			$data->nameIdentifier = $session->getNameIdentifier();
+			$data->matchType = 'WATCHLIST';
+			$matchArr = $wc->getMatchesArrName($data);
 
+			$paramAssoc = new stdClass();
+			$paramAssoc->matchIdentifier = $matchArr[$entityId];
+			$paramAssoc->nameType = $session->getNameType();
+			
+			$nodeParam = $wc->getAssociates($paramAssoc);
+			$wcLocal->setTree($nodeParam);
+
+			$this->_redirect('/worldcheck/orgchildren/entityid/'.$entityId.'/id/'.$id);
+		}
+	}
+	
+	/**
+	 * List results of WorldCheck search
+	 */
+	public function listAction()
+	{
+		$request = $this->getRequest();
+		$wc = new WsWorldCheck();
+		$session = new SessionWorldcheck();
+		$param = new stdClass();
+		
     	$nameIdentifier = $session->getNameIdentifier();
     	$matchCount = $session->getMatchCount();
-
+    	
+		$param->dirNom = $session->getName();
+		$param->dirPrenom = $session->getFName();
+		$param->dirType = $session->getNameType();
+    	
     	if ($matchCount!==0)
     	{
     		$summary = new stdClass();
@@ -155,13 +191,141 @@ class WorldcheckController extends Zend_Controller_Action
 		$param->nameType = $session->getNameType();
 
 		$wc = new WsWorldCheck();
+		$nodeParam = $wc->getAssociates($param);
+		//print_r($nodeParam);
+		$db = new Application_Model_Worldcheck();
+		$db->setTree($nodeParam);
 		
 		$cache = new Cache();
 		$content = $cache->wcCache($this->wcConfig['cachedir'], $wc, "getDetailsContent", $param, $param->matchIdentifier);
 
-		$this->view->assign('matchIdentifier', $param->matchIdentifier);
 		$this->view->assign('content', $content);
 		$this->view->assign('nameType', $param->nameType);
 		$this->view->assign('exportObjet', $content);
 	}
+	
+	/**
+	 * le Parent de l'organigramme des associés
+	 */
+	public function organigrammeAction()
+	{
+		$this->_helper->layout()->disableLayout();
+		$wc = new WsWorldCheck();
+
+		$request = $this->getRequest();
+		$entityId = $request->getParam('entityid', null);
+		
+		$wcLocal = new Application_Model_Worldcheck();
+		$currentBranch = $wcLocal->getTree($entityId);
+
+		$primary = $currentBranch['primary'];
+
+		$parent = array();
+
+		$data = new stdClass();
+		$data->title = $primary['fullName'];
+		$data->icon = "/themes/default/images/worldcheck/".strtolower($primary['nameType']).".png";
+		
+		$attr = new stdClass();
+		$attr->id = uniqid('wc_');
+		$attr->entityId = $primary['entityId'];
+		$attr->nameType = $primary['nameType'];
+		$attr->lastName = $primary['lastName'];
+		$attr->givenName = $primary['givenName'];
+		
+		$parent[] = array(
+				"data" 		=> $data,
+				"attr"		=> $attr,
+				"state" 	=> "closed",
+				"parent" 	=> "#"
+		);
+
+		$jData = json_encode($parent);
+		$this->view->assign('data', $jData);
+	}
+
+	/**
+	 * les associés du parent de l'organigramme
+	 */
+	public function orgchildrenAction()
+	{
+		$this->_helper->layout()->disableLayout();
+		$wc = new WsWorldCheck();
+
+		$request = $this->getRequest();
+		$entityId = $request->getParam('entityid', null);
+		$id = $request->getParam('id', null);
+		
+		$wcLocal = new Application_Model_Worldcheck();
+		$currentBranch = $wcLocal->getTree($entityId);
+
+		$associates = $currentBranch['associates'];
+
+		$children = array();
+
+		foreach ($associates as $associate) {
+			
+			$data = new stdClass();
+			$data->title = $associate['fullName'];
+			$data->icon = "/themes/default/images/worldcheck/".strtolower($associate['nameType']).".png";
+			
+			$attr = new stdClass();
+			$attr->id = uniqid('wc_');
+			$attr->entityId = $associate['entityId'];
+			$attr->nameType = $associate['nameType'];
+			$attr->lastName = $associate['lastName'];
+			$attr->givenName = $associate['givenName'];
+			
+			$children[] = array(
+					"data" 		=> $data,
+					"attr"		=> $attr,
+					"state" 	=> "closed",
+					"parent"	=> $id,
+			);
+		}
+
+		$jData = json_encode($children);
+		$this->view->assign('data', $jData);
+	}
+	
+	/**
+	 * Affichage de l'information courte de chaque node dans le popup
+	 */
+	public function popupAction()
+	{
+		$this->_helper->layout()->disableLayout();
+		$request = $this->getRequest();
+		$entityId = $request->getParam('entityId', null);
+		$entityIdP = $request->getParam('entityIdP', null);
+
+		$wc = new WsWorldCheck();
+		$user = new Scores_Utilisateur();
+
+		$paramP = new stdClass();
+		$paramP->idClient = $user->getIdClient();
+		$paramP->dirNom = $request->getParam('dirNomP');
+		$paramP->dirPrenom = $request->getParam('dirPrenomP');
+		$paramP->dirType = $request->getParam('dirTypeP');
+
+		$wcLocal = new Application_Model_Worldcheck();
+		$result = $wcLocal->getScreenerId($paramP);
+
+		$data = new stdClass();
+		$data->nameIdentifier = $result->nameIdentifier;
+		$data->matchType = "WATCHLIST";
+		$matches = $wc->getMatchesArrName($data);
+
+		$param = new stdClass();
+		$param->matchIdentifier = $matches[$entityIdP];
+		$param->nameType = $paramP->dirType;
+		$associates = $wc->getAssociates($param);
+
+		foreach($associates['associates'] as $assoc)
+		{
+			if ($assoc['entityId']==$entityId)
+				break;
+		}
+
+		$this->view->assign('data', $assoc);
+	}
 }

application/models/Worldcheck.php

@@ -2,6 +2,8 @@
 class Application_Model_Worldcheck extends Zend_Db_Table_Abstract
 {
 	protected $_name = 'worldcheck';
+	protected $tbList = 'worldcheck_list';
+	protected $tbAssoc = 'worldcheck_a';
 	
 	/**
 	 * Return nameIdentifier and matchCount from local DB if found. 
@@ -70,4 +72,73 @@ class Application_Model_Worldcheck extends Zend_Db_Table_Abstract
 		} 
 		return false;
 	}
+	
+	/**
+	 * Set WorldCheck  associates tree data into DB
+	 * @param array $nodeParams
+	 * @param string $nodeType, value must be 'p'[parent] or 'a'[associate]
+	 */
+	public function setTree($nodeParams)
+	{
+		$primary = array(
+				'entityId'=>'',
+				'nameType'=>'',
+				'fullName'=>'',
+				'givenName'=>'',
+				'lastName'=>'');
+	
+		$assoc = array(
+				'entityIdP'=>'',
+				'entityId'=>'',
+				'nameType'=>'',
+				'fullName'=>'',
+				'givenName'=>'',
+				'lastName'=>'');
+	
+		$primary = array_intersect_key($nodeParams['primary'], $primary);
+	
+		$sql = $this->getAdapter()->select()
+		->from($this->tbList, 'entityId')
+		->where('entityId=?', $primary['entityId']);
+		if (!$this->getAdapter()->fetchRow($sql)) {
+			$this->getAdapter()->insert($this->tbList, $primary);
+		}
+
+		$associates = $nodeParams['associates'];
+	
+		foreach($associates as $associate) {
+			$associate = array_intersect_key($associate, $assoc);
+			$associate['entityIdP'] = $primary['entityId'];
+				
+			$sql = $this->getAdapter()->select()
+			->from($this->tbAssoc, array('entityId', 'entityIdP'))
+			->where('entityId=?', $associate['entityId'])
+			->where('entityIdP=?', $primary['entityId']);
+			if (!$this->getAdapter()->fetchRow($sql)) {
+				$this->getAdapter()->insert($this->tbAssoc, $associate);
+			}
+		}
+	}
+	
+	/**
+	 * Get WorldCheck associates tree data from DB
+	 * @param string $entityId
+	 * @return Ambigous <multitype:, multitype:mixed Ambigous <string, boolean, mixed> >
+	 */
+	public function getTree($entityId)
+	{
+		$sql = $this->getAdapter()->select()
+		->from(array('a' => $this->tbAssoc), array('a.entityId', 'a.fullName', 'a.givenName', 'a.lastName', 'a.nameType'))
+		->join(array('l' => $this->tbList), 'a.entityIdP = l.entityId', array())
+		->where('a.entityIdP=?', $entityId);
+		$associates = $this->getAdapter()->fetchAll($sql);
+		
+		$sql = $this->getAdapter()->select()
+		->from(array('l' => $this->tbList), array('l.entityId', 'l.fullName', 'l.givenName', 'l.lastName', 'l.nameType'))
+		->where('l.entityId=?', $entityId);
+		$primary = $this->getAdapter()->fetchRow($sql);
+		
+		$output = array('primary' => $primary, 'associates' => $associates);
+		return $output;
+	}	
 }

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

@@ -12,8 +12,8 @@
 	</td>
 	<td colspan="2"><b>Brut</b></td>
 	<td colspan="2"><b>Amortissement, provisions</b></td>
-	<td><b><?php echo $this->dateCloture.'<br/>'.$this->dureesMois?> Mois</b></td>
-	<td><b><?php echo $this->dateCloturePre.'<br/>'.$this->dureesMoisPre;?> Mois</b></td>
+	<td><b><?=$this->dateCloture?></b><br/><?php if($this->dureesMois!='') {?><b><?=$this->dureesMois?> Mois</b><?php }?></td>
+	<td><b><?=$this->dateCloturePre?></b><br/><?php if($this->dureesMoisPre!='') {?><b><?=$this->dureesMoisPre?> Mois</b><?php }?></td>
 </tr>
 <tr>
 	<td rowspan="19">A<br/>C<br/>T<br/>I<br/>F<br/></td>

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

@@ -2,7 +2,7 @@
 span.title { float:right; margin:0 10px; }
 </style>
 <div id="center">
-<h1>FICHE PROC&Eacute;DURE COLLECTIVES</h1>
+<h1>FICHE PROC&Eacute;DURES COLLECTIVES</h1>
 
 <span class="title"><?=date('d/m/Y H:i')?></span>
 

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

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

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

@@ -3,33 +3,25 @@
 <h1>PI&Egrave;CES OFFICIELLES</h1>
 <div class="paragraph">
 <table class="identite">
-  <tr>
+<tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">
-      Num&eacute;ro identifiant Siren
-    </td>
-    <td width="350" class="StyleInfoData">
-      <?=$this->SirenTexte($this->siren)?>
-    </td>
-  </tr>
-  <tr>
+    <td width="200" class="StyleInfoLib">Num&eacute;ro identifiant Siren</td>
+    <td width="350" class="StyleInfoData"><?=$this->SirenTexte($this->siren)?></td>
+</tr>
+<tr>
     <td width="30">&nbsp;</td>
     <td width="200" class="StyleInfoLib">Dénomination Sociale</td>
     <td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
-  </tr>
-  <?php if ($this->surveillance) {?>
-  <tr>
+</tr>
+<?php if ($this->surveillance) {?>
+<tr>
     <td width="30">&nbsp;</td>
     <td colspan="2" width="550" class="StyleInfoData">
-     <?=$this->action('infos','surveillance', null, array(
-     	'source' => 'actes',
-     	'siret' => $this->siret
-     ))?>
+     <?=$this->action('infos','surveillance',null,array('source'=>'actes','siret'=>$this->siret))?>
 	</td>
-  </tr>
-  <?php }?>
+</tr>
+<?php }?>
 </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>
@@ -37,6 +29,8 @@ Les éléments disponibles ci-dessous en téléchargement ou commande peuvent fa
 </p>
 </div>
 
+</div>
+
 <h2>Actes & Status</h2>
 <div class="paragraph">
 <?php if ($this->ErreurMessage):?>
@@ -51,7 +45,7 @@ Les éléments disponibles ci-dessous en téléchargement ou commande peuvent fa
 <?php foreach($this->InfosActes as $acte):?>
 	<?php
 	$style = '';
-	if ($acte['mode']=='fichier' && $this->ModeEdition) {
+	if ($acte['mode']=='T'  && $acte['isFileExist']  && $this->ModeEdition) {
 		$style.=' style="background-color: #007DFF;"';
 	}
 	?>
@@ -61,7 +55,6 @@ Les éléments disponibles ci-dessous en téléchargement ou commande peuvent fa
 	<?php
 	switch($acte['mode'])
 	{
-		case 'fichier':
 		case 'T':
 		?>
 		<span class="fichier">
@@ -71,7 +64,6 @@ Les éléments disponibles ci-dessous en téléchargement ou commande peuvent fa
 		</span>
 		<?php
 		break;
-		case 'courrier':
 		case 'C':
 		?>
 		<a class="dialogcmd" href="<?=$acte['href']?>" title="<?=$acte['title']?>">
@@ -84,15 +76,9 @@ Les éléments disponibles ci-dessous en téléchargement ou commande peuvent fa
 	</td>
 	<td class="decision">
 	<?=$acte['decision']?>
-	<?php if ($this->ModeEdition && $acte['mode']!='fichier') {?>
-		<br/><a href="<?=$this->url(array(
-			'controller' => 'pieces',
-			'action' => 'cmdfactice',
-			'siret' => $this->siret,
-			'ref' => $acte['ref']
-		), null, true)?>" target="_blank">
-		Créer une commande factice.
-		</a>
+	<?php if ($this->ModeEdition) {?>
+		<br/>
+		<a href="<?=$acte['factice']?>" target="_blank">Créer une commande factice.</a>
 	<?php }?>
 	</td>
 	</tr>

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

@@ -1 +1,38 @@
-<?php
+<?php if ($this->formCmd) {?>
+
+<p>Commande du document : <b>Comptes <?=$this->type?> cloturé le <?=$this->LabelCloture?></b></p>
+
+<p>Vous recevrez un email (sous 3/5 jours ouvrés) lorsque le document sera disponible.</p>
+
+<p>Votre email : <b><?=$this->email?></b> </p>
+
+<?php if ($this->emailValide===false) {?>
+
+<p><span class="ui-icon ui-icon-alert" style="float: left; margin-right: .3em;"></span>
+<strong>Commande impossible</strong> Votre email est invalide.</p>
+
+<?php } else {?>
+
+<div id="output">
+<form name="commande" action="<?=$this->url(array('controller'=>'pieces','action'=>'bilan'),null,true)?>" method="post">
+<input type="hidden" name="mode" value="<?=$this->mode?>"/>
+<input type="hidden" name="siren" value="<?=$this->siren?>"/>
+<input type="hidden" name="type" value="<?=$this->type?>"/>
+<input type="hidden" name="cloture" value="<?=$this->cloture?>"/>
+<label>Votre référence :
+<input type="text" name="ref" value="" />
+</label>
+</form>
+</div>
+
+<?php }?>
+
+<?php } else {?>
+
+    <?php if($this->msg) {?>
+        <?=$this->msg?>
+    <?php } else {?>
+        <a href="<?=$this->url?>">Télécharger le fichier</a>
+    <?php }?>
+
+<?php }?>

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

@@ -3,33 +3,27 @@
 <h1>PI&Egrave;CES OFFICIELLES</h1>
 <div class="paragraph">
 <table class="identite">
-  <tr>
+<tr>
     <td width="30">&nbsp;</td>
-    <td width="200" class="StyleInfoLib">
-      Num&eacute;ro identifiant Siren
-    </td>
-    <td width="350" class="StyleInfoData">
-      <?=$this->SirenTexte($this->siren)?>
-    </td>
-  </tr>
-  <tr>
+    <td width="200" class="StyleInfoLib">Num&eacute;ro identifiant Siren</td>
+    <td width="350" class="StyleInfoData"><?=$this->SirenTexte($this->siren)?></td>
+</tr>
+<tr>
     <td width="30">&nbsp;</td>
     <td width="200" class="StyleInfoLib">Dénomination Sociale</td>
     <td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
-  </tr>
-  <?php if ($this->surveillance) {?>
-  <tr>
+</tr>
+<?php if ($this->surveillance) {?>
+<tr>
     <td width="30">&nbsp;</td>
     <td colspan="2" width="550" class="StyleInfoData">
-     <?=$this->action('infos','surveillance', null, array(
-     	'source' => 'actes',
-     	'siret' => $this->siret
-     ))?>
+     <?=$this->action('infos','surveillance',null,array('source'=>'actes','siret'=>$this->siret))?>
 	</td>
-  </tr>
-  <?php }?>
+</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.
@@ -44,24 +38,25 @@ Les éléments disponibles ci-dessous en téléchargement ou commande peuvent fa
 <?php else:?>
 <table class="greffe">
 <thead>
-<tr><th>Date de clôture</th><th>Type</th><th>Décisions</th>
+<tr>
+    <th>Date de clôture</th>
+    <th>Type</th>
+    <th>Décisions</th>
 </tr>
 </thead>
 <tbody>
 <?php foreach($this->InfosBilans as $bilan):?>
 	<?php
 	$style = '';
-	if ($bilan['mode']=='fichier' && $this->ModeEdition) {
+	if ($bilan['mode']=='T' && $bilan['isFileExist'] && $this->ModeEdition) {
 		$style.=' style="background-color: #007DFF;"';
 	}
 	?>
 	<tr<?=$style?>>
-	<td class="date"><?=$bilan['date']?></td>
+	<td rowspan="2" class="date"><?=$bilan['date']?></td>
 	<td class="type"><?=$bilan['type']?>
 	<?php
-	switch($bilan['mode'])
-	{
-		case 'fichier':
+	switch( $bilan['mode'] ) {
 		case 'T':
 	?>
 		<span class="fichier">
@@ -71,7 +66,6 @@ Les éléments disponibles ci-dessous en téléchargement ou commande peuvent fa
 		</span>
 	<?php
 		break;
-		case 'courrier':
 		case 'C':
 	?>
 		<a class="dialogcmd" href="<?=$bilan['href']?>" title="<?=$bilan['title']?>">
@@ -81,19 +75,19 @@ Les éléments disponibles ci-dessous en téléchargement ou commande peuvent fa
 		break;
 	}
 	?>
+	<?php if ( !empty($bilan['duree']) ) {?><br/><?=$bilan['duree']?><?php }?>
 	</td>
 	<td class="decision">
 	<?=$bilan['decision']?>
-	<?php if ($this->ModeEdition && $bilan['mode']!='fichier'){?>
-		<br/><a href="<?=$this->url(array(
-			'controller' => 'pieces',
-			'action' => 'cmdfactice',
-			'siret' => $this->siret,
-			'ref' => $bilan['ref'],
-
-		), null, true)?>" target="_blank">
-		Créer une commande factice.
-		</a>
+	</td>
+	</tr>
+	<tr>
+	<td class="saisie" colspan="2">
+    <?php if ( $bilan['saisie'] ) {?>
+        <i><?=$bilan['saisie']?></i>
+	<?php }?>
+	<?php if ( $this->ModeEdition ) {?>
+		<br/><a href="<?=$bilan['factice']?>" target="_blank">Créer une commande factice.</a>
 	<?php }?>
 	</td>
 	</tr>

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

@@ -9,10 +9,6 @@ div#dlg input#frm {
     width: 20em;
     height:1.5em;
 }
-pre {
-	font-family: arial;
-	font-size:0.9em;
-}
 label#frm {
 	font-family: arial;
 	font-size:0.9em;
@@ -41,26 +37,28 @@ label#frm {
 	z-index: 1;
 }
 .message {
-	font-size: 10px;
-	width: 98%;
+	font-size: 0.8em;
+	width: 96%;
     background-color: #FFFFDD;
 	border: 1px solid #FCEFA1;
 	border-radius: 4px;
     padding: 10px 15px 10px 15px;
 }
-#stl {
+.stl {
 	height:25px;
 }
 
-#htxt #ftxt {
-	width:400px;
+#htxt, #ftxt {
+	margin-top: 10px;
+	margin-bottom:20px;
+	font-size: 0.9em;
 }
 
 </style>
 
 <?php if ($this->sendEmail) {?>
 <div class='message'><p id='<?=$this->bt_fermer;?>'>
-Votre demande avec les informations suivantes a été envoyée. Nous vous contacterons prochainement.
+Votre demande a été envoyée. Nous vous contacterons prochainement.
 </p></div>
 
 <script>
@@ -74,63 +72,53 @@ $('#dlg').dialog({ buttons: [
 <?php if ($this->message!='') {?>
 <div class='message'><p id='<?=$this->bt_fermer;?>'><?=$this->message; ?></p></div>
 <?php }?>
-<?php
-$params = $this->params;
-?>
 
 <div id='htxt'>
-<pre>
 Pour recevoir votre mot de passe et/ou votre identifiant oubliés, nous vous invitons à saisir les informations ci-dessous et cliquer sur valider.
 A réception de ces données, nous vous informerons par e-mail.
-
-Tous les champs (*) sont obligatoires : en cas de données manquantes ou erronées , votre demande ne pourra pas être prise en compte par nos services. * = champ obligatoire.
-
-</pre>
+<p>Tous les champs (*) sont obligatoires : en cas de données manquantes ou erronées, votre demande ne pourra pas être prise en compte par nos services. * = champ obligatoire.</p>
 </div>
 
 <div>
 <form>
-<div id="stl">
+<div class="stl">
 <label id="frm">Votre Identifiant :</label>
-<input id="frm" type="text" name="identifiant" value="<?=$params['identifiant']; ?>"/>
+<input id="frm" type="text" name="identifiant"/>
 </div>
-<div id="stl">
+<div class="stl">
 <label id="frm">Votre Adresse email* :</label>
-<input id="frm" type="text" name="email" value="<?=$params['email']; ?>" required />
+<input id="frm" type="text" name="email" required/>
 </div>
-<div id="stl">
+<div class="stl">
 <label id="frm">Votre Numéro de téléphone* :</label>
-<input id="frm" type="text" name="telephone" value="<?=$params['telephone']; ?>" required/>
+<input id="frm" type="text" name="telephone" required/>
 </div>
-<div id="stl">
+<div class="stl">
 <label id="frm">Votre Nom* :</label>
-<input id="frm" type="text" name="nom" value="<?=$params['nom']; ?>" required/>
+<input id="frm" type="text" name="nom" required/>
 </div>
-<div id="stl">
+<div class="stl">
 <label id="frm">Votre Prénom* :</label>
-<input id="frm" type="text" name="prenom" value="<?=$params['prenom']; ?>" required/>
+<input id="frm" type="text" name="prenom" required/>
 </div>
-<div id="stl">
+<div class="stl">
 <label id="frm">Votre Fonction* :</label>
-<input id="frm" type="text" name="fonction" value="<?=$params['fonction']; ?>" required/>
+<input id="frm" type="text" name="fonction" required/>
 </div>
-<div id="stl">
+<div class="stl">
 <label id="frm">Votre Service* :</label>
-<input id="frm" type="text" name="service" value="<?=$params['service']; ?>" required/>
+<input id="frm" type="text" name="service" required/>
 </div>
-<div id="stl">
+<div class="stl">
 <label id="frm">Dénomination Sociale* :</label>
-<input id="frm" type="text" name="rsociale" value="<?=$params['rsociale']; ?>" required/>
+<input id="frm" type="text" name="rsociale" required/>
 </div>
 
 </form>
 </div>
 
 <div id="ftxt">
-<pre>
-
-Ces informations sont destinées exclusivement au traitement de votre demande et à l'émission d'une réponse personnalisée.
-</pre>
+<p>Ces informations sont destinées exclusivement au traitement de votre demande et à l'émission d'une réponse personnalisée.</p>
 </div>
 
 <div class="loading"><center><img style="padding-top:25%" src="/themes/default/images/giant/19-1.gif" /></center></div>
@@ -183,7 +171,6 @@ $('#dlg').dialog({ buttons: [
     	}
     	$.post('/user/motpasse', values, function(data) {
     		$('#dlg').html(data);
-    		$('pre').hide();
     		$('#htxt').height(50);
     		$('input#frm').attr("disabled", "disabled");
     		$(".ui-dialog-buttonpane button:contains('Valider')").hide();

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

@@ -1,64 +0,0 @@
-<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
-if (!$this->resultWC)
-{
-?>
-	 <div>Aucun résultat.</div>
-<? }
-else
-{
-	$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/list.phtml

@@ -0,0 +1,64 @@
+<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
+if (!$this->resultWC)
+{
+?>
+	 <div>Aucun résultat.</div>
+<? }
+else
+{
+	$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

@@ -161,6 +161,35 @@ foreach($content[0]->roles->role as $role)
 
 <?php
 if (isset($content[0]->associates->associate)) {
+$wcOrganigramme = array(
+		'controller' => 'worldcheck',
+	    'action' => 'organigramme',
+	    'entityid' => $content[0]->entityId);
+?>
+<div class="paragraph"><a class="organigramme" title="Organigramme des associés" href="<?=$this->url($wcOrganigramme, null, true);?>">Organigramme des associés</a></div>
+<script>
+$( "a.organigramme" ).on('click', function(e){
+	e.preventDefault();
+	var href = $(this).attr('href');
+	var dialogOpts = {
+		bgiframe: true,
+		resizable: false,
+		title: $(this).attr('title'),
+		width: 600,
+   		height: 650,
+		modal: true,
+		open: function(event, ui) {
+   			$(this).html('Chargement...');
+   			$(this).load(href);
+   		},
+		buttons: { "Fermer": function() { $(this).dialog("close"); }},
+		close: function() { $('#confirm').remove(); }
+	};
+	$('<div id="confirm"></div>').dialog(dialogOpts);
+	return false;
+});
+</script>
+<?php 
 foreach($content[0]->associates->associate as $associate)
 { ?>
 <h2>
@@ -203,16 +232,16 @@ if ($associate->associatetype=='ASSOCIATE')
 ?>
 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;'><img class="wcheck" id="<?=$id;?>" style="cursor:pointer;" 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...",
+		show: { solo: true, delay: 500 },
+		content: { title: 'WorldCheck', button: true, text: "Chargement...",
 		ajax: { url: '<?=$this->url(array('controller'=>'worldcheck','action'=>'occurence'));?>'+$(this).attr('id') } },
-		position: { my: "bottom left", at: "top center" }
+		position: { my: 'right center', at: 'left center' }
 	});
 });
 </script>

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

@@ -0,0 +1,58 @@
+<div id="assocTree" class="jstree jstree-default" style="overflow:auto;"></div>
+<script src="/libs/jstree/jstree.js"></script>
+<script>
+$("#assocTree").jstree({
+	"core" : { "html_titles" : true },
+	"plugins" : [ "themes", "json_data", "ui" ],
+	"json_data" : {
+		"data":<?=$this->data ?>,
+		"ajax":{
+			"type": 'POST',
+			"url": "/worldcheck/index/",
+			"data": function(node) { 
+				var dirNom = node.attr("lastName");
+				var dirPrenom = node.attr("givenName");
+				var dirType = node.attr("nameType");
+				var entityId = node.attr("entityId");
+				var id = node.attr("id");
+				return {dirNom:dirNom, dirPrenom:dirPrenom, dirType:dirType, entityId:entityId, id:id};
+				},
+			"success": function (data) { return data; },
+			"error": function (xhr, ajaxOptions, thrownError){
+                alert('Error xhr : ' + xhr.status);    
+                alert('Error: ' + thrownError);    
+            }
+		}
+	},
+	"themes" : {
+		"theme" : "default",
+		"url" : "/libs/jstree/themes/default/style.css",
+		"dots" : true,
+		"icons" : true
+	}
+});
+
+//using qtip popup to get short information about each node
+$("#assocTree").bind("hover_node.jstree", function (e, data) {
+	var id = data.rslt.obj.attr("id");
+	var entityId = data.rslt.obj.attr("entityId");
+	var entityIdP = data.inst._get_parent(data.rslt.obj).attr("entityId");
+	var dirNomP = data.inst._get_parent(data.rslt.obj).attr("lastName");
+	var dirPrenomP = data.inst._get_parent(data.rslt.obj).attr("givenName");
+	var dirTypeP = data.inst._get_parent(data.rslt.obj).attr("nameType");
+
+	$('#'+id).qtip({
+		hide: { event: 'mouseout', delay:3000 },
+		show: { when: false, ready: true, solo: true, delay: 1000 },
+		content: {
+			button: true,
+			title: 'WorldCheck',
+			text: 'Chargement...',
+			ajax: { 
+				'url': '/worldcheck/popup',
+				'data': {id:id, entityId:entityId, entityIdP:entityIdP, dirNomP:dirNomP, dirPrenomP:dirPrenomP, dirTypeP:dirTypeP} }},
+		position: { my: 'right top', at: 'right top' },
+		style: {tip:false}
+	});
+});
+</script>

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

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

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

@@ -0,0 +1,78 @@
+<style>
+.InfoTitle {
+	color: #535353;
+    font-family: Arial,Helvetica,sans-serif;
+    font-size: 11px;
+    font-weight: bold;
+    line-height: 16px;
+    vertical-align: top;
+	float: left;
+	border: none;
+	width:70px;
+}
+
+.InfoData {
+	color: #535353;
+    font-family: Arial,Helvetica,sans-serif;
+    font-size: 11px;
+    line-height: 16px;
+	float: left;
+	border: none;
+	width:230px;
+	word-wrap:break-word;
+	padding: 0px 0px 5px 0px;
+}
+</style>
+<div>
+<?php $data=$this->data;?>
+<h5 style="text-align: left;"><?=$data['fullName'];?></h5>
+<div>
+<div class="InfoTitle">Category</div>
+<div class="InfoData"><?=$data['category'];?></div>
+</div>
+
+<div>
+<div class="InfoTitle">Biography</div>
+<div class="InfoData"><?=$data['biography'];?></div>
+</div>
+
+<div>
+<div class="InfoTitle">Relations</div>
+<div class="InfoData"><?=str_replace(").", ")</br>", $data['identification']);?></div>
+</div>
+
+<div>
+<div class="InfoTitle">Links</div>
+<div class="InfoData">
+<?php
+if (strtolower($data['nameType'])=='individual')
+{
+	$paramExtranet = array(
+			'controller'=>'recherche',
+			'action'=>'dirigeant',
+			'dirNom'=>$data['lastName'],
+			'dirPrenom'=>$data['givenName'],
+	);
+} else {
+	$paramExtranet = array(
+			'controller'=>'recherche',
+			'action'=>'entreprise',
+			'raisonSociale'=>$data['fullName'],
+	);
+}
+?>
+<a href="<?=$this->url($paramExtranet, null, true)?>">Search more in Extranet</a>
+<br/>
+<?php 
+$paramWorldcheck = array(
+			'controller'=>'worldcheck',
+			'action'=>'index',
+			'dirNom'=>$data['lastName'],
+			'dirPrenom'=>$data['givenName'],
+			'dirType'=>$data['nameType']
+	);
+?>
+<a href="<?=$this->url($paramWorldcheck, null, true)?>">Search more in WorldCheck</a>
+</div>
+</div>
+</div>

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

@@ -1,7 +1,26 @@
-/*! normalize.css v2.1.2 */
+/*! normalize.css v3.0.0 | MIT License | git.io/normalize */
 
-/* ==========================================================================
-   HTML5 display definitions
+/**
+ * 1. Set default font family to sans-serif.
+ * 2. Prevent iOS text size adjust after orientation change, without disabling
+ *    user zoom.
+ */
+
+html {
+  font-family: sans-serif; /* 1 */
+  -ms-text-size-adjust: 100%; /* 2 */
+  -webkit-text-size-adjust: 100%; /* 2 */
+}
+
+/**
+ * Remove default margin.
+ */
+
+body {
+  margin: 0;
+}
+
+/* HTML5 display definitions
    ========================================================================== */
 
 /**
@@ -20,17 +39,20 @@ main,
 nav,
 section,
 summary {
-    display: block;
+  display: block;
 }
 
 /**
- * Correct `inline-block` display not defined in IE 8/9.
+ * 1. Correct `inline-block` display not defined in IE 8/9.
+ * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
  */
 
 audio,
 canvas,
+progress,
 video {
-    display: inline-block;
+  display: inline-block; /* 1 */
+  vertical-align: baseline; /* 2 */
 }
 
 /**
@@ -39,52 +61,29 @@ video {
  */
 
 audio:not([controls]) {
-    display: none;
-    height: 0;
+  display: none;
+  height: 0;
 }
 
 /**
- * Address styling not present in IE 8/9.
+ * Address `[hidden]` styling not present in IE 8/9.
+ * Hide the `template` element in IE, Safari, and Firefox < 22.
  */
 
-[hidden] {
-    display: none;
+[hidden],
+template {
+  display: none;
 }
 
-/* ==========================================================================
-   Base
+/* Links
    ========================================================================== */
 
 /**
- * 1. Set default font family to sans-serif.
- * 2. Prevent iOS text size adjust after orientation change, without disabling
- *    user zoom.
+ * Remove the gray background color from active links in IE 10.
  */
 
-html {
-    font-family: sans-serif; /* 1 */
-    -ms-text-size-adjust: 100%; /* 2 */
-    -webkit-text-size-adjust: 100%; /* 2 */
-}
-
-/**
- * Remove default margin.
- */
-
-body {
-    margin: 0;
-}
-
-/* ==========================================================================
-   Links
-   ========================================================================== */
-
-/**
- * Address `outline` inconsistency between Chrome and other browsers.
- */
-
-a:focus {
-    outline: thin dotted;
+a {
+  background: transparent;
 }
 
 /**
@@ -93,29 +92,18 @@ a:focus {
 
 a:active,
 a:hover {
-    outline: 0;
+  outline: 0;
 }
 
-/* ==========================================================================
-   Typography
+/* Text-level semantics
    ========================================================================== */
 
-/**
- * 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;
-}
-
 /**
  * Address styling not present in IE 8/9, Safari 5, and Chrome.
  */
 
 abbr[title] {
-    border-bottom: 1px dotted;
+  border-bottom: 1px dotted;
 }
 
 /**
@@ -124,7 +112,7 @@ abbr[title] {
 
 b,
 strong {
-    font-weight: bold;
+  font-weight: bold;
 }
 
 /**
@@ -132,17 +120,17 @@ strong {
  */
 
 dfn {
-    font-style: italic;
+  font-style: italic;
 }
 
 /**
- * Address differences between Firefox and other browsers.
+ * Address variable `h1` font-size and margin within `section` and `article`
+ * contexts in Firefox 4+, Safari 5, and Chrome.
  */
 
-hr {
-    -moz-box-sizing: content-box;
-    box-sizing: content-box;
-    height: 0;
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
 }
 
 /**
@@ -150,36 +138,8 @@ hr {
  */
 
 mark {
-    background: #ff0;
-    color: #000;
-}
-
-/**
- * Correct font family set oddly in Safari 5 and Chrome.
- */
-
-code,
-kbd,
-pre,
-samp {
-    font-family: monospace, serif;
-    font-size: 1em;
-}
-
-/**
- * Improve readability of pre-formatted text in all browsers.
- */
-
-pre {
-    white-space: pre-wrap;
-}
-
-/**
- * Set consistent quote types.
- */
-
-q {
-    quotes: "\201C" "\201D" "\2018" "\2019";
+  background: #ff0;
+  color: #000;
 }
 
 /**
@@ -187,7 +147,7 @@ q {
  */
 
 small {
-    font-size: 80%;
+  font-size: 80%;
 }
 
 /**
@@ -196,22 +156,21 @@ small {
 
 sub,
 sup {
-    font-size: 75%;
-    line-height: 0;
-    position: relative;
-    vertical-align: baseline;
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
 }
 
 sup {
-    top: -0.5em;
+  top: -0.5em;
 }
 
 sub {
-    bottom: -0.25em;
+  bottom: -0.25em;
 }
 
-/* ==========================================================================
-   Embedded content
+/* Embedded content
    ========================================================================== */
 
 /**
@@ -219,7 +178,7 @@ sub {
  */
 
 img {
-    border: 0;
+  border: 0;
 }
 
 /**
@@ -227,11 +186,10 @@ img {
  */
 
 svg:not(:root) {
-    overflow: hidden;
+  overflow: hidden;
 }
 
-/* ==========================================================================
-   Figures
+/* Grouping content
    ========================================================================== */
 
 /**
@@ -239,68 +197,82 @@ svg:not(:root) {
  */
 
 figure {
-    margin: 0;
+  margin: 1em 40px;
 }
 
-/* ==========================================================================
-   Forms
+/**
+ * Address differences between Firefox and other browsers.
+ */
+
+hr {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+  height: 0;
+}
+
+/**
+ * Contain overflow in all browsers.
+ */
+
+pre {
+  overflow: auto;
+}
+
+/**
+ * Address odd `em`-unit font size rendering in all browsers.
+ */
+
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
+}
+
+/* Forms
    ========================================================================== */
 
 /**
- * Define consistent border, margin, and padding.
+ * Known limitation: by default, Chrome and Safari on OS X allow very limited
+ * styling of `select`, unless a `border` property is set.
  */
 
-fieldset {
-    border: 1px solid #c0c0c0;
-    margin: 0 2px;
-    padding: 0.35em 0.625em 0.75em;
-}
-
 /**
- * 1. Correct `color` not being inherited in IE 8/9.
- * 2. Remove padding so people aren't caught out if they zero out fieldsets.
- */
-
-legend {
-    border: 0; /* 1 */
-    padding: 0; /* 2 */
-}
-
-/**
- * 1. Correct font family not being inherited in all browsers.
- * 2. Correct font size not being inherited in all browsers.
+ * 1. Correct color not being inherited.
+ *    Known issue: affects color of disabled elements.
+ * 2. Correct font properties not being inherited.
  * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
  */
 
 button,
 input,
+optgroup,
 select,
 textarea {
-    font-family: inherit; /* 1 */
-    font-size: 100%; /* 2 */
-    margin: 0; /* 3 */
+  color: inherit; /* 1 */
+  font: inherit; /* 2 */
+  margin: 0; /* 3 */
 }
 
 /**
- * Address Firefox 4+ setting `line-height` on `input` using `!important` in
- * the UA stylesheet.
+ * Address `overflow` set to `hidden` in IE 8/9/10.
  */
 
-button,
-input {
-    line-height: normal;
+button {
+  overflow: visible;
 }
 
 /**
  * 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.
+ * Correct `button` style inheritance in Firefox, IE 8+, and Opera
+ * Correct `select` style inheritance in Firefox.
  */
 
 button,
 select {
-    text-transform: none;
+  text-transform: none;
 }
 
 /**
@@ -315,8 +287,8 @@ button,
 html input[type="button"], /* 1 */
 input[type="reset"],
 input[type="submit"] {
-    -webkit-appearance: button; /* 2 */
-    cursor: pointer; /* 3 */
+  -webkit-appearance: button; /* 2 */
+  cursor: pointer; /* 3 */
 }
 
 /**
@@ -325,18 +297,51 @@ input[type="submit"] {
 
 button[disabled],
 html input[disabled] {
-    cursor: default;
+  cursor: default;
 }
 
 /**
- * 1. Address box sizing set to `content-box` in IE 8/9.
- * 2. Remove excess padding in IE 8/9.
+ * Remove inner padding and border in Firefox 4+.
+ */
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+
+/**
+ * Address Firefox 4+ setting `line-height` on `input` using `!important` in
+ * the UA stylesheet.
+ */
+
+input {
+  line-height: normal;
+}
+
+/**
+ * It's recommended that you don't attempt to style these elements.
+ * Firefox's implementation doesn't respect box-sizing, padding, or width.
+ *
+ * 1. Address box sizing set to `content-box` in IE 8/9/10.
+ * 2. Remove excess padding in IE 8/9/10.
  */
 
 input[type="checkbox"],
 input[type="radio"] {
-    box-sizing: border-box; /* 1 */
-    padding: 0; /* 2 */
+  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Fix the cursor style for Chrome's increment/decrement buttons. For certain
+ * `font-size` values of the `input`, it causes the cursor style of the
+ * decrement button to change from `default` to `text`.
+ */
+
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  height: auto;
 }
 
 /**
@@ -346,44 +351,61 @@ input[type="radio"] {
  */
 
 input[type="search"] {
-    -webkit-appearance: textfield; /* 1 */
-    -moz-box-sizing: content-box;
-    -webkit-box-sizing: content-box; /* 2 */
-    box-sizing: content-box;
+  -webkit-appearance: textfield; /* 1 */
+  -moz-box-sizing: content-box;
+  -webkit-box-sizing: content-box; /* 2 */
+  box-sizing: content-box;
 }
 
 /**
- * Remove inner padding and search cancel button in Safari 5 and Chrome
- * on OS X.
+ * Remove inner padding and search cancel button in Safari and Chrome on OS X.
+ * Safari (but not Chrome) clips the cancel button when the search input has
+ * padding (and `textfield` appearance).
  */
 
 input[type="search"]::-webkit-search-cancel-button,
 input[type="search"]::-webkit-search-decoration {
-    -webkit-appearance: none;
+  -webkit-appearance: none;
 }
 
 /**
- * Remove inner padding and border in Firefox 4+.
+ * Define consistent border, margin, and padding.
  */
 
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-    border: 0;
-    padding: 0;
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
 }
 
 /**
- * 1. Remove default vertical scrollbar in IE 8/9.
- * 2. Improve readability and alignment in all browsers.
+ * 1. Correct `color` not being inherited in IE 8/9.
+ * 2. Remove padding so people aren't caught out if they zero out fieldsets.
+ */
+
+legend {
+  border: 0; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Remove default vertical scrollbar in IE 8/9.
  */
 
 textarea {
-    overflow: auto; /* 1 */
-    vertical-align: top; /* 2 */
+  overflow: auto;
 }
 
-/* ==========================================================================
-   Tables
+/**
+ * Don't inherit the `font-weight` (applied by a rule above).
+ * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
+ */
+
+optgroup {
+  font-weight: bold;
+}
+
+/* Tables
    ========================================================================== */
 
 /**
@@ -391,8 +413,13 @@ textarea {
  */
 
 table {
-    border-collapse: collapse;
-    border-spacing: 0;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+td,
+th {
+  padding: 0;
 }
 
 /* Main
@@ -406,13 +433,13 @@ body {background-color:#bebebe;font-family: Verdana, Arial, sans-serif;font-size
 #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;}
+.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;}
-.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;}
+.StyleInfoLib {font-family: Arial, Helvetica, sans-serif;font-size:11px;font-weight:bold;color:#535353; vertical-align:top;line-height:16px;}
+.StyleInfoData {font-family: Arial, Helvetica, sans-serif;font-size:11px;color:#535353;line-height:16px;}
+.StyleInfoDataActif {font-family: Arial, Helvetica, sans-serif;font-size:11px;line-height:16px;}
 table.identite {border-collapse:separate;border-spacing:4px;}
 table.data {width:100%;}
 table.data td {border:1px solid #ccc; padding:5px;}
@@ -653,18 +680,19 @@ fieldset legend{ padding:0 0 0 10px;}
 .field .smallfield{width:95px;}
 .field .medfield{width:110px;}
 .field span { display:block; }
-.field input, .field select{ font-size:110%; margin:2px 0; }
-.field input[type="radio"] { margin:0 5px 0 5px; border:0; }
-input[type="checkbox"] { margin:0 5px 0 5px; border:0; }
+.field input, .field select{font-size:110%; margin:2px 0;}
+.field input[type="radio"] {margin:0 5px 0 5px; border:0;}
+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: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 {}
-table.greffe td.type {text-align:center;}
+table.greffe td {padding:8px 4px 8px 4px;border:1px solid #000000;border-bottom: 1px dashed; vertical-align:top;}
+table.greffe td.decision {min-width:150px;}
+table.greffe td.type {min-width:250px;}
+table.greffe td.saisie {border-top: 1px dashed;}
 
 /* Kbis
 ----------------------------------*/

docs/README

@@ -1,9 +1,9 @@
 README
 ======
 
+ - Project
  - System Requirements
  - Installation
- - Project
  - Library
  - Translate
 
@@ -11,6 +11,11 @@ Note : Project are define to be use on Linux Server, so take care about path and
  Also some script (CLI) don't work on Windows.
 
 
+PROJECT
+=======
+	
+	This application is a frontend for the WebService and it's display information graphically.
+
 SYSTEM REQUIREMENTS
 ===================
 
@@ -165,14 +170,6 @@ Partners
 --------
 
 
-
-
-PROJECT
-=======
-	
-	This application is a frontend for the WebService and it's display information graphically.
-
-
 LIBRARY
 =======
 
@@ -201,7 +198,6 @@ TRANSLATE
 	Add more precise search string by configuring in the Sources keywords these items
 
 	    translate
-	    plural:1,2
 	    _
 	    setLabel
 	    setValue

library/Application/Controller/Plugin/Theme.php

@@ -75,7 +75,7 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
 				        ->appendStylesheet('/libs/ui-1.9.2/themes/smoothness/jquery-ui.css', 'all');
 				} else {
 				   $view->headLink()
-				       ->appendStylesheet('/libs/ui-1.10.3/themes/smoothness/jquery-ui.min.css', 'all');
+				       ->appendStylesheet('/libs/ui-1.10.4/themes/smoothness/jquery-ui.min.css', 'all');
 				}
 				$view->headLink()->appendStylesheet('/libs/qtip/jquery.qtip.css', 'all');
 
@@ -84,7 +84,7 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
 				 * ===> Standard Javascript
 				 */
 				$view->headScript()
-				    ->appendFile('/libs/jquery/jquery-1.10.2.min.js', 'text/javascript');
+				    ->appendFile('/libs/jquery/jquery-1.11.0.min.js', 'text/javascript');
 
 				if ($isIE6) {
 				    //Old JQuery version for IE6
@@ -94,8 +94,8 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
 				        ->appendFile('/libs/ui-1.9.2/jquery-ui-i18n.min.js', 'text/javascript');
 				} else {
 				    $view->headScript()
-				        ->appendFile('/libs/ui-1.10.3/jquery-ui.min.js', 'text/javascript')
-				        ->appendFile('/libs/ui-1.10.3/jquery-ui-i18n.min.js', 'text/javascript');
+				        ->appendFile('/libs/ui-1.10.4/jquery-ui.min.js', 'text/javascript')
+				        ->appendFile('/libs/ui-1.10.4/jquery-ui-i18n.min.js', 'text/javascript');
 				}
 				$view->headScript()
 					->appendFile('/libs/qtip/jquery.qtip.js', 'text/javascript')
@@ -183,12 +183,12 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
 
 				//Style
 				$view->headLink()
-					->appendStylesheet('/libs/mobile/1.3.0/jquery.mobile-1.3.0.min.css', 'all');
+					->appendStylesheet('/libs/mobile/1.4.0/jquery.mobile-1.4.0.min.css', 'all');
 
 				//JavaScript
 				$view->headScript()
-				    ->appendFile('/libs/jquery/jquery-1.9.1.min.js', 'text/javascript')
-				    ->appendFile('/libs/mobile/1.3.0/jquery.mobile-1.3.0.min.js', 'text/javascript')
+				    ->appendFile('/libs/jquery/jquery-1.11.0.min.js', 'text/javascript')
+				    ->appendFile('/libs/mobile/1.4.0/jquery.mobile-1.4.0.min.js', 'text/javascript')
 					->appendFile($paramsTheme->pathScript.'/script.js', 'text/javascript');
 
 				break;

library/Scores/Finance/Liasse.php

@@ -32,26 +32,31 @@ class Scores_Finance_Liasse
 			'source' => $data->SOURCE,
 		);
 
+		$postesData = array();
+        foreach ( $data->POSTES->item as $element ) {
+            $postesData[$element->id] = $element->val;
+        }
+
+		//Transformation Simplifié en Normal
+		if ( $data->CONSOLIDE == 'S'){
+		    $postesData = $this->bilanSimplifie2Normal($postesData);
+		}
+
 		//Affectaction des postes
-		foreach ($data->POSTES->item as $element){
+		foreach ($postesData as $id => $val){
 		    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éé
+    			'XP'                             // numero de centre de gestion agréé
     			)))
 		    {
-		        $this->postes[$element->id] = number_format($element->val, 0, '', ' ');
+		        $this->postes[$id] = number_format($val, 0, '', ' ');
 		    } else {
-		        $this->postes[$element->id] = $this->dMontant($element->val);
+		        $this->postes[$id] = $this->dMontant($val);
 		    }
 		}
-
-		//Transformation Simplifié en Normal
-		if ( $data->CONSOLIDE == 'S'){
-			$this->postes = $this->bilanSimplifie2Normal($this->postes);
-		}
 	}
 
 	public function getInfo($key)

library/Scores/WsScores.php

@@ -937,13 +937,18 @@ class WsScores
 
 	/**
 	 * Liste des bilans
-	 * @param string $siren
-	 * @todo : Cache
+	 * @param string $identifiant
+	 *     Siren
+	 * @param int $position
+	 * @param int $nbRep
+	 *
 	 */
-	public function getPiecesBilans($siren)
+	public function getPiecesBilans($identifiant, $position = 0, $nbRep = 200)
 	{
-	    $params = new stdClass();
-	    $params->identifiant = $siren;
+	    $params = new stdClass();
+	    $params->identifiant = $identifiant;
+	    $params->position = $position;
+	    $params->nbRep = $nbRep;
 	    $client = $this->loadClient('pieces');
 	    try {
 	        $reponse = $client->getBilans($params);
@@ -958,16 +963,17 @@ class WsScores
 	/**
 	 * Bilan URL
 	 * @param string $siren
+	 * @param string $type
 	 * @param string $diffusion
 	 * @param string $dateCloture
 	 * @param string $reference
 	 */
-	public function getPiecesBilan($siren, $diffusion, $dateCloture, $reference)
+	public function getPiecesBilan($siren, $type, $diffusion, $dateCloture, $reference = '')
 	{
 	    $params = new stdClass();
 	    $params->identifiant = $siren;
 	    $params->dateCloture = $dateCloture;
-	    $params->type = null;
+	    $params->type = $type;
 	    $params->diffusion = $diffusion;
 	    $params->reference = $reference;
 	    $client = $this->loadClient('pieces');
@@ -982,6 +988,47 @@ class WsScores
 	    }
 	}
 
+	public function getPiecesActe($siren, $diffusion, $depotNum, $depotDate, $acteType, $acteNum, $acteDate, $reference = '')
+	{
+	    $params = new stdClass();
+	    $params->identifiant = $siren;
+	    $params->diffusion = $diffusion;
+	    $params->depotNum = $depotNum;
+	    $params->depotDate = $depotDate;
+	    $params->acteType = $acteType;
+	    $params->acteNum = $acteNum;
+	    $params->acteDate = $acteDate;
+	    $params->reference = $reference;
+	    $client = $this->loadClient('pieces');
+	    try {
+	        $reponse = $client->getActe($params);
+	        Zend_Registry::get('firebug')->info($reponse);
+	        return $reponse->getActeResult;
+	    } catch (SoapFault $fault) {
+	        Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+	        $this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+	        return false;
+	    }
+	}
+
+	public function getPiecesActes($identifiant, $position = 0, $nbRep = 200)
+	{
+	    $params = new stdClass();
+	    $params->identifiant = $identifiant;
+	    $params->position = $position;
+	    $params->nbRep = $nbRep;
+	    $client = $this->loadClient('pieces');
+	    try {
+	        $reponse = $client->getActes($params);
+	        return $reponse->getActesResult;
+	    } catch (SoapFault $fault) {
+	        Zend_Registry::get('firebug')->info($fault->faultcode.':'.$fault->faultstring);
+	        $this->soaperror(__FUNCTION__, $fault, $client->__getLastRequest(), $client->__getLastResponse());
+	        return false;
+	    }
+	}
+
+
 	public function setCGU()
 	{
 		$params = new stdClass();

library/WorldCheck/WsWorldCheck.php

@@ -75,7 +75,7 @@ class WsWorldCheck
 	 * The initial request of Worldcheck to get nameIdentifier.
 	 * nameType available values: 'INDIVIDUAL', 'ORGANISATION'
 	 * @param object $data
-	 * @return NameIdentifier (Unique for each request, begins with so_n_)
+	 * @return nameIdentifier (Unique for each request, begins with so_n_)
 	 */
 	public function getScreener($data)
 	{
@@ -136,8 +136,91 @@ class WsWorldCheck
 		$nameType = strtolower($params->nameType);
 		$param->matchIdentifier = $params->matchIdentifier;
 		try {
-			if ($nameType=='individual') return $client->getDetails($param)->return->entitySet->entities->individual;
-			else return $client->getDetails($param)->return->entitySet->entities->organisation;
+			return $client->getDetails($param)->return->entitySet->entities->$nameType;
+		} catch (SoapFault $fault) {
+			if ($fault->faultcode){
+				return $fault->faultstring;
+			} else {
+				echo $client->__getLastResponse();
+				return false;
+			}
+		}
+	}
+	
+	/**
+	 * get branch of associates - tree
+	 * @param object: matchIdentifier, nameType
+	 * @return object content
+	 */
+	public function getBranchTree($params)
+	{
+		$client = $this->loadClientWC('content');
+		$param = new stdClass();
+		$nameType = strtolower($params->nameType);
+		$param->matchIdentifier = $params->matchIdentifier;
+		try {
+			return $client->getDetails($param)->return->entitySet->entities->$nameType;
+		} catch (SoapFault $fault) {
+			if ($fault->faultcode){
+				return $fault->faultstring;
+			} else {
+				echo $client->__getLastResponse();
+				return false;
+			}
+		}
+	}
+	
+	/**
+	 * getAssociates
+	 * @param object: matchIdentifier, nameType
+	 * @return array
+	 */
+	public function getAssociates($params)
+	{
+		$client = $this->loadClientWC('content');
+		$param = new stdClass();
+		$nameType = strtolower($params->nameType);
+		$param->matchIdentifier = $params->matchIdentifier;
+		
+		$primary = array();
+		$associates = array();
+		
+		try {
+			$response = $client->getDetails($param)->return->entitySet->entities;
+			if ($nameType=='individual') {
+				$prim = $response->individual[0];
+			} else {
+				$prim = $response->organisation[0];
+			}
+			$primary['entityId'] = $prim->entityId;
+			$primary['nameType'] = strtoupper($nameType);
+			$primary['category'] = $prim->category;
+			$primary['fullName'] = $prim->names->name[0]->fullName;
+			$primary['givenName'] = $prim->names->name[0]->givenName;
+			$primary['lastName'] = $prim->names->name[0]->lastName;
+			$primary['biography'] = $prim->details->detail[0]->text;
+			$primary['identification'] = $prim->details->detail[1]->text;
+			
+			$assoc = $prim->associates;
+			
+			foreach ($assoc->associate as $associate)
+			{
+				$assoc = array();
+				$assoc['entityId'] = $associate->targetEntity->entityId;
+				$assoc['nameType'] = ($associate->associatetype=='ASSOCIATE')?'INDIVIDUAL':'ORGANISATION';
+				$assoc['category'] = $associate->targetEntity->category;
+				$assoc['fullName'] = $associate->targetEntity->names->name[0]->fullName;
+				$assoc['givenName'] = $associate->targetEntity->names->name[0]->givenName;
+				$assoc['lastName'] = $associate->targetEntity->names->name[0]->lastName;
+				$assoc['biography'] = $associate->targetEntity->details->detail[0]->text;
+				$assoc['identification'] = $associate->targetEntity->details->detail[1]->text;
+				
+				$associates[] = $assoc;
+			}
+			
+			$output = array('primary' => $primary, 'associates' => $associates);
+			return $output;
+			
 		} catch (SoapFault $fault) {
 			if ($fault->faultcode){
 				return $fault->faultstring;
@@ -197,6 +280,7 @@ class WsWorldCheck
 				{
 					$key = $summary->entityId->entityId;
 					$shortData = new stdClass();
+					$shortData->fullName = $summary->names->name[0]->fullName;
 					$shortData->givenName = $summary->names->name[0]->givenName;
 					$shortData->lastName = $summary->names->name[0]->lastName;
 					$shortData->description = $summary->groups->group[0]->details->detail[0]->description;
@@ -300,8 +384,14 @@ class WsWorldCheck
 		$client = $this->loadClientWC('content');
 		$param = new stdClass();
 		$param->matchIdentifier = $matchIdentifier;
+		
+		$usefulData = new stdClass();
 		try {
-			return $client->getTitlesForMatch($param)->return;
+			$output = $client->getTitlesForMatch($param)->return->contentTitles->contentTitle[0];
+			$usefulData->entityId = $output->entityId;
+			$usefulData->lastName = $output->names->name[0]->lastName;
+			$usefulData->givenName = $output->names->name[0]->givenName;
+			return $usefulData; 
 		} catch (SoapFault $fault) {
 			if ($fault->faultcode){
 				return $fault->faultstring;