From 292d2e7a9e16daadbf62e58350043ef9f84e3855 Mon Sep 17 00:00:00 2001
From: Nael <t.rechel@gmx.de>
Date: Sat, 15 Mar 2014 23:30:58 +0100
Subject: [PATCH] new graph

---
 uVote/api/api_uvote.php                                      | 3 +++
 uVote/api/votes/votes.php                                    | 2 +-
 uVote/dbd/qq/UVOTE_DATA_GRAPH_BT_TO_USER_OVERALL_BY_TIME.php | 2 +-
 uVote/page/user_main_urVote/urVote.tpl                       | 3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/uVote/api/api_uvote.php b/uVote/api/api_uvote.php
index 83034d9..fc6b640 100644
--- a/uVote/api/api_uvote.php
+++ b/uVote/api/api_uvote.php
@@ -54,4 +54,7 @@ class api_uvote extends \SYSTEM\API\api_login {
     
     public static function call_graph_bt_to_uvote_overall_by_time($timespan = 84600){
         return votes::get_graph_bt_to_uvote_overall_by_time($timespan);}
+        
+    public static function call_graph_bt_to_user_overall_by_time($timespan = 84600){
+        return votes::get_graph_bt_to_user_overall_by_time($timespan);}
 }
diff --git a/uVote/api/votes/votes.php b/uVote/api/votes/votes.php
index 0c3453a..d8eaeee 100644
--- a/uVote/api/votes/votes.php
+++ b/uVote/api/votes/votes.php
@@ -15,7 +15,7 @@ class votes {
     
     public static function get_graph_bt_to_user_overall_by_time ($timespan = 84600,$returnasjson = true){
         $result = array();
-        $res = \DBD\UVOTE_DATA_GRAPH_BT_TO_USER_OVERALL_BY_TIME::QQ(array($timespan, \SYSTEM\SECURITY\Security::getUser()->id));
+        $res = \DBD\UVOTE_DATA_GRAPH_BT_TO_USER_OVERALL_BY_TIME::QQ(array($timespan, \SYSTEM\SECURITY\Security::getUser()->id, \SYSTEM\SECURITY\Security::getUser()->id));
         while ($row = $res->next()){
             $result[] = array(  0 => $row['day'],
                                 'class_match' => $row['class_match'] / ($row['class_match']+$row['class_mismatch']+1),
diff --git a/uVote/dbd/qq/UVOTE_DATA_GRAPH_BT_TO_USER_OVERALL_BY_TIME.php b/uVote/dbd/qq/UVOTE_DATA_GRAPH_BT_TO_USER_OVERALL_BY_TIME.php
index 70eea8b..4cb3aea 100644
--- a/uVote/dbd/qq/UVOTE_DATA_GRAPH_BT_TO_USER_OVERALL_BY_TIME.php
+++ b/uVote/dbd/qq/UVOTE_DATA_GRAPH_BT_TO_USER_OVERALL_BY_TIME.php
@@ -14,6 +14,6 @@ class UVOTE_DATA_GRAPH_BT_TO_USER_OVERALL_BY_TIME extends \SYSTEM\DB\QP {
 FROM uvote_data as a
 LEFT JOIN (Select choice, poll_ID FROM uvote_data WHERE user_ID = ? GROUP BY choice LIMIT 1) b ON a.poll_ID = b.poll_ID
 LEFT JOIN uvote_votes as c ON a.poll_ID = c.ID
-WHERE bt_choice
+WHERE bt_choice AND user_ID = ?
 GROUP BY day;'
 );}}
diff --git a/uVote/page/user_main_urVote/urVote.tpl b/uVote/page/user_main_urVote/urVote.tpl
index ac9ef02..1b3e44a 100644
--- a/uVote/page/user_main_urVote/urVote.tpl
+++ b/uVote/page/user_main_urVote/urVote.tpl
@@ -22,7 +22,8 @@
         <div style="margin-left: 40px; float: right;">
              ${user_overall_votes}
         </div>
-        <div id="graph_bt_user_overall" style=""></div>
+        <div style=" clear: both"></div>
+        <div id="graph_bt_user_overall" style="float: left"></div>
     <script type="text/javascript" language="JavaScript">load_visualisation_urvote('graph_bt_user_overall',84600);</script>
 </div>