SD-29 Remplacement des pipes par des crochets

This commit is contained in:
Claire DELBOS 2017-04-04 17:45:17 +02:00
parent f328c4c8a1
commit 6839d094a1

View File

@ -2124,14 +2124,14 @@ function contentieuxlisteEntete($values)
foreach($values as $value){
$tmp[] = $value;
}
if(in_array('historique',$tmp)){
$tmp[]='dateDecision';
$tmp[]='libelleDecision';
if(in_array('Historique',$tmp)){
$tmp[]='DateDecision';
$tmp[]='LibelleDecision';
}
return $tmp;
} else {
return array(
'idAffaire',
'IdAffaire',
);
}
}
@ -2220,7 +2220,7 @@ function contentieuxlisteMultiple($siren, $nic=0, $values = false,$qualite='')
if(in_array('Parties',$tabFields) || in_array('Representants',$tabFields)){
foreach($tabData as $k => $row){
if(isset($row['Parties']) && !empty($row['Parties'])){
$text='';
$text=' [ ';
$parties=json_decode($row['Parties']);
foreach($parties as $p){
$text.=(isset($p->nomPartie)?$p->nomPartie:'').' ('.(isset($p->entreprise->siren)?$p->entreprise->siren:'').') ';
@ -2229,7 +2229,7 @@ function contentieuxlisteMultiple($siren, $nic=0, $values = false,$qualite='')
$text.=' '.isset($r->nom)?' # '.$r->nom:'';
}
}
$text.=' | ';
$text.=' ] ';
}
//echo $tabData[$k]['parties'];echo $text;
$tabData[$k]['Parties']=$text;