From e52abd49880e8eec7afe59d68ed6a69d5d5f6464 Mon Sep 17 00:00:00 2001
From: Nael <t.rechel@gmx.de>
Date: Thu, 13 Feb 2014 01:45:56 +0100
Subject: [PATCH] major db queries

---
 uVote/api/votes/votes.php                     | 13 ++--------
 uVote/dbd/qq/UVOTE_DATA_BT_PER_POLL.php       |  2 +-
 uVote/dbd/qq/UVOTE_DATA_PARTY_PER_POLL.php    | 11 ++++++++
 .../qq/UVOTE_DATA_USER_PER_PARTY_OVERALL.php  | 15 +++++++++++
 .../qq/UVOTE_DATA_USER_TO_PARTY_OVERALL.php   | 15 +++++++++++
 uVote/page/default_bulletin/bulletin.tpl      | 25 +++++++++----------
 .../default_bulletin/default_bulletin.php     |  4 +--
 uVote/page/default_bulletin/table_bt.tpl      |  5 ++--
 uVote/page/default_bulletin/table_parties.tpl |  1 +
 9 files changed, 61 insertions(+), 30 deletions(-)
 create mode 100644 uVote/dbd/qq/UVOTE_DATA_PARTY_PER_POLL.php
 create mode 100644 uVote/dbd/qq/UVOTE_DATA_USER_PER_PARTY_OVERALL.php
 create mode 100644 uVote/dbd/qq/UVOTE_DATA_USER_TO_PARTY_OVERALL.php

diff --git a/uVote/api/votes/votes.php b/uVote/api/votes/votes.php
index cf43f0b..83ee18d 100644
--- a/uVote/api/votes/votes.php
+++ b/uVote/api/votes/votes.php
@@ -75,16 +75,7 @@ class votes {
     }
     
     public static function get_barsperparty($poll_ID){
-        $con = new \SYSTEM\DB\Connection(new \DBD\uVote());
-        $pbpp = array();
-        $part = $con->prepare(  'selVoteByPoll_ID',
-                                'SELECT * FROM `uvote_votes_per_party` WHERE `poll_ID` = ?;',
-                                array($poll_ID));
-
-        while ($result = $part->next()){            
-            $pbpp[] = $result;}
-        return $pbpp;
-    }
+        return \DBD\UVOTE_DATA_PARTY_PER_POLL::QA(array($poll_ID));}
     
     public static function write_vote($poll_ID, $vote){
         if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
@@ -99,7 +90,7 @@ class votes {
                      
         $res = $con->prepare(   'insertVote',
                                 'REPLACE uvote_data
-                                 VALUES (?, ?, ?, 0);',
+                                 VALUES (?, ?, ?, 0, NOW());',
                                 array($poll_ID, \SYSTEM\SECURITY\Security::getUser()->id, $vote));   
         return JsonResult::ok();
     }
diff --git a/uVote/dbd/qq/UVOTE_DATA_BT_PER_POLL.php b/uVote/dbd/qq/UVOTE_DATA_BT_PER_POLL.php
index b2af6f8..acf9cd4 100644
--- a/uVote/dbd/qq/UVOTE_DATA_BT_PER_POLL.php
+++ b/uVote/dbd/qq/UVOTE_DATA_BT_PER_POLL.php
@@ -11,6 +11,6 @@ class UVOTE_DATA_BT_PER_POLL extends \SYSTEM\DB\QP {
     sum(votes_pro) as bt_pro, 
     sum(votes_contra) as bt_con, 
     sum(nr_attending) as bt_attending, 
-    sum(total) as bt_total 
+    sum(total) as bt_total
 FROM uvote_votes_per_party WHERE poll_ID = ?;'
 );}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_PARTY_PER_POLL.php b/uVote/dbd/qq/UVOTE_DATA_PARTY_PER_POLL.php
new file mode 100644
index 0000000..a0d0a19
--- /dev/null
+++ b/uVote/dbd/qq/UVOTE_DATA_PARTY_PER_POLL.php
@@ -0,0 +1,11 @@
+<?php
+namespace DBD;
+
+class UVOTE_DATA_PARTY_PER_POLL extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'',
+//mys
+'SELECT * FROM `uvote_votes_per_party` WHERE `poll_ID` = ?;'
+);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_USER_PER_PARTY_OVERALL.php b/uVote/dbd/qq/UVOTE_DATA_USER_PER_PARTY_OVERALL.php
new file mode 100644
index 0000000..f1839ec
--- /dev/null
+++ b/uVote/dbd/qq/UVOTE_DATA_USER_PER_PARTY_OVERALL.php
@@ -0,0 +1,15 @@
+<?php
+namespace DBD;
+
+class UVOTE_DATA_USER_PER_PARTY_OVERALL 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_per_party.choice then 1 else 0 end) class_MATCH,
+		 sum(case when uvote_data.choice != uvote_votes_per_party.choice then 1 else 0 end) class_MISSMATCH 
+FROM uvote_data LEFT JOIN uvote_votes_per_party 
+ON uvote_data.poll_ID = uvote_votes_per_party.poll_ID 
+WHERE user_ID = ? AND party = ?;'
+);}}
\ No newline at end of file
diff --git a/uVote/dbd/qq/UVOTE_DATA_USER_TO_PARTY_OVERALL.php b/uVote/dbd/qq/UVOTE_DATA_USER_TO_PARTY_OVERALL.php
new file mode 100644
index 0000000..a07aac5
--- /dev/null
+++ b/uVote/dbd/qq/UVOTE_DATA_USER_TO_PARTY_OVERALL.php
@@ -0,0 +1,15 @@
+<?php
+namespace DBD;
+
+class UVOTE_DATA_USER_TO_PARTY_OVERALL 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_per_party.choice then 1 else 0 end) class_MATCH,
+		 sum(case when uvote_data.choice != uvote_votes_per_party.choice then 1 else 0 end) class_MISSMATCH 
+FROM uvote_data LEFT JOIN uvote_votes_per_party 
+ON uvote_data.poll_ID = uvote_votes_per_party.poll_ID 
+WHERE party = ?;'
+);}}
\ No newline at end of file
diff --git a/uVote/page/default_bulletin/bulletin.tpl b/uVote/page/default_bulletin/bulletin.tpl
index 12d1d51..d3d18aa 100644
--- a/uVote/page/default_bulletin/bulletin.tpl
+++ b/uVote/page/default_bulletin/bulletin.tpl
@@ -1,21 +1,20 @@
 <script language="JavaScript" src="/default_bulletin/js/vote.js">
-
 </script>
-<div style="margin-right: 10px;">
-    <img src="${frontend_logos}logo2.png" style="float: right" width="200px"/>
-    ${vote_buttons}                
-</div>
-   <br>                
-   
-   <div>
+<div>
    ${bars_user}
    </div>
-
+   <div>   
+   <h4>Ergebnis Bundestag</h4>
+   ${bars_bt}
+   </div>
+<div style="margin-right: 10px;">
+    <img src="${frontend_logos}logo2.png" style="float: left; margin-right: 70px;" width="200px"/>
+    ${vote_buttons} 
+</div>
+   <br>                  
+   <br>
    <div>
-   <h4>Ergebnis der Fraktionen</h4>
    ${bars_party}
    </div>
    <div style="clear: both"></div>
-   <div>
-   ${bars_bt}
-   </div>
\ No newline at end of file
+   
\ No newline at end of file
diff --git a/uVote/page/default_bulletin/default_bulletin.php b/uVote/page/default_bulletin/default_bulletin.php
index 4dc0852..b143f0a 100644
--- a/uVote/page/default_bulletin/default_bulletin.php
+++ b/uVote/page/default_bulletin/default_bulletin.php
@@ -53,8 +53,8 @@ class default_bulletin extends SYSTEM\PAGE\Page {
         $poll_data[] = DBD\UVOTE_DATA_CHOICE_OVERALL::Q1(array(2));
         $poll_data[] = DBD\UVOTE_DATA_CHOICE_OVERALL::Q1(array(3));
         $vars = array();
-        $vars['bars_party'] = $this->bars_party();
-        $vars['bars_user'] =  $poll_expired ? '' : $this->bars_user();
+        $vars['bars_party'] = $poll_expired ? '' : $this->bars_party();
+        $vars['bars_user'] =  $this->bars_user();
         $vars['bars_bt'] = $this->bars_bt();
         $vars['js'] = $this->js();
         $vars['css'] = $this->css();
diff --git a/uVote/page/default_bulletin/table_bt.tpl b/uVote/page/default_bulletin/table_bt.tpl
index 9ac6950..ae6cacb 100644
--- a/uVote/page/default_bulletin/table_bt.tpl
+++ b/uVote/page/default_bulletin/table_bt.tpl
@@ -1,6 +1,5 @@
-<div style="margin-right: 10px;">
-    <h4>Ergebnis Bundestag</h4>
-        <div class="progress" style="width: 150px; height: 20px;">
+<div style="margin-right: 10px;">   
+        <div class="progress" style="height: 20px;">
           <div class="bar bar-success" style="width: ${bt_pro}%;"></div>
           <div class="bar bar-danger" style="width: ${bt_con}%;"></div>
           <div class="bar bar-info" style="width: ${bt_ent}%;"><p></p></div>
diff --git a/uVote/page/default_bulletin/table_parties.tpl b/uVote/page/default_bulletin/table_parties.tpl
index d42008c..940c8a1 100644
--- a/uVote/page/default_bulletin/table_parties.tpl
+++ b/uVote/page/default_bulletin/table_parties.tpl
@@ -5,4 +5,5 @@ ${party}
           <div class="bar bar-danger" style="width: ${party_no}%;"></div>
           <div class="bar bar-info" style="width: ${party_ent}%;"><p></p></div>
         </div>
+        ${choice}
 </div>
\ No newline at end of file