Reintegrate trunk

This commit is contained in:
Michael RICOIS 2014-03-05 10:39:49 +00:00
commit e13292170b
8 changed files with 1523 additions and 123 deletions

View File

@ -22,9 +22,6 @@ class JuridiqueController extends Zend_Controller_Action
$vue = $request->getParam('vue', 'bodacc');
$p = $request->getParam('p', 1);
$this->view->assign('p', $p);
$idAnn = $request->getParam('idAnn', null);
$siren = substr($this->siret, 0,9);
@ -57,8 +54,11 @@ class JuridiqueController extends Zend_Controller_Action
$this->view->assign('vue', $vue);
$nbAnnonces = 20;
$position = ($p-1)*$nbAnnonces;
//Pagination
$page = $request->getParam('page', 1);
if ( $page <= 0 ) $page = 1;
$nbAffichage = 20;
$position = ($page - 1 ) * $nbAffichage;
$ws = new WsScores();
switch ( $vue ) {
@ -68,25 +68,25 @@ class JuridiqueController extends Zend_Controller_Action
if(intval($siren)==0) {
$idAnn = $session->getSourceId();
}
$infos = $ws->getAnnoncesLegales($siren, $idAnn, null, $position, $nbAnnonces);
$infos = $ws->getAnnoncesLegales($siren, $idAnn, null, $position, $nbAffichage);
break;
case 'balo':
$infos = $ws->getAnnoncesBalo($siren, $idAnn, null, $position, $nbAnnonces);
$infos = $ws->getAnnoncesBalo($siren, $idAnn, null, $position, $nbAffichage);
break;
case 'asso':
if ( intval($siren)==0 && substr($session->getAutreId(),0,1)=='W' ) {
$infos = $ws->getAnnoncesAsso($session->getAutreId(), $idAnn, null, $position, $nbAnnonces);
$infos = $ws->getAnnoncesAsso($session->getAutreId(), $idAnn, null, $position, $nbAffichage);
} elseif (intval($siren)!=0) {
$infos = $ws->getAnnoncesAsso($siren, $idAnn, null, $position, $nbAnnonces);
$infos = $ws->getAnnoncesAsso($siren, $idAnn, null, $position, $nbAffichage);
} else {
$idAnn = $session->getSourceId();
$infos = $ws->getAnnoncesAsso($siren, $idAnn, null, $position, $nbAnnonces);
$infos = $ws->getAnnoncesAsso($siren, $idAnn, null, $position, $nbAffichage);
}
break;
case 'bomp':
$filtre = $request->getParam('filtre', null);
$this->view->assign('filtre', $filtre);
$infos = $ws->getAnnoncesBoamp($siren, $idAnn, $filtre, $position, $nbAnnonces);
$infos = $ws->getAnnoncesBoamp($siren, $idAnn, $filtre, $position, $nbAffichage);
break;
}
if ($infos === false) $this->_forward('soap', 'error');
@ -148,6 +148,9 @@ class JuridiqueController extends Zend_Controller_Action
//$this->_helper->viewRenderer->setNoRender(true);
$this->renderScript('juridique/annonce-ajax.phtml');
} else {
$this->view->assign('PageCurrent', $page);
//Définir url pour téléchargement pdf
if ( in_array($annonce['Code'], array('BODA', 'BODB', 'BODC')) && intval($annonce['Annee'])>=2008) {
$lienBodacc = $this->view->url(array(
@ -166,45 +169,36 @@ class JuridiqueController extends Zend_Controller_Action
//Affichage pour la liste des annonces
} else {
$nbReponses = $infos->nbReponses;
$nbPages = ceil($nbReponses/$nbAnnonces);
//Attention ajout des filtres
if ( $p <= 1 ) {
$lienPagePrecedente = false;
//Calcul pagination
$nbReponses = count($infos->result->item);
$nbReponsesTotal = $infos->nbReponses;
if ($nbReponses < $nbReponsesTotal) {
$pageTotal = ceil( $nbReponsesTotal / $nbAffichage );
$pageCurrent = $page;
$pagePrev = $page - 1;
if ($pagePrev < 1) {
$pagePrev = 1;
}
$pageNext = $page + 1;
if( $pageNext > $pageTotal ) {
$pageNext = $pageTotal;
}
} else {
$lienPagePrecedente = $this->view->url(array(
'controller' => 'juridique',
'action' => 'annonces',
'vue'=> $vue,
'p' => $p-1
));
$pageTotal = $pageCurrent = 1;
}
$this->view->assign('PageTotal', $pageTotal);
$this->view->assign('PagePrev', $pagePrev);
$this->view->assign('PageNext', $pageNext);
$this->view->assign('PageCurrent', $pageCurrent);
if ( $p+1 > $nbPages ) {
$lienPageSuivante = false;
} else {
$lienPageSuivante = $this->view->url(array(
'controller' => 'juridique',
'action' => 'annonces',
'vue' => $vue,
'p' => $p+1
));
}
$this->view->assign('nbReponses', empty($nbReponses) ? 0 : $nbReponses);
$this->view->assign('nbReponsesTotal', empty($nbReponsesTotal) ? 0 : $nbReponsesTotal);
$this->view->assign('nbPages',$nbPages);
$this->view->assign('lienPagePrecedente',$lienPagePrecedente);
$this->view->assign('lienPageSuivante',$lienPageSuivante);
foreach ($typeAnnonces as $type)
{
foreach ( $typeAnnonces as $type ) {
$classType = 'annonces'.$type;
$annonces = array();
if (count($objAnnonces->$classType)>0)
{
foreach($objAnnonces->$classType as $ann)
{
Zend_Registry::get('firebug')->info('id:'.$ann->id.', deleted:'.$ann->deleted);
if ( count( $objAnnonces->$classType ) > 0 ) {
foreach( $objAnnonces->$classType as $ann ) {
$annonces[] = $objAnnonces->getAnnonceResume($ann);
}
$this->view->assign($classType, $annonces);

View File

@ -215,12 +215,12 @@ class PiecesController extends Zend_Controller_Action
$nbPage = 0;
if ( $item->FileNumberOfPages > 0 ) {
$nbPage = $item->FileNumberOfPages;
} elseif ( $item->ActeNumberOfPage > 0 ) {
$nbPage = $item->ActeNumberOfPage;
} elseif ( $item->ActeNumberOfPages > 0 ) {
$nbPage = $item->ActeNumberOfPages;
}
if( $nbPage > 1 ) {
$data.= '<br/>Document de '.$nbPage.' pages.';
} elseif( $nbPage ==1) {
} elseif( $nbPage == 1 ) {
$data.= '<br/>Document de '.$nbPage.' page.';
}
@ -409,7 +409,7 @@ class PiecesController extends Zend_Controller_Action
//Télécharger le fichier
case 'T':
$response = $ws->getPiecesBilan($siren, $type, $mode, $dateCloture);
if ($response===false) {
if ( $response === false || $response == '' ) {
$this->view->assign('msg', "Fichier introuvable.");
} else {
try {
@ -506,7 +506,7 @@ class PiecesController extends Zend_Controller_Action
//Enregistrement de la commande
$response = $ws->getPiecesActe($siren, $mode, $depotNum, $depotDate, $acteType, $acteNum, $acteDate, $ref);
if ($response===false) {
$this->view->assign('msg', "Erreur lors du passage de la commande.");
$this->view->assign('msg',"Erreur lors du passage de la commande.");
} else {
$this->view->assign('msg',"Enregistrement de votre commande sous la référence ".strtoupper($response).".");
}
@ -515,7 +515,7 @@ class PiecesController extends Zend_Controller_Action
//Télécharger le fichier
case 'T':
$response = $ws->getPiecesActe($siren, $mode, $depotNum, $depotDate, $acteType, $acteNum, $acteDate);
if ($response===false) {
if ( $response === false || $response == '' ) {
$this->view->assign('msg', "Fichier introuvable.");
} else {
try {

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,15 @@
[PROD]
WS_URL = "https://webservices.infogreffe.fr/WSContextInfogreffe/INFOGREFFE"
WS_URI = "https://webservices.infogreffe.fr/"
WS_USER = "85000109"
WS_PASS = "166"
FILETIME = 8
PATH = APPLICATION_PATH "/../data/infogreffe/"
[DEBUG]
WS_URL = "https://wsrcte.extelia.fr/WSContextInfogreffe/INFOGREFFE"
WS_URI = "https://wsrcte.extelia.fr/"
WS_USER = "85000109"
WS_PASS = "160409"
FILETIME = 8
PATH = APPLICATION_PATH "/../data/infogreffe/"

View File

@ -0,0 +1,80 @@
<definitions
targetNamespace="java:com.experian.webserv.infogreffe"
xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:tns="java:com.experian.webserv.infogreffe"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>
<types>
<schema targetNamespace='java:com.experian.webserv.infogreffe'
xmlns='http://www.w3.org/2001/XMLSchema'>
</schema>
</types>
<message name="getProduitsWebServicesXMLRequest">
<part name="arg0" type="xsd:string" />
</message>
<message name="getProduitsWebServicesXMLResponse">
<part name="return" type="xsd:string" />
</message>
<message name="getProduitsWebServicesRequest">
<part name="arg0" type="xsd:string" />
<part name="arg1" type="xsd:string" />
<part name="arg2" type="xsd:string" />
<part name="arg3" type="xsd:string" />
<part name="arg4" type="xsd:string" />
<part name="arg5" type="xsd:string" />
<part name="arg6" type="xsd:string" />
<part name="arg7" type="xsd:string" />
<part name="arg8" type="xsd:string" />
<part name="arg9" type="xsd:string" />
<part name="arg10" type="xsd:string" />
</message>
<message name="getProduitsWebServicesResponse">
<part name="return" type="xsd:string" />
</message>
<message name="getVersionRequest">
</message>
<message name="getVersionResponse">
<part name="return" type="xsd:string" />
</message>
<portType name="WebServicesProduitsPortType">
<operation name="getProduitsWebServicesXML">
<input message="tns:getProduitsWebServicesXMLRequest"/>
<output message="tns:getProduitsWebServicesXMLResponse"/>
</operation>
<operation name="getProduitsWebServices">
<input message="tns:getProduitsWebServicesRequest"/>
<output message="tns:getProduitsWebServicesResponse"/>
</operation>
<operation name="getVersion">
<input message="tns:getVersionRequest"/>
<output message="tns:getVersionResponse"/>
</operation>
</portType>
<binding name="WebServicesProduitsBinding" type="tns:WebServicesProduitsPortType">
<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
<operation name="getProduitsWebServicesXML">
<soap:operation soapAction="urn:getProduitsWebServicesXML"/>
<input><soap:body use="encoded" namespace='urn:WebServicesProduits' encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></input>
<output><soap:body use="encoded" namespace='urn:WebServicesProduits' encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></output>
</operation>
<operation name="getProduitsWebServices">
<soap:operation soapAction="urn:getProduitsWebServices"/>
<input><soap:body use="encoded" namespace='urn:WebServicesProduits' encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></input>
<output><soap:body use="encoded" namespace='urn:WebServicesProduits' encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></output>
</operation>
<operation name="getVersion">
<soap:operation soapAction="urn:getVersion"/>
<input><soap:body use="encoded" namespace='urn:Version' encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></input>
<output><soap:body use="encoded" namespace='urn:Version' encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/></output>
</operation>
</binding>
<service name="WebServicesProduits">
<documentation>Service Soap Experian, Service Produit</documentation>
<port name="WebServicesProduitsPort" binding="tns:WebServicesProduitsBinding">
<soap:address location="https://webservices.infogreffe.fr:443/WSContextInfogreffe/INFOGREFFE"/>
</port>
</service>
</definitions>

View File

@ -1,32 +0,0 @@
.fbuttons {
text-align: right;
}
#center {
background-color: #FFF;
padding: 5px 0;
}
.titre {
clear: both;
margin: 5px;
padding: 5px;
background: #606060;
color: #FFF;
font: 600 1.4em Arial, Verdana, Sans-serif;
letter-spacing: 1px;
line-height: 1.2em;
}
.liste_li {
list-style-type: decimal;
border: 1px solid #efefef;
box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.60);
-moz-box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.60);
-webkit-box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.60);
-moz-border-radius: 7px;
-webkit-border-radius: 7px;
-khtml-border-radius: 7px;
border-radius: 7px;
behavior: url(/pie.htc);
padding: 17px;
margin-bottom: 11px;
background: #FFF;
}