issue #0001500 : Ajout de la date de calcul de l'indiScore
This commit is contained in:
parent
e8d1f01811
commit
3d4644a732
@ -1124,7 +1124,8 @@ function indiScoreEntete($values)
|
||||
{
|
||||
return array(
|
||||
'indiScore',
|
||||
'encours',
|
||||
'indiScoreDate',
|
||||
'encours',
|
||||
'dateBilan',
|
||||
);
|
||||
}
|
||||
@ -1133,18 +1134,15 @@ function indiScoreData($siren, $nic, $values = false)
|
||||
{
|
||||
$tabData = array();
|
||||
$iDb = new WDB();
|
||||
$ret = $iDb->select('jo.scores_surveillance', 'indiScore, encours, indiScoreDate, dateBilan, indiScorePre, encoursPre, indiScoreDatePre', 'siren='.$siren, false, MYSQL_ASSOC);
|
||||
$ret = $iDb->select('jo.scores_surveillance', 'indiScore, encours, indiScoreDate, dateBilan', 'siren='.$siren, false, MYSQL_ASSOC);
|
||||
if (isset($ret[0]['indiScore'])) {
|
||||
$tabData['indiScore'] = $ret[0]['indiScore'];
|
||||
$tabData['encours'] = $ret[0]['encours'];
|
||||
$tabData['dateBilan'] = $ret[0]['dateBilan'];
|
||||
$tabData['indiScore'] = $ret[0]['indiScore'];
|
||||
$tabData['indiScoreDate'] = $ret[0]['indiScoreDate'];
|
||||
$tabData['encours'] = $ret[0]['encours'];
|
||||
$tabData['dateBilan'] = $ret[0]['dateBilan'];
|
||||
} else {
|
||||
/*$iDb->insert('scores_surveillance', array('siren'=>$siren), false);
|
||||
$tabData['indiScore'] = 'En cours';
|
||||
$tabData['encours'] = 'En cours';
|
||||
$ret = $iDb->select('jo.bilans', 'MAX(dateExercice) as dateBilan', 'siren='.$siren, false, MYSQL_ASSOC);
|
||||
$tabData['dateBilan']= $ret[0]['dateBilan'];*/
|
||||
$tabData['indiScore'] = 'Aucune donnée';
|
||||
$tabData['indiScoreDate'] = 'Aucune donnée';
|
||||
$tabData['encours'] = 'Aucune donnée';
|
||||
$tabData['dateBilan'] = 'Aucune donnée';
|
||||
}
|
||||
@ -1162,7 +1160,6 @@ function AdresseNormaliseEntete($values)
|
||||
'AdresseL6_POST',
|
||||
'AdresseL7_PAYS',
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
function AdresseNormaliseData($siren, $nic, $values = false)
|
||||
|
Loading…
Reference in New Issue
Block a user