diff --git a/uvote/api/votes/bars.php b/uvote/api/votes/bars.php index 396187e..0557e3e 100644 --- a/uvote/api/votes/bars.php +++ b/uvote/api/votes/bars.php @@ -37,7 +37,6 @@ class bars{ $result .= $p['title']."
"; } $result .= "
"; - new INFO($result); return $result; } public static function user_per_party_by_choicetype($choice){ diff --git a/uvote/api/votes/lists.php b/uvote/api/votes/lists.php index c31cc72..3e09aa7 100644 --- a/uvote/api/votes/lists.php +++ b/uvote/api/votes/lists.php @@ -6,48 +6,19 @@ class lists{ foreach($votes as $vote){ $time_remain = strtotime($vote['time_end'])- microtime(true); $time_span = strtotime($vote['time_end']) - strtotime($vote['time_start']); - $vote_count = votes::get_count_user_votes_per_poll($vote['ID']); - -// $vote['title'] = utf8_encode($vote['title']); + $vote_count = votes::get_count_user_votes_per_poll($vote['ID']); $vote['time_left'] = round($time_remain/($time_span+1)*100,0); $vote['time_done'] = 100-$vote['time_left']; - $vote['full_vote_btn'] = $time_remain > 0 ? 'Abstimmen' : 'Ansehen'; $vote['uv'] = $vote['bt'] = ''; $vote['uv_count'] = $vote_count['count'] > 4 ? $vote_count['count'] : '< 5'; - $user_vote = votes::getUserPollData($vote['ID']); $vote['vote_class'] = switchers::tablerow_class($user_vote); - if($user_vote){ - //user vote - $vote['vote_class'] = switchers::tablerow_class($user_vote); - - //bt vote - $party_votes = votes::get_barsperparty($vote['ID']); - $vote['bt_vote_class'] = switchers::tablerow_class($vote['bt_choice']); - foreach($party_votes as $pv){ - $vote['bt'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_votelist/tpl/vote_bt.tpl'), - array( 'party' => $pv['party'], - 'choice' => switchers::get_party_per_poll($pv['choice']), - 'choice_class' => switchers::badge_class($pv['choice']))); - } - - //uvote vote - $uvote = votes::get_users_choice_per_poll($vote['ID']); - $vote['uv_vote_class'] = count($uvote) > 0 ? switchers::tablerow_class($uvote[0]['choice']) : ''; - foreach($uvote as $v){ - $vote['uv'] .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/vote_uv.tpl'), - array( 'badge' => switchers::badge_class($v['choice']), - 'perc' => $v['count'] > 0 ? round($v['count']/$vote_count['count']*100, 2) : 0)); - } - } - - //new panels: - $vote['panel_class'] = switchers::panel_class($user_vote); - - if($time_remain > 0){ + if($time_remain > 0){ + $vote['statusmarker'] = 'aktuell'; $result[0] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_votelist/tpl/vote.tpl'), $vote); } else { + $vote['statusmarker'] = 'vergangen'; $result[1] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_votelist/tpl/vote.tpl'), $vote); } } diff --git a/uvote/api/votes/votes.php b/uvote/api/votes/votes.php index c3a123c..60fb001 100644 --- a/uvote/api/votes/votes.php +++ b/uvote/api/votes/votes.php @@ -77,12 +77,11 @@ class votes { public static function get_user_temp_votes(){ $vars = \SQL\UVOTE_DATA_TEMP_VOTES::Q1(array(\SYSTEM\SECURITY\Security::getUser()->id, \SYSTEM\SECURITY\Security::getUser()->id)); - $v = $vars['voted']; + $v = $vars['voted'] > 1 ? $vars['voted'] : 1; $nv = $vars['not_voted']; - print_r($vars, true); return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/all_polls.tpl'), - array( 'vote_perc'=> round($v/(($nv+$v)*100+1), 2), - 'no_vote_perc'=> round($nv/(($nv+$v)*100+1), 2), + array( 'vote_percent'=> round($v/(($nv+$v)*100+1), 2), + 'no_vote_percent'=> round($nv/(($nv+$v)*100+1), 2), 'voted'=> $v, 'not_voted'=> $nv));} diff --git a/uvote/page/user_main_analysis/tpl/all_polls.tpl b/uvote/page/user_main_analysis/tpl/all_polls.tpl index 8911b40..704c8d7 100644 --- a/uvote/page/user_main_analysis/tpl/all_polls.tpl +++ b/uvote/page/user_main_analysis/tpl/all_polls.tpl @@ -7,8 +7,7 @@
Teilnahme an aktuellen Abstimmungen
-
${vote_perc}%
-
+
${vote_percent}%
Teilgenommen: ${voted}, nicht Teilgenommen: ${not_voted} diff --git a/uvote/page/user_main_votelist/tpl/vote.tpl b/uvote/page/user_main_votelist/tpl/vote.tpl index 855e636..7bc3b85 100644 --- a/uvote/page/user_main_votelist/tpl/vote.tpl +++ b/uvote/page/user_main_votelist/tpl/vote.tpl @@ -3,14 +3,15 @@
- Abstimmen - - +   Abstimmen
-
+
${title} -
- +
+
+ + ${statusmarker} +
diff --git a/uvote/sai/saimod_uvote_vote_edit/main.tpl b/uvote/sai/saimod_uvote_vote_edit/main.tpl index e388a05..5307f2d 100644 --- a/uvote/sai/saimod_uvote_vote_edit/main.tpl +++ b/uvote/sai/saimod_uvote_vote_edit/main.tpl @@ -27,7 +27,7 @@ - 00:00

bt choice



- Submit + Submit
diff --git a/uvote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.js b/uvote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.js index fdaf697..3ff417f 100644 --- a/uvote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.js +++ b/uvote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.js @@ -4,8 +4,9 @@ $('.bt_data_submit').click(function() { var title = $('#' + poll_ID + '_vote_title').val(); var time_end = $('#' + poll_ID + '_time_end').val(); var iframe_link = $('#' + poll_ID + '_iframe_link').val(); + var bt_choice = $('#' + poll_ID + '_bt_choice').val(); var tags = JSON.stringify($('#' + poll_ID + '_tags').val().split(',').map(function(s) { return s.trim() })); - var data = {poll_ID: poll_ID, title: title, time_end: time_end, iframe_link: iframe_link}; + var data = {poll_ID: poll_ID, title: title, time_end: time_end, iframe_link: iframe_link, bt_choice: bt_choice}; $.getJSON('./sai.php?sai_mod=.SAI.saimod_uvote_vote_edit&action=edit_vote&data=' + JSON.stringify(data) + '&tags=' + tags, function(data) { var items = []; if(data.status == true){ @@ -15,8 +16,8 @@ $('.bt_data_submit').click(function() { } }); }); -}; -$('.bt_partydata_submit').click(function() { + + $('.bt_partydata_submit').click(function() { var poll_ID = $(this).attr('poll_ID'); var party = $('#input_party').val(); var votes_pro = $('#input_pro').val(); @@ -34,6 +35,8 @@ $('.bt_partydata_submit').click(function() { } }); }); +}; + diff --git a/uvote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.php b/uvote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.php index 5f9b257..bbc7627 100644 --- a/uvote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.php +++ b/uvote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.php @@ -54,7 +54,7 @@ class saimod_uvote_vote_edit extends \SYSTEM\SAI\SaiModule { \SYSTEM\PAGE\text::save($data['title'], $data['title'], 'deDE', $tags, 'blanc'); return \SQL\UVOTE_DATA_NEW_POLL::QA(array($data['title'], $data['time_end'], $data['iframe_link'])); } - return \SQL\UVOTE_DATA_EDIT_POLL::QA(array($data['poll_ID'], $data['title'], $data['time_end'], $data['iframe_link'])); + return \SQL\UVOTE_DATA_EDIT_POLL::QA(array($data['poll_ID'], $data['title'], $data['time_end'], $data['iframe_link'], $data['bt_choice'])); } public static function sai_mod__SAI_saimod_uvote_vote_edit_action_edit_partydata($data_json){ diff --git a/uvote/sql/qq/UVOTE_DATA_TEMP_VOTES.php b/uvote/sql/qq/UVOTE_DATA_TEMP_VOTES.php index 1f0f5d5..f9c8804 100644 --- a/uvote/sql/qq/UVOTE_DATA_TEMP_VOTES.php +++ b/uvote/sql/qq/UVOTE_DATA_TEMP_VOTES.php @@ -10,5 +10,5 @@ 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' +ON uvdata.poll_ID = uvote_votes.ID WHERE uvote_votes.time_end > NOW();' ;}}