NapoleonDynamite/munera-vaadin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: inverted columns of graph

Browse source
This commit is contained in:
filippo-ferrari 2024-09-12 19:29:45 +02:00
parent cda5ee05d8
commit edff838299
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/com/application/munera/views/dashboard/DashboardView.java
View file

@ -199,28 +199,30 @@ public class DashboardView extends Div {
for (Person person : people) { for (Person person : people) {
BigDecimal balance = personService.calculateNetBalance(person); BigDecimal balance = personService.calculateNetBalance(person);
personData.put(person.getFirstName(), balance.doubleValue()); // Invert the balance value
personData.put(person.getFirstName(), balance.negate().doubleValue());
} }
// Prepare series data for Highcharts with conditional coloring // Prepare series data for Highcharts with conditional coloring
StringBuilder data = new StringBuilder("["); StringBuilder data = new StringBuilder("[");
for (Map.Entry<String, Double> entry : personData.entrySet()) { for (Map.Entry<String, Double> entry : personData.entrySet()) {
double value = entry.getValue(); double value = entry.getValue();
String color = value >= 0 ? "#FF9999" : "#90EE90"; // Green for positive, red for negative // Green for positive (credits) and red for negative (debits)
String color = value >= 0 ? "#90EE90" : "#FF9999";
data.append("{ y: ").append(value).append(", color: '").append(color).append("' },"); data.append("{ y: ").append(value).append(", color: '").append(color).append("' },");
} }
data.setCharAt(data.length() - 1, ']'); // Replace last comma with closing bracket data.setCharAt(data.length() - 1, ']'); // Replace the last comma with a closing bracket
// Generate JavaScript initialization // Generate JavaScript initialization
return "Highcharts.chart('bottomLeftChart', {" + return "Highcharts.chart('bottomLeftChart', {" +
"chart: {" + "chart: {" +
"type: 'column'," + // Specify the chart type as column "type: 'column'," +
"}," + "}," +
"title: {" + "title: {" +
"text: 'Net Balances by Person'" + "text: 'Net Balances by Person'" +
"}," + "}," +
"xAxis: {" + "xAxis: {" +
"categories: " + new Gson().toJson(personData.keySet()) + // Categories are the person names "categories: " + new Gson().toJson(personData.keySet()) +
"}," + "}," +
"yAxis: {" + "yAxis: {" +
"title: {" + "title: {" +
@ -232,9 +234,10 @@ public class DashboardView extends Div {
"color: '#808080'" + "color: '#808080'" +
"}]" + "}]" +
"}," + "}," +
"plotOptions: {" + // Add plotOptions to configure the column width "plotOptions: {" +
"column: {" + "column: {" +
"pointWidth: 50" + // Adjust the width of the columns (in pixels) "pointWidth: 50," +
"threshold: 0" + // Ensure columns are drawn correctly from the zero line
"}" + "}" +
"}," + "}," +
"series: [{" + "series: [{" +