Merge branch 'master' into 'HS_Frontend_Recipes'
# Conflicts: # src/main/resources/Economics/Income.register
Showing
- src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java 79 additions, 35 deletions...a/no/ntnu/idatt1002/demo/controller/BudgetController.java
- src/main/java/no/ntnu/idatt1002/demo/controller/FinanceController.java 1 addition, 1 deletion.../no/ntnu/idatt1002/demo/controller/FinanceController.java
- src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java 122 additions, 80 deletions...nu/idatt1002/demo/controller/IncomeExpenseController.java
- src/main/java/no/ntnu/idatt1002/demo/controller/MainMenu.java 110 additions, 25 deletions...main/java/no/ntnu/idatt1002/demo/controller/MainMenu.java
- src/main/java/no/ntnu/idatt1002/demo/controller/SceneController.java 1 addition, 1 deletion...va/no/ntnu/idatt1002/demo/controller/SceneController.java
- src/main/java/no/ntnu/idatt1002/demo/data/Budget/GeneralBudget.java 27 additions, 10 deletions...ava/no/ntnu/idatt1002/demo/data/Budget/GeneralBudget.java
- src/main/java/no/ntnu/idatt1002/demo/data/Economics/Overview.java 4 additions, 4 deletions.../java/no/ntnu/idatt1002/demo/data/Economics/Overview.java
- src/main/resources/Budget/Budget.budget 8 additions, 0 deletionssrc/main/resources/Budget/Budget.budget
- src/main/resources/Economics/Expense.register 1 addition, 7 deletionssrc/main/resources/Economics/Expense.register
- src/main/resources/Economics/Income.register 6 additions, 22 deletionssrc/main/resources/Economics/Income.register
- src/main/resources/view/BudgetNewest.fxml 19 additions, 9 deletionssrc/main/resources/view/BudgetNewest.fxml
- src/main/resources/view/IncomeAndExpenses.fxml 18 additions, 12 deletionssrc/main/resources/view/IncomeAndExpenses.fxml
- src/main/resources/view/dualList.fxml 212 additions, 0 deletionssrc/main/resources/view/dualList.fxml
- src/main/resources/view/newBudgetBudgert.fxml 230 additions, 0 deletionssrc/main/resources/view/newBudgetBudgert.fxml
- src/test/java/no/ntnu/idatt1002/demo/data/Budget/GeneralBudgetTest.java 35 additions, 0 deletions...no/ntnu/idatt1002/demo/data/Budget/GeneralBudgetTest.java
Loading
Please register or sign in to comment