From 4b8786fda6e17d6bbfb7e933bb06caf4f885272d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 26 Nov 2008 12:21:33 +0000 Subject: [PATCH] Make message more clear --- scripts/cron/stock-graph.php | 167 ++++++++++++++++++----------------- 1 file changed, 85 insertions(+), 82 deletions(-) diff --git a/scripts/cron/stock-graph.php b/scripts/cron/stock-graph.php index b309138852a..99a30c88e7f 100644 --- a/scripts/cron/stock-graph.php +++ b/scripts/cron/stock-graph.php @@ -18,22 +18,22 @@ */ /** - \file scripts/cron/stock-graph.php - \ingroup stock - \brief Créé le graph de valorisation du stock - \version $Id$ -*/ + \file scripts/cron/stock-graph.php + \ingroup stock + \brief Créé le graph de valorisation du stock + \version $Id$ + */ // Test si mode CLI $sapi_type = php_sapi_name(); -$script_file=__FILE__; +$script_file=__FILE__; if (eregi('([^\\\/]+)$',$script_file,$reg)) $script_file=$reg[1]; if (substr($sapi_type, 0, 3) == 'cgi') { - echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer $script_file en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; - exit; + echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer $script_file en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n"; + exit; } - + // Recupere env dolibarr $version='$Revision$'; $path=eregi_replace($script_file,'',$_SERVER["PHP_SELF"]); @@ -51,18 +51,18 @@ $error=0; $verbose = 0; for ($i = 1 ; $i < sizeof($argv) ; $i++) { - if ($argv[$i] == "-v") - { - $verbose = 1; - } - if ($argv[$i] == "-vv") - { - $verbose = 2; - } - if ($argv[$i] == "-vvv") - { - $verbose = 3; - } + if ($argv[$i] == "-v") + { + $verbose = 1; + } + if ($argv[$i] == "-vv") + { + $verbose = 2; + } + if ($argv[$i] == "-vvv") + { + $verbose = 3; + } } @@ -77,16 +77,16 @@ $resql = $db->query($sql) ; $entrepots = array(); if ($resql) { - $i = 0; - while ($row = $db->fetch_row($resql)) - { - $entrepots[$row[0]] = $row[0]; - } - $db->free($resql); + $i = 0; + while ($row = $db->fetch_row($resql)) + { + $entrepots[$row[0]] = $row[0]; + } + $db->free($resql); } else { - dolibarr_print_error($db,$sql); + dolibarr_print_error($db,$sql); } $now = time(); @@ -94,12 +94,13 @@ $year = strftime('%Y',$now); $day = strftime('%j', $now); for ($i = 0 ; $i < strftime('%j',$now) ; $i++) { - foreach ($entrepots as $key => $ent) - { - $values[$key][$i] = 0; - } - $values[0][$i] = 0; - $legends[$i] = strftime('%b',dolibarr_mktime(12,0,0,1,1,2006) + ($i * 3600 * 24)); + foreach ($entrepots as $key => $ent) + { + $values[$key][$i] = 0; + } + $values[0][$i] = 0; + $legends[$i] = strftime('%b',dolibarr_mktime(12,0,0,1,1,2006) + ($i * 3600 * 24)); + //print $legends[$i].strftime('%j',$now); } /* @@ -114,45 +115,45 @@ $resql = $db->query($sql) ; if ($resql) { - $i = 0; - $last_day = 0; - while ($row = $db->fetch_row($resql)) - { - if ($last_day > 0) + $i = 0; + $last_day = 0; + while ($row = $db->fetch_row($resql)) { - for ($j = $last_day + 1 ; $j < $row[0] ; $j++) - { - foreach ($entrepots as $key => $ent) + if ($last_day > 0) { - $values[$key][$j] = $values[$key][$last_day]; + for ($j = $last_day + 1 ; $j < $row[0] ; $j++) + { + foreach ($entrepots as $key => $ent) + { + $values[$key][$j] = $values[$key][$last_day]; + } + $values[0][$j] = $values[0][$last_day]; + } } - $values[0][$j] = $values[0][$last_day]; - } + $last_day = $row[0]; + + $max_day = $row[0]; + $values[$row[2]][$row[0]] = $row[1]; + $values[0][$row[0]] += $row[1]; + + $total[$row[2]] += abs($row[1]); + $total[0] += abs($row[1]); + $i++; } - $last_day = $row[0]; - - $max_day = $row[0]; - $values[$row[2]][$row[0]] = $row[1]; - $values[0][$row[0]] += $row[1]; - - $total[$row[2]] += abs($row[1]); - $total[0] += abs($row[1]); - $i++; - } - $db->free($resql); + $db->free($resql); } else { - dolibarr_print_error($db,$sql); + dolibarr_print_error($db,$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]; + foreach ($entrepots as $key => $ent) + { + $values[$key][$i] = $values[$key][$max_day]; + } + $values[0][$i] = $values[0][$max_day]; } @@ -163,14 +164,14 @@ for ($i = $max_day + 1 ; $i < ($day + 1) ; $i++) */ foreach ($entrepots as $key => $ent) { - $file = $dir ."/entrepot-".$key."-".$year.".png"; - $title = "Valorisation PMP du stock de l'entrepôt (euros HT) sur l'année ".$year; + $file = $dir ."/entrepot-".$key."-".$year.".png"; + $title = "Valorisation PMP du stock de l'entrepôt (euros HT) sur l'année ".$year; - if ($total[$key] > 0) - graph_datas($file, $title, $values[$key], $legends); + if ($total[$key] > 0) + graph_datas($file, $title, $values[$key], $legends); - if ($verbose) - print "$file\n"; + if ($verbose) + print "$file\n"; } /* @@ -180,41 +181,43 @@ $file = $dir."/entrepot-".$year.".png"; $title = "Valorisation PMP (Prix Moyen Pondéré) du stock global (euros HT) sur l'année ".$year; if ($total[$key] > 0) - graph_datas($file, $title, $values[0], $legends); +graph_datas($file, $title, $values[0], $legends); if ($verbose) - print "$file\n"; +print "$file\n"; /** \brief Build graph -* \param file File -* \param title Title -* \param values Value -* \param legends Legend -*/ + * \param file File + * \param title Title + * \param values Value + * \param legends Legend + */ function graph_datas($file, $title, $values, $legends) { $width=800; $height=230; + + print "Build graph ".$file."\n"; $newvalues=array(); foreach ($values as $abs=>$ord) { $newvalues[]=array($legends[$abs],$ord); } - + $px = new DolGraph(); $px->SetData($newvalues); //$px->SetLegend(''); - $px->SetMaxValue($px->GetCeilMaxValue()); - $px->SetMinValue($px->GetFloorMinValue()); - $px->SetTitle($title); - $px->SetWidth($width); - $px->SetHeight($height); + $px->SetMaxValue($px->GetCeilMaxValue()); + $px->SetMinValue($px->GetFloorMinValue()); + $px->SetTitle($title); + $px->SetWidth($width); + $px->SetHeight($height); $px->SetType('lines'); $px->setBgColor('default'); - $px->setBgColorGrid(array(255,255,255)); + $px->setBgColorGrid(array(255,255,255)); $px->SetHideXGrid(true); $px->SetLabelInterval(31); $px->draw($file);