Merge branch 'develop' into 'master'

Develop into master : path library

See merge request !4
This commit is contained in:
potier 2017-04-13 08:07:34 +00:00
commit b6bd6e005e

View File

@ -2211,8 +2211,8 @@ function contentieuxlisteMultiple($siren, $nic=0, $values = false,$qualite='')
$tabData=$stmt->fetchAll(\PDO::FETCH_ASSOC);
//if(false){
if(in_array('StatusLabel',$tabFields) || in_array('CategoryLabel',$tabFields) || in_array('Parties',$tabFields) || in_array('Representants',$tabFields)){
$status = include APPLICATION_PATH . '/../vendor/scores/src/library/Metier/Ctx/AffaireStatus.php';
$categories = include APPLICATION_PATH . '/../vendor/scores/src/library/Metier/Table/AffairesTypes.php';
$status = include APPLICATION_PATH . '/../vendor/scores/library/src/Metier/Ctx/AffaireStatus.php';
$categories = include APPLICATION_PATH . '/../vendor/scores/library/src/Metier/Table/AffairesTypes.php';
foreach($tabData as $k => $row){
echo $k.'--->'.$siren;
if(isset($row['StatusLabel']) && isset($status[$row['StatusLabel']])){$tabData[$k]['StatusLabel']=$status[$row['StatusLabel']];}