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

Merge modif recherche et ajout fiche identité

Browse Source
This commit is contained in:
Michael RICOIS 2010-05-04 16:21:54 +00:00
commit 1ce58e65f1
8 changed files with 104 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/identite/content.php
View File

@ -176,6 +176,10 @@ if($element!==false){ echo dRow($element['lib'], $element['data']); }
$element = formatElement('identite', 'naf4', array($etab['Naf4Ent'], $etab['Naf4EntLib'], $etab['Naf4Etab'], $etab['Naf4EtabLib']));
if($element!==false){ echo dRow($element['lib'], $element['data']); }
//NACE
$element = formatElement('identite', 'nace', array($etab['NaceEnt'], $etab['Naf4Etab']));
if($element!==false){ echo dRow($element['lib'], $element['data']); }
//Nature de l'activité
$element = formatElement('identite', 'natureactivite', array($etab['NatureActivite'], $etab['Actif']));
if($element!==false){ echo dRow($element['lib'], $element['data']); }

26
includes/recherche/recherche_dir.php
View File

@ -11,7 +11,7 @@ foreach (array('dirNom',
}
?>
<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">
<input type="hidden" name="formR[type]" value="dir"/>
<table cellpadding="0" cellspacing="0">
<tr>
@ -30,7 +30,6 @@ foreach (array('dirNom',
<td width="208" align="right" class="StyleRechercheLib"><b>NOM</b></td>
<td width="300" align="left">
<input type="text" name="formR[dirNom]" value="<?=$formR['dirNom']?>" size="25" maxlength="40" style="vertical-align:middle;" />
&nbsp;<img onClick="return overlay(this, 'subcontent1')" src="./img/puce_plus_rond.gif" alt="Plus d'options de recherche..." style="vertical-align:middle;" />
</td>
<td width="72">&nbsp;</td>
</tr>
@ -41,7 +40,6 @@ foreach (array('dirNom',
<td width="72">&nbsp;</td>
</tr>
</table>
<div id="subcontent1" style="display:block">
<br/>
<table>
<tr>
@ -58,17 +56,23 @@ foreach (array('dirNom',
<td width="72">&nbsp;</td>
</tr>
</table>
</div>
<table width="580">
<tr>
<td width="208">&nbsp;</td>
<td width="176" align="center" valign="top">
<input class="button" type="submit" name="submit" value="Recherche" title="Lancer la recherche..." />
</td>
<td valign="top">
<input class="button" type="reset" name="reset" value="RàZ" title="Remise à zéro" />
</td>
</tr>
</table>
</td>
</tr>
</table>
<table width="580">
<tr>
<td align="center" valign="top">
<input type="image" src="./img/boutton_valider_off.gif" name="submit" onmouseover="this.src='./img/boutton_valider_on.gif'" onmouseout="this.src='./img/boutton_valider_off.gif'" title="Lancer la recherche..." />
</td>
</tr>
</table>
</form>

7
includes/recherche/recherche_ent.php
View File

@ -101,9 +101,12 @@ foreach (array('siret',
<table width="580">
<tr>
<td align="center" valign="top">
<td width="208">&nbsp;</td>
<td width="176" align="center" valign="top">
<input class="button" type="submit" name="submit" value="Recherche" title="Lancer la recherche..." />
</td>
<td valign="top">
<input class="button" type="reset" name="reset" value="RàZ" title="Remise à zéro" />
<input class="button" type="submit" name="submit" value="Recherche" title="Lancer la recherche..." />
</td>
</tr>
</table>

14
includes/recherche/recherche_histo.php
View File

@ -7,7 +7,7 @@ $nb_recherche = count($_SESSION['recherche']['list']);
require_once 'recherche/session.php';
$parametres = recherche_element(0);
if( isset($parametres) && $parametres['info']['page']=='recherche' )
{
{
recherche_saveinfo( array('page' => '') );
}
@ -35,7 +35,7 @@ Aucune recherche enregistrée.
<?php if($parametres['raisonSociale']=='' && $parametres['info']['raisonSociale']!=''){ print '&nbsp;('.$parametres['info']['raisonSociale'].')'; } ?>
<br/><?php } ?>
<?php if($parametres['raisonSociale']!=''){ ?>RAISON SOCIALE : <b><?=$parametres['raisonSociale'];?></b><br/><?php } ?>
<?php if($parametres['numVoie']!=''){ ?>N° & VOIE : <b><?=$parametres['numVoie'];?></b><br/><?php } ?>
<?php if($parametres['numVoie']!=''){ ?>N° &amp; VOIE : <b><?=$parametres['numVoie'];?></b><br/><?php } ?>
<?php if($parametres['cpVille']!=''){ ?>CP OU DÉP. / VILLE : <b><?=$parametres['cpVille'];?></b><br/><?php } ?>
<?php if($parametres['telFax']!=''){ ?>TÉL / FAX : <b><?=$parametres['telFax'];?></b><br/><?php } ?>
<?php if($parametres['naf']!=''){ ?>NAF : <b><?=$parametres['naf'];?></b><br/><?php } ?>
@ -53,18 +53,18 @@ Aucune recherche enregistrée.
<?php
}
?>
<?php
<?php
if( $parametres['info']['page']=='identite' && isset($parametres['info']['siret']) && isset($parametres['info']['idEntreprise']) )
{
?>
<a href="./?page=identite&siret=<?=$parametres['info']['siret']?>&idEntreprise=<?=$parametres['info']['idEntreprise']?>">Afficher la fiche d'identité consultée</a>
<?php
<?php
}
else
{
?>
<a href="./?page=recherche&action=rechercher&vue=list<?=$parametres['link'];?>">Lancer la recherche</a>
<?php
?>
<a href="./?page=recherche&action=rechercher&vue=list<?=$parametres['link']?>">Lancer la recherche</a>
<?php
}
?>
<br/>

16
includes/recherche/recherche_list.php
View File

@ -12,6 +12,14 @@ if (isset($_REQUEST['formR'])){
exit;
}
/*
* Si la session est rempli alors on affecte les valeurs
* pour les champs du formulaire
*/
if (isset($_SESSION['formR'])) {
$formR = $_SESSION['formR'];
}
if ( $formR['type']=='ent' || $formR['type']=='dir' ){
$typeRech = $formR['type'];
}
@ -200,10 +208,14 @@ if ($typeRech=='ent' && $siret<>'') {
}
}
$params = '';
foreach($formR as $key => $value){
$params.= '&formR['.$key.']='.urlencode($value);
}
if($typeRech == 'ent'){
$strCriteres = '<a href="./?page=recherche&vue=ent">'.trim(@implode(' ', $O['results']['criteres'])).'</a>';
$strCriteres = '<a href="./?page=recherche&vue=ent'.$params.'">'.trim(@implode(' ', $O['results']['criteres'])).'</a>';
} elseif($typeRech == 'dir') {
$strCriteres = '<a href="./?page=recherche&vue=dir">'.trim(@implode(' ', $O['results']['criteres'])).'</a>';
$strCriteres = '<a href="./?page=recherche&vue=dir'.$params.'">'.trim(@implode(' ', $O['results']['criteres'])).'</a>';
}
if ( $O['results']['nbReponses']==0)

93
includes/scoresws/identite.php
View File

@ -63,30 +63,36 @@ function identite_logo()
$lib = 'Logo';
}
function identite_numrc($numRC, $tribunalLib)
function identite_numrc($numRC, $tribunalLib, $numRM = '')
{
if (isset($numRC) && $numRC!='')
if (isset($numRC) && $numRC!='')
{
$lib = 'Num&eacute;ro R.C.';
$libTrib = '';
if (preg_match('/(A|B|C|D)/i', $numRC))
{
$lib = 'Num&eacute;ro R.C.';
$libTrib = '';
if (preg_match('/(A|B|C|D)/i', $numRC))
{
$lib = 'Num&eacute;ro R.C.';
$libTrib = ' RCS '.preg_replace('/(^TC |^TI |^TGIcc |^TMX )/i','',$tribunalLib);
}
elseif (preg_match('/(P)/i', $numRC))
{
$lib = 'Num&eacute;ro R.S.A.C.';
$libTrib = ' RSAC '.preg_replace('/(^TC |^TI |^TGIcc |^TMX )/i','',$tribunalLib);
}
$lib = 'Num&eacute;ro R.C.';
$libTrib = ' RCS '.preg_replace('/(^TC |^TI |^TGIcc |^TMX )/i','',$tribunalLib);
}
elseif (preg_match('/(P)/i', $numRC))
{
$lib = 'Num&eacute;ro R.S.A.C.';
$libTrib = ' RSAC '.preg_replace('/(^TC |^TI |^TGIcc |^TMX )/i','',$tribunalLib);
}
$data = $numRC.$libTrib;
return array( $lib , $data );
}
else
{
return false;
}
$data = $numRC.$libTrib;
return array( $lib , $data );
}
elseif (!empty($numRM))
{
$lib = 'Répertoire des métiers';
$data = $numRM;
return array( $lib , $data );
}
else
{
return false;
}
}
function identite_autreid($autreId, $tribunalLib, $numRC)
@ -419,23 +425,39 @@ function identite_activiteen($activite, $nafent, $nafentlib)
function identite_activiteet($nafetab, $nafetablib)
{
$lib = 'Activit&eacute; de l\'&eacute;tablissement';
$data = $nafetab.' : '. strWsToHtml($nafetablib);
return array($lib, $data);
$lib = 'Activit&eacute; de l\'&eacute;tablissement';
$data = $nafetab.' : '. strWsToHtml($nafetablib);
return array($lib, $data);
}
function identite_naf4($naf4ent, $naf4entlib, $naf4etab, $naf4etablib)
{
if (preg_match('/\bNAF4\b/i', $_SESSION['tabInfo']['pref']) && trim(@$naf4ent)!='')
{
$lib = 'Anciens codes NAF';
$data = $naf4ent.' - '.strWsToHtml($naf4entlib).'<br/><b>&Eacute;tab. :</b> '.$naf4etab.' - '. strWsToHtml($naf4etablib);
return array($lib, $data);
}
else
{
return false;
}
if (hasPref('naf4') && trim(@$naf4ent)!='')
{
$lib = 'Anciens codes NAF';
$data = $naf4ent.' - '.strWsToHtml($naf4entlib).
'<br/><b>&Eacute;tab. :</b> '.$naf4etab.' - '.
strWsToHtml($naf4etablib);
return array($lib, $data);
}
else
{
return false;
}
}
function identite_nace($naceEnt, $naceEtab)
{
if (hasPref('nace')){
$lib = 'Codes NACE';
$data = $naceEnt;
if (!empty($naceEtab)){
$data.= ', <b>&Eacute;tab. :</b> '.$naceEtab;
}
return array($lib, $data);
} else {
return false;
}
}
function identite_natureactivite($natureactivite, $actif)
@ -455,7 +477,8 @@ function identite_natureactivite($natureactivite, $actif)
function identite_originefond($originecreation)
{
if ( ( $originecreation*1>0 && $originecreation*1<9 ) ||
$originecreation=='A' || $originecreation=='B' || $originecreation=='C' ||
$originecreation=='A' || $originecreation=='B' ||
$originecreation=='C' ||
$originecreation=='D' || $originecreation=='E' )
{
$tabCreation=array(

1
includes/user/preferences.php
View File

@ -2,6 +2,7 @@
$definePref = array(
'NAF4' => array( 'init' => '', 'txt' => 'Afficher les anciens NAF'),
'NACE' => array( 'init' => '', 'txt' => 'Afficher les codes NACES'),
'NEWS' => array( 'init' => '', 'txt' => 'Afficher les news Google&copy;'),
'MAPPY' => array( 'init' => '', 'txt' => 'Afficher les fa&ccedil;ades d\'immeubles'),
'CARTES' => array( 'init' => '', 'txt' => 'Afficher les cartes et les plans'),

6
www/pages/recherche.php
View File

@ -7,12 +7,6 @@ if ($_SESSION['tabInfo']['idClient']==34){ $_SESSION['nowAuthorized']=FALSE; }
*/
if (isset($_REQUEST['formR'])){
$formR = $_REQUEST['formR'];
/*
* Si la session est rempli alors on affecte les valeurs
* pour les champs du formulaire
*/
} elseif (isset($_SESSION['formR'])) {
$formR = $_SESSION['formR'];
}
if(!isset($vueRecherche)){ $vueRecherche = $_REQUEST['vue']; }