diff --git a/includes/identite/content.php b/includes/identite/content.php index 6efd663d2..579e962e8 100644 --- a/includes/identite/content.php +++ b/includes/identite/content.php @@ -136,8 +136,21 @@ if($element!==false){ echo dRow($element['lib'], $element['data']); } $element = formatElement('identite', 'datecreaet', array($etab['DateCreaEt'])); if($element!==false){ echo dRow($element['lib'], $element['data']); } +FB::log($etab, 'etab'); //Adresse -$element = formatElement('identite', 'adresse', array($etab['Adresse'], $etab['Adresse2'], $etab['AdresseNum'], $etab['AdresseRue'], $etab['CP'], $etab['Ville'], $etab['Pays'])); +$element = formatElement('identite', 'adresse', + array( + $etab['Adresse'], + $etab['Adresse2'], + $etab['AdresseNum'], + $etab['AdresseRue'], + $etab['CP'], + $etab['Ville'], + $etab['Pays'], + $etab['AdresseDom'], + $etab['AdresseDomEnt'], + $etab['AdresseDomNb']) + ); if($element!==false){ echo dRow($element['lib'], $element['data']); } //Zones prioritaires diff --git a/includes/scoresws/identite.php b/includes/scoresws/identite.php index b62cb7dcd..7c6989cb9 100644 --- a/includes/scoresws/identite.php +++ b/includes/scoresws/identite.php @@ -292,7 +292,7 @@ function identite_datecreaet($datecreaet) return array($lib, $data); } -function identite_adresse($adresse, $adresse2, $num, $rue, $cp, $ville, $pays) +function identite_adresse($adresse, $adresse2, $num, $rue, $cp, $ville, $pays, $dom, $domEnt, $domNb) { $lib = 'Adresse'; @@ -313,6 +313,19 @@ function identite_adresse($adresse, $adresse2, $num, $rue, $cp, $ville, $pays) $data.= ''.strWsToHtml($pays).''; $data.= ''; + if ( $dom == 1 ){ + $data.= 'Adresse de domiciliation Domiciliation'; + $data.= '
'; + if ( $domNb == 1000 ) { $domNb = '+ de 1000'; } + $data.="Entreprise à l'adresse : ".$domNb."
"; + if ( count($domEnt)> 0){ + $data.= 'Domiciliataire :
'; + foreach ( $domEnt as $ent ) { + $data.= $ent['nom'].' ('.$ent['siren'].')
'; + } + } + $data.= '
'; + } return array($lib, $data); } diff --git a/www/css/main.css b/www/css/main.css index d497e27b2..f5c667e46 100644 --- a/www/css/main.css +++ b/www/css/main.css @@ -550,3 +550,7 @@ div.submit p.required-note span { text-align:center; margin:0; } + +div.domiciliation { + display:none; +} diff --git a/www/img/domiciliation.gif b/www/img/domiciliation.gif new file mode 100644 index 000000000..7b53d14ad Binary files /dev/null and b/www/img/domiciliation.gif differ diff --git a/www/img/domiciliation.png b/www/img/domiciliation.png new file mode 100644 index 000000000..60639b503 Binary files /dev/null and b/www/img/domiciliation.png differ diff --git a/www/js/combine/scripts.js b/www/js/combine/scripts.js index 458be00ef..d3e240446 100644 --- a/www/js/combine/scripts.js +++ b/www/js/combine/scripts.js @@ -1517,4 +1517,4 @@ $.fn.qtip.log={error:function(){return this;}};$.fn.qtip.constants={};$.fn.qtip. return true;});$('input.button').button();$('input.button:reset').click(function(){$('input:text','form[name=form_recherche]').val('');return false;});$('.dialogsurv').live('click',function(){var title=$(this).attr('title');var href=$(this).attr('href')+'&dialog=1';var dialogOpts={bgiframe:true,title:title,width:500,height:350,modal:true,open:function(event,ui){$(this).html('Chargement...');$(this).load(href);$('#dialogsurv').keypress(function(e){if(e.keyCode==13){e.preventDefault();survSubmit();}});},buttons:{Ok:function(){survSubmit();},Annuler:function(){$(this).dialog('close');}},close:function(){$('#dialogsurv').remove();}};$('
').dialog(dialogOpts);return false;});function survSubmit(){var buttons=$('#dialogsurv').dialog('option','buttons');for(var button in buttons){$(":button:contains('"+button+"')").attr('disabled','disabled');} var formAction=$('#frmSurv').attr('action');var href=$(location).attr('href');var serData=$('#frmSurv').serialize();$('#frmSurv').replaceWith('
Mise sous surveillance en cours...
');$.post(formAction,serData,function(data){if(data==''){$('#frmSurv').html("L'entité a été placé sous surveillance.\n");$(location).attr('href',href);}else{$('#frmSurv').html(data);}});} $('a[idobjet]').click(function() -{idObject=$(this).attr('idobjet');$('#document'+idObject).html('Construction du document en cours...');$.ajax({type:"POST",url:"/",data:"page=getmarques&idObject="+idObject,success:function(msg){$('#document'+idObject).html(msg);},error:function(){$('#document'+idObject).html('Erreur');}});});$('.datemaj').qtip({content:$(this).attr('alt'),style:{name:'cream',width:170},position:{corner:{target:'bottomMiddle',tooltip:'topMiddle'}}});$('u[tooltip]').each(function(){$(this).qtip({content:$(this).attr('tooltip'),style:{name:'dark'},position:{corner:{target:'topMiddle',tooltip:'bottomMiddle'}}});});});function checkEmail(eMail){var isMail=eMail.length;var verif=/^[a-z0-9_.-]+@[a-z0-9_.-]+[.][a-z]{2,4}$/i;if(!isMail||verif.exec(eMail)==null){return false;}else{return true;}} \ No newline at end of file +{idObject=$(this).attr('idobjet');$('#document'+idObject).html('Construction du document en cours...');$.ajax({type:"POST",url:"/",data:"page=getmarques&idObject="+idObject,success:function(msg){$('#document'+idObject).html(msg);},error:function(){$('#document'+idObject).html('Erreur');}});});$('.datemaj').qtip({content:$(this).attr('alt'),style:{name:'cream',width:170},position:{corner:{target:'bottomMiddle',tooltip:'topMiddle'}}});$('u[tooltip]').each(function(){$(this).qtip({content:$(this).attr('tooltip'),style:{name:'dark'},position:{corner:{target:'topMiddle',tooltip:'bottomMiddle'}}});});$('img.domiciliation').qtip({content:$('div.domiciliation').html(),style:{name:'cream',width:200},position:{corner:{target:'bottomMiddle',tooltip:'topMiddle'}}});});function checkEmail(eMail){var isMail=eMail.length;var verif=/^[a-z0-9_.-]+@[a-z0-9_.-]+[.][a-z]{2,4}$/i;if(!isMail||verif.exec(eMail)==null){return false;}else{return true;}} \ No newline at end of file diff --git a/www/js/scripts.js b/www/js/scripts.js index d190190cc..c3c381888 100644 --- a/www/js/scripts.js +++ b/www/js/scripts.js @@ -117,6 +117,16 @@ $(document).ready(function(){ tooltip: 'bottomMiddle' } } }); }); + + //Tooltip de domiciliation + $('img.domiciliation').qtip({ + content: $('div.domiciliation').html(), + style: { name: 'cream', width: 200 }, + position: { + corner: { target: 'bottomMiddle', + tooltip: 'topMiddle' } } + }); + });