diff --git a/uvote/api/api_uvote.php b/uvote/api/api_uvote.php index 0ba84f0..cd4e32a 100644 --- a/uvote/api/api_uvote.php +++ b/uvote/api/api_uvote.php @@ -47,4 +47,11 @@ class api_uvote extends \SYSTEM\API\api_system { public static function call_vote_action_commentrate($c_ID, $val) { return comments::write_commentrate($c_ID, $val);} + + public static function call_load_tab($set, $cat){ + return stats_basic::basic($cat); + } +} + + \ No newline at end of file diff --git a/uvote/api/votes/stats_basic.php b/uvote/api/votes/stats_basic.php new file mode 100644 index 0000000..199a03d --- /dev/null +++ b/uvote/api/votes/stats_basic.php @@ -0,0 +1,41 @@ +id); + $vars['user_temp_votes'] = votes::get_user_temp_votes(); + $vars['user_overall_votes'] = votes::get_user_overall_votes(); + $vars['analysis_help_basic_stats'] = \SYSTEM\PAGE\text::get('analysis_help_basic_stats'); + $vars['analysis_math_basic_stats'] = \SYSTEM\PAGE\text::get('analysis_math_basic_stats'); + $vars['analysis_help_basic_votes'] = \SYSTEM\PAGE\text::get('analysis_help_basic_votes'); + $vars['analysis_math_basic_votes'] = \SYSTEM\PAGE\text::get('analysis_math_basic_votes'); + $vars['frontend_logos'] = './api.php?call=files&cat=frontend_logos&id='; + return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_basic/tab_basic_user.tpl'),$vars); + } + public static function community_basic(){ + $vars['basic_stats_community'] = bars::get_uvote_choice_overall(); + $vars['analysis_help_community'] = \SYSTEM\PAGE\text::get('analysis_help_community'); + $vars['analysis_math_community'] = \SYSTEM\PAGE\text::get('analysis_math_community'); + $vars['frontend_logos'] = './api.php?call=files&cat=frontend_logos&id='; + return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_basic/tab_basic_community.tpl'),$vars); + } + + public static function bt_basic(){ + $vars['basic_stats_bt'] = bars::get_bt_choice_overall(); + $vars['analysis_help_bt_basic'] = \SYSTEM\PAGE\text::get('analysis_help_bt_basic'); + $vars['analysis_math_bt_basic'] = \SYSTEM\PAGE\text::get('analysis_math_bt_basic'); + $vars['frontend_logos'] = './api.php?call=files&cat=frontend_logos&id='; + return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/tab_basic/tab_basic_bt.tpl'),$vars); + } +} diff --git a/uvote/api/votes/switchers.php b/uvote/api/votes/switchers.php index 7036753..f3b5e41 100644 --- a/uvote/api/votes/switchers.php +++ b/uvote/api/votes/switchers.php @@ -3,13 +3,13 @@ class switchers{ public static function get_party_per_poll($choice){ switch($choice){ case 1: - return 'PRO'; + return 'pro'; case 2: - return 'CON'; + return 'con'; case 3: - return 'ENT'; + return 'ent'; default: - return 'NONE'; + return 'none'; } } @@ -25,6 +25,18 @@ class switchers{ return 'open'; } } + public static function tablerow_class_full($choice){ + switch($choice){ + case 1: + return 'pro'; + case 2: + return 'contra'; + case 3: + return 'enthaltung'; + default: + return ''; + } + } public static function badge_class($choice){ switch($choice){ diff --git a/uvote/page/default_page/tpl/menu_loggedout.tpl b/uvote/page/default_page/tpl/menu_loggedout.tpl index 931c533..cf0a204 100644 --- a/uvote/page/default_page/tpl/menu_loggedout.tpl +++ b/uvote/page/default_page/tpl/menu_loggedout.tpl @@ -2,7 +2,7 @@ \ No newline at end of file diff --git a/uvote/page/default_register/js/default_register.js b/uvote/page/default_register/js/default_register.js index 5632870..ca2aa8c 100644 --- a/uvote/page/default_register/js/default_register.js +++ b/uvote/page/default_register/js/default_register.js @@ -1,10 +1,13 @@ function init_default_register(){ register_registerform(); } - -function register_registerform(){ + function register_registerform(){ //console.log("wegwegwegwegwegweg"); - + $("#register_user_form input").not("[type=submit]").jqBootstrapValidation( + { + preventSubmit: true, + submitError: function($form, event, errors) {}, + submitSuccess: function($form, event){ $.get('./api.php?call=account&action=create&username=' + $('#register_username').val() + '&password_sha=' + $.sha1($('#user_register_password1').val()) + '&email=' + $('#register_email').val() + '&locale=deDE', function (data) { if(data == 1){ window.location.reload(); @@ -12,4 +15,8 @@ function register_registerform(){ $('#help-block-user-password-combi-wrong').attr('style', 'display: block;'); } }); + event.preventDefault(); } + }); +} + diff --git a/uvote/page/default_register/tpl/register.tpl b/uvote/page/default_register/tpl/register.tpl index c4df117..177b15a 100644 --- a/uvote/page/default_register/tpl/register.tpl +++ b/uvote/page/default_register/tpl/register.tpl @@ -2,7 +2,7 @@

- Willkommen auf uvote.eu! +   Willkommen auf uvote.eu!

@@ -13,7 +13,7 @@
-

Accounterstellung

+

Accounterstellung

@@ -21,7 +21,6 @@
- +
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 a39fd0b..43045cc 100644 --- a/uvote/page/user_main_analysis/js/user_main_analysis.js +++ b/uvote/page/user_main_analysis/js/user_main_analysis.js @@ -1,5 +1,7 @@ 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); @@ -8,7 +10,32 @@ load_visualisation_user_to_party_overall('graph_user_to_party_overall_gruene', ' 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); +$('#a_acc_2').click(function () { + var set = 'basic'; + var cat = 'user'; + var body = '#acc_2_body'; + load_tab(set, cat, body); +}); +$('#a_acc_8').click(function () { + var set = 'basic'; + var cat = 'community'; + var body = '#acc_8_body'; + load_tab(set, cat, body); +}); +$('#a_acc_10').click(function () { + var set = 'basic'; + var cat = 'bt'; + var body = '#acc_10_body'; + load_tab(set, cat, body); +}); } + +function load_tab(set, cat, body){ + $(body).load('./api.php?call=load_tab&set=' + set + '&cat=' + cat, function(e){ + e.preventDefault(); + }); +} + function load_visualisation(id, timespan){ $('img#loader').show(); $.getJSON('./api.php?call=graph_bt_to_uvote_overall_by_time',function(json){ 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 new file mode 100644 index 0000000..a71f312 --- /dev/null +++ b/uvote/page/user_main_analysis/tpl/tab_basic/tab_basic_bt.tpl @@ -0,0 +1,12 @@ +
+
+

+ ${basic_stats_bt} +
+
+

+ ${analysis_help_bt_basic} +

+ ${analysis_math_bt_basic} +
+
\ No newline at end of file diff --git a/uvote/page/user_main_analysis/tpl/tab_basic/tab_basic_community.tpl b/uvote/page/user_main_analysis/tpl/tab_basic/tab_basic_community.tpl new file mode 100644 index 0000000..718e9a1 --- /dev/null +++ b/uvote/page/user_main_analysis/tpl/tab_basic/tab_basic_community.tpl @@ -0,0 +1,12 @@ +
+
+

Entscheidungsverhalten der uVote Community

+ ${basic_stats_community} +
+
+

+ ${analysis_help_community} +

+ ${analysis_math_community} +
+
\ No newline at end of file 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 new file mode 100644 index 0000000..c3a2a82 --- /dev/null +++ b/uvote/page/user_main_analysis/tpl/tab_basic/tab_basic_user.tpl @@ -0,0 +1,28 @@ + +
+
+ ${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/user_main_analysis.tpl b/uvote/page/user_main_analysis/tpl/user_main_analysis.tpl index 4c78909..8e3eedb 100644 --- a/uvote/page/user_main_analysis/tpl/user_main_analysis.tpl +++ b/uvote/page/user_main_analysis/tpl/user_main_analysis.tpl @@ -1,79 +1,60 @@ - -
-
-
-

- ${urVote_title} -

-
-
-
- ${urvote_body_text} -
-
- ${urvote_info_info_1} - - ${urvote_info_info_2} - - ${urvote_info_info_3} -
-
-
+
+
+
+

+   ${urVote_title} +

+
+
+
+ ${urvote_body_text} +
+
+ ${urvote_info_info_1} + + ${urvote_info_info_2} + + ${urvote_info_info_3} +
+
-
+
+
+

Deine Statistik

+
+
- +

   Deine Daten +

-
-
- ${basic_stats} -
-
-

- ${analysis_help_basic_stats} -

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

- ${analysis_help_basic_votes} -

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

   Bilanz: Fraktionen +

-
+

Absolute Übereinstimmungsrate

@@ -107,18 +88,19 @@
-
+
- +

   Bilanz: Fraktionen nach Stimmverhalten +

-
+
@@ -159,18 +141,19 @@
-
+
- +

   Entwicklung: Fraktionen +

-
+
@@ -208,18 +191,19 @@
-
+
- +

   Bilanz: Bundestag +

-
+
Bundestag gesamt @@ -254,18 +238,19 @@ -
+
- +

   Entwicklung: Bundestag +

-
+
@@ -283,41 +268,35 @@
-
-
+
+
+

community Statistik

+
+
- +

   community Daten +

-
-
-
-

Entscheidungsverhalten der uVote Community

- ${votes_all} -
-
-

- ${analysis_help_community} -

- ${analysis_math_community} -
-
+
+
+
+

Bundestag Statistik

+
- +

   Bundestag Daten +

-
-
-

- ${bt_basic_stats} -
-
-

- ${analysis_help_bt_basic} -

- ${analysis_math_bt_basic} -
-
+
@@ -371,10 +343,11 @@
- +

-    Bilanz: Bundestag & Fraktionen +    Bundestag-Bilanz: Fraktionen +

diff --git a/uvote/page/user_main_analysis/user_main_analysis.php b/uvote/page/user_main_analysis/user_main_analysis.php index b130f4c..ef41e99 100644 --- a/uvote/page/user_main_analysis/user_main_analysis.php +++ b/uvote/page/user_main_analysis/user_main_analysis.php @@ -3,13 +3,7 @@ class user_main_analysis extends SYSTEM\PAGE\Page { public static function js(){ return array(\SYSTEM\WEBPATH(new \PPAGE(),'user_main_analysis/js/user_main_analysis.js'));} public function html(){ - $vars = array(); - - //second panel - $vars['basic_stats'] = bars::get_user_choice_overall(\SYSTEM\SECURITY\Security::getUser()->id); - $vars['user_temp_votes'] = votes::get_user_temp_votes(); - $vars['user_overall_votes'] = votes::get_user_overall_votes(); - + $vars = array(); //third panel $vars['choices_user_ID'] = bars::user_per_party_overall(); @@ -23,13 +17,7 @@ class user_main_analysis extends SYSTEM\PAGE\Page { $vars['choices_user_ID_per_bt_pro'] = bars::user_per_bt_by_choicetype('1'); $vars['choices_user_ID_per_bt_con'] = bars::user_per_bt_by_choicetype('2'); $vars['choices_user_ID_per_bt_ent'] = bars::user_per_bt_by_choicetype('3'); - - - $vars['votes_all'] = bars::get_uvote_choice_overall(); $vars['votes_all_to_bt'] = bars::get_uvote_choice_overall_to_bt(); - - $vars['bt_basic_stats'] = bars::get_bt_choice_overall(); - $vars['choices_bt'] = bars::get_bt_choice_overall_to_bt(); $vars['frontend_logos'] = './api.php?call=files&cat=frontend_logos&id='; $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote')); diff --git a/uvote/page/user_main_impressum/tpl/user_main_impressum.tpl b/uvote/page/user_main_impressum/tpl/user_main_impressum.tpl index 875c1d2..4e945f7 100644 --- a/uvote/page/user_main_impressum/tpl/user_main_impressum.tpl +++ b/uvote/page/user_main_impressum/tpl/user_main_impressum.tpl @@ -2,7 +2,7 @@

- Impressum +   Impressum

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 8b64bb1..86ff653 100644 --- a/uvote/page/user_main_poll/js/user_main_poll.js +++ b/uvote/page/user_main_poll/js/user_main_poll.js @@ -8,6 +8,8 @@ function init_user_main_poll(){ $('#btnvote_off').click(function () { vote_click($(this).attr('poll_ID'),3); }); - + $('#user_main').resize(function(){ + $('#pollframe').height($('#user_main').height()); + }); } \ No newline at end of file diff --git a/uvote/page/user_main_poll/tpl/bars_user.tpl b/uvote/page/user_main_poll/tpl/bars_user.tpl index 2d67845..0839b29 100644 --- a/uvote/page/user_main_poll/tpl/bars_user.tpl +++ b/uvote/page/user_main_poll/tpl/bars_user.tpl @@ -1,5 +1,4 @@ -
${bulletin_bars_title}
-${urvote_bars_user} +

uvote community

${vote_yes_perc}%
${vote_no_perc}%
diff --git a/uvote/page/user_main_poll/tpl/full_vote.tpl b/uvote/page/user_main_poll/tpl/full_vote.tpl index 83681ac..4ee5549 100644 --- a/uvote/page/user_main_poll/tpl/full_vote.tpl +++ b/uvote/page/user_main_poll/tpl/full_vote.tpl @@ -5,11 +5,11 @@

- Info +   Info

-
-
+
+

${title}

@@ -19,23 +19,22 @@
${voice_weight}
-
+
-
+

- Statistik +   Statistik

-
- -
-
+
+
+

@@ -49,8 +48,8 @@

-
-
+
+

@@ -69,13 +68,13 @@

-
+

- Abstimmen +   Abstimmen

@@ -90,8 +89,8 @@
Quelle: ${iframe_link}
-
- +
+
diff --git a/uvote/page/user_main_poll/tpl/table_bt.tpl b/uvote/page/user_main_poll/tpl/table_bt.tpl index ad57733..f6b7b01 100644 --- a/uvote/page/user_main_poll/tpl/table_bt.tpl +++ b/uvote/page/user_main_poll/tpl/table_bt.tpl @@ -1,4 +1,5 @@ -Ergebnis Bundestag +${choice_show} +Stimmverteilung Bundestag
${bt_pro}%
${bt_con}%
diff --git a/uvote/page/user_main_poll/tpl/table_bt_choice.tpl b/uvote/page/user_main_poll/tpl/table_bt_choice.tpl new file mode 100644 index 0000000..02671bf --- /dev/null +++ b/uvote/page/user_main_poll/tpl/table_bt_choice.tpl @@ -0,0 +1,3 @@ + +Der Bundestag hat "${choice_full}" abgestimmt.

+${disclaimer} \ No newline at end of file diff --git a/uvote/page/user_main_poll/user_main_poll.php b/uvote/page/user_main_poll/user_main_poll.php index 54c7a7c..75a4ef0 100644 --- a/uvote/page/user_main_poll/user_main_poll.php +++ b/uvote/page/user_main_poll/user_main_poll.php @@ -4,41 +4,14 @@ class user_main_poll extends SYSTEM\PAGE\Page { public function __construct($poll_ID){ $this->poll_ID = $poll_ID; } - private static function tablerow_class($choice){ - switch($choice){ - case 1: - return 'pro'; - case 2: - return 'con'; - case 3: - return 'ent'; - default: - return 'open'; - } - } - - private function get_party_per_poll($choice){ - switch($choice){ - case 1: - return 'pro'; - case 2: - return 'con'; - case 3: - return 'ent'; - default: - return ''; - } - } private function choice_party (){ $result = ''; $party_votes = votes::get_barsperparty($this->poll_ID); - -// $vote['bt_vote_class'] = $this->tablerow_class($vote['bt_choice']); foreach($party_votes as $pv){ $vote = array( 'party' => $pv['party'], - 'choice' => $this->get_party_per_poll($pv['choice']), - 'choice_class' => $this->tablerow_class($pv['choice']), + 'choice' => switchers::get_party_per_poll($pv['choice']), + 'choice_class' => switchers::tablerow_class($pv['choice']), 'party_yes' => $pv['votes_pro'] > 0 ? round($pv['votes_pro']/$pv['total']*100,0) : ($pv['choice'] == 1 ? '100' : '0'), 'party_no' => $pv['votes_contra'] > 0 ? round($pv['votes_contra']/$pv['total']*100,0) : ($pv['choice'] == 2 ? '100' : '0'), 'party_off' => $pv['total'] > 0 ? round(($pv['total'] - $pv['nr_attending'])/$pv['total']*100,0) : '0', @@ -59,9 +32,8 @@ class user_main_poll extends SYSTEM\PAGE\Page { } private function bars_party(){ - $partyvotes = votes::get_barsperparty($this->poll_ID); - $result = ""; + $partyvotes = votes::get_barsperparty($this->poll_ID); foreach($partyvotes as $vote){ $vote['party_yes'] = $vote['votes_pro'] > 0 ? round($vote['votes_pro']/$vote['total']*100,0) : $vote['votes_pro']; $vote['party_no'] = $vote['votes_contra'] > 0 ? round($vote['votes_contra']/$vote['total']*100,0) : $vote['votes_contra']; @@ -72,18 +44,27 @@ class user_main_poll extends SYSTEM\PAGE\Page { return $result; } - private function icons_party(){ - $vars = votes::get_bar_bt_per_poll($this->poll_ID); - if (!$vars['bt_total']){ - return '';} - $info = array(); - return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_poll/tpl/icons_table_parties.tpl'), $info); - } - private function bars_bt(){ $vars = votes::get_bar_bt_per_poll($this->poll_ID); + $info = votes::get_voteinfo($this->poll_ID); if (!$vars['bt_total']){ - return 'Keine differenzierten Ergebnisse für den Bundestag verfügbar.';} + + $var['disclaimer'] = 'Keine differenzierten Ergebnisse für den Bundestag verfügbar'; + $var['choice'] = switchers::tablerow_class($info['bt_choice']); + $var['choice_full'] = switchers::tablerow_class($info['bt_choice']); + if ($var['choice_full'] == ''){ + $var['choice_full'] = 'noch nicht'; + } + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_poll/tpl/table_bt_choice.tpl'), $var); + } + + $vars['disclaimer'] = ''; + $vars['choice'] = switchers::tablerow_class($info['bt_choice']); + $vars['choice_full'] = switchers::tablerow_class($info['bt_choice']); + if ($vars['choice_full'] == 'open'){ + $vars['choice_full'] = 'noch nicht'; + } + $vars['choice_show'] = SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_poll/tpl/table_bt_choice.tpl'), $vars); $vars['bt_ent'] = round(($vars['bt_attending'] - $vars['bt_pro'] - $vars['bt_con'])/$vars['bt_total']*100,0); $vars['bt_pro'] = round($vars['bt_pro']/$vars['bt_total']*100,0); $vars['bt_con'] = round($vars['bt_con']/$vars['bt_total']*100,0); @@ -96,19 +77,6 @@ class user_main_poll extends SYSTEM\PAGE\Page { return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_poll/tpl/voteweight.tpl'), $vars); } - private function p_fields (){ - $result = ""; - - $list = array (array(1, 'Aussenpolitik'), - array(2, 'Aussenpolitik'), - array(4, 'Aussenpolitik'), - array(8, 'Aussenpolitik')); - foreach($list as $l){ - if($p_fields & $l[0]) $result .= $l[1]; - } - return $result; - } - private function vote_buttons($poll_expired,$user_poll){ if($poll_expired){ if(!$user_poll){ @@ -146,7 +114,6 @@ class user_main_poll extends SYSTEM\PAGE\Page { $vars = array_merge($vars,votes::get_voteinfo($this->poll_ID)); //$vars['comments_pro'] = $this->get_pro_comments(); //$vars['comments_con'] = $this->get_con_comments(); - $vars['icons_party'] = $this->icons_party(); $vars['choice_party'] = $this->choice_party(); $vars['bars_party'] = $this->bars_party(); $vars['bars_user'] = $this->bars_user(); diff --git a/uvote/page/user_main_start/tpl/news.tpl b/uvote/page/user_main_start/tpl/news.tpl deleted file mode 100644 index 81cb6fb..0000000 --- a/uvote/page/user_main_start/tpl/news.tpl +++ /dev/null @@ -1 +0,0 @@ -{$text} \ No newline at end of file diff --git a/uvote/page/user_main_start/tpl/newsfeed.tpl b/uvote/page/user_main_start/tpl/newsfeed.tpl deleted file mode 100644 index 402e208..0000000 --- a/uvote/page/user_main_start/tpl/newsfeed.tpl +++ /dev/null @@ -1 +0,0 @@ -${news} \ No newline at end of file diff --git a/uvote/page/user_main_start/tpl/user_main_start.tpl b/uvote/page/user_main_start/tpl/user_main_start.tpl index 385d322..1cad198 100644 --- a/uvote/page/user_main_start/tpl/user_main_start.tpl +++ b/uvote/page/user_main_start/tpl/user_main_start.tpl @@ -3,7 +3,7 @@

- Willkommen auf uvote.eu! +   Willkommen auf uvote.eu!

@@ -34,7 +34,7 @@

- News +   News