From 39f4e347eb33cd116ee5d7bd929347d52ee755f1 Mon Sep 17 00:00:00 2001
From: Nael <t.rechel@gmx.de>
Date: Thu, 6 Mar 2014 01:38:20 +0100
Subject: [PATCH] oh yeah, its gettin forward bitches!

---
 uVote/api/api_uvote.php                       |  3 ++
 uVote/api/votes/votes.php                     | 12 ++++++
 ...DATA_GRAPH_BT_TO_UVOTE_OVERALL_BY_TIME.php | 19 ++++++++++
 uVote/dbd/qq/UVOTE_DATA_PARTY_PER_POLL.php    |  2 +-
 .../qq/UVOTE_DATA_USERS_CHOICE_PER_POLL.php   |  2 +-
 uVote/page/default_page/default_page.php      |  6 ++-
 uVote/page/default_page/js/loadtexts.js       | 37 ++++++++++++++++++-
 uVote/page/default_page/vote.tpl              | 12 ++----
 uVote/page/default_register/register.tpl      |  2 +-
 uVote/page/user_main_uVote/uVote.tpl          | 24 +++++++-----
 10 files changed, 94 insertions(+), 25 deletions(-)
 create mode 100644 uVote/dbd/qq/UVOTE_DATA_GRAPH_BT_TO_UVOTE_OVERALL_BY_TIME.php

diff --git a/uVote/api/api_uvote.php b/uVote/api/api_uvote.php
index 8af9c52..0341952 100644
--- a/uVote/api/api_uvote.php
+++ b/uVote/api/api_uvote.php
@@ -33,4 +33,7 @@ class api_uvote extends \SYSTEM\API\api_login {
         return votes::vote_submit($poll_ID);
         
     }
+    
+    public static function call_graph_bt_to_uvote_overall_by_time($timespan = 84600){
+        return votes::get_graph_bt_to_uvote_overall_by_time($timespan);}
 }
diff --git a/uVote/api/votes/votes.php b/uVote/api/votes/votes.php
index f568fbc..2dfbc65 100644
--- a/uVote/api/votes/votes.php
+++ b/uVote/api/votes/votes.php
@@ -1,6 +1,18 @@
 <?php
 
 class votes {
+    
+    public static function get_graph_bt_to_uvote_overall_by_time ($timespan = 84600,$returnasjson = true){
+        $result = array();
+        $res = \DBD\UVOTE_DATA_GRAPH_BT_TO_UVOTE_OVERALL_BY_TIME::QQ(array($timespan));
+        while ($row = $res->next()){
+            $result[] = array(  0 => $row['day'],
+                                'class_match' => $row['class_match'] / ($row['class_match']+$row['class_mismatch']+1),
+                                'class_mismatch' => $row['class_mismatch'] / ($row['class_match']+$row['class_mismatch']+1));
+        }
+        return $returnasjson ? SYSTEM\LOG\JsonResult::toString($result) : $result;
+    }
+
     public static function getAllVotesOfGroup($groupid){
         return \DBD\UVOTE_GENERATE_VOTELIST::QA(array($groupid));}
     
diff --git a/uVote/dbd/qq/UVOTE_DATA_GRAPH_BT_TO_UVOTE_OVERALL_BY_TIME.php b/uVote/dbd/qq/UVOTE_DATA_GRAPH_BT_TO_UVOTE_OVERALL_BY_TIME.php
new file mode 100644
index 0000000..4ce5330
--- /dev/null
+++ b/uVote/dbd/qq/UVOTE_DATA_GRAPH_BT_TO_UVOTE_OVERALL_BY_TIME.php
@@ -0,0 +1,19 @@
+<?php
+namespace DBD;
+
+class UVOTE_DATA_GRAPH_BT_TO_UVOTE_OVERALL_BY_TIME extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'',
+//mys
+'SELECT
+	DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP(a.`timestamp`) - MOD(UNIX_TIMESTAMP(a.`timestamp`),?)),"%Y/%m/%d %H:%i:%s") as day,
+	SUM(CASE WHEN  a.choice = c.bt_choice THEN 1 ELSE 0 END) class_match,
+	SUM(CASE WHEN  a.choice = c.bt_choice THEN 0 ELSE 1 END) class_mismatch
+FROM uvote_data as a
+LEFT JOIN (Select choice, poll_ID FROM uvote_data 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
+GROUP BY day;'
+);}}
diff --git a/uVote/dbd/qq/UVOTE_DATA_PARTY_PER_POLL.php b/uVote/dbd/qq/UVOTE_DATA_PARTY_PER_POLL.php
index a0d0a19..47215fb 100644
--- a/uVote/dbd/qq/UVOTE_DATA_PARTY_PER_POLL.php
+++ b/uVote/dbd/qq/UVOTE_DATA_PARTY_PER_POLL.php
@@ -7,5 +7,5 @@ class UVOTE_DATA_PARTY_PER_POLL extends \SYSTEM\DB\QP {
 //pg            
 '',
 //mys
-'SELECT * FROM `uvote_votes_per_party` WHERE `poll_ID` = ?;'
+'SELECT * FROM `uvote_votes_per_party` WHERE `poll_ID` = ? ORDER BY party;'
 );}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_USERS_CHOICE_PER_POLL.php b/uVote/dbd/qq/UVOTE_DATA_USERS_CHOICE_PER_POLL.php
index c5eb7fb..289442e 100644
--- a/uVote/dbd/qq/UVOTE_DATA_USERS_CHOICE_PER_POLL.php
+++ b/uVote/dbd/qq/UVOTE_DATA_USERS_CHOICE_PER_POLL.php
@@ -7,5 +7,5 @@ class UVOTE_DATA_USERS_CHOICE_PER_POLL extends \SYSTEM\DB\QP {
 //pg            
 '',
 //mys
-'SELECT COUNT(*) as count, choice FROM uvote_data WHERE `poll_ID` = ? GROUP BY choice ORDER BY count DESC;'
+'SELECT COUNT(*) as count, choice FROM uvote_data WHERE `poll_ID` = ? GROUP BY choice ORDER BY count DESC, choice;'
 );}}
\ No newline at end of file
diff --git a/uVote/page/default_page/default_page.php b/uVote/page/default_page/default_page.php
index 0df425e..487ea6a 100644
--- a/uVote/page/default_page/default_page.php
+++ b/uVote/page/default_page/default_page.php
@@ -9,8 +9,10 @@ class default_page extends SYSTEM\PAGE\Page {
                 '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PCRYPTOSHA(),'jquery.md5.js').'"></script>'.
                 '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PCRYPTOSHA(),'jquery.sha1.js').'"></script>'.
                 '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PLIB(),'jquery.countdown\jquery.countdown.js').'"></script>'.                
-                '<script src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/loadtexts.js').'"></script>';
-                '<script src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/account_create.js').'"></script>';
+                '<script src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/loadtexts.js').'"></script>'.               
+                '<script src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/account_create.js').'"></script>'.
+                '<script src="https://www.google.com/jsapi" type="text/javascript"></script>'.
+                '<script type="text/javascript">google.load("visualization", "1", {packages:["corechart"]});</script>';
     }
     
     private function css(){  
diff --git a/uVote/page/default_page/js/loadtexts.js b/uVote/page/default_page/js/loadtexts.js
index dcd7f0a..d5b2fc9 100644
--- a/uVote/page/default_page/js/loadtexts.js
+++ b/uVote/page/default_page/js/loadtexts.js
@@ -79,12 +79,16 @@ $(document).ready(function() {
             $(this).tab('show');
             load_user_main_tab($(this).attr('action'));        
         });
-        
+
         //load_user_main_tab('user_main_uVote');
-    });
+    });    
         
 });
 
+function drawChart(){
+    //load_visualisation('#graph_bt_uv_overall',84600);
+}
+
 function load_user_main_tab(action){
     switch(action){
         
@@ -236,4 +240,33 @@ function loadApiPic(id) {
     }).complete(function() { 
         
     });
+}
+
+function load_visualisation(id, timespan){
+    $('img#loader').show();    
+    $.getJSON('./api.php?call=graph_bt_to_uvote_overall_by_time',function(json){
+        if(!json || json.status != true || !json.result){
+            $('img#loader').hide();            
+            return;
+        }        
+        json = json.result;
+        $('img#loader').hide();
+        var data = new google.visualization.DataTable();
+        first = true;        
+        $.each(json[0], function(key, value){
+            if(first){                
+                data.addColumn('datetime',key);
+                first = false;
+            } else {
+                data.addColumn('number',key);
+            }       
+        });            
+        $.each(json, function(key, value){
+            first = true;
+            data.addRow($.map(value, function(v) { if(first){first=false;return [new Date(v)];}else{return [parseFloat(v)];}}));});
+         
+        console.log(data);
+        var options = {title: id, aggregationTarget: 'category', selectionMode: 'multiple', curveType: 'function', /*focusTarget: 'category',*/ chartArea:{},  vAxis:{logScale: false}, interpolateNulls: false,  width: "300", height: "250"};
+        new google.visualization.LineChart(document.getElementById(id)).draw(data, options);
+    });
 }
\ No newline at end of file
diff --git a/uVote/page/default_page/vote.tpl b/uVote/page/default_page/vote.tpl
index 6dc3f69..df93ac5 100644
--- a/uVote/page/default_page/vote.tpl
+++ b/uVote/page/default_page/vote.tpl
@@ -1,25 +1,21 @@
 <table style="margin-bottom: 5px; width: 95%; height: 100px; border: solid lightgray 1px; background: beige;">
     <tr> 
-        <!--<td class="${vote_class}" style="width: 10px; margin-top: 10px; border-left: 1px solid lightgray;">            
-        </td>-->
         <td style="padding: 5px; padding-top: 0;">            
             <h5>${title}</h5>
             <img src="${frontend_logos}icon_urn_${vote_class}.png"/>
             <a class="btn btn-primary btn-small btn_vote" style="" poll_ID="${ID}">${full_vote_btn}</a>
         </td>
-        <td class="${bt_vote_class}" style="width: 80px; margin-top: 10px; border-left: 1px solid lightgray;">            
+        <td class="${bt_vote_class}" style="width: 80px; margin-top: 5px; border-left: 1px solid lightgray; padding: 2px;">            
             <img src="${frontend_logos}icon_bt.png" width="80"/>
             ${bt}            
         </td>
-        <td class="${uv_vote_class}" style="width: 60px; height: 100%; border-left: 1px solid lightgray;">          
+        <td class="${uv_vote_class}" style="width: 60px; height: 100%; border-left: 1px solid lightgray; padding: 2px;">          
             <img src="${frontend_logos}icon_urn.png" width="20"/>
             <span style="float: right"><font size="2">uVote</font></span>
             <br/>
             ${uv}
-            <span class="badge badge-info" style="">${uv_count}</span>
-            <br>
-            <br>
-            <br>
+            <span class="badge" style="">${uv_count}</span>
+
         </td>
         <td style="margin: 0; padding: 0; width: 3px;" >
             <table class="poll_time" time="${time_end}" style="width: 100%; height: 100%; margin: 0; padding: 0;">
diff --git a/uVote/page/default_register/register.tpl b/uVote/page/default_register/register.tpl
index 430cbeb..7fd1828 100644
--- a/uVote/page/default_register/register.tpl
+++ b/uVote/page/default_register/register.tpl
@@ -1,4 +1,4 @@
-<div style="width: 90%;">
+<div style="width: 50%; padding: 60px;">
 <img src="${frontend_logos}logo2.png"/>
 <br />
 <br />
diff --git a/uVote/page/user_main_uVote/uVote.tpl b/uVote/page/user_main_uVote/uVote.tpl
index 09aeb18..42a3d9f 100644
--- a/uVote/page/user_main_uVote/uVote.tpl
+++ b/uVote/page/user_main_uVote/uVote.tpl
@@ -1,13 +1,17 @@
-<div style="float: left">
-<table style="border-collapse: separate;
-        border-spacing: 10px 5px; width: 350px;">
-    ${welcome_text}
-        <tr>
-     <h5>Übereinstimmung von uVote & Politik</h5>
-     ${uvote_to_bt}
-     </tr>
-    </table>
-     </div>
+<div style="width: 100%;">
+     ${welcome_text}
+    <div style="float: left;">
+        <table style="border-collapse: separate; border-spacing: 10px 5px; width: 350px;">           
+            <tr>
+             <h5>Übereinstimmung von uVote & Politik</h5>
+             ${uvote_to_bt}
+             </tr>
+        </table>
+    </div>
+    <div id="graph_bt_uv_overall" style="float: left; width: 300px;"></div>
+    <script type="text/javascript" language="JavaScript">load_visualisation('graph_bt_uv_overall',84600);</script>
+</div>
+<div style="clear: both"></div>
 <div style="width: 50%; margin-bottom: 30px; float: left;">   
     <h5>Entscheidungsverhalten der uVote Community</h5>
     <span style="">