diff --git a/uvote/api/votes/bars.php b/uvote/api/votes/bars.php index 4c7cc3d..396187e 100644 --- a/uvote/api/votes/bars.php +++ b/uvote/api/votes/bars.php @@ -118,7 +118,7 @@ class bars{ WHERE user_ID = ?;', array(\SYSTEM\SECURITY\Security::getUser()->id)); while($row = $res->next()){ - $row['match_percentage'] = round($row['class_MATCH']/($row['class_MATCH']+$row['class_MISSMATCH']+1)*100,2); + $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/bt_to_user_overall.tpl'), $row); } 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 c33feb8..8eb2182 100644 --- a/uvote/page/user_main_analysis/tpl/user_main_analysis.tpl +++ b/uvote/page/user_main_analysis/tpl/user_main_analysis.tpl @@ -27,23 +27,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}
@@ -63,27 +67,32 @@
-
-
-
- Gesamtübereinstimmung mit den Fraktionen im Bundestag
+
+
+

Absolute Übereinstimmungsrate

auf %Angabe clicken für Details

${choices_user_ID}
-
+
+

${analysis_help_user_to_party_overall} +

${analysis_math_user_to_party_overall}
- +
+
-
+
+

Relative Übereinstimmung

-
- ${analysis_help_user_to_party_overall_donut} - ${analysis_math_user_to_party_overall_donut} +
+

+ ${analysis_help_party_donut} +

+ ${analysis_math_party_donut}
@@ -102,35 +111,40 @@
-
+
Übereinstimmung der pro Stimmen
${choices_user_ID_per_party_pro}
-
- ${analysis_help_user_to_party_overall_by_vote_pro} - ${analysis_math_user_to_party_overall_by_vote_pro} +
+

+ ${analysis_help_uservera_to_party_pro} +

+ ${analysis_math_uservera_to_party_pro}
-
+
Übereinstimmung der contra Stimmen
${choices_user_ID_per_party_con}
-
+
+

${analysis_help_user_to_party_overall_by_vote_pro} +

${analysis_math_user_to_party_overall_by_vote_pro}
-
+
Übereinstimmung der Enthaltungen
${choices_user_ID_per_party_ent}
-
+
${analysis_help_user_to_party_overall_by_vote_pro} +

${analysis_math_user_to_party_overall_by_vote_pro}
@@ -149,18 +163,27 @@
-
- Bundestag gesamt - ${choices_bt_to_user} +
+
+ Bundestag gesamt + ${choices_bt_to_user} +
+
+ +
- -
- Übereinstimmung mit dem Bundestag - - ${choices_user_ID_per_bt_pro} - ${choices_user_ID_per_bt_con} - ${choices_user_ID_per_bt_ent} -
+
+
+
+ Übereinstimmung mit dem Bundestag + + ${choices_user_ID_per_bt_pro} + ${choices_user_ID_per_bt_con} + ${choices_user_ID_per_bt_ent} +
+
+
+
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 a1ca7ee..e207085 100644 --- a/uvote/page/user_main_start/tpl/user_main_start.tpl +++ b/uvote/page/user_main_start/tpl/user_main_start.tpl @@ -28,4 +28,18 @@
+
+
+
+
+
+

+ News +

+
+
+ +
+
+
\ No newline at end of file diff --git a/uvote/page/user_main_start/user_main_start.php b/uvote/page/user_main_start/user_main_start.php index ee058e4..af8f410 100644 --- a/uvote/page/user_main_start/user_main_start.php +++ b/uvote/page/user_main_start/user_main_start.php @@ -5,7 +5,7 @@ class user_main_start extends SYSTEM\PAGE\Page { return $vars['count']; } - + public function html(){ $vars = array(); $vars['frontend_logos'] = './api.php?call=files&cat=frontend_logos&id=';