diff --git a/uVote/api/votes/votes.php b/uVote/api/votes/votes.php
index 463be9a..97a464e 100644
--- a/uVote/api/votes/votes.php
+++ b/uVote/api/votes/votes.php
@@ -77,6 +77,9 @@ class votes {
return $res;
}
+ public static function get_user_temp_votes($user_ID){
+ return \DBD\UVOTE_DATA_TEMP_VOTES::Q1(array($user_ID, $user_ID, $user_ID));}
+
public static function get_bar_bt_per_poll($poll_ID){
return \DBD\UVOTE_DATA_BT_PER_POLL::Q1(array($poll_ID));}
diff --git a/uVote/dbd/qq/UVOTE_DATA_COUNT_VOTES.php b/uVote/dbd/qq/UVOTE_DATA_COUNT_VOTES.php
deleted file mode 100644
index a0348f0..0000000
--- a/uVote/dbd/qq/UVOTE_DATA_COUNT_VOTES.php
+++ /dev/null
@@ -1,11 +0,0 @@
-
+
- uVote
- urVote
diff --git a/uVote/page/user_main_uVote/user_main_uVote.php b/uVote/page/user_main_uVote/user_main_uVote.php
index 16515ee..237db0e 100644
--- a/uVote/page/user_main_uVote/user_main_uVote.php
+++ b/uVote/page/user_main_uVote/user_main_uVote.php
@@ -37,7 +37,7 @@ class user_main_uVote extends SYSTEM\PAGE\Page {
$vote['bt_choice'] = 'ENTH';
break;
case 0:
- $vote['bt_choice'] = 'OPEN';
+ $vote['bt_choice'] = 'OFFEN';
}
//$vote['count'];
//$vote['choice'];
diff --git a/uVote/page/user_main_urVote/all_polls.tpl b/uVote/page/user_main_urVote/all_polls.tpl
index cc8476c..ee3c9f4 100644
--- a/uVote/page/user_main_urVote/all_polls.tpl
+++ b/uVote/page/user_main_urVote/all_polls.tpl
@@ -1 +1,7 @@
-${poll_compare}
\ No newline at end of file
+Deine aktuelle Abstimmungsquote
+Abgestimmt/
+Offene Abstimmungen
+
\ No newline at end of file
diff --git a/uVote/page/user_main_urVote/urVote.tpl b/uVote/page/user_main_urVote/urVote.tpl
index 3fa6692..e4d58bb 100644
--- a/uVote/page/user_main_urVote/urVote.tpl
+++ b/uVote/page/user_main_urVote/urVote.tpl
@@ -1,18 +1,21 @@
-
-
+
+
${urVote_title}
+
+ border-spacing: 10px 5px; width: 350px;">
- ${urVote_title}
-
-
-
- ${urVote_user_party_compare}
+ ${urVote_user_party_compare}
${choices_user_ID}
${choices_bt_to_user}
-
-
\ No newline at end of file
+
+
+
+ ${user_temp_votes}
+
+
+
+
\ 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 0fb2d47..1261ccc 100644
--- a/uVote/page/user_main_urVote/user_main_urVote.php
+++ b/uVote/page/user_main_urVote/user_main_urVote.php
@@ -1,11 +1,13 @@
id);
+ $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)));
}
private function user_to_bt(){
@@ -22,7 +24,7 @@ class user_main_urVote extends SYSTEM\PAGE\Page {
while($row = $res->next()){
$row['match_percentage'] = round($row['class_MATCH']/($row['class_MATCH']+$row['class_MISSMATCH']+1)*100,2);
- $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/bt_to_user_overall.tpl'), $row);;
+ $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/bt_to_user_overall.tpl'), $row);
}
return $result;
$row['votes_cast'] = round(($row['class_MATCH']+$row['class_MISSMATCH']),2);
@@ -54,6 +56,7 @@ class user_main_urVote extends SYSTEM\PAGE\Page {
$vars['choices_user_ID'] = $this->user_per_party_overall();
$vars['choices_bt_to_user'] = $this->user_to_bt();
$vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id=';
+ $vars['user_temp_votes'] = $this->user_temp_votes();
$vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
$vars = array_merge($vars, \SYSTEM\locale::getStrings(150));
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_urVote/urVote.tpl'),$vars);