From 14d3de26a76ebdc207467fce5300418c5b748eb6 Mon Sep 17 00:00:00 2001 From: Naeltard Date: Tue, 20 Oct 2015 12:57:33 +0200 Subject: [PATCH] new api for analysis reloadable complete for analysis --- uvote/api/api_uvote.php | 10 +- uvote/api/votes/bars.php | 117 ++-- uvote/api/votes/stats_basic.php | 4 +- uvote/api/votes/stats_bilance.php | 46 ++ uvote/api/votes/stats_bilance_choice.php | 34 ++ uvote/api/votes/switchers.php | 18 + uvote/api/votes/votes.php | 9 +- .../js/user_main_analysis.js | 81 ++- .../tpl/{ => tab_basic}/bt_total.tpl | 0 .../overall_votes.tpl} | 0 .../tpl/tab_basic/tab_basic_bt.tpl | 3 +- .../tpl/tab_basic/tab_basic_user.tpl | 51 +- .../temp_votes.tpl} | 0 .../tpl/{ => tab_basic}/user_total.tpl | 8 +- .../tpl/{ => tab_basic}/uvote_total.tpl | 0 .../bars_community.tpl} | 17 +- .../bars_user.tpl} | 15 +- .../bars_user_bt.tpl} | 0 .../tpl/tab_bilance/bars_user_frame.tpl | 1 + .../tpl/tab_bilance/tab_bilance_bt.tpl | 12 + .../tpl/tab_bilance/tab_bilance_community.tpl | 13 + .../tpl/tab_bilance/tab_bilance_user.tpl | 30 + .../tpl/tab_bilance/tab_bilance_user_bt.tpl | 12 + .../bars_user.tpl} | 0 .../tab_bilance_choice_user_bt.tpl | 15 + .../tab_bilance_choice_user_party.tpl | 37 ++ .../urvotebt_by_choice.tpl | 0 .../tpl/user_main_analysis.tpl | 513 +++++++----------- .../user_main_analysis/user_main_analysis.php | 19 +- uvote/page/user_main_poll/tpl/full_vote.tpl | 18 +- uvote/page/user_main_poll/user_main_poll.php | 24 +- uvote/sql/qq/UVOTE_DATA_USER_BILANCE.php | 12 + .../sql/qq/UVOTE_DATA_USER_CHOICE_OVERALL.php | 6 +- 33 files changed, 601 insertions(+), 524 deletions(-) create mode 100644 uvote/api/votes/stats_bilance.php create mode 100644 uvote/api/votes/stats_bilance_choice.php rename uvote/page/user_main_analysis/tpl/{ => tab_basic}/bt_total.tpl (100%) rename uvote/page/user_main_analysis/tpl/{overall_all_polls.tpl => tab_basic/overall_votes.tpl} (100%) rename uvote/page/user_main_analysis/tpl/{all_polls.tpl => tab_basic/temp_votes.tpl} (100%) rename uvote/page/user_main_analysis/tpl/{ => tab_basic}/user_total.tpl (85%) rename uvote/page/user_main_analysis/tpl/{ => tab_basic}/uvote_total.tpl (100%) rename uvote/page/user_main_analysis/tpl/{urvoteparties.tpl => tab_bilance/bars_community.tpl} (55%) rename uvote/page/user_main_analysis/tpl/{uvoteparties.tpl => tab_bilance/bars_user.tpl} (50%) rename uvote/page/user_main_analysis/tpl/{bt_to_user_overall.tpl => tab_bilance/bars_user_bt.tpl} (100%) create mode 100644 uvote/page/user_main_analysis/tpl/tab_bilance/bars_user_frame.tpl create mode 100644 uvote/page/user_main_analysis/tpl/tab_bilance/tab_bilance_bt.tpl create mode 100644 uvote/page/user_main_analysis/tpl/tab_bilance/tab_bilance_community.tpl create mode 100644 uvote/page/user_main_analysis/tpl/tab_bilance/tab_bilance_user.tpl create mode 100644 uvote/page/user_main_analysis/tpl/tab_bilance/tab_bilance_user_bt.tpl rename uvote/page/user_main_analysis/tpl/{urvoteparties_by_choice.tpl => tab_bilance_choice/bars_user.tpl} (100%) create mode 100644 uvote/page/user_main_analysis/tpl/tab_bilance_choice/tab_bilance_choice_user_bt.tpl create mode 100644 uvote/page/user_main_analysis/tpl/tab_bilance_choice/tab_bilance_choice_user_party.tpl rename uvote/page/user_main_analysis/tpl/{ => tab_bilance_choice}/urvotebt_by_choice.tpl (100%) create mode 100644 uvote/sql/qq/UVOTE_DATA_USER_BILANCE.php diff --git a/uvote/api/api_uvote.php b/uvote/api/api_uvote.php index cd4e32a..fdc6e93 100644 --- a/uvote/api/api_uvote.php +++ b/uvote/api/api_uvote.php @@ -49,7 +49,15 @@ class api_uvote extends \SYSTEM\API\api_system { return comments::write_commentrate($c_ID, $val);} public static function call_load_tab($set, $cat){ - return stats_basic::basic($cat); + if($set == 'basic'){ + return stats_basic::basic_basic($cat); + } + if($set == 'bilance'){ + return stats_bilance::basic_bilance($cat); + } + if($set == 'bilance_choice'){ + return stats_bilance_choice::basic_bilance_choice($cat); + } } } diff --git a/uvote/api/votes/bars.php b/uvote/api/votes/bars.php index 2f17e25..144fe4e 100644 --- a/uvote/api/votes/bars.php +++ b/uvote/api/votes/bars.php @@ -1,12 +1,13 @@ 0 ? round($vars['user_total_pro']/$vars['user_total_total']*100) : 0; - $vars['user_total_con_percentage'] = $vars['user_total_total'] > 0 ? round($vars['user_total_con']/$vars['user_total_total']*100) : 0; - $vars['user_total_ent_percentage'] = $vars['user_total_total'] > 0 ? round($vars['user_total_ent']/$vars['user_total_total']*100) : 0; - return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/user_total.tpl'),$vars); + $vars['total_total'] = $vars['total_pro'] + $vars['total_con'] + $vars['total_ent']; + $vars['total_pro_percentage'] = $vars['total_total'] > 0 ? round($vars['total_pro']/$vars['total_total']*100) : 0; + $vars['total_con_percentage'] = $vars['total_total'] > 0 ? round($vars['total_con']/$vars['total_total']*100) : 0; + $vars['total_ent_percentage'] = $vars['total_total'] > 0 ? round($vars['total_ent']/$vars['total_total']*100) : 0; + return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_basic/user_total.tpl'),$vars); } public static function get_uvote_choice_overall(){ $vars = \SQL\UVOTE_DATA_CHOICE_OVERALL::Q1(array()); @@ -15,7 +16,7 @@ class bars{ $vars['total_con_percentage'] = round($vars['con']/$vars['total_total']*100+1); $vars['total_ent_percentage'] = round($vars['ent']/$vars['total_total']*100+1); new SYSTEM\LOG\INFO($vars['total_ent_percentage']); - return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/uvote_total.tpl'),$vars); + return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_basic/uvote_total.tpl'),$vars); } public static function get_bt_choice_overall(){ $vars = \SQL\UVOTE_DATA_CHOICE_BT_OVERALL::Q1(array()); @@ -24,46 +25,36 @@ class bars{ $vars['total_con_percentage'] = round($vars['con']/$vars['total_total']*100+1); $vars['total_ent_percentage'] = round($vars['ent']/$vars['total_total']*100+1); new SYSTEM\LOG\INFO($vars['total_ent_percentage']); - return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/bt_total.tpl'),$vars); + return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_basic/bt_total.tpl'),$vars); } - public static function get_uvote_choice_overall_to_bt(){ + public static function bilance_community(){ $result = ''; $vars = \SQL\UVOTE_DATA_UVOTE_TO_PARTY_OVERALL::QA(array()); foreach($vars as $bar){ $bar['match_percentage'] = round($bar['class_MATCH']/($bar['class_MATCH']+$bar['class_MISSMATCH'])*100,2); - $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/urvoteparties.tpl'), $bar); + $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_bilance/bars_community.tpl'), $bar); } return $result; } - public static function get_bt_choice_overall_to_bt(){ + public static function bilance_bt(){ $result = ''; $vars = \SQL\UVOTE_DATA_BT_TO_PARTY_OVERALL::QA(array()); foreach($vars as $bar){ $bar['match_percentage'] = round($bar['class_MATCH']/($bar['class_MATCH']+$bar['class_MISSMATCH'])*100,2); - $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/urvoteparties.tpl'), $bar); + $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_bilance/bars_community.tpl'), $bar); } return $result; } - public static function user_per_party_overall(){ - //$vars = votes::get_user_per_party_overall(array(\SYSTEM\SECURITY\Security::getUser()->id)); + public static function bilance_user(){ $result = ''; - $con = new \SYSTEM\DB\Connection(); - $res = $con->prepare( 'test', - 'SELECT party, sum(case when uvote_data.choice = uvote_votes_per_party.choice then 1 else 0 end) class_MATCH, - sum(case when uvote_data.choice != uvote_votes_per_party.choice then 1 else 0 end) class_MISSMATCH - FROM uvote_data INNER JOIN uvote_votes_per_party - ON uvote_data.poll_ID = uvote_votes_per_party.poll_ID - WHERE user_ID = ? GROUP BY party;', - array(\SYSTEM\SECURITY\Security::getUser()->id)); - $i = 0; - while($row = $res->next()){ - - $res2 = votes::vote_accord_with_party($row['party']); - $row['according_laws'] = self::build_according_law_html($res2, $row['party']); + $res = \SQL\UVOTE_DATA_USER_BILANCE::QA(array(\SYSTEM\SECURITY\Security::getUser()->id)); + foreach($res as $row){ + //$res2 = votes::vote_accord_with_party($row['party']); + //$row['according_laws'] = self::build_according_law_html($res2, $row['party']); $row['match_percentage'] = round($row['class_MATCH']/($row['class_MATCH']+$row['class_MISSMATCH'])*100,2); - $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/urvoteparties.tpl'), $row); + $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_bilance/bars_user.tpl'), $row); } - return $result; + return $result; } public static function build_according_law_html($part, $party){ $part = json_decode($part, true); @@ -74,7 +65,7 @@ class bars{ $result .= "
"; return $result; } - public static function user_per_party_by_choicetype($choice){ + public static function bilance_choice_user_party($choice){ $bar = switchers::bar_class($choice); $result = ''; $con = new \SYSTEM\DB\Connection(); @@ -85,35 +76,19 @@ class bars{ ON uvote_data.poll_ID = uvote_votes_per_party.poll_ID WHERE user_ID = ? AND uvote_votes_per_party.choice = ? GROUP BY party;', array(\SYSTEM\SECURITY\Security::getUser()->id, $choice)); - $i = 0; while($row = $res->next()){ $row['match_percentage'] = round($row['class_MATCH']/($row['class_MATCH']+$row['class_MISSMATCH'])*100,2); $row['bar'] = $bar; - $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/urvoteparties_by_choice.tpl'), $row);; + $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_bilance_choice/bars_user.tpl'), $row);; } if(empty($result)){ return 'Keine relevanten Daten verfügbar'; } - return $result; } - public static function user_per_bt_by_choicetype($choice){ - switch($choice){ - case 1: - $bar = 'progress-bar-success'; - $icon_type = 'pro'; - break; - case 2: - $bar = 'progress-bar-danger'; - $icon_type = 'con'; - break; - case 3: - $bar = 'progress-bar-info'; - $icon_type = 'ent'; - break; - case 0: - $bar = 'progress-bar'; - } + public static function bilance_choice_user_bt($choice){ + $bar = switchers::bar_class($choice); + $icon_type = switchers::tablerow_class($choice); $result = ''; $con = new \SYSTEM\DB\Connection(); $res = $con->prepare( 'user_to_party_by_choice_bt', @@ -123,16 +98,14 @@ class bars{ ON uvote_data.poll_ID = uvote_votes.ID WHERE user_ID = ? AND uvote_votes.bt_choice = ? GROUP by user_ID;', array(\SYSTEM\SECURITY\Security::getUser()->id, $choice)); - $i = 0; - while($row = $res->next()){ if(empty($row['class_MATCH'])){ - return 'Keine relevanten Daten verfügbar
'; + return 'Keine relevanten Daten verfügbar

'; } $row['match_percentage'] = round($row['class_MATCH']/($row['class_MATCH']+$row['class_MISSMATCH'])*100,2); $row['bar'] = $bar; $row['icon_type'] = $icon_type; - $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/urvotebt_by_choice.tpl'), $row);; + $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_bilance_choice/urvotebt_by_choice.tpl'), $row);; } if(empty($result)){ return 'Keine relevanten Daten verfügbar

'; @@ -140,28 +113,20 @@ class bars{ return $result; } - public static function user_to_bt(){ - //$vars = votes::get_user_per_party_overall($user_ID); - $result = ''; - $con = new \SYSTEM\DB\Connection(); - $res = $con->prepare( 'bt_to_user', - 'SELECT sum(case when uvote_data.choice = uvote_votes.bt_choice then 1 else 0 end) class_MATCH, - sum(case when uvote_data.choice != uvote_votes.bt_choice then 1 else 0 end) class_MISSMATCH - FROM uvote_data LEFT JOIN uvote_votes - ON uvote_data.poll_ID = uvote_votes.ID - WHERE user_ID = ?;', - array(\SYSTEM\SECURITY\Security::getUser()->id)); - while($row = $res->next()){ - $row['match_percentage'] = ($row['class_MATCH']+$row['class_MISSMATCH']) > 0 ? round($row['class_MATCH']/($row['class_MATCH']+$row['class_MISSMATCH'])*100,2) : 0; - - $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/bt_to_user_overall.tpl'), $row); - } + public static function bilance_user_bt(){ + $result = ''; + $con = new \SYSTEM\DB\Connection(); + $res = $con->prepare( 'bt_to_user', + 'SELECT sum(case when uvote_data.choice = uvote_votes.bt_choice then 1 else 0 end) class_MATCH, + sum(case when uvote_data.choice != uvote_votes.bt_choice then 1 else 0 end) class_MISSMATCH + FROM uvote_data LEFT JOIN uvote_votes + ON uvote_data.poll_ID = uvote_votes.ID + WHERE user_ID = ?;', + array(\SYSTEM\SECURITY\Security::getUser()->id)); + while($row = $res->next()){ + $row['match_percentage'] = ($row['class_MATCH']+$row['class_MISSMATCH']) > 0 ? round($row['class_MATCH']/($row['class_MATCH']+$row['class_MISSMATCH'])*100,2) : 0; + $result .= \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_bilance/bars_user_bt.tpl'), $row); + } return $result; } -} -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ - +} \ No newline at end of file diff --git a/uvote/api/votes/stats_basic.php b/uvote/api/votes/stats_basic.php index 199a03d..a531a38 100644 --- a/uvote/api/votes/stats_basic.php +++ b/uvote/api/votes/stats_basic.php @@ -1,6 +1,6 @@ id); diff --git a/uvote/api/votes/stats_bilance.php b/uvote/api/votes/stats_bilance.php new file mode 100644 index 0000000..81e43b4 --- /dev/null +++ b/uvote/api/votes/stats_bilance.php @@ -0,0 +1,46 @@ +id, \SYSTEM\SECURITY\Security::getUser()->id)); $v = $vars['voted']; $nv = $vars['not_voted']; - return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/all_polls.tpl'), + return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_basic/temp_votes.tpl'), array( 'vote_percent'=> $v > 0 ? round($v/($nv+$v)*100, 2) : 0, 'no_vote_percent'=> $nv > 0 ? round($nv/($nv+$v)*100, 2) : 0, 'voted'=> $v, @@ -89,7 +89,7 @@ class votes { $vars = \SQL\UVOTE_DATA_OVERALL_VOTES::Q1(array(\SYSTEM\SECURITY\Security::getUser()->id, \SYSTEM\SECURITY\Security::getUser()->id, \SYSTEM\SECURITY\Security::getUser()->id, \SYSTEM\SECURITY\Security::getUser()->creationDate)); $v = $vars['voted']; $nv = $vars['not_voted']; - return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/overall_all_polls.tpl'), + return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_basic/overall_votes.tpl'), array( 'vote_perc'=> $v > 0 ? round($v/($nv+$v)*100, 2) : 0, 'no_vote_perc'=> $v > 0 ? round($nv/($nv+$v)*100, 2) : 0, 'voted'=> $v, @@ -121,7 +121,8 @@ class votes { $user = \SYSTEM\SECURITY\Security::getUser()->id; $data = \SQL\UVOTE_ACCORD_WITH_FRACTION::QA(array($party,$user)); //$data_escaped = array_walk_recursive($data, 'mysql_real_escape_string'); - return \SYSTEM\LOG\JsonResult::toString($data); + //return \SYSTEM\LOG\JsonResult::toString($data); + return json.encode($data); } public static function get_users_choice_per_poll($poll_ID){ return \SQL\UVOTE_DATA_USERS_CHOICE_PER_POLL::QA(array($poll_ID));} @@ -139,8 +140,6 @@ class votes { return $res; } - public static function get_barsperparty($poll_ID){ - return \SQL\UVOTE_DATA_PARTY_PER_POLL::QA(array($poll_ID));} public static function get_party_choice($poll_ID, $party){ $res = \SQL\UVOTE_DATA_PARTY_CHOICE_PER_POLL::Q1(array($poll_ID, $party)); diff --git a/uvote/page/user_main_analysis/js/user_main_analysis.js b/uvote/page/user_main_analysis/js/user_main_analysis.js index 43045cc..f1f0191 100644 --- a/uvote/page/user_main_analysis/js/user_main_analysis.js +++ b/uvote/page/user_main_analysis/js/user_main_analysis.js @@ -2,14 +2,13 @@ function init_user_main_analysis(){ $('.acc_toggle').click(function(){ $(this).find('i').toggleClass('glyphicon-circle-arrow-down').toggleClass('glyphicon-circle-arrow-up'); }); -load_visualisation_urvote('graph_user_to_party_overall_bt', 84600); -load_visualisation_user_to_party_overall('graph_user_to_party_overall_cdu', 'cdu', 84600); -load_visualisation_user_to_party_overall('graph_user_to_party_overall_csu', 'csu', 84600); -load_visualisation_user_to_party_overall('graph_user_to_party_overall_spd', 'spd', 84600); -load_visualisation_user_to_party_overall('graph_user_to_party_overall_gruene', 'gruene', 84600); -load_visualisation_user_to_party_overall('graph_user_to_party_overall_linke', 'linke', 84600); -load_visualisation_user_to_parties_overall('donut_user_to_party_overall', 84600); + + +/* -------- clickhandlers for basic_stats_tab -------- +----------- set specifies tab type, -------- +----------- cat specifies perspective, -------- +----------- body specifies load-to element -------- */ $('#a_acc_2').click(function () { var set = 'basic'; var cat = 'user'; @@ -28,11 +27,70 @@ $('#a_acc_10').click(function () { var body = '#acc_10_body'; load_tab(set, cat, body); }); + +/* -------- clickhandlers for bilance_stats_tab -------- +----------- set specifies tab type, -------- +----------- cat specifies perspective, -------- +----------- body specifies load-to element -------- */ +$('#a_acc_3').click(function () { + var set = 'bilance'; + var cat = 'user'; + var body = '#acc_3_body'; + load_tab(set, cat, body); +}); +$('#a_acc_6').click(function () { + var set = 'bilance'; + var cat = 'user_bt'; + var body = '#acc_6_body'; + load_tab(set, cat, body); +}); +$('#a_acc_9').click(function () { + var set = 'bilance'; + var cat = 'community'; + var body = '#acc_9_body'; + load_tab(set, cat, body); +}); +$('#a_acc_11').click(function () { + var set = 'bilance'; + var cat = 'bt'; + var body = '#acc_11_body'; + load_tab(set, cat, body); +}); + +/* -------- clickhandlers for bilance_choice_stats_tab -------- +----------- set specifies tab type, -------- +----------- cat specifies perspective, -------- +----------- body specifies load-to element -------- */ +$('#a_acc_4').click(function () { + var set = 'bilance_choice'; + var cat = 'user_party'; + var body = '#acc_4_body'; + load_tab(set, cat, body); +}); +$('#a_acc_12').click(function () { + var set = 'bilance_choice'; + var cat = 'user_bt'; + var body = '#acc_12_body'; + load_tab(set, cat, body); +}); + +/* -------- clickhandlers for google charts -------- */ +$('#a_acc_7').click(function () { + $('#acc_7_body').load(load_visualisation_urvote('graph_user_to_party_overall_bt', 84600)); +}); +$('#a_acc_5').click(function () { + $('#acc_5_body').load(load_visualisation_user_to_party_overall('graph_user_to_party_overall_cdu', 'cdu', 84600), + load_visualisation_user_to_party_overall('graph_user_to_party_overall_csu', 'csu', 84600), + load_visualisation_user_to_party_overall('graph_user_to_party_overall_spd', 'spd', 84600), + load_visualisation_user_to_party_overall('graph_user_to_party_overall_gruene', 'gruene', 84600), + load_visualisation_user_to_party_overall('graph_user_to_party_overall_linke', 'linke', 84600)); +}); } function load_tab(set, cat, body){ - $(body).load('./api.php?call=load_tab&set=' + set + '&cat=' + cat, function(e){ - e.preventDefault(); + $(body).load('./api.php?call=load_tab&set=' + set + '&cat=' + cat, function(){ + if(set == 'bilance' && cat == 'user'){ + load_visualisation_user_to_parties_overall('donut_user_to_party_overall', 84600);} }); } @@ -90,7 +148,10 @@ function load_visualisation_urvote(id, timespan){ var options = {title: 'Übereinstimmung mit dem Bundestag', aggregationTarget: 'category', selectionMode: 'multiple', - legend: 'none', + legend: 'none', + animation:{ + duration: 1000, + easing: 'out',}, chartArea:{}, // vAxis:{logScale: false}, vAxis: {viewWindow: {min: 0, max: 100}}, diff --git a/uvote/page/user_main_analysis/tpl/bt_total.tpl b/uvote/page/user_main_analysis/tpl/tab_basic/bt_total.tpl similarity index 100% rename from uvote/page/user_main_analysis/tpl/bt_total.tpl rename to uvote/page/user_main_analysis/tpl/tab_basic/bt_total.tpl diff --git a/uvote/page/user_main_analysis/tpl/overall_all_polls.tpl b/uvote/page/user_main_analysis/tpl/tab_basic/overall_votes.tpl similarity index 100% rename from uvote/page/user_main_analysis/tpl/overall_all_polls.tpl rename to uvote/page/user_main_analysis/tpl/tab_basic/overall_votes.tpl diff --git a/uvote/page/user_main_analysis/tpl/tab_basic/tab_basic_bt.tpl b/uvote/page/user_main_analysis/tpl/tab_basic/tab_basic_bt.tpl index a71f312..c2fe421 100644 --- a/uvote/page/user_main_analysis/tpl/tab_basic/tab_basic_bt.tpl +++ b/uvote/page/user_main_analysis/tpl/tab_basic/tab_basic_bt.tpl @@ -1,6 +1,5 @@
-
-

+
${basic_stats_bt}
diff --git a/uvote/page/user_main_analysis/tpl/tab_basic/tab_basic_user.tpl b/uvote/page/user_main_analysis/tpl/tab_basic/tab_basic_user.tpl index c3a2a82..ce56151 100644 --- a/uvote/page/user_main_analysis/tpl/tab_basic/tab_basic_user.tpl +++ b/uvote/page/user_main_analysis/tpl/tab_basic/tab_basic_user.tpl @@ -1,28 +1,27 @@ - -
-
- ${basic_stats} -
-
-

- ${analysis_help_basic_stats} -

- ${analysis_math_basic_stats} -
-
-
-
-
-
${user_temp_votes}
-
-
${user_overall_votes}
-
-
-

- ${analysis_help_basic_votes} -

- ${analysis_math_basic votes} -
-
+
+
+ ${basic_stats} +
+
+

+ ${analysis_help_basic_stats} +

+ ${analysis_math_basic_stats} +
+
+
+
+
+
${user_temp_votes}
+
+
${user_overall_votes}
+
+
+

+ ${analysis_help_basic_votes} +

+ ${analysis_math_basic votes} +
+
\ No newline at end of file diff --git a/uvote/page/user_main_analysis/tpl/all_polls.tpl b/uvote/page/user_main_analysis/tpl/tab_basic/temp_votes.tpl similarity index 100% rename from uvote/page/user_main_analysis/tpl/all_polls.tpl rename to uvote/page/user_main_analysis/tpl/tab_basic/temp_votes.tpl diff --git a/uvote/page/user_main_analysis/tpl/user_total.tpl b/uvote/page/user_main_analysis/tpl/tab_basic/user_total.tpl similarity index 85% rename from uvote/page/user_main_analysis/tpl/user_total.tpl rename to uvote/page/user_main_analysis/tpl/tab_basic/user_total.tpl index c0c924f..3aff14f 100644 --- a/uvote/page/user_main_analysis/tpl/user_total.tpl +++ b/uvote/page/user_main_analysis/tpl/tab_basic/user_total.tpl @@ -12,7 +12,7 @@
pro Stimmen
-
${user_total_pro}
+
${total_pro}
@@ -24,7 +24,7 @@
contra Stimmen
-
${user_total_con}
+
${total_con}
@@ -36,7 +36,7 @@
Enthaltungen
-
${user_total_ent}
+
${total_ent}
@@ -46,7 +46,7 @@
-
Total: ${user_total_total}
+
Total: ${total_total}
diff --git a/uvote/page/user_main_analysis/tpl/uvote_total.tpl b/uvote/page/user_main_analysis/tpl/tab_basic/uvote_total.tpl similarity index 100% rename from uvote/page/user_main_analysis/tpl/uvote_total.tpl rename to uvote/page/user_main_analysis/tpl/tab_basic/uvote_total.tpl diff --git a/uvote/page/user_main_analysis/tpl/urvoteparties.tpl b/uvote/page/user_main_analysis/tpl/tab_bilance/bars_community.tpl similarity index 55% rename from uvote/page/user_main_analysis/tpl/urvoteparties.tpl rename to uvote/page/user_main_analysis/tpl/tab_bilance/bars_community.tpl index dc5cec3..2216664 100644 --- a/uvote/page/user_main_analysis/tpl/urvoteparties.tpl +++ b/uvote/page/user_main_analysis/tpl/tab_bilance/bars_community.tpl @@ -6,21 +6,12 @@
${match_percentage}%
- - -
+
+
-
+ diff --git a/uvote/page/user_main_analysis/tpl/uvoteparties.tpl b/uvote/page/user_main_analysis/tpl/tab_bilance/bars_user.tpl similarity index 50% rename from uvote/page/user_main_analysis/tpl/uvoteparties.tpl rename to uvote/page/user_main_analysis/tpl/tab_bilance/bars_user.tpl index dc5cec3..5a0eb08 100644 --- a/uvote/page/user_main_analysis/tpl/uvoteparties.tpl +++ b/uvote/page/user_main_analysis/tpl/tab_bilance/bars_user.tpl @@ -6,17 +6,10 @@
${match_percentage}%
- - -
- -
+ +
+ +