diff --git a/uvote/api/votes/votes.php b/uvote/api/votes/votes.php index 319e8d9..0e29d89 100644 --- a/uvote/api/votes/votes.php +++ b/uvote/api/votes/votes.php @@ -18,7 +18,7 @@ class votes { public static function getUserPollData($poll_ID){ if (!\SYSTEM\SECURITY\Security::isLoggedIn()){ return NULL;} - $con = new \SYSTEM\DB\Connection(new \SQL\uVote()); + $con = new \SYSTEM\DB\Connection(); $res = $con->prepare( 'selVoteByGrp', 'SELECT * FROM `uvote_data` WHERE `user_ID` = ? AND poll_ID = ?;', array(\SYSTEM\SECURITY\Security::getUser()->id,$poll_ID)); @@ -27,7 +27,7 @@ class votes { } public static function get_barsperusers($poll_ID,$return_as_json = true){ - $con = new \SYSTEM\DB\Connection(new \SQL\uVote()); + $con = new \SYSTEM\DB\Connection(); //count $res = $con->prepare( 'selVoteBy_count', 'SELECT COUNT(*) as "count" FROM `uvote_data` WHERE `poll_ID` = ?;', @@ -73,7 +73,7 @@ class votes { } public static function get_user_temp_votes($user_ID){ - return \SQL\UVOTE_DATA_TEMP_VOTES::Q1(array($user_ID, $user_ID, $user_ID));} + return \SQL\UVOTE_DATA_TEMP_VOTES::Q1(array($user_ID, $user_ID));} public static function get_user_overall_votes($user_ID, $creationDate){ return \SQL\UVOTE_DATA_OVERALL_VOTES::Q1(array($user_ID, $user_ID, $user_ID, $creationDate));} @@ -113,7 +113,7 @@ class votes { return \SQL\UVOTE_DATA_USERS_CHOICE_PER_POLL::QA(array($poll_ID));} public static function get_voteinfo($poll_ID){ - $con = new \SYSTEM\DB\Connection(new \SQL\uVote()); + $con = new \SYSTEM\DB\Connection(); $res = $con->prepare( 'selVoteByID', 'SELECT * FROM `uvote_votes` WHERE `ID` = ?;', array($poll_ID)); @@ -131,7 +131,7 @@ class votes { } public static function write_vote($poll_ID, $vote){ - $con = new \SYSTEM\DB\Connection(new \SQL\uVote()); + $con = new \SYSTEM\DB\Connection(); $res = $con->prepare( 'selVote', 'SELECT * FROM `uvote_votes` WHERE `ID` = ?;', array($poll_ID)); @@ -156,7 +156,7 @@ class votes { if(!\SYSTEM\SECURITY\Security::isLoggedIn()){ throw new ERROR("You need to be logged in.");} - $con = new \SYSTEM\DB\Connection(new \SQL\uVote()); + $con = new \SYSTEM\DB\Connection(); $res = $con->prepare( 'insertFeedback', 'INSERT INTO uvote_beta_feedback VALUES (?, ?);', diff --git a/uvote/page/default_page/css/vote.css b/uvote/page/default_page/css/vote.css index 7ab7d22..2a35caf 100644 --- a/uvote/page/default_page/css/vote.css +++ b/uvote/page/default_page/css/vote.css @@ -1,5 +1,6 @@ #vote_main { - padding: 5px; + padding: 5px; + margin: 5px; width: 100%; border: solid lightgray 3px; } diff --git a/uvote/page/user_main_analysis/tpl/bt_to_user_overall.tpl b/uvote/page/user_main_analysis/tpl/bt_to_user_overall.tpl index cd2c1f8..5bc3461 100644 --- a/uvote/page/user_main_analysis/tpl/bt_to_user_overall.tpl +++ b/uvote/page/user_main_analysis/tpl/bt_to_user_overall.tpl @@ -3,6 +3,6 @@ ${class_MATCH} - ${class_MISSMATCH} + ${class_MISSMATCH} ${match_percentage} \ No newline at end of file diff --git a/uvote/page/user_main_analysis/tpl/overall_all_polls.tpl b/uvote/page/user_main_analysis/tpl/overall_all_polls.tpl index c31d252..5b8d088 100644 --- a/uvote/page/user_main_analysis/tpl/overall_all_polls.tpl +++ b/uvote/page/user_main_analysis/tpl/overall_all_polls.tpl @@ -2,7 +2,7 @@ Abstimmungsquote seit Accounterstellung
${vote_perc}%
-
+
Teilgenommen: ${voted}, diff --git a/uvote/page/user_main_analysis/tpl/user_main_analysis.tpl b/uvote/page/user_main_analysis/tpl/user_main_analysis.tpl index 93bda58..cef22ff 100644 --- a/uvote/page/user_main_analysis/tpl/user_main_analysis.tpl +++ b/uvote/page/user_main_analysis/tpl/user_main_analysis.tpl @@ -22,7 +22,6 @@ border-spacing: 10px 5px; width: 350px;">
${urVote_user_party_compare}
- ${urvote_user_party_compare_sub} ${choices_user_ID} diff --git a/uvote/page/user_main_analysis/user_main_analysis.php b/uvote/page/user_main_analysis/user_main_analysis.php index be67e09..5f0a2d2 100644 --- a/uvote/page/user_main_analysis/user_main_analysis.php +++ b/uvote/page/user_main_analysis/user_main_analysis.php @@ -11,8 +11,8 @@ class user_main_analysis extends SYSTEM\PAGE\Page { 'not_voted'=> $nv)); } - private function user_temp_votes (){ - $vars = votes::get_user_temp_votes(\SYSTEM\SECURITY\Security::getUser()->id); + public static function user_temp_votes (){ + $vars = votes::get_user_temp_votes(\SYSTEM\SECURITY\Security::getUser()->id, \SYSTEM\SECURITY\Security::getUser()->id); $v = $vars['voted']; $nv = $vars['not_voted']; print_r($vars, true); @@ -87,7 +87,7 @@ class user_main_analysis extends SYSTEM\PAGE\Page { break; case 2: $vote['choice'] = 'CON'; - $vote['badge_color'] = 'badge-important'; + $vote['badge_color'] = 'badge-alert'; break; case 3: $vote['choice'] = 'ENT'; @@ -111,7 +111,7 @@ class user_main_analysis extends SYSTEM\PAGE\Page { break; case 2: $vote['bt_choice'] = 'CON'; - $vote['badge_color'] = 'badge-important'; + $vote['badge_color'] = 'badge-alert'; break; case 3: $vote['bt_choice'] = 'ENT'; @@ -120,8 +120,6 @@ class user_main_analysis extends SYSTEM\PAGE\Page { case 0: $vote['bt_choice'] = 'OFFEN'; } - //$vote['count']; - //$vote['choice']; $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/votecountchoicebt.tpl'),$vote); } return $result; diff --git a/uvote/page/user_main_poll/js/user_main_poll.js b/uvote/page/user_main_poll/js/user_main_poll.js index 98bbf96..8b64bb1 100644 --- a/uvote/page/user_main_poll/js/user_main_poll.js +++ b/uvote/page/user_main_poll/js/user_main_poll.js @@ -1,11 +1,11 @@ function init_user_main_poll(){ - $('.btnvote_yes').click(function () { + $('#btnvote_yes').click(function () { vote_click($(this).attr('poll_ID'),1); }); - $('.btnvote_no').click(function () { + $('#btnvote_no').click(function () { vote_click($(this).attr('poll_ID'),2); }); - $('.btnvote_off').click(function () { + $('#btnvote_off').click(function () { vote_click($(this).attr('poll_ID'),3); }); diff --git a/uvote/page/user_main_poll/user_main_poll.php b/uvote/page/user_main_poll/user_main_poll.php index 56a87ef..e846ee1 100644 --- a/uvote/page/user_main_poll/user_main_poll.php +++ b/uvote/page/user_main_poll/user_main_poll.php @@ -112,20 +112,18 @@ class user_main_poll extends SYSTEM\PAGE\Page { if($poll_expired){ if(!$user_poll){ return '
Stimme hier ab
- Pro - Pro + + ';} $classes = array('','',''); switch($user_poll){ case 1: $classes = array('btn-success disabled','btn-danger','btn-info'); break; @@ -135,20 +133,20 @@ class user_main_poll extends SYSTEM\PAGE\Page { } return '
Ändere deine Stimme hier ab
- Pro - Pro + + '; } else { return 'ye soon to come infos'; @@ -158,8 +156,8 @@ class user_main_poll extends SYSTEM\PAGE\Page { $var = votes::get_voteinfo($this->poll_ID); return $var['iframe_link']; } - private function js(){ - return \SYSTEM\HTML\html::link(\SYSTEM\WEBPATH(new \PPAGE(),'default_bulletin/js/vote.js'));} + public static function js(){ + return array(\SYSTEM\WEBPATH(new \PPAGE(),'user_main_poll/js/user_main_poll.js'));} private function css(){ return \SYSTEM\HTML\html::link(\SYSTEM\WEBPATH(new \PPAGE(),'default_bulletin\css\bars_user.css')). \SYSTEM\HTML\html::link(\SYSTEM\WEBPATH(new \PPAGE(),'default_bulletin\css\bulletin.css')). diff --git a/uvote/page/user_main_votelist/tpl/user_main_votelist.tpl b/uvote/page/user_main_votelist/tpl/user_main_votelist.tpl index 7e4b4ed..96c5373 100644 --- a/uvote/page/user_main_votelist/tpl/user_main_votelist.tpl +++ b/uvote/page/user_main_votelist/tpl/user_main_votelist.tpl @@ -1,8 +1,25 @@
-
- ${welcome_text} - +
+
+
+
+

+ uvote +

+
+
+ ${welcome_text} +
+
+ +
+ + +
+
+ ${user_temp_votes} ${user_count} Nutzer auf uVote +
${votelist} \ No newline at end of file diff --git a/uvote/page/user_main_votelist/tpl/vote.tpl b/uvote/page/user_main_votelist/tpl/vote.tpl index c2fd763..9dbabfe 100644 --- a/uvote/page/user_main_votelist/tpl/vote.tpl +++ b/uvote/page/user_main_votelist/tpl/vote.tpl @@ -2,12 +2,13 @@
-
- ${title} +
+ ${full_vote_btn} +
-
- ${full_vote_btn} +
+ ${title}
diff --git a/uvote/page/user_main_votelist/user_main_votelist.php b/uvote/page/user_main_votelist/user_main_votelist.php index 40b127b..1ae2b04 100644 --- a/uvote/page/user_main_votelist/user_main_votelist.php +++ b/uvote/page/user_main_votelist/user_main_votelist.php @@ -111,8 +111,9 @@ class user_main_votelist extends SYSTEM\PAGE\Page { public function html(){ $vars = array(); $vars['votelist'] = $this->generate_votelist(); - $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=files&cat=frontend_logos&id='; + $vars['frontend_logos'] = './api.php?call=files&cat=frontend_logos&id='; $vars['user_count'] = $this->user_count(); + $vars['user_temp_votes'] = user_main_analysis::user_temp_votes(); $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote_register')); $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote')); return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_votelist/tpl/user_main_votelist.tpl'), $vars); diff --git a/uvote/sql/db/uVote.php b/uvote/sql/db/uVote.php deleted file mode 100644 index e0c222e..0000000 --- a/uvote/sql/db/uVote.php +++ /dev/null @@ -1,8 +0,0 @@ - NOW();' +'SELECT +-- uvdata.user_ID as uid, uvote_votes.ID as ID +SUM(CASE WHEN user_ID = ? THEN 1 ELSE 0 END) as voted, +SUM(CASE WHEN user_ID is NULL THEN 1 ELSE 0 END) AS not_voted +FROM uvote_votes +LEFT JOIN (SELECT * FROM uvote_data WHERE uvote_data.user_ID = ?) as uvdata +ON uvdata.poll_ID = uvote_votes.ID' ;}}