From 7e7aced5a15c75d059bcf56bbf0a4bfd978d5928 Mon Sep 17 00:00:00 2001 From: Nael Date: Thu, 20 Feb 2014 15:42:14 +0100 Subject: [PATCH] poll count --- uVote/api/votes/votes.php | 3 ++ uVote/dbd/qq/UVOTE_DATA_COUNT_VOTES.php | 11 ++++++ uVote/page/default_page/js/loadtexts.js | 37 +++++++++++++------ uVote/page/user_main_urVote/all_polls.tpl | 1 + uVote/page/user_main_urVote/urVote.tpl | 4 +- .../user_main_urVote/user_main_urVote.php | 11 +++++- 6 files changed, 53 insertions(+), 14 deletions(-) create mode 100644 uVote/dbd/qq/UVOTE_DATA_COUNT_VOTES.php create mode 100644 uVote/page/user_main_urVote/all_polls.tpl diff --git a/uVote/api/votes/votes.php b/uVote/api/votes/votes.php index 9e46688..8f2ef04 100644 --- a/uVote/api/votes/votes.php +++ b/uVote/api/votes/votes.php @@ -3,6 +3,9 @@ class votes { public static function getAllVotesOfGroup($groupid){ return \DBD\UVOTE_GENERATE_VOTELIST::QA(array($groupid));} + + public static function countAllPolls($group){ + return \DBD\UVOTE_DATA_COUNT_VOTES::QP($group);} public static function insertPartyChoice($poll_ID, $party, $votes_pro, $votes_contra, $nr_attending, $total, $choice){ return \DBD\UVOTE_GENERATE_VOTELIST::QI(array($poll_ID, $party, $votes_pro, $votes_contra, $nr_attending, $total, $choice));} diff --git a/uVote/dbd/qq/UVOTE_DATA_COUNT_VOTES.php b/uVote/dbd/qq/UVOTE_DATA_COUNT_VOTES.php new file mode 100644 index 0000000..1cac244 --- /dev/null +++ b/uVote/dbd/qq/UVOTE_DATA_COUNT_VOTES.php @@ -0,0 +1,11 @@ +
${urVote_title}
+
${urVote_user_party_compare}
${choices_user_ID} @@ -12,6 +13,7 @@ ${choices_bt_to_user} - + + ${poll_compare} \ 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 f65bacd..396187c 100644 --- a/uVote/page/user_main_urVote/user_main_urVote.php +++ b/uVote/page/user_main_urVote/user_main_urVote.php @@ -1,8 +1,14 @@ user_per_party_overall(); $vars['choices_bt_to_user'] = $this->user_to_bt(); + $vars['poll_compare'] = $this->count_all_polls(); $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));