From fd6bc3688b311b4803dd594b2d7ba5ac3da2333b Mon Sep 17 00:00:00 2001
From: Harry Linrui XU <xulr0820@hotmail.com>
Date: Sun, 26 Mar 2023 13:32:44 +0200
Subject: [PATCH] "Made sum field refresh with tableview changes"
---
.../idatt1002/demo/controller/BudgetController.java | 12 ++++--------
.../demo/controller/ExpensesController.java | 8 +++++---
.../idatt1002/demo/controller/IncomeController.java | 11 ++++-------
src/main/resources/Economics/Expense.register | 2 +-
src/main/resources/Economics/Income.register | 2 +-
src/main/resources/view/MainMenu.fxml | 6 +++---
6 files changed, 18 insertions(+), 23 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 76955931..22215ac7 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java
@@ -17,16 +17,11 @@ import javafx.stage.Stage;
import no.ntnu.idatt1002.demo.data.Budget.BudgetItem;
import no.ntnu.idatt1002.demo.data.Budget.FileHandlingBudget;
import no.ntnu.idatt1002.demo.data.Budget.GeneralBudget;
-import no.ntnu.idatt1002.demo.data.Economics.Expense;
import no.ntnu.idatt1002.demo.data.Economics.ExpenseCategory;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Optional;
-import no.ntnu.idatt1002.demo.data.Economics.FileHandling;
-import no.ntnu.idatt1002.demo.data.Economics.IncomeRegister;
public class BudgetController {
@@ -126,7 +121,7 @@ public class BudgetController {
showIllegalBudgetItemDialog();
}
}
- refreshObservableList();
+ refreshTableView();
}
@FXML
@@ -145,7 +140,7 @@ public class BudgetController {
Optional<ButtonType> isConfirmed = showConfirmationDialog();
if (isConfirmed.isPresent() && isConfirmed.get() == ButtonType.OK) {
general.deleteItemFromBudget(item.getBudgetCategory());
- refreshObservableList();
+ refreshTableView();
}
}
@@ -188,8 +183,9 @@ public class BudgetController {
}
- protected void refreshObservableList(){
+ protected void refreshTableView(){
this.budgetList.setAll(general.getBudgetItems());
+ this.sum.setText(String.valueOf(general.totalSum()));
}
@FXML
diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/ExpensesController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/ExpensesController.java
index 4ef9cc43..34b0c179 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/ExpensesController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/ExpensesController.java
@@ -159,7 +159,7 @@ public class ExpensesController {
if (newExpense != null && dialogMode == DialogMode.ADD) {
expenseRegister.addItem(newExpense);
}
- refreshObservableList();
+ refreshTableView();
}
//Only add the expense to the tableview, if the expense is not null
@@ -172,12 +172,14 @@ public class ExpensesController {
Optional<ButtonType> isConfirmed = showConfirmationDialog();
if (isConfirmed.isPresent() && isConfirmed.get() == ButtonType.OK) {
expenseRegister.removeItem(chosenExpense);
- refreshObservableList();
+ refreshTableView();
}
}
- protected void refreshObservableList() {
+ protected void refreshTableView() {
this.expenses.setAll(expenseRegister.getItems());
+ this.sum.setText(String.valueOf(expenseRegister.getTotalSum()));
+
}
private Optional<ButtonType> showConfirmationDialog() {
diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeController.java
index fea1cb48..489d98db 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeController.java
@@ -27,10 +27,6 @@ import no.ntnu.idatt1002.demo.data.Economics.Income;
import no.ntnu.idatt1002.demo.data.Economics.IncomeCategory;
import no.ntnu.idatt1002.demo.data.Economics.IncomeRegister;
import no.ntnu.idatt1002.demo.data.Economics.FileHandling;
-import no.ntnu.idatt1002.demo.data.Economics.Income;
-import no.ntnu.idatt1002.demo.data.Economics.IncomeRegister;
-import no.ntnu.idatt1002.demo.data.Economics.Item;
-import no.ntnu.idatt1002.demo.data.Economics.ItemRegister;
public class IncomeController {
@@ -152,7 +148,7 @@ public class IncomeController {
if (newIncome != null && dialogMode == DialogMode.ADD) {
incomeRegister.addItem(newIncome);
}
- refreshObservableList();
+ refreshTableView();
}
//Only add the income to the tableview, if the income is not null
@@ -165,12 +161,13 @@ public class IncomeController {
Optional<ButtonType> isConfirmed = showConfirmationDialog();
if (isConfirmed.isPresent() && isConfirmed.get() == ButtonType.OK) {
incomeRegister.removeItem(chosenIncome);
- refreshObservableList();
+ refreshTableView();
}
}
- protected void refreshObservableList() {
+ protected void refreshTableView() {
this.income.setAll(incomeRegister.getItems());
+ this.sum.setText(String.valueOf(incomeRegister.getTotalSum()));
}
private Optional<ButtonType> showConfirmationDialog() {
diff --git a/src/main/resources/Economics/Expense.register b/src/main/resources/Economics/Expense.register
index d05c78c3..ec17f6ed 100644
--- a/src/main/resources/Economics/Expense.register
+++ b/src/main/resources/Economics/Expense.register
@@ -11,7 +11,7 @@ isRecurring=Not recurring
category=OTHER
date=2023-03-26
-amount=4000.0
+amount=10.0
isRecurring=Not recurring
category=FOOD
diff --git a/src/main/resources/Economics/Income.register b/src/main/resources/Economics/Income.register
index a9197b71..bc73c779 100644
--- a/src/main/resources/Economics/Income.register
+++ b/src/main/resources/Economics/Income.register
@@ -11,7 +11,7 @@ category=GIFT
date=2023-03-25
description=airbnb
-amount=3000.0
+amount=1000.0
isRecurring=Not recurring
category=GIFT
diff --git a/src/main/resources/view/MainMenu.fxml b/src/main/resources/view/MainMenu.fxml
index 5bc13db1..a2b96f23 100644
--- a/src/main/resources/view/MainMenu.fxml
+++ b/src/main/resources/view/MainMenu.fxml
@@ -69,9 +69,9 @@
</ImageView>
<ProgressBar fx:id="progressbar" prefHeight="40.0" prefWidth="554.0" progress="0.72" translateY="-10.0" />
<Label fx:id="today" text="Today" textAlignment="CENTER" translateX="-150.0" translateY="-2.0">
- <font>
- <Font name="System Bold" size="12.0" />
- </font>
+ <StackPane.margin>
+ <Insets left="300.0" />
+ </StackPane.margin>
</Label>
</children>
</StackPane>
--
GitLab