diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/FinanceController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/FinanceController.java index c0d6a7ddc4dd33eb864d24b84ffefa8da56d8525..96efb6519e3b2e44ce77d43580ecf8e48e9524dd 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/controller/FinanceController.java +++ b/src/main/java/no/ntnu/idatt1002/demo/controller/FinanceController.java @@ -18,19 +18,19 @@ public interface FinanceController { * Method for handling the adding of new entries in the tableview. * @param event A button click on the add button. */ - void handleAddBtn(ActionEvent event); + void handleAddBtn(javafx.event.ActionEvent event); /** * Method for handling the editing of a chosen entry in the tableview. * @param event A button click on the edit button. */ - void handleEditBtn(ActionEvent event); + void handleEditBtn(javafx.event.ActionEvent event); /** * Deletes an entry from the tableview, if an entry has been selected. The method brings up a popup window, asking for confirmation for deleting the entry. * @param event A button click on the delete button */ - void handleDeleteBtn(ActionEvent event); + void handleDeleteBtn(javafx.event.ActionEvent event); /** * Method for synching the register with the tableview. The observable list to which the tableview is set, is being refilled with all the entries diff --git a/src/main/java/no/ntnu/idatt1002/demo/view/FinanceDialog.java b/src/main/java/no/ntnu/idatt1002/demo/view/FinanceDialog.java deleted file mode 100644 index c7c5dc20c822c6938f447a3c78282eaaddc0ed19..0000000000000000000000000000000000000000 --- a/src/main/java/no/ntnu/idatt1002/demo/view/FinanceDialog.java +++ /dev/null @@ -1,2 +0,0 @@ -package no.ntnu.idatt1002.demo.view;public class FinanceDialog { -} diff --git a/src/main/resources/Economics/Expense.register b/src/main/resources/Economics/Expense.register index 3e3f3d5fa15f46231db748edd65480d6aa509212..680b65f4e274704e9d6af201433e29dc2ff7b183 100644 --- a/src/main/resources/Economics/Expense.register +++ b/src/main/resources/Economics/Expense.register @@ -3,13 +3,3 @@ amount=100.0 isRecurring=Not recurring category=FOOD -date=2023-03-27 -amount=100.0 -isRecurring=Recurring -category=OTHER - -date=2023-03-30 -amount=200.0 -isRecurring=Not recurring -category=BOOKS - diff --git a/src/main/resources/Economics/Income.register b/src/main/resources/Economics/Income.register index 534019fcdfa9f726f8d34613139b85c01ad398d0..da16fff25774f98bc979a37541e9c58899f9db22 100644 --- a/src/main/resources/Economics/Income.register +++ b/src/main/resources/Economics/Income.register @@ -1,5 +1,10 @@ date=2023-03-27 -amount=950.0 +amount=110.0 isRecurring=Recurring category=SALARY +date=2023-03-31 +amount=100.0 +isRecurring=Not recurring +category=GIFT +