diff --git a/htdocs/telephonie/stats/distributeurs/distributeur.php b/htdocs/telephonie/stats/distributeurs/distributeur.php
index d580100d345..cd8fe493114 100644
--- a/htdocs/telephonie/stats/distributeurs/distributeur.php
+++ b/htdocs/telephonie/stats/distributeurs/distributeur.php
@@ -41,7 +41,7 @@ $h++;
if ($_GET["id"])
{
-
+ $year = strftime("%Y",time());
$distri = new DistributeurTelephonie($db);
$distri->fetch($_GET["id"]);
@@ -54,18 +54,20 @@ if ($_GET["id"])
print '
';
- print '| ';
+ print ' |
';
+
+ print '
'."\n";
+
+ print ' | ';
print '';
print '';
print '| Mois | Prise d\'ordre | ';
$sql = "SELECT sum(p.montant), date_format(datepo, '%m-%Y')";
- $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_contrat_priseordre as p";
-
+ $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_contrat_priseordre as p";
$sql .= " WHERE p.fk_distributeur = ".$_GET["id"];
- $sql .= " GROUP BY date_format(p.datepo, '%Y%m') DESC";
-
+ $sql .= " GROUP BY date_format(p.datepo, '%Y%m') DESC";
$resql = $db->query($sql);
if ($resql)
@@ -74,18 +76,11 @@ if ($_GET["id"])
$i = 0;
$total = 0;
- while ($i < $num)
+ while ($row = $db->fetch_row($resql))
{
- $row = $db->fetch_row($i);
-
- $var=!$var;
-
- print "";
-
- print '| '.$row[1].' | ';
-
+ $var=!$var;
+ print " | ".$row[1].' | ';
print ''.price($row[0]).' | ';
- $i++;
}
$db->free();
}
@@ -93,21 +88,96 @@ if ($_GET["id"])
{
print $db->error() . ' ' . $sql;
}
- print ' ';
-
-
- print ' | ';
-
- print '
'."\n";
+ print ' |
';
+ print '';
print '
'."\n";
-
- print '
'."\n";
+ print ' | ';
+ print ' |
';
+ print '
'."\n";
+ print ' | ';
+ print '';
+ print '| Mois | Resultat | ';
+
+ $sql = "SELECT valeur,legend FROM ".MAIN_DB_PREFIX."telephonie_stats";
+ $sql .= " WHERE graph = 'distributeur.resultat.mensuel.".$_GET["id"]."'";
+ $sql .= " ORDER BY legend DESC";
+ $resql = $db->query($sql);
+
+ if ($resql)
+ {
+ while ($row = $db->fetch_row($resql))
+ {
+ $var=!$var;
+ print "| ".$row[1].' | ';
+ print ''.price($row[0]).' | ';
+ }
+ $db->free();
+ }
+ else
+ {
+ print $db->error() . ' ' . $sql;
+ }
+ print ' ';
+
+ print ' |
';
print '
'."\n";
-
- print '
'."\n";
+ print ' | ';
+ print '';
+ print '| Mois | Gain | ';
+ $sql = "SELECT valeur,legend FROM ".MAIN_DB_PREFIX."telephonie_stats";
+ $sql .= " WHERE graph = 'distributeur.gain.mensuel.".$_GET["id"]."'";
+ $sql .= " ORDER BY legend DESC";
+ $resql = $db->query($sql);
+
+ if ($resql)
+ {
+ while ($row = $db->fetch_row($resql))
+ {
+ $var=!$var;
+ print "| ".$row[1].' | ';
+ print ''.price($row[0]).' | ';
+ }
+ $db->free();
+ }
+ else
+ {
+ print $db->error() . ' ' . $sql;
+ }
+ print ' ';
+
+ print ' |
';
+ print '
'."\n";
+
+ print ' | ';
+
+ print '';
+ print '| Mois | Commission | ';
+
+ $sql = "SELECT valeur,legend FROM ".MAIN_DB_PREFIX."telephonie_stats";
+ $sql .= " WHERE graph = 'distributeur.commission.mensuel.".$_GET["id"]."'";
+ $sql .= " ORDER BY legend DESC";
+ $resql = $db->query($sql);
+
+ if ($resql)
+ {
+ while ($row = $db->fetch_row($resql))
+ {
+ $var=!$var;
+ print "| ".$row[1].' | ';
+ print ''.price($row[0]).' | ';
+ }
+ $db->free();
+ }
+ else
+ {
+ print $db->error() . ' ' . $sql;
+ }
+ print ' ';
+
+
print ' |
';
print '';