From 38da673c2d9d5e319cf5c1237debe8b99a017307 Mon Sep 17 00:00:00 2001
From: Harry Linrui XU <xulr0820@hotmail.com>
Date: Fri, 14 Apr 2023 11:58:38 +0200
Subject: [PATCH] Refresh pie chart in budget window
---
.../no/ntnu/idatt1002/demo/controller/BudgetController.java | 5 +++++
src/main/resources/view/BudgetNewest.fxml | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java
index 5bf55849..62be882f 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java
@@ -93,6 +93,9 @@ public class BudgetController implements FinanceController {
descriptionCol.setCellValueFactory(new PropertyValueFactory<BudgetItem, String>("budgetDescription"));
try { //Initialize registers, tableview and pie charts
+ //if (FileHandlingBudget.hasBudgetSet - from line 4/5, so after the general amount and such) {
+ //add, edit and delete buttons are removed.
+
general = loadBudgetDataFromFile("Budget");
budgetList = FXCollections.observableArrayList(general.getBudgetItems());
budgetTableView.setItems(budgetList);
@@ -197,6 +200,7 @@ public class BudgetController implements FinanceController {
}
//Updates the tableview using the register
refreshTableView();
+ refreshPieChart();
}
@@ -217,6 +221,7 @@ public class BudgetController implements FinanceController {
if (isConfirmed.isPresent() && isConfirmed.get() == ButtonType.OK) {
general.deleteItemFromBudget(item.getBudgetCategory());
refreshTableView();
+ refreshPieChart();
}
}
diff --git a/src/main/resources/view/BudgetNewest.fxml b/src/main/resources/view/BudgetNewest.fxml
index b7f3e789..4999c3a5 100644
--- a/src/main/resources/view/BudgetNewest.fxml
+++ b/src/main/resources/view/BudgetNewest.fxml
@@ -60,7 +60,7 @@
</Pane>
</left>
<center>
- <Label fx:id="title" text="Budget" textAlignment="CENTER" BorderPane.alignment="CENTER">
+ <Label fx:id="title" text="BUDGET" textAlignment="CENTER" BorderPane.alignment="CENTER">
<font>
<Font name="Lucida Console" size="48.0" />
</font>
@@ -150,7 +150,7 @@
<children>
<Pane>
<children>
- <Label alignment="CENTER" layoutX="99.0" layoutY="-12.0" text="Amount at disposal: 1000">
+ <Label alignment="CENTER" layoutX="135.0" text="Max amount: 1000">
<font>
<Font name="Lucida Console" size="24.0" />
</font>
@@ -184,7 +184,7 @@
</VBox>
<Pane GridPane.columnIndex="1">
<children>
- <PieChart fx:id="budgetPieChart" layoutX="95.0" layoutY="99.0" legendSide="RIGHT" maxHeight="444.0" maxWidth="512.0" prefHeight="302.0" prefWidth="354.0" />
+ <PieChart fx:id="budgetPieChart" layoutX="105.0" layoutY="33.0" legendSide="RIGHT" maxHeight="444.0" maxWidth="512.0" prefHeight="302.0" prefWidth="354.0" />
</children>
</Pane>
</children>
--
GitLab