Bugfix sur le calcul
This commit is contained in:
parent
afe4d36aa0
commit
7fc5fe0505
@ -78,6 +78,7 @@ else
|
|||||||
*/
|
*/
|
||||||
$now = time();
|
$now = time();
|
||||||
$year = strftime('%Y',$now);
|
$year = strftime('%Y',$now);
|
||||||
|
$day = strftime('%j', $now);
|
||||||
for ($i = 0 ; $i < strftime('%j',$now) ; $i++)
|
for ($i = 0 ; $i < strftime('%j',$now) ; $i++)
|
||||||
{
|
{
|
||||||
foreach ($entrepots as $key => $ent)
|
foreach ($entrepots as $key => $ent)
|
||||||
@ -103,9 +104,9 @@ if ($resql)
|
|||||||
$i = 0;
|
$i = 0;
|
||||||
while ($row = $db->fetch_row($resql))
|
while ($row = $db->fetch_row($resql))
|
||||||
{
|
{
|
||||||
|
$max_day = $row[0];
|
||||||
$values[$row[2]][$row[0]] = $row[1];
|
$values[$row[2]][$row[0]] = $row[1];
|
||||||
$values[0][$row[0]] += $row[1];
|
$values[0][$row[0]] += $row[1];
|
||||||
|
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
$db->free($resql);
|
$db->free($resql);
|
||||||
@ -115,6 +116,17 @@ else
|
|||||||
print $sql;
|
print $sql;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for ($i = $max_day + 1 ; $i < ($day + 1) ; $i++)
|
||||||
|
{
|
||||||
|
foreach ($entrepots as $key => $ent)
|
||||||
|
{
|
||||||
|
$values[$key][$i] = $values[$key][$max_day];
|
||||||
|
}
|
||||||
|
$values[0][$i] = $values[0][$max_day];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
require_once DOL_DOCUMENT_ROOT."/../external-libs/Artichow/LinePlot.class.php";
|
require_once DOL_DOCUMENT_ROOT."/../external-libs/Artichow/LinePlot.class.php";
|
||||||
|
|
||||||
foreach ($entrepots as $key => $ent)
|
foreach ($entrepots as $key => $ent)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user