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

Merge pour issue #0000299

Browse Source
This commit is contained in:
Michael RICOIS 2010-06-29 10:28:15 +00:00
commit f38431106c
7 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
includes/identite/content.php
View File

@ -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

15
includes/scoresws/identite.php
View File

@ -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.= '<span class="adresse">'.strWsToHtml($pays).'</span>';
$data.= '</a>';
if ( $dom == 1 ){
$data.= '<img class="domiciliation" alt="Adresse de domiciliation" src="img/domiciliation.png" /> Domiciliation';
$data.= '<div class="domiciliation">';
if ( $domNb == 1000 ) { $domNb = '+ de 1000'; }
$data.="Entreprise à l'adresse : ".$domNb."<br/>";
if ( count($domEnt)> 0){
$data.= 'Domiciliataire : <br/>';
foreach ( $domEnt as $ent ) {
$data.= $ent['nom'].' ('.$ent['siren'].')<br/>';
}
}
$data.= '</div>';
}
return array($lib, $data);
}

4
www/css/main.css
View File

@ -550,3 +550,7 @@ div.submit p.required-note span {
text-align:center;
margin:0;
}
div.domiciliation {
display:none;
}

BIN
www/img/domiciliation.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 986 B

BIN
www/img/domiciliation.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 651 B

2
www/js/combine/scripts.js
View File

@ -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();}};$('<div id="dialogsurv"></div>').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('<div id="frmSurv">Mise sous surveillance en cours...</div>');$.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;}}
{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;}}

10
www/js/scripts.js
View File

@ -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' } }
});
});