diff --git a/uVote/api/autoload.inc.php b/uVote/api/autoload.inc.php index 4246ac3..a345682 100644 --- a/uVote/api/autoload.inc.php +++ b/uVote/api/autoload.inc.php @@ -4,3 +4,4 @@ $autoload = SYSTEM\autoload::getInstance(); $autoload->registerFolder(dirname(__FILE__),''); $autoload->registerFolder(dirname(__FILE__).'/votes',''); + diff --git a/uVote/api/votes/votes.php b/uVote/api/votes/votes.php index c17100f..1486e48 100644 --- a/uVote/api/votes/votes.php +++ b/uVote/api/votes/votes.php @@ -16,6 +16,19 @@ class votes { $vars = array('percentage' => $percentage); return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/closedvoteinfo.tpl'), $vars); } + + public static function get_barsperparty($poll_ID){ + $con = new \SYSTEM\DB\Connection(new \DBD\uVote()); + $pbpp = ""; + $part = $con->prepare( 'selVoteByPoll_ID', + 'SELECT * FROM `uvote_votes_per_party` WHERE `poll_ID` = ?;', + array($poll_ID)); + + while ($result = $part->next()){ + $pbpp .= self::getProgessbar($result['votes_pro']);} + return $result; +} + public static function get_openinfo($poll_ID){ $con = new \SYSTEM\DB\Connection(new \DBD\uVote()); $res = $con->prepare( 'selVoteByID', @@ -23,22 +36,11 @@ class votes { array($poll_ID)); $res = $res->next(); $result = array(); - - $pb = ""; - $part = $con->prepare( 'selVoteByPoll_ID', - 'SELECT * FROM `uvote_votes_per_party` WHERE `poll_ID` = ?;', - array($poll_ID)); - - while ($result = $part->next()){ - $pb .= self::getProgessbar($result['votes_pro']); - - } - - $result['graph_right'] = $pb; - $result = array_merge($result,$res); - + $result['graph_right'] = get_barsperparty($pbpp); + $result = array_merge($result,$res); return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/openvoteinfo.tpl'),$result); } + public static function write_vote($poll_ID, $vote){ if(!\SYSTEM\SECURITY\Security::isLoggedIn()){ throw new ERROR("You need to be logged in.");} diff --git a/uVote/page/default_page/js/loadtexts.js b/uVote/page/default_page/js/loadtexts.js index 780ebc8..f339a3f 100644 --- a/uVote/page/default_page/js/loadtexts.js +++ b/uVote/page/default_page/js/loadtexts.js @@ -98,6 +98,14 @@ function load_openvoteinfo (poll_ID){ } +function get_barsperparty (poll_ID) { + $.get('./api.php?call_bars_action_getbarsperparty&poll_ID=' + poll_ID, function (data) { + dataTmp = data; + }).complete(function() { + + }); +} + function vote_click (poll_ID, vote) { $.getJSON('./api.php?call=vote&action=vote&poll_ID=' + poll_ID + '&vote=' + vote, function(data) { var items = [];