From eb5a7dd8e5a83ff4fc5c864a24dbceca0d63e378 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Wed, 2 Aug 2017 19:11:34 +0200
Subject: [PATCH] Fixed #125 - Chart categories tool tip displays NONE
---
.../chartGenerators/CategoriesChartGenerator.java | 10 ++++++++--
.../logic/chartGenerators/MonthChartGenerator.java | 8 +++++++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/de/deadlocker8/budgetmaster/logic/chartGenerators/CategoriesChartGenerator.java b/src/de/deadlocker8/budgetmaster/logic/chartGenerators/CategoriesChartGenerator.java
index 0fb5ec4c2..1b157ee80 100644
--- a/src/de/deadlocker8/budgetmaster/logic/chartGenerators/CategoriesChartGenerator.java
+++ b/src/de/deadlocker8/budgetmaster/logic/chartGenerators/CategoriesChartGenerator.java
@@ -70,9 +70,15 @@ public class CategoriesChartGenerator
double percentage = value / total;
currentPart.prefWidthProperty().bind(chart.widthProperty().multiply(percentage));
-
+
+ String categoryName = currentItem.getName();
+ if(categoryName.equals("NONE"))
+ {
+ categoryName = "Keine Kategorie";
+ }
+
Tooltip tooltip = new Tooltip();
- tooltip.setText(currentItem.getName() + "\n" + Helpers.NUMBER_FORMAT.format(percentage*100) + " %\n" + Helpers.getCurrencyString(value, currency));//
+ tooltip.setText(categoryName + "\n" + Helpers.NUMBER_FORMAT.format(percentage*100) + " %\n" + Helpers.getCurrencyString(value, currency));//
currentPart.setTooltip(tooltip);
}
diff --git a/src/de/deadlocker8/budgetmaster/logic/chartGenerators/MonthChartGenerator.java b/src/de/deadlocker8/budgetmaster/logic/chartGenerators/MonthChartGenerator.java
index f4715f86c..dd2a0cdef 100644
--- a/src/de/deadlocker8/budgetmaster/logic/chartGenerators/MonthChartGenerator.java
+++ b/src/de/deadlocker8/budgetmaster/logic/chartGenerators/MonthChartGenerator.java
@@ -110,8 +110,14 @@ public class MonthChartGenerator
currentPart.setMinHeight(0);
currentPart.prefHeightProperty().bind(chart.heightProperty().multiply(percentage));
+ String categoryName = currentItem.getName();
+ if(categoryName.equals("NONE"))
+ {
+ categoryName = "Keine Kategorie";
+ }
+
Tooltip tooltip = new Tooltip();
- tooltip.setText(currentItem.getName() + "\n"+ Helpers.NUMBER_FORMAT.format(percentage * 100) + " %\n" + Helpers.NUMBER_FORMAT.format(value).replace(".", ",") + currency);//
+ tooltip.setText(categoryName + "\n"+ Helpers.NUMBER_FORMAT.format(percentage * 100) + " %\n" + Helpers.NUMBER_FORMAT.format(value).replace(".", ",") + currency);//
currentPart.setTooltip(tooltip);
}
--
GitLab