Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

I

idatt1002_2023_9
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

f48bb608

Commit f48bb608 authored 2 years ago by Harry Linrui Xu

Downloads
- Plain Diff

Merge branch 'button-popup' into 'master'

Added information popup to edit and delete buttons and fixed positioning of adding ingredients

See merge request !55

parents dcf16057 c997035c

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 8
Pipelines 3

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java 29 additions, 2 deletions

...a/no/ntnu/idatt1002/demo/controller/BudgetController.java
src/main/java/no/ntnu/idatt1002/demo/controller/SuggestRecipesController.java 8 additions, 1 deletion

...u/idatt1002/demo/controller/SuggestRecipesController.java
src/main/java/no/ntnu/idatt1002/demo/data/Budget/FileHandlingBudgetArchive.java 0 additions, 13 deletions

...idatt1002/demo/data/Budget/FileHandlingBudgetArchive.java
src/main/java/no/ntnu/idatt1002/demo/data/Budget/MMBI.java 0 additions, 64 deletions

src/main/java/no/ntnu/idatt1002/demo/data/Budget/MMBI.java
src/main/resources/view/AddIngredient.fxml 14 additions, 6 deletions

src/main/resources/view/AddIngredient.fxml
src/main/resources/view/BudgetNewest.fxml 1 addition, 1 deletion

src/main/resources/view/BudgetNewest.fxml
src/main/resources/view/IncomeAndExpenses.fxml 1 addition, 1 deletion

src/main/resources/view/IncomeAndExpenses.fxml
src/main/resources/view/newBudgetBudgert.fxml 1 addition, 1 deletion

src/main/resources/view/newBudgetBudgert.fxml

with 54 additions and 89 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment