diff --git a/uVote/api/votes/votes.php b/uVote/api/votes/votes.php index 9e46688..7c8f460 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::Q1();} 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_USER_PER_PARTY_OVERALL.php b/uVote/dbd/qq/UVOTE_DATA_USER_PER_PARTY_OVERALL.php index 52e499e..e9b774f 100644 --- a/uVote/dbd/qq/UVOTE_DATA_USER_PER_PARTY_OVERALL.php +++ b/uVote/dbd/qq/UVOTE_DATA_USER_PER_PARTY_OVERALL.php @@ -8,7 +8,7 @@ class UVOTE_DATA_USER_PER_PARTY_OVERALL extends \SYSTEM\DB\QP { '', //mys 'SELECT party, 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 + sum(case when uvote_data.choice = uvote_votes_per_party.choice then 0 else 1 end) class_MISSMATCH FROM uvote_data INNER JOIN uvote_votes_per_party ON uvote_data.poll_ID = uvote_votes_per_party.poll_ID WHERE user_ID = ? GROUP BY party;' diff --git a/uVote/page/user_main_urVote/urVote.tpl b/uVote/page/user_main_urVote/urVote.tpl index 696de84..e6ccf71 100644 --- a/uVote/page/user_main_urVote/urVote.tpl +++ b/uVote/page/user_main_urVote/urVote.tpl @@ -5,6 +5,7 @@
${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));