From 4ba232814a2fc6cca2b8c8c1420cdb1f2eabf4cb Mon Sep 17 00:00:00 2001
From: Harry Linrui XU <xulr0820@hotmail.com>
Date: Sun, 26 Mar 2023 11:36:34 +0200
Subject: [PATCH] "Fixed FileHandBudget bug that prevented the application from
loading an empty budget"
---
.../demo/controller/BudgetController.java | 3 +--
.../demo/data/Budget/FileHandlingBudget.java | 6 +-----
src/main/resources/Budget/Budget.budget | 7 +++++++
src/main/resources/Economics/Expense.register | 6 ------
src/main/resources/Economics/Income.register | 17 +++++++++++++++++
5 files changed, 26 insertions(+), 13 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 97da74c3..b2be85cb 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java
@@ -192,13 +192,12 @@ public class BudgetController {
protected void refreshObservableList(){
- budgetTableView.setItems(budgetList);
this.budgetList.setAll(general.getBudgetItems());
}
@FXML
public void switchScene(ActionEvent event) throws IOException {
- //saveDataToFile("Budget");
+ saveDataToFile("Budget");
FXMLLoader loader = new FXMLLoader();
if (event.getSource() == expenseBtn) {
loader.setLocation(SceneController.class.getResource("/view/Expenses.fxml"));
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Budget/FileHandlingBudget.java b/src/main/java/no/ntnu/idatt1002/demo/data/Budget/FileHandlingBudget.java
index 3fe4eb3a..c3932186 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/data/Budget/FileHandlingBudget.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Budget/FileHandlingBudget.java
@@ -91,14 +91,10 @@ public class FileHandlingBudget {
} else if (line.startsWith(FileHandlingBudget.budgetDescription)) {
budgetDescription = line.replace(FileHandlingBudget.budgetDescription,"");
}
- if ((line.isEmpty() || (nextLine == null)) /*&& (expenseCategory!=null)*/) {
+ if (line.isEmpty() || (nextLine == null)) {
if(generalBudget == null){
- System.out.println("hello 1");
- System.out.println(budgetPeriod);
generalBudget = new GeneralBudget(budgetPeriod,maxAmount);
- generalBudget.addToBudget(budgetAmount,budgetDescription,expenseCategory);
} else{
- System.out.println("hello2");
generalBudget.addToBudget(budgetAmount,budgetDescription,expenseCategory);
}
}
diff --git a/src/main/resources/Budget/Budget.budget b/src/main/resources/Budget/Budget.budget
index e69de29b..78b9f48b 100644
--- a/src/main/resources/Budget/Budget.budget
+++ b/src/main/resources/Budget/Budget.budget
@@ -0,0 +1,7 @@
+budgetPeriod=31
+maxAmount=1000.0
+
+budgetAmount=500.0
+budgetCategory=FOOD
+budgetDescription=dd
+
diff --git a/src/main/resources/Economics/Expense.register b/src/main/resources/Economics/Expense.register
index 06e27051..92c0b798 100644
--- a/src/main/resources/Economics/Expense.register
+++ b/src/main/resources/Economics/Expense.register
@@ -10,9 +10,3 @@ amount=121.0
isRecurring=Not recurring
category=OTHER
-date=2024-03-16
-description=1112111
-amount=1000.0
-isRecurring=Not recurring
-category=FOOD
-
diff --git a/src/main/resources/Economics/Income.register b/src/main/resources/Economics/Income.register
index e69de29b..a9197b71 100644
--- a/src/main/resources/Economics/Income.register
+++ b/src/main/resources/Economics/Income.register
@@ -0,0 +1,17 @@
+date=2023-03-24
+description=studie
+amount=1000.0
+isRecurring=Recurring
+category=STUDENT_LOAN
+
+date=2023-03-25
+amount=100.0
+isRecurring=Not recurring
+category=GIFT
+
+date=2023-03-25
+description=airbnb
+amount=3000.0
+isRecurring=Not recurring
+category=GIFT
+
--
GitLab