From b3b4fcdf7064306fe1c9ff54aff2f047f71082fa Mon Sep 17 00:00:00 2001
From: Harry Linrui XU <xulr0820@hotmail.com>
Date: Fri, 24 Mar 2023 13:29:01 +0100
Subject: [PATCH] "Refactored BudgetController to update a list contained in
GeneralBudget"
---
.../idatt1002/demo/controller/BudgetController.java | 11 +++++------
1 file changed, 5 insertions(+), 6 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 edcb0d1d..d8f13356 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java
@@ -25,8 +25,7 @@ import java.util.Optional;
public class BudgetController {
private DialogMode dialogMode;
- private List<BudgetItem> listOfBudgetItems = new ArrayList<>();
- private GeneralBudget general = new GeneralBudget(31, listOfBudgetItems, 200);
+ private GeneralBudget general = new GeneralBudget(31, 2000);
@FXML
@@ -65,7 +64,7 @@ public class BudgetController {
public void initialize() throws IOException {
- budgetList = FXCollections.observableArrayList(listOfBudgetItems);
+ budgetList = FXCollections.observableArrayList(general.getBudgetItems());
budgetTableView.setItems(budgetList);
categoryColumn.setCellValueFactory(new PropertyValueFactory<BudgetItem, ExpenseCategory>("budgetCategory"));
@@ -108,7 +107,7 @@ public class BudgetController {
item = budgetController.getNewBudgetItem();
if(item != null && dialogMode == DialogMode.ADD){
try {
- general.addToBudget(item.getBudgetAmount(), item.getBudgetDescription(), item.getBudgetCategory());
+ general.addToBudgetBudgetItem(item);
} catch(IllegalArgumentException e) {
showIllegalBudgetItemDialog();
}
@@ -149,7 +148,7 @@ public class BudgetController {
Alert alert = new Alert(AlertType.ERROR);
alert.setTitle("Budget amount exceeded");
alert.setHeaderText("Your budget exceeds the max limit");
- alert.setContentText("The total budget sum must be bl" );
+ alert.setContentText("The total budget sum must be below " + general.getMaxAmount());
return alert.showAndWait();
}
@@ -157,7 +156,7 @@ public class BudgetController {
protected void refreshObservableList(){
budgetTableView.setItems(budgetList);
- this.budgetList.setAll(listOfBudgetItems);
+ this.budgetList.setAll(general.getBudgetItems());
}
}
--
GitLab