From e11284e1a41f05f073b07eae0b0985db215cd911 Mon Sep 17 00:00:00 2001
From: Nael <t.rechel@gmx.de>
Date: Wed, 19 Feb 2014 22:00:21 +0100
Subject: [PATCH] bt to user

---
 uVote/api/votes/votes.php                     |   4 ++-
 uVote/dbd/qq/UVOTE_DATA_USER_TO_BT.php        |  15 ++++++++++++
 uVote/img/frontend_logos/icon_bt.png          | Bin 0 -> 3606 bytes
 uVote/page/user_main/main_menu.tpl            |   3 +--
 .../page/user_main_uVote/user_main_uVote.php  |   1 +
 .../user_main_urVote/bt_to_user_overall.tpl   |   8 ++++++
 uVote/page/user_main_urVote/urVote.tpl        |   4 +++
 uVote/page/user_main_urVote/urvoteparties.tpl |   3 ++-
 .../user_main_urVote/user_main_urVote.php     |  23 +++++++++++++++++-
 9 files changed, 56 insertions(+), 5 deletions(-)
 create mode 100644 uVote/dbd/qq/UVOTE_DATA_USER_TO_BT.php
 create mode 100644 uVote/img/frontend_logos/icon_bt.png
 create mode 100644 uVote/page/user_main_urVote/bt_to_user_overall.tpl

diff --git a/uVote/api/votes/votes.php b/uVote/api/votes/votes.php
index 2ace03d..78687b1 100644
--- a/uVote/api/votes/votes.php
+++ b/uVote/api/votes/votes.php
@@ -75,7 +75,9 @@ class votes {
     public static function get_user_per_party_overall($user_ID){
         return \DBD\UVOTE_DATA_USER_PER_PARTY_OVERALL::QA(array($user_ID));        
     }
-
+    public static function get_user_to_bt_overall($user_ID){
+        return \DBD\UVOTE_DATA_USER_TO_BT::QA(array($user_ID));        
+    }
 
     public static function get_voteinfo($poll_ID){
         $con = new \SYSTEM\DB\Connection(new \DBD\uVote());
diff --git a/uVote/dbd/qq/UVOTE_DATA_USER_TO_BT.php b/uVote/dbd/qq/UVOTE_DATA_USER_TO_BT.php
new file mode 100644
index 0000000..3cb98da
--- /dev/null
+++ b/uVote/dbd/qq/UVOTE_DATA_USER_TO_BT.php
@@ -0,0 +1,15 @@
+<?php
+namespace DBD;
+
+class UVOTE_DATA_USER_TO_BT extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'',
+//mys
+'SELECT sum(case when uvote_data.choice = uvote_votes.bt_choice then 1 else 0 end) class_MATCH,
+		 sum(case when uvote_data.choice != uvote_votes.bt_choice then 1 else 0 end) class_MISSMATCH 
+FROM uvote_data LEFT JOIN uvote_votes 
+ON uvote_data.poll_ID = uvote_votes.ID 
+WHERE user_ID = ?;'
+);}}
\ No newline at end of file
diff --git a/uVote/img/frontend_logos/icon_bt.png b/uVote/img/frontend_logos/icon_bt.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d8267086a2c07f5a76ad00257f9f188881d8610
GIT binary patch
literal 3606
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

literal 0
HcmV?d00001

diff --git a/uVote/page/user_main/main_menu.tpl b/uVote/page/user_main/main_menu.tpl
index 195d64f..e35e4c8 100644
--- a/uVote/page/user_main/main_menu.tpl
+++ b/uVote/page/user_main/main_menu.tpl
@@ -10,9 +10,8 @@
         <div class="tab-pane" id="tab_myVote"></div>
     </div>
 </div>
-<img src="${frontend_logos}logo2.png"/>
 <form>
-    <br />
+    <br /><img src="${frontend_logos}logo2.png" width="180"/>
     <h4>uVote BETA Feedback</h4>
     <textarea id="feedback_text">Sag uns was dich stört!</textarea>
     <br />
diff --git a/uVote/page/user_main_uVote/user_main_uVote.php b/uVote/page/user_main_uVote/user_main_uVote.php
index 467b3a4..79f5ea6 100644
--- a/uVote/page/user_main_uVote/user_main_uVote.php
+++ b/uVote/page/user_main_uVote/user_main_uVote.php
@@ -1,5 +1,6 @@
 <?php
 class user_main_uVote extends SYSTEM\PAGE\Page {    
+   
     private function votes_all(){
         $votes = votes::get_all_votes();
         $result = '';
diff --git a/uVote/page/user_main_urVote/bt_to_user_overall.tpl b/uVote/page/user_main_urVote/bt_to_user_overall.tpl
new file mode 100644
index 0000000..cd2c1f8
--- /dev/null
+++ b/uVote/page/user_main_urVote/bt_to_user_overall.tpl
@@ -0,0 +1,8 @@
+<tr>
+    <td style="border-top: 1px solid black;">
+    <img src="${frontend_logos}icon_bt.png"/>
+    </td>
+    <td><span class="badge badge-success">${class_MATCH}</span></td>
+    <td><span class="badge badge-important">${class_MISSMATCH}</span></td>
+    <td><span class="badge">${match_percentage}</span></td>
+</tr>    
\ No newline at end of file
diff --git a/uVote/page/user_main_urVote/urVote.tpl b/uVote/page/user_main_urVote/urVote.tpl
index 0aacf33..696de84 100644
--- a/uVote/page/user_main_urVote/urVote.tpl
+++ b/uVote/page/user_main_urVote/urVote.tpl
@@ -9,5 +9,9 @@
         <h6>${urVote_user_party_compare}</h6>
         ${choices_user_ID}
         </tr>
+        
+        <tr>
+        ${choices_bt_to_user}
+        </tr>
     </table>
 </div>
\ No newline at end of file
diff --git a/uVote/page/user_main_urVote/urvoteparties.tpl b/uVote/page/user_main_urVote/urvoteparties.tpl
index 86df87a..f1f3b77 100644
--- a/uVote/page/user_main_urVote/urvoteparties.tpl
+++ b/uVote/page/user_main_urVote/urvoteparties.tpl
@@ -3,5 +3,6 @@
         <img src="${frontend_logos}icon_${party}.png"/>
     </td>
     <td><span class="badge badge-success">${class_MATCH}</span></td>
-    <td><span class="badge badge-important">${class_MISSMATCH}</span></td>        
+    <td><span class="badge badge-important">${class_MISSMATCH}</span></td>
+    <td><span class="badge">${match_percentage}%</span></td>      
 </tr>    
\ No newline at end of file
diff --git a/uVote/page/user_main_urVote/user_main_urVote.php b/uVote/page/user_main_urVote/user_main_urVote.php
index 018abcc..f65bacd 100644
--- a/uVote/page/user_main_urVote/user_main_urVote.php
+++ b/uVote/page/user_main_urVote/user_main_urVote.php
@@ -1,6 +1,25 @@
 <?php
 class user_main_urVote extends SYSTEM\PAGE\Page { 
     
+      
+    private function user_to_bt(){
+        //$vars = votes::get_user_per_party_overall($user_ID);
+        $result = '';
+        $con = new \SYSTEM\DB\Connection();
+        $res = $con->prepare(   'bt_to_user',
+                                'SELECT sum(case when uvote_data.choice = uvote_votes.bt_choice then 1 else 0 end) class_MATCH,
+                                sum(case when uvote_data.choice != uvote_votes.bt_choice then 1 else 0 end) class_MISSMATCH 
+                                FROM uvote_data LEFT JOIN uvote_votes 
+                                ON uvote_data.poll_ID = uvote_votes.ID 
+                                WHERE user_ID = ?;',
+                                array(\SYSTEM\SECURITY\Security::getUser()->id));
+        while($row = $res->next()){
+            $row['match_percentage'] = round($row['class_MATCH']/($row['class_MATCH']+$row['class_MISSMATCH'])*100,2);
+            $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/bt_to_user_overall.tpl'), $row);;
+        }
+        return $result;        
+    }
+    
     private function user_per_party_overall(){
         //$vars = votes::get_user_per_party_overall(array(\SYSTEM\SECURITY\Security::getUser()->id));        
         $result = '';
@@ -12,7 +31,8 @@ class user_main_urVote extends SYSTEM\PAGE\Page {
                                     ON uvote_data.poll_ID = uvote_votes_per_party.poll_ID 
                                 WHERE user_ID = ? GROUP BY party;',
                                 array(\SYSTEM\SECURITY\Security::getUser()->id));
-        while($row = $res->next()){          
+        while($row = $res->next()){
+            $row['match_percentage'] = round($row['class_MATCH']/($row['class_MATCH']+$row['class_MISSMATCH'])*100,2);
             $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/urvoteparties.tpl'), $row);;
         }
         return $result;        
@@ -21,6 +41,7 @@ class user_main_urVote extends SYSTEM\PAGE\Page {
     public function html(){
         $vars = array();       
         $vars['choices_user_ID'] = $this->user_per_party_overall();
+        $vars['choices_bt_to_user'] = $this->user_to_bt();
         $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id=';
         $vars = array_merge($vars,  \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
         $vars = array_merge($vars,  \SYSTEM\locale::getStrings(150));