From 3cddfc9c615525902ae6e0d90edd7b62e74b7d3d Mon Sep 17 00:00:00 2001
From: Markus Utke <markus.utke@gmx.de>
Date: Tue, 19 Nov 2024 16:13:42 +0100
Subject: [PATCH] changed order of radar chart, fixed tooltip bug

---
 src/components/charts/CategoryProportions.js  |  2 +-
 .../charts/RulePropertyRadarChart.js          |  2 +-
 .../charts/SatisfactionHistogram.js           |  2 +-
 src/constants/constants.js                    |  4 ++--
 .../ElectionGraphs.js                         | 19 ++++++++++---------
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/components/charts/CategoryProportions.js b/src/components/charts/CategoryProportions.js
index 0567edd..5700816 100644
--- a/src/components/charts/CategoryProportions.js
+++ b/src/components/charts/CategoryProportions.js
@@ -134,7 +134,7 @@ export default function CategoryProportion(props) {
 
     return (
       <GeneralChart 
-        chart_id={"category_proportions"}
+        chart_id={"category_proportions" + election_name}
         api_request={api_request}
         // compute_graph_data={compute_graph_data}
         update_graph_data={update_graph_data}
diff --git a/src/components/charts/RulePropertyRadarChart.js b/src/components/charts/RulePropertyRadarChart.js
index 6196be2..ff5c4a6 100644
--- a/src/components/charts/RulePropertyRadarChart.js
+++ b/src/components/charts/RulePropertyRadarChart.js
@@ -200,7 +200,7 @@ export default function RulePropertyRadarChart(props) {
   return (
     <div className={styles.graph_info_text_container}>
       <GeneralChart 
-        chart_id={"rule_property_radar_chart"}
+        chart_id={"rule_property_radar_chart" + JSON.stringify(election_filters)}
         initial_graph_data={initial_graph_data}
         // compute_graph_data={compute_graph_data}
         update_graph_data={update_graph_data}
diff --git a/src/components/charts/SatisfactionHistogram.js b/src/components/charts/SatisfactionHistogram.js
index b10f56b..2fc87a1 100644
--- a/src/components/charts/SatisfactionHistogram.js
+++ b/src/components/charts/SatisfactionHistogram.js
@@ -191,7 +191,7 @@ export default function SatisfactionHistogram(props) {
   return (
     <div className={styles.graph_info_text_container}>
       <GeneralChart
-        chart_id={"satisfaction_histogram"}
+        chart_id={"satisfaction_histogram" + JSON.stringify(election_filters)}
         compute_graph_data={compute_graph_data}
         update_graph_data={update_graph_data}
         generate_corner_info={single_election ? null : generate_corner_info}
diff --git a/src/constants/constants.js b/src/constants/constants.js
index df75d7a..063a6e0 100644
--- a/src/constants/constants.js
+++ b/src/constants/constants.js
@@ -53,12 +53,12 @@ export const default_rules_visible = {
 
 export const radar_chart_single_election_property_short_names = {
   approval: [
+    "prop_pos_sat",
+    "inverted_cost_gini",
     "avg_card_sat",
     "avg_relcard_sat",
     "avg_cost_sat",
     "avg_relcost_sat",
-    "inverted_cost_gini",
-    "prop_pos_sat",
   ],
   ordinal: [
     "avg_borda_sat",
diff --git a/src/pages/compare_election_results/ElectionGraphs.js b/src/pages/compare_election_results/ElectionGraphs.js
index eff7685..b1cafa2 100644
--- a/src/pages/compare_election_results/ElectionGraphs.js
+++ b/src/pages/compare_election_results/ElectionGraphs.js
@@ -160,15 +160,16 @@ export default function ElectionGraphs(props) {
                     style={{
                       width: only_one_selected ? section.width : "100%",
                       height: section.height
-                    }}>
-                    {section.render(
-                      election,
-                      rules,
-                      rule_visibility,
-                      rule_properties,
-                      election_filters[election_index],
-                      only_one_selected
-                    )}
+                    }}
+                  >
+                  {section.render(
+                    election,
+                    rules,
+                    rule_visibility,
+                    rule_properties,
+                    election_filters[election_index],
+                    only_one_selected
+                  )}
                   </div>
                 </div>
               </Collapsable>