diff --git a/uVote/dbd/qq/UVOTE_DATA_TEMP_VOTES.php b/uVote/dbd/qq/UVOTE_DATA_TEMP_VOTES.php index 15f9234..77959ae 100644 --- a/uVote/dbd/qq/UVOTE_DATA_TEMP_VOTES.php +++ b/uVote/dbd/qq/UVOTE_DATA_TEMP_VOTES.php @@ -9,5 +9,6 @@ class UVOTE_DATA_TEMP_VOTES extends \SYSTEM\DB\QP { //mys '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 = ?);' +FROM uvote_data RIGHT JOIN uvote_votes ON ( uvote_data.poll_ID = uvote_votes.ID AND uvote_data.user_ID = ?) +WHERE time_end > NOW();' );}} diff --git a/uVote/page/default_bulletin/bulletin.tpl b/uVote/page/default_bulletin/bulletin.tpl index 0b0b197..226045c 100644 --- a/uVote/page/default_bulletin/bulletin.tpl +++ b/uVote/page/default_bulletin/bulletin.tpl @@ -6,7 +6,7 @@ ${voice_weight}
-

Ergebnis Bundestag

+ ${bars_bt}
@@ -14,7 +14,7 @@
- +
${vote_buttons} diff --git a/uVote/page/default_bulletin/default_bulletin.php b/uVote/page/default_bulletin/default_bulletin.php index 08fd882..d67863a 100644 --- a/uVote/page/default_bulletin/default_bulletin.php +++ b/uVote/page/default_bulletin/default_bulletin.php @@ -40,7 +40,7 @@ class default_bulletin extends SYSTEM\PAGE\Page { private function voice_weight(){ $vars = votes::get_count_user_votes_per_poll($this->poll_ID); - $vars['voteweight'] = 1/$vars['count']*100; + $vars['voteweight'] = round(1/$vars['count']*100); return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/voteweight.tpl'), $vars); } @@ -113,7 +113,8 @@ class default_bulletin extends SYSTEM\PAGE\Page { $user_vote = votes::getUserPollData($this->poll_ID); $vars = array(); - $vars['bars_party'] = $vars['bars_user'] = $vars['bars_bt'] = $vars['voice_weight'] = 'Vote to see results!'; + $vars['voice_weight'] = $vars['bars_user'] = $vars['bars_bt'] = ''; + $vars['bars_party'] = 'Erst nach der Abgabe deiner Stimme werden dir die daten angezeigt'; $vars['js'] = $this->js(); $vars['css'] = $this->css(); diff --git a/uVote/page/default_bulletin/table_bt.tpl b/uVote/page/default_bulletin/table_bt.tpl index d8b2f21..25ea9eb 100644 --- a/uVote/page/default_bulletin/table_bt.tpl +++ b/uVote/page/default_bulletin/table_bt.tpl @@ -1,4 +1,5 @@ -
+
+

Ergebnis Bundestag

${bt_pro}%
${bt_con}%
diff --git a/uVote/page/default_page/default_page.php b/uVote/page/default_page/default_page.php index 3171a59..0df425e 100644 --- a/uVote/page/default_page/default_page.php +++ b/uVote/page/default_page/default_page.php @@ -93,7 +93,7 @@ class default_page extends SYSTEM\PAGE\Page { foreach($uvote as $v){ $vote['uv'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote_uv.tpl'), array( 'badge' => self::badge_class($v['choice']), - 'perc' => $v['count'] > 0 ? $v['count']/$vote_count['count']*100 : 0)); + 'perc' => $v['count'] > 0 ? round($v['count']/$vote_count['count']*100, 2) : 0)); } } diff --git a/uVote/page/default_page/vote.tpl b/uVote/page/default_page/vote.tpl index eda761e..6dc3f69 100644 --- a/uVote/page/default_page/vote.tpl +++ b/uVote/page/default_page/vote.tpl @@ -11,10 +11,15 @@ ${bt} - -
+ + + uVote +
${uv} ${uv_count} +
+
+
diff --git a/uVote/page/default_page/vote_uv.tpl b/uVote/page/default_page/vote_uv.tpl index 0172bb6..10ec4d2 100644 --- a/uVote/page/default_page/vote_uv.tpl +++ b/uVote/page/default_page/vote_uv.tpl @@ -1 +1 @@ -${perc}%
\ No newline at end of file +${perc}% diff --git a/uVote/page/user_main_urVote/all_polls.tpl b/uVote/page/user_main_urVote/all_polls.tpl index 474008d..ffd7492 100644 --- a/uVote/page/user_main_urVote/all_polls.tpl +++ b/uVote/page/user_main_urVote/all_polls.tpl @@ -1,9 +1,8 @@ -
Deine Abstimmungsquote
-
-
Abgestimmt/
-
Offen
+
Aktueller Status
+
+ Teilnahme an aktuellen Abstimmungen
-
${voted}
-
${not_voted}
+
${vote_perc}%
+
\ 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 4fc1a7c..ddfb89c 100644 --- a/uVote/page/user_main_urVote/user_main_urVote.php +++ b/uVote/page/user_main_urVote/user_main_urVote.php @@ -8,8 +8,8 @@ class user_main_urVote extends SYSTEM\PAGE\Page { $v = $vars['voted']; $nv = $vars['not_voted']; return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/all_polls.tpl'), - array( 'vote_perc'=> round($v/($nv+$v)*100,0), - 'no_vote_perc'=> round($nv/($nv+$v)*100,0), + array( 'vote_perc'=> round($v/($nv+$v)*100, 2), + 'no_vote_perc'=> round($nv/($nv+$v)*100, 2), 'voted'=> $v, 'not_voted'=> $nv)); }