From 3213db86a0e1143bf6d3b2e92332659dae6ca71a Mon Sep 17 00:00:00 2001 From: Naeltard Date: Mon, 26 Oct 2015 18:54:34 +0100 Subject: [PATCH] fixed statistics on poll --- uvote/api/votes/votes.php | 6 +++--- uvote/page/user_main_poll/user_main_poll.php | 6 +++--- uvote/page/user_main_poll_sub/user_main_poll_sub.php | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/uvote/api/votes/votes.php b/uvote/api/votes/votes.php index 9b728b8..bddcb6e 100644 --- a/uvote/api/votes/votes.php +++ b/uvote/api/votes/votes.php @@ -139,11 +139,11 @@ class votes { public static function get_pfields_per_poll($poll_ID){ return \SQL\UVOTE_DATA_USERS_CHOICE_PER_POLL::QA(array($poll_ID));} - public static function get_voteinfo($poll_ID){ + public static function get_voteinfo($poll_ID, $group){ $con = new \SYSTEM\DB\Connection(); $res = $con->prepare( 'selVoteByID', - 'SELECT * FROM `uvote_votes` WHERE `ID` = ? AND uvote_votes.group = 1;', - array($poll_ID)); + 'SELECT * FROM `uvote_votes` WHERE `ID` = ? AND uvote_votes.group = ?;', + array($poll_ID, $group)); $res = $res->next(); // $res['title'] = utf8_encode($res['title']); return $res; diff --git a/uvote/page/user_main_poll/user_main_poll.php b/uvote/page/user_main_poll/user_main_poll.php index e4377d9..a988524 100644 --- a/uvote/page/user_main_poll/user_main_poll.php +++ b/uvote/page/user_main_poll/user_main_poll.php @@ -35,7 +35,7 @@ class user_main_poll extends SYSTEM\PAGE\Page { private function bars_bt(){ $vars = votes::get_bar_bt_per_poll($this->poll_ID); - $info = votes::get_voteinfo($this->poll_ID); + $info = votes::get_voteinfo($this->poll_ID, 1); if (!$vars['bt_total']){ $var['disclaimer'] = 'Keine differenzierten Ergebnisse für den Bundestag verfügbar'; @@ -86,7 +86,7 @@ class user_main_poll extends SYSTEM\PAGE\Page { } } private function get_voteinfo(){ - $var = votes::get_voteinfo($this->poll_ID); + $var = votes::get_voteinfo($this->poll_ID, 1); return $var['iframe_link']; } public static function js(){ @@ -96,7 +96,7 @@ class user_main_poll extends SYSTEM\PAGE\Page { $poll_expired = \SQL\UVOTE_POLL_EXPIRED::Q1(array($this->poll_ID, 1)); $user_vote = votes::getUserPollData($this->poll_ID); $vars = array(); - $vars = array_merge($vars, votes::get_voteinfo($this->poll_ID)); + $vars = array_merge($vars, votes::get_voteinfo($this->poll_ID, 1)); $vars['sub_buttons'] = votes::get_sublinks($this->poll_ID); $vars['choice_party'] = $this->choice_party(); $vars['bars_user'] = $this->bars_user(); diff --git a/uvote/page/user_main_poll_sub/user_main_poll_sub.php b/uvote/page/user_main_poll_sub/user_main_poll_sub.php index d30456e..c42849e 100644 --- a/uvote/page/user_main_poll_sub/user_main_poll_sub.php +++ b/uvote/page/user_main_poll_sub/user_main_poll_sub.php @@ -35,7 +35,7 @@ class user_main_poll_sub extends SYSTEM\PAGE\Page { private function bars_bt(){ $vars = votes::get_bar_bt_per_poll($this->poll_ID); - $info = votes::get_voteinfo($this->poll_ID); + $info = votes::get_voteinfo($this->poll_ID , 2); if (!$vars['bt_total']){ $var['disclaimer'] = 'Keine differenzierten Ergebnisse für den Bundestag verfügbar'; @@ -83,7 +83,7 @@ class user_main_poll_sub extends SYSTEM\PAGE\Page { } private function get_voteinfo(){ - $var = votes::get_voteinfo($this->poll_ID); + $var = votes::get_voteinfo($this->poll_ID, 2); return $var['iframe_link']; } public static function js(){