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 97da74c3829343d720488994a7720a4b5c7fa817..b2be85cb41ddc0f22e375477b76797e8be44fec3 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 3fe4eb3a0f177a7375d8ee06225313d787e4c1cf..c39321868e3685847d9eb0a920828f81937778e4 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..78b9f48b0b7ef60c96033b2573dfddcd296b6de6 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 06e27051887b2718c0d462e929dd90f7fa1b9bb2..92c0b798ec66b8d8624dd7c86f0e381cdb0e35bb 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a9197b714cedf37c3fef72859cb940902ebd462a 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 +