scores/extranet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed issue #0000245

Browse Source
This commit is contained in:
Michael RICOIS 2010-05-04 08:09:28 +00:00
commit 3f4c6b4465
5 changed files with 91 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
includes/recherche/recherche_dir.php
View File

@ -10,7 +10,6 @@ foreach (array('dirNom',
} }
} }
?> ?>
<br/><br/><br/><br/><br/> <br/><br/><br/><br/><br/>
<form name="form_recherche" action="./?page=recherche&action=rechercher&vue=list" method="post" enctype="multipart/form-data"> <form name="form_recherche" action="./?page=recherche&action=rechercher&vue=list" method="post" enctype="multipart/form-data">
<input type="hidden" name="formR[type]" value="dir"/> <input type="hidden" name="formR[type]" value="dir"/>
@ -20,7 +19,9 @@ foreach (array('dirNom',
<table> <table>
<tr> <tr>
<td align="center"><h2 align="center" class="StyleRechercheTitre">RECHERCHE PAR DIRIGEANT</h2></td> <td align="center">
<h2 align="center" class="StyleRechercheTitre">RECHERCHE PAR DIRIGEANT</h2>
</td>
</tr> </tr>
</table> </table>
@ -40,14 +41,15 @@ foreach (array('dirNom',
<td width="72">&nbsp;</td> <td width="72">&nbsp;</td>
</tr> </tr>
</table> </table>
<!--<div id="subcontent1" style="display:none">-->
<div id="subcontent1" style="display:block"> <div id="subcontent1" style="display:block">
<br/> <br/>
<table> <table>
<tr> <tr>
<td width="208" align="right" class="StyleRechercheLib"><b>DATE NAISSANCE</b></td> <td width="208" align="right" class="StyleRechercheLib"><b>DATE NAISSANCE</b></td>
<td width="300" align="left" class="StyleRechercheLib"><input maxLength="2" size="3" name="formR[dirDateNaissJJ]" value="<?=$formR['dirDateNaissJJ']?>" />&nbsp;/&nbsp;<input maxLength="2" size="3" name="formR[dirDateNaissMM]" value="<?=$formR['dirDateNaissMM']?>" />&nbsp;/&nbsp;<input maxLength="4" size="5" name="formR[dirDateNaissAAAA]" value="<?=$formR['dirDateNaissAAAA']?>" /></td> <td width="300" align="left" class="StyleRechercheLib">
<input maxLength="2" size="2" name="formR[dirDateNaissJJ]" value="<?=$formR['dirDateNaissJJ']?>" />&nbsp;/&nbsp;
<input maxLength="2" size="2" name="formR[dirDateNaissMM]" value="<?=$formR['dirDateNaissMM']?>" />&nbsp;/&nbsp;
<input maxLength="4" size="4" name="formR[dirDateNaissAAAA]" value="<?=$formR['dirDateNaissAAAA']?>" /></td>
<td width="72">&nbsp;</td> <td width="72">&nbsp;</td>
</tr> </tr>
<tr> <tr>

62
includes/recherche/recherche_ent.php
View File

@ -1,18 +1,3 @@
<script type="text/javascript">
$(document).ready(function(){
$('input[name=formR[siret]]').focus();
$("form[name=form_recherche]").submit(function(){
var reg = /[a-z]{3}/i;
var siret = $('input[name=formR[siret]]').val();
if(siret.match(reg)){
$('input[name=formR[raisonSociale]]').attr('value',siret);
$('input[name=formR[siret]]').attr('value','');
}
return true;
});
});
</script>
<?php <?php
foreach (array('siret', foreach (array('siret',
'raisonSociale', 'raisonSociale',
@ -26,7 +11,6 @@ foreach (array('siret',
} }
} }
?> ?>
<br/><br/><br/><br/><br/> <br/><br/><br/><br/><br/>
<form name="form_recherche" id="formR-id" action="./?page=recherche&action=rechercher&vue=list" method="post"> <form name="form_recherche" id="formR-id" action="./?page=recherche&action=rechercher&vue=list" method="post">
<input type="hidden" name="formR[type]" value="ent" /> <input type="hidden" name="formR[type]" value="ent" />
@ -36,38 +20,50 @@ foreach (array('siret',
<table> <table>
<tr> <tr>
<td align="center"><h2 align="center" class="StyleRechercheTitre">RECHERCHE ENTREPRISE</h2></td> <td align="center">
<h2 align="center" class="StyleRechercheTitre">
RECHERCHE ENTREPRISE
</h2>
</td>
</tr> </tr>
</table> </table>
<table> <table>
<tr> <tr>
<td width="208" align="right" class="StyleRechercheLib"><b>SIREN</b></td> <td width="208" align="right" class="StyleRechercheLib">
<b>SIREN</b>
</td>
<td width="300" align="left" style="line-height:20px;"> <td width="300" align="left" style="line-height:20px;">
<input type="text" name="formR[siret]" value="<?=$formR['siret']?>" size="25" maxlength="20" style="vertical-align:middle;" /> <input type="text" name="formR[siret]" value="<?=$formR['siret']?>" size="30" maxlength="20" style="vertical-align:middle;" />
&nbsp;<img src="img/exclamation.png" title="Recherche par SIREN, SIRET, N° TVA intracommunautaire, N° RC, N° WALDEC, ISIN" style="vertical-align:middle;" /> &nbsp;<img src="img/exclamation.png" title="Recherche par SIREN, SIRET, N° TVA intracommunautaire, N° RC, N° WALDEC, ISIN" style="vertical-align:middle;" />
</td> </td>
<td width="72">&nbsp;</td> <td width="72">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td width="208" align="right" class="StyleRechercheLib"><b>RAISON SOCIALE<br/>ENSEIGNE / SIGLE</b></td> <td width="208" align="right" class="StyleRechercheLib"><b>RAISON SOCIALE<br/>ENSEIGNE / SIGLE</b></td>
<td width="300" align="left"><input type="text" name="formR[raisonSociale]" value="<?=$formR['raisonSociale']?>" size="25" maxlength="40" /></td> <td width="300" align="left"><input type="text" name="formR[raisonSociale]" value="<?=$formR['raisonSociale']?>" size="30" maxlength="40" /></td>
<td width="72">&nbsp;</td> <td width="72">&nbsp;</td>
</tr> </tr>
</table> </table>
<!-- <div id="subcontent1" style="display:block"> -->
<br/> <br/>
<table> <table>
<tr> <tr>
<td width="208" align="right" class="StyleRechercheLib"><b>N&deg; &amp; VOIE</b></td> <td width="208" align="right" class="StyleRechercheLib">
<td width="300" align="left"><input type="text" name="formR[numVoie]" value="<?=$formR['numVoie']?>" size="4" maxlength="4" /> <b>N&deg; &amp; VOIE</b>
<input type="text" name="formR[voie]" value="<?=$formR['voie']?>" size="17" maxlength="30" /></td> </td>
<td width="300" align="left">
<input type="text" name="formR[numVoie]" value="<?=$formR['numVoie']?>" size="4" maxlength="4" />
<input type="text" name="formR[voie]" value="<?=$formR['voie']?>" size="20" maxlength="30" />
</td>
<td width="72">&nbsp;</td> <td width="72">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td width="208" align="right" class="StyleRechercheLib"><b>CP OU D&Eacute;P. / VILLE</b></td> <td width="208" align="right" class="StyleRechercheLib">
<td width="300" align="left"><input type="text" name="formR[cpVille]" value="<?=$formR['cpVille']?>" size="25" maxlength="40" /></td> <b>CP OU D&Eacute;P. / VILLE</b>
</td>
<td width="300" align="left"><input type="text" name="formR[cpVille]" value="<?=$formR['cpVille']?>" size="30" maxlength="40" /></td>
<td width="72">&nbsp;</td> <td width="72">&nbsp;</td>
</tr> </tr>
</table> </table>
@ -75,8 +71,12 @@ foreach (array('siret',
<br/> <br/>
<table> <table>
<tr> <tr>
<td width="208" align="right" class="StyleRechercheLib"><b>T&Eacute;L / FAX</b></td> <td width="208" align="right" class="StyleRechercheLib">
<td width="300" align="left"><input type="text" name="formR[telFax]" value="<?=$formR['telFax']?>" size="15" maxlength="15" /><!--&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img onClick="return overlay(this, 'subcontent1')" src="./img/puce_plus_rond.gif" alt="Plus d'options de recherche..." />--></td> <b>T&Eacute;L / FAX</b>
</td>
<td width="300" align="left">
<input type="text" name="formR[telFax]" value="<?=$formR['telFax']?>" size="30" maxlength="15" />
</td>
<td width="72">&nbsp;</td> <td width="72">&nbsp;</td>
</tr> </tr>
</table> </table>
@ -84,9 +84,11 @@ foreach (array('siret',
<div id="subcontent1" style="display:block"> <div id="subcontent1" style="display:block">
<table> <table>
<tr> <tr>
<td width="208" align="right" class="StyleRechercheLib"><b>NAF</b></td> <td width="208" align="right" class="StyleRechercheLib">
<b>NAF</b>
</td>
<td width="300" align="left"> <td width="300" align="left">
<input type="text" title="Commencer à saisir le code ou le libellé du Naf, puis séléctionner l'une des propositions" size="15" name="formR[naf]" id="formR-naf" value="<?=$formR['naf']?>" /> <input type="text" title="Commencer à saisir le code ou le libellé du Naf, puis séléctionner l'une des propositions" size="30" name="formR[naf]" id="formR-naf" value="<?=$formR['naf']?>" />
</td> </td>
<td width="72">&nbsp;</td> <td width="72">&nbsp;</td>
</tr> </tr>

105
includes/recherche/recherche_list.php
View File

@ -1,5 +1,17 @@
<?php <?php
if ( !is_array($formR) || count($formR)==0 ) $formR=$_POST['formR']; /*
* Le formulaire est soumis en POST
* puis on place le résultat dans la session et on fait un header pour rediriger
* le navigateur du client sur la même url
*/
if (isset($_POST['formR'])){
$_SESSION['formR'] = $_POST['formR'];
unset($_POST['formR']);
header('Location: ./?page=recherche&vue=list');
}
if ( !is_array($formR) || count($formR)==0 ) $formR=$_SESSION['formR'];
if ( $formR['type']=='ent' || $formR['type']=='dir' ) if ( $formR['type']=='ent' || $formR['type']=='dir' )
$typeRech = $formR['type']; $typeRech = $formR['type'];
if (isset($formR['siret']) == true) { if (isset($formR['siret']) == true) {
@ -35,9 +47,7 @@ if ($siret!='')
$siret=''; $siret='';
} }
//Code ISIN //Code ISIN
elseif( $len==12 ) elseif ($len==12){
{
// C'est probablement un code ISIN
$typeId = 'I'; $typeId = 'I';
$autreId = $siret; $autreId = $siret;
$siret = ''; $siret = '';
@ -134,8 +144,9 @@ if ($typeRech == 'ent') {
else $dirVille = trim($dirCpVille); else $dirVille = trim($dirCpVille);
} }
if (isset($formR['index'])) { //Index à enovoyer aux webservice pour obtenir les résultats suivant
$position = $formR['index']; if (isset($_REQUEST['p'])) {
$position = $_REQUEST['p'];
} else { } else {
$position = 0; $position = 0;
} }
@ -188,30 +199,11 @@ if ($typeRech=='ent' && $siret<>'') {
} }
} }
/* URL du formulaire de recherche */ if($typeRech == 'ent'){
print '<form name="form_recherche_ini" action="./?page=recherche&vue='. $strCriteres = '<a href="./?page=recherche&vue=ent">'.trim(@implode(' ', $O['results']['criteres'])).'</a>';
$formR['type'].'" method="post">'; } elseif($typeRech == 'dir') {
foreach(array('siret', $strCriteres = '<a href="./?page=recherche&vue=dir">'.trim(@implode(' ', $O['results']['criteres'])).'</a>';
'raisonSociale',
'numVoie',
'voie',
'cpVille',
'telFax',
'naf',
'dirNom',
'dirPrenom',
'dirDateNaissJJ',
'dirDateNaissMM',
'dirDateNaissAAAA',
'dirCpVille') as $label) {
if (isset($formR[$label])) {
print '<input type="hidden" name="formR['.$label.']" value="'.
$formR[$label].'"/>';
}
} }
print '</form>';
$strCriteres='<a href="Javascript:document.form_recherche_ini.submit()">'.trim(@implode(' ', $O['results']['criteres'])).'</a>';
if ( $O['results']['nbReponses']==0) if ( $O['results']['nbReponses']==0)
{ {
@ -221,12 +213,10 @@ if ( $O['results']['nbReponses']==0)
else else
{ {
$etabs = $O['results']['reponses']; $etabs = $O['results']['reponses'];
$firephp->log($etabs, 'etabs');
//Enregistrement de la première raison sociale trouvé si la recherche n'a été faite que sur un siren //Enregistrement de la première raison sociale trouvé si la recherche n'a été faite que sur un siren
if ($typeRech=='ent' && $siret!='' && $raisonSociale=='') if ($typeRech=='ent' && $siret!='' && $raisonSociale=='')
{ {
$firephp->info('Informations suplémentaires');
recherche_saveinfo( array('raisonSociale' => $etabs[0]['Nom']) ); recherche_saveinfo( array('raisonSociale' => $etabs[0]['Nom']) );
} }
?> ?>
@ -236,10 +226,17 @@ else
{ {
$totPage=ceil($O['results']['nbReponsesTotal']/$tabInfo['nbReponses']); $totPage=ceil($O['results']['nbReponsesTotal']/$tabInfo['nbReponses']);
$curPage=ceil($position/$tabInfo['nbReponses'])+1; $curPage=ceil($position/$tabInfo['nbReponses'])+1;
echo $O['results']['nbReponsesTotal'].' r&eacute;ponses avec les crit&egrave;res "'. $strCriteres .'". '.$O['results']['nbReponses'].' r&eacute;sultats affich&eacute;s. Page '.$curPage.'/'.$totPage.'.'; echo $O['results']['nbReponsesTotal'] .
' r&eacute;ponses avec les crit&egrave;res "' .
$strCriteres . '". ' .
$O['results']['nbReponses'].
' r&eacute;sultats affich&eacute;s. Page ' .
$curPage.'/'.$totPage.'.';
} else { } else {
$totPage=$curPage=1; $totPage=$curPage=1;
echo $O['results']['nbReponsesTotal'].' r&eacute;ponses avec les crit&egrave;res "'. $strCriteres .'".'; echo $O['results']['nbReponsesTotal'] .
' r&eacute;ponses avec les crit&egrave;res "' .
$strCriteres .'".';
} }
?> ?>
</p> </p>
@ -361,24 +358,9 @@ else
if ($prev_index<$O['results']['nbReponses']) $prev_index=0; if ($prev_index<$O['results']['nbReponses']) $prev_index=0;
?> ?>
<td width="40%" align="right"> <td width="40%" align="right">
<form name="form_recherche_prev" action="./?page=recherche&action=rechercher&vue=list" method="post"> <a href="./?page=recherche&vue=list&p=<?=$prev_index?>" title="Page précédente...">
<input type="hidden" name="formR[type]" value="<?=$formR['type']?>"/> <img src="./img/boutton_precedent_off.gif" onmouseover="this.src='./img/boutton_precedent_on.gif'" onmouseout="this.src='./img/boutton_precedent_off.gif'"/>
<input type="hidden" name="formR[index]" value="<?=$prev_index?>"/> </a>
<input type="hidden" name="formR[siret]" value="<?=$formR['siret']?>"/>
<input type="hidden" name="formR[raisonSociale]" value="<?=$formR['raisonSociale']?>"/>
<input type="hidden" name="formR[numVoie]" value="<?=$formR['numVoie']?>"/>
<input type="hidden" name="formR[voie]" value="<?=$formR['voie']?>"/>
<input type="hidden" name="formR[cpVille]" value="<?=$formR['cpVille']?>"/>
<input type="hidden" name="formR[telFax]" value="<?=$formR['telFax']?>"/>
<input type="hidden" name="formR[naf]" value="<?=$formR['naf']?>"/>
<input type="hidden" name="formR[dirNom]" value="<?=$formR['dirNom']?>"/>
<input type="hidden" name="formR[dirPrenom]" value="<?=$formR['dirPrenom']?>"/>
<input type="hidden" name="formR[dirDateNaissJJ]" value="<?=$formR['dirDateNaissJJ']?>"/>
<input type="hidden" name="formR[dirDateNaissMM]" value="<?=$formR['dirDateNaissMM']?>"/>
<input type="hidden" name="formR[dirDateNaissAAAA]" value="<?=$formR['dirDateNaissAAAA']?>"/>
<input type="hidden" name="formR[dirCpVille]" value="<?=$formR['dirCpVille']?>"/>
<input type="image" src="./img/boutton_precedent_off.gif" name="submit" onmouseover="this.src='./img/boutton_precedent_on.gif'" onmouseout="this.src='./img/boutton_precedent_off.gif'" title="Page suivante...">
</form>
</td> </td>
<? <?
} }
@ -400,23 +382,10 @@ else
{ {
?> ?>
<td width="40%" align="left"> <td width="40%" align="left">
<form name="form_recherche_next" action="./?page=recherche&action=rechercher&vue=list" method="post"> <a href="./?page=recherche&vue=list&p=<?=$position+$O['results']['nbReponses']?>" title="Page suivante...">
<input type="hidden" name="formR[type]" value="<?=$formR['type']?>"/> <img src="./img/boutton_suivant_off.gif" onmouseover="this.src='./img/boutton_suivant_on.gif'" onmouseout="this.src='./img/boutton_suivant_off.gif'"/>
<input type="hidden" name="formR[index]" value="<?=$position+$O['results']['nbReponses']?>"/> </a>
<input type="hidden" name="formR[siret]" value="<?=$formR['siret']?>"/> </td>
<input type="hidden" name="formR[raisonSociale]" value="<?=$formR['raisonSociale']?>"/>
<input type="hidden" name="formR[numVoie]" value="<?=$formR['numVoie']?>"/>
<input type="hidden" name="formR[voie]" value="<?=$formR['voie']?>"/>
<input type="hidden" name="formR[cpVille]" value="<?=$formR['cpVille']?>"/>
<input type="hidden" name="formR[telFax]" value="<?=$formR['telFax']?>"/>
<input type="hidden" name="formR[naf]" value="<?=$formR['naf']?>"/>
<input type="hidden" name="formR[dirNom]" value="<?=$formR['dirNom']?>"/>
<input type="hidden" name="formR[dirPrenom]" value="<?=$formR['dirPrenom']?>"/>
<input type="hidden" name="formR[dirDateNaissJJ]" value="<?=$formR['dirDateNaissJJ']?>"/>
<input type="hidden" name="formR[dirDateNaissMM]" value="<?=$formR['dirDateNaissMM']?>"/>
<input type="hidden" name="formR[dirDateNaissAAAA]" value="<?=$formR['dirDateNaissAAAA']?>"/>
<input type="hidden" name="formR[dirCpVille]" value="<?=$formR['dirCpVille']?>"/>
<input type="image" src="./img/boutton_suivant_off.gif" name="submit" onmouseover="this.src='./img/boutton_suivant_on.gif'" onmouseout="this.src='./img/boutton_suivant_off.gif'" title="Page suivante..."></form></td>
<? <?
} }
else else

13
www/js/scripts.js
View File

@ -19,6 +19,19 @@ $(document).ready(function(){
} }
}); });
//Champs de recherche
$('input[name=formR[siret]]').focus();
$('form[name=form_recherche]').submit(function(){
var reg = /[a-z]{3}/i;
var siret = $('input[name=formR[siret]]').val();
if(siret.match(reg)){
$('input[name=formR[raisonSociale]]').attr('value',siret);
$('input[name=formR[siret]]').attr('value','');
}
return true;
});
//Boite de dialog surveillance //Boite de dialog surveillance
$('.dialogsurv').live('click', function(){ $('.dialogsurv').live('click', function(){
var title = $(this).attr('title'); var title = $(this).attr('title');

5
www/pages/recherche.php
View File

@ -2,10 +2,9 @@
if (!$_SESSION['connected']) die(); if (!$_SESSION['connected']) die();
if ($_SESSION['tabInfo']['idClient']==34){ $_SESSION['nowAuthorized']=FALSE; } if ($_SESSION['tabInfo']['idClient']==34){ $_SESSION['nowAuthorized']=FALSE; }
if (isset($_REQUEST['formR'])) { if (isset($_SESSION['formR'])) {
$formR = $_REQUEST['formR']; $formR = $_SESSION['formR'];
} }
$firephp->log($_REQUEST,'REQUEST');
if(!isset($vueRecherche)){ $vueRecherche = $_REQUEST['vue']; } if(!isset($vueRecherche)){ $vueRecherche = $_REQUEST['vue']; }