From 7e29e2ee747d5d1df2956bb977a12097b69d9268 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Mon, 14 Nov 2005 09:56:22 +0000
Subject: [PATCH] Modif presentation

---
 .../distributeur.commission.class.php            | 16 +++++++++++-----
 .../distributeurs/distributeur.gain.class.php    | 12 +++++++++++-
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/htdocs/telephonie/stats/distributeurs/distributeur.commission.class.php b/htdocs/telephonie/stats/distributeurs/distributeur.commission.class.php
index 5c661560d5c..3a25c645bfa 100644
--- a/htdocs/telephonie/stats/distributeurs/distributeur.commission.class.php
+++ b/htdocs/telephonie/stats/distributeurs/distributeur.commission.class.php
@@ -28,9 +28,9 @@ class GraphDistributeurCommission extends GraphBar {
   {
     $this->db = $DB;
     $this->file = $file;
-
+    $this->year = strftime("%Y",time());
     $this->client = 0;
-    $this->titre = "Commission mensuelle";
+    $this->titre = "Commission mensuelle ".$this->year;
 
     $this->barcolor = "orange";
     $this->showframe = true;
@@ -65,18 +65,17 @@ class GraphDistributeurCommission extends GraphBar {
 	    $row = $this->db->fetch_row($resql);	
 	    	    
 	    $datas[$i] = $row[1];
+	    $comms[$row[0]] = $row[1];
 	    $labels[$i] = substr($row[0],-2)."/".substr($row[0],2,2);
 	    
 	    $sqli = "INSERT INTO ".MAIN_DB_PREFIX."telephonie_stats";
 	    $sqli .= " (graph,ord,legend,valeur)";
 	    $sqli .= " VALUES ('distributeur.commission.mensuel.".$distributeur."'";
 	    $sqli .= ",'$i','".$row[0]."','".$datas[$i]."');";
-
 	    $resqli = $this->db->query($sqli);
 
 	    $i++;
-	  }
-	
+	  }	
 	$this->db->free($resql);
       }
     else 
@@ -84,6 +83,13 @@ class GraphDistributeurCommission extends GraphBar {
 	print $this->db->error() . ' ' . $sql;
       }                  
 
+    for ($i = 1 ; $i < 13 ; $i++)
+      {
+	$idx = $this->year.substr('0'.$i,-2);
+	$datas[$i-1] = $comms[$idx];
+	$labels[$i-1] = $i;
+      }
+
     if (sizeof($datas))
       {
 	$this->GraphDraw($this->file, $datas, $labels);
diff --git a/htdocs/telephonie/stats/distributeurs/distributeur.gain.class.php b/htdocs/telephonie/stats/distributeurs/distributeur.gain.class.php
index 849d04106ea..5df82121868 100644
--- a/htdocs/telephonie/stats/distributeurs/distributeur.gain.class.php
+++ b/htdocs/telephonie/stats/distributeurs/distributeur.gain.class.php
@@ -30,7 +30,7 @@ class GraphDistributeurGain extends GraphBar {
     $this->file = $file;
 
     $this->client = 0;
-    $this->titre = "Gain mensuel";
+    $this->titre = "Gain mensuel ".strftime("%Y",time());
 
     $this->barcolor = "pink";
     $this->showframe = true;
@@ -39,6 +39,7 @@ class GraphDistributeurGain extends GraphBar {
   Function GraphMakeGraph($distributeur=0)
   {
     $num = 0;
+    $year = strftime("%Y",time());
 
     $sql = "DELETE FROM ".MAIN_DB_PREFIX."telephonie_stats";
     $sql .= " WHERE graph='distributeur.gain.mensuel.".$distributeur."';";
@@ -62,6 +63,7 @@ class GraphDistributeurGain extends GraphBar {
 	$i = 0;
 	$j = -1;
 	$datas = array();
+	$gains = array();
 	$labels = array();
 	
 	while ($i < $num)
@@ -69,6 +71,7 @@ class GraphDistributeurGain extends GraphBar {
 	    $row = $this->db->fetch_row($resql);	
 	    	    
 	    $datas[$i] = $row[1];
+	    $gains[$row[0]] = $row[1];
 	    $labels[$i] = substr($row[0],-2)."/".substr($row[0],2,2);
 	    
 	    $sqli = "INSERT INTO ".MAIN_DB_PREFIX."telephonie_stats";
@@ -88,6 +91,13 @@ class GraphDistributeurGain extends GraphBar {
 	print $this->db->error() . ' ' . $sql;
       }                  
 
+    for ($i = 1 ; $i < 13 ; $i++)
+      {
+	$idx = $year.substr('0'.$i,-2);
+	$datas[$i-1] = $gains[$idx];
+	$labels[$i-1] = $i;
+      }
+
     if (sizeof($datas))
       {
 	$this->GraphDraw($this->file, $datas, $labels);