diff --git a/uVote/dbd/qq/UVOTE_GENERATE_VOTELIST.php b/uVote/dbd/qq/UVOTE_GENERATE_VOTELIST.php
index 3f4e2f4..d3e9339 100644
--- a/uVote/dbd/qq/UVOTE_GENERATE_VOTELIST.php
+++ b/uVote/dbd/qq/UVOTE_GENERATE_VOTELIST.php
@@ -7,5 +7,5 @@ class UVOTE_GENERATE_VOTELIST extends \SYSTEM\DB\QP {
//pg
'',
//mys
-'SELECT * FROM `uvote_votes` WHERE `group` = ?;'
+'SELECT * FROM `uvote_votes` WHERE `group` = ? ORDER BY (time_end-time_start) ASC;'
);}}
\ No newline at end of file
diff --git a/uVote/page/default_bulletin/default_bulletin.php b/uVote/page/default_bulletin/default_bulletin.php
index 84870b0..57f0d4d 100644
--- a/uVote/page/default_bulletin/default_bulletin.php
+++ b/uVote/page/default_bulletin/default_bulletin.php
@@ -65,7 +65,7 @@ class default_bulletin extends SYSTEM\PAGE\Page {
default: array('','','');
}
- return '
Stimme hier ab
+ return 'Ändere deine bereits abgegebene Stimme hier ab
tablerow_class(votes::getUserPollData($vote['ID']));
- $vote['full_vote_btn'] = (strtotime($vote['time_end'])- microtime(true)) > 0 ? 'Abstimmen' : 'Ansehen';
- $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote.tpl'), $vote);
+ $vote['full_vote_btn'] = $time_remain > 0 ? 'Abstimmen' : 'Ansehen';
+ $vote['time_left'] = round($time_remain/($time_span+1)*100,0);
+ $vote['time_done'] = 100-$vote['time_left'];
+ if($time_remain > 0){
+ $result[0] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote.tpl'), $vote);
+ } else {
+ $result[1] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote.tpl'), $vote);
+ }
}
- return $result;
+ return $result[0].$result[1];
}
-// public function generate_vote(){
-// $result = "";
-// $votes = votes::getAllVotesOfGroup(1);
-//
-// foreach($votes as $vote){
-// new INFO (print_r($vote, TRUE));
-// $vars = array('vote_title' => $vote['title'], 'vote_text' => $vote['text'], 'vote_init' => $vote['initiative'], 'poll_ID' => $vote['ID'], 'time_end' => $vote['time_end'], 'iframe_link' => $vote['iframe_link']);
-// $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/full_vote.tpl'), $vars);
-//
-// }
-// return $result;
-// }
-
public function get_coverpage(){
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/cover.tpl'), array());}
@@ -74,7 +69,6 @@ class default_page extends SYSTEM\PAGE\Page {
$vars['js'] = $this->js();
$vars['css'] = $this->css();
$vars['votelist'] = \SYSTEM\SECURITY\Security::isLoggedIn() ? $this->generate_votelist() : $this->get_coverpage() ;
-// $vars['vote'] = $this->generate_vote();
$vars['registerform'] = \SYSTEM\SECURITY\Security::isLoggedIn() ? $this->getloggedinform() : $this->exchange_registerform();
$vars['loginform'] = \SYSTEM\SECURITY\Security::isLoggedIn() ? $this->exchange_loginform() : $this->getloginform() ;
$vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id=';
diff --git a/uVote/page/default_page/vote.tpl b/uVote/page/default_page/vote.tpl
index 0c0a28a..055e262 100644
--- a/uVote/page/default_page/vote.tpl
+++ b/uVote/page/default_page/vote.tpl
@@ -7,5 +7,11 @@
Nr.${ID}
|
+
+
+ |