vote and stuff working again!

2015-10-04 04:30:11 +02:00 · 2015-10-04 04:30:11 +02:00 · 0dd0a76eb4
commit 0dd0a76eb4
parent 2ec1907966
13 changed files with 66 additions and 56 deletions
--- a/uvote/api/votes/votes.php
+++ b/uvote/api/votes/votes.php
@ -18,7 +18,7 @@ class votes {
    public static function getUserPollData($poll_ID){
        if (!\SYSTEM\SECURITY\Security::isLoggedIn()){
            return NULL;}
-        $con = new \SYSTEM\DB\Connection(new \SQL\uVote());
+        $con = new \SYSTEM\DB\Connection();
        $res = $con->prepare(   'selVoteByGrp',
                                'SELECT * FROM `uvote_data` WHERE `user_ID` = ? AND poll_ID = ?;',
                                array(\SYSTEM\SECURITY\Security::getUser()->id,$poll_ID));        
@ -27,7 +27,7 @@ class votes {
    }
    
    public static function get_barsperusers($poll_ID,$return_as_json = true){
-        $con = new \SYSTEM\DB\Connection(new \SQL\uVote());
+        $con = new \SYSTEM\DB\Connection();
        //count
        $res = $con->prepare(  'selVoteBy_count',
                                'SELECT COUNT(*) as "count" FROM `uvote_data` WHERE `poll_ID` = ?;',
@ -73,7 +73,7 @@ class votes {
    }
    
    public static function get_user_temp_votes($user_ID){
-        return \SQL\UVOTE_DATA_TEMP_VOTES::Q1(array($user_ID, $user_ID, $user_ID));}
+        return \SQL\UVOTE_DATA_TEMP_VOTES::Q1(array($user_ID, $user_ID));}
    
    public static function get_user_overall_votes($user_ID, $creationDate){
        return \SQL\UVOTE_DATA_OVERALL_VOTES::Q1(array($user_ID, $user_ID, $user_ID, $creationDate));}
@ -113,7 +113,7 @@ class votes {
        return \SQL\UVOTE_DATA_USERS_CHOICE_PER_POLL::QA(array($poll_ID));}
    
    public static function get_voteinfo($poll_ID){
-        $con = new \SYSTEM\DB\Connection(new \SQL\uVote());
+        $con = new \SYSTEM\DB\Connection();
        $res = $con->prepare(   'selVoteByID',
                                'SELECT * FROM `uvote_votes` WHERE `ID` = ?;',
                                array($poll_ID));        
@ -131,7 +131,7 @@ class votes {
    }
    
    public static function write_vote($poll_ID, $vote){
-        $con = new \SYSTEM\DB\Connection(new \SQL\uVote());
+        $con = new \SYSTEM\DB\Connection();
        $res = $con->prepare(   'selVote',
                                'SELECT * FROM `uvote_votes` WHERE `ID` = ?;',
                                array($poll_ID));   
@ -156,7 +156,7 @@ class votes {
        if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
            throw new ERROR("You need to be logged in.");}
            
-        $con = new \SYSTEM\DB\Connection(new \SQL\uVote());                    
+        $con = new \SYSTEM\DB\Connection();                    
        $res = $con->prepare(   'insertFeedback',
                                'INSERT INTO uvote_beta_feedback
                                 VALUES (?, ?);',
--- a/uvote/page/default_page/css/vote.css
+++ b/uvote/page/default_page/css/vote.css
@ -1,5 +1,6 @@
 #vote_main {
-    padding: 5px; 
+    padding: 5px;
+    margin: 5px;
    width: 100%; 
    border: solid lightgray 3px;
 }
--- a/uvote/page/user_main_analysis/tpl/bt_to_user_overall.tpl
+++ b/uvote/page/user_main_analysis/tpl/bt_to_user_overall.tpl
@ -3,6 +3,6 @@
    <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 badge-alert">${class_MISSMATCH}</span></td>
    <td><span class="badge">${match_percentage}</span></td>
 </tr>    
--- a/uvote/page/user_main_analysis/tpl/overall_all_polls.tpl
+++ b/uvote/page/user_main_analysis/tpl/overall_all_polls.tpl
@ -2,7 +2,7 @@
    <font size="2">Abstimmungsquote seit Accounterstellung</font>
    <div class="progress" style="height: 20px;">   
      <div class="progress-bar" style="width: ${vote_perc}%;">${vote_perc}%</div>
-      <div class="bar bar-info" style=""></div>     
+      <div class="progress-bar progress-bar-info" style=""></div>     
    </div>
      <div style="">
      <font size="1">Teilgenommen: ${voted},
--- a/uvote/page/user_main_analysis/tpl/user_main_analysis.tpl
+++ b/uvote/page/user_main_analysis/tpl/user_main_analysis.tpl
@ -22,7 +22,6 @@
                            border-spacing: 10px 5px; width: 350px;"> 
                            <tr>
                            <h5>${urVote_user_party_compare}</h5>
-                            ${urvote_user_party_compare_sub}
                            ${choices_user_ID}
                            </tr>

--- a/uvote/page/user_main_analysis/user_main_analysis.php
+++ b/uvote/page/user_main_analysis/user_main_analysis.php
@ -11,8 +11,8 @@ class user_main_analysis extends SYSTEM\PAGE\Page {
                        'not_voted'=> $nv));
    }
    
-    private function user_temp_votes (){
-        $vars = votes::get_user_temp_votes(\SYSTEM\SECURITY\Security::getUser()->id);
+    public static function user_temp_votes (){
+        $vars = votes::get_user_temp_votes(\SYSTEM\SECURITY\Security::getUser()->id, \SYSTEM\SECURITY\Security::getUser()->id);
        $v = $vars['voted'];
        $nv = $vars['not_voted'];
        print_r($vars, true);
@ -87,7 +87,7 @@ class user_main_analysis extends SYSTEM\PAGE\Page {
                    break;
                case 2:
                    $vote['choice'] = 'CON';
-                    $vote['badge_color'] = 'badge-important';
+                    $vote['badge_color'] = 'badge-alert';
                    break;
                case 3:
                    $vote['choice'] = 'ENT';
@ -111,7 +111,7 @@ class user_main_analysis extends SYSTEM\PAGE\Page {
                    break;
                case 2:
                    $vote['bt_choice'] = 'CON';
-                    $vote['badge_color'] = 'badge-important';
+                    $vote['badge_color'] = 'badge-alert';
                    break;
                case 3:
                    $vote['bt_choice'] = 'ENT';
@ -120,8 +120,6 @@ class user_main_analysis extends SYSTEM\PAGE\Page {
                case 0:
                    $vote['bt_choice'] = 'OFFEN';
            }
-            //$vote['count'];
-            //$vote['choice'];
            $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/votecountchoicebt.tpl'),$vote);
        }
        return $result;        
--- a/uvote/page/user_main_poll/js/user_main_poll.js
+++ b/uvote/page/user_main_poll/js/user_main_poll.js
@ -1,11 +1,11 @@
 function init_user_main_poll(){
-    $('.btnvote_yes').click(function () {            
+    $('#btnvote_yes').click(function () {            
            vote_click($(this).attr('poll_ID'),1);
            });
-        $('.btnvote_no').click(function () {
+        $('#btnvote_no').click(function () {
            vote_click($(this).attr('poll_ID'),2);
            });
-        $('.btnvote_off').click(function () {
+        $('#btnvote_off').click(function () {
            vote_click($(this).attr('poll_ID'),3);
            });
    
--- a/uvote/page/user_main_poll/user_main_poll.php
+++ b/uvote/page/user_main_poll/user_main_poll.php
@ -112,20 +112,18 @@ class user_main_poll extends SYSTEM\PAGE\Page {
        if($poll_expired){
            if(!$user_poll){
                return '<h5>Stimme hier ab</h5>
-                                     <a class="btn btn-success btn-default btnvote_yes"
+                                     <button id="btnvote_yes" class="btn btn-success btn-default"
                                        style="width: 70px"                                     
                                        poll_ID="${poll_ID}"><font 
-                                        size="3">Pro</font></a>
-                                     <a class="btn btn-danger btn-default btnvote_no" 
+                                        size="3">Pro</font></button>
+                                     <button id="btnvote_no" class="btn btn-danger btn-default" 
                                        style="width: 70px" 
-                                        href="#" 
                                        poll_ID="${poll_ID}"><font 
-                                        size="3">Contra</font></a>
-                                     <a class="btn btn-info btn-default btnvote_off" 
-                                        style="width: 70px" 
-                                        href="#" 
+                                        size="3">Contra</font></button>
+                                     <button id="btnvote_off" class="btn btn-info btn-default" 
+                                        style="width: 70px"
                                        poll_ID="${poll_ID}"><font 
-                                        size="3">Enthaltung</font></a>';}
+                                        size="3">Enthaltung</font></button>';}
            $classes = array('','','');
            switch($user_poll){
                case 1: $classes = array('btn-success disabled','btn-danger','btn-info'); break;
@ -135,20 +133,20 @@ class user_main_poll extends SYSTEM\PAGE\Page {
            }
            
            return '                 <h5>Ändere deine Stimme hier ab</h5>
-                                     <a class="btn btn_vote '.$classes[0].' btn-default btnvote_yes"
+                                     <button id="btnvote_yes" class="btn btn_vote '.$classes[0].' btn-default btnvote_yes"
                                        style="width: 70px"                                     
                                        poll_ID="${poll_ID}"><font 
-                                        size="3">Pro</font></a>
-                                     <a class="btn btn_vote '.$classes[1].' btn-default btnvote_no" 
+                                        size="3">Pro</font></button>
+                                     <button id="btnvote_no" class="btn btn_vote '.$classes[1].' btn-default btnvote_no" 
                                        style="width: 70px" 
                                        href="#" 
                                        poll_ID="${poll_ID}"><font 
-                                        size="3">Contra</font></a>
-                                     <a class="btn btn_vote '.$classes[2].' btn-default btnvote_off" 
+                                        size="3">Contra</font></button>
+                                     <button id="btnvote_off" class="btn btn_vote '.$classes[2].' btn-default btnvote_off" 
                                        style="width: 70px" 
                                        href="#" 
                                        poll_ID="${poll_ID}"><font 
-                                        size="3">Enthaltung</font></a>
+                                        size="3">Enthaltung</font></button>
                                        ';
        } else {
            return 'ye soon to come infos';
@ -158,8 +156,8 @@ class user_main_poll extends SYSTEM\PAGE\Page {
         $var = votes::get_voteinfo($this->poll_ID);
         return $var['iframe_link'];
    }
-    private function js(){        
-        return  \SYSTEM\HTML\html::link(\SYSTEM\WEBPATH(new \PPAGE(),'default_bulletin/js/vote.js'));}
+    public static function js(){        
+        return array(\SYSTEM\WEBPATH(new \PPAGE(),'user_main_poll/js/user_main_poll.js'));}
    private function css(){  
        return \SYSTEM\HTML\html::link(\SYSTEM\WEBPATH(new \PPAGE(),'default_bulletin\css\bars_user.css')).
               \SYSTEM\HTML\html::link(\SYSTEM\WEBPATH(new \PPAGE(),'default_bulletin\css\bulletin.css')).
--- a/uvote/page/user_main_votelist/tpl/user_main_votelist.tpl
+++ b/uvote/page/user_main_votelist/tpl/user_main_votelist.tpl
@ -1,8 +1,25 @@
 <div class="row" style="padding-bottom: 30px;">
-<div class="col-md-12">
-    ${welcome_text}
-
+<div class="col-md-8">
+    <div class="row panel-group" id="accordion">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <h4 class="panel-title">
+                    uvote
+                </h4>
+            </div>
+            <div class="panel-body">
+      ${welcome_text}  
+    </div>
+        </div>
+        
+    </div>
+    
+    
+</div>
+<div class="col-md-4">
+    ${user_temp_votes}
    <span class="badge badge-info">${user_count}</span> Nutzer auf uVote
+    
 </div>               
 </div>
 ${votelist}
--- a/uvote/page/user_main_votelist/tpl/vote.tpl
+++ b/uvote/page/user_main_votelist/tpl/vote.tpl
@ -2,12 +2,13 @@
    <div class="col-md-1">
        <img src="${frontend_logos}icon_urn_${vote_class}.png">
    </div>
-    <div class="col-md-4">
-        ${title}           
+    <div class="col-md-2">
+        <a href="#!start(poll);poll.${ID}" class="btn btn-primary btn-small" poll_ID="${ID}">${full_vote_btn}</a>
+                  
        
    </div>
-    <div class="col-md-7">
-        <a href="#!start(poll);poll.${ID}" class="btn btn-primary btn-small" poll_ID="${ID}">${full_vote_btn}</a>
+    <div class="col-md-9">
+        ${title} 
    </div>                   
                    
 </div>
--- a/uvote/page/user_main_votelist/user_main_votelist.php
+++ b/uvote/page/user_main_votelist/user_main_votelist.php
@ -111,8 +111,9 @@ class user_main_votelist extends SYSTEM\PAGE\Page {
    public function html(){
        $vars = array();
        $vars['votelist'] = $this->generate_votelist();
-        $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=frontend_logos&id=';
+        $vars['frontend_logos'] = './api.php?call=files&cat=frontend_logos&id=';
        $vars['user_count'] = $this->user_count();
+        $vars['user_temp_votes'] = user_main_analysis::user_temp_votes();
        $vars = array_merge($vars,  \SYSTEM\PAGE\text::tag('uvote_register'));
        $vars = array_merge($vars,  \SYSTEM\PAGE\text::tag('uvote'));
        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_votelist/tpl/user_main_votelist.tpl'), $vars);
--- a/uvote/sql/db/uVote.php
+++ b/uvote/sql/db/uVote.php
@ -1,8 +0,0 @@
-<?php
-namespace SQL;
-
-class uVote extends \SYSTEM\DB\DBInfoMYS {
-
-    public function  __construct() {
-        parent::__construct('host_uVote', 'mojotrolls_dev', 'dsjgfasudzfsvad', '127.0.0.1');}
-}
--- a/uvote/sql/qq/UVOTE_DATA_TEMP_VOTES.php
+++ b/uvote/sql/qq/UVOTE_DATA_TEMP_VOTES.php
@ -4,8 +4,11 @@ namespace SQL;
 class UVOTE_DATA_TEMP_VOTES extends \SYSTEM\DB\QP {
    public static function get_class(){return \get_class();}
    public static function mysql(){return
-'SELECT SUM(CASE WHEN uvote_data.user_ID = ? THEN 1 ELSE 0 END) as voted,
-        SUM(CASE WHEN uvote_data.user_ID = ? THEN 0 ELSE 1 END) AS not_voted 
-FROM uvote_data RIGHT JOIN uvote_votes ON ( uvote_data.poll_ID  = uvote_votes.ID AND uvote_data.user_ID = ?)
-WHERE time_end > NOW();'
+'SELECT 
+-- uvdata.user_ID as uid, uvote_votes.ID as ID
+SUM(CASE WHEN user_ID = ? THEN 1 ELSE 0 END) as voted,
+SUM(CASE WHEN user_ID is NULL THEN 1 ELSE 0 END) AS not_voted 
+FROM uvote_votes
+LEFT JOIN (SELECT * FROM uvote_data WHERE uvote_data.user_ID = ?) as uvdata
+ON  uvdata.poll_ID  = uvote_votes.ID'
 ;}}