Commits · 80abb2af0cdbdddd270f9e8f91ff38a57e5cce2e · Andreas Kluge Svendsrud / idatt1002_2023_9 · GitLab

Snippets Groups Projects

Apr 18, 2023
- Make ingredients sorted alphabetically · 80abb2af
  HSoreide authored 1 year ago
  
  80abb2af
- Add check for Apply button being present · 12904e22
  HSoreide authored 1 year ago
  
  12904e22
- Add sample recipes, food types and measuring units · 54ffa627
  HSoreide authored 1 year ago
  
  54ffa627
- Adjust spacing and scrolling of recipe instructions · 8200834f
  HSoreide authored 1 year ago
  
  8200834f
- List of all recipes with navigation to selected recipe · b7cd7e46
  HSoreide authored 1 year ago
  
  b7cd7e46
Apr 17, 2023
- Skeleton of view of all recipes in a scrollable list · f04f5058
  HSoreide authored 1 year ago
  
  f04f5058
- View for showing selected recipe in detail working with dynamic list of ingredients · 6041aed0
  HSoreide authored 1 year ago
  
  6041aed0
- Add some styling for buttons and lists · 55b50fe8
  HSoreide authored 1 year ago
  
  55b50fe8
- Bugfix of overlaying recipes in grid and display missing ingredients upon hover over recipes · f67ce0fc
  HSoreide authored 1 year ago
  
  f67ce0fc
Apr 16, 2023
- Create controller and fxml file for display of one Recipe with details · 7c9e44a7
  HSoreide authored 1 year ago
  
  7c9e44a7
- Suggested recipes are shown and update with changes ti ingredients at hand · ce9d67f4
  HSoreide authored 1 year ago
  
  ce9d67f4
- Create best-fit-recipes picker in RecipeRegister · 2f3ec095
  HSoreide authored 1 year ago
  
  2f3ec095
- Ingredients can be added to the fridge · 94c03500
  HSoreide authored 1 year ago
  
  94c03500
- Ingredients can be removed from the fridge · db97121b
  HSoreide authored 1 year ago
  
  db97121b
Apr 15, 2023
- Initialize ingredients at hand and recipe register from file in SuggestRecipesController · a24adfdf
  HSoreide authored 1 year ago
  
  a24adfdf
- Merge branch 'HS_Rewrite_fileHandling_for_recipes_and_ingredients' into 'HS_Frontend_Recipes' · d21b72ab
  Hanne-Sofie Søreide authored 1 year ago
  
  Hs rewrite file handling for recipes and ingredients See merge request !36
  d21b72ab
- Tidy up unit tests of detailed and simplified IngredientsAtHand classes · 1432ee61
  HSoreide authored 1 year ago
  
  1432ee61
- FileHandler writes and reads ingredients at hand from file · 9b5cefb4
  HSoreide authored 1 year ago
  
  9b5cefb4
- Refactor simplified class for ingredients at hand · eb177b1b
  HSoreide authored 1 year ago
  
  eb177b1b
- File handler reads recipes from file and creates a RecipeRegister · 3ae78945
  HSoreide authored 1 year ago
  
  3ae78945
- File handler that writes recipe register to file with basic unit test · 062d2a39
  HSoreide authored 1 year ago
  
  062d2a39
- Import and search for Ingredients to add to fridge in pop-up window · c488a0ce
  HSoreide authored 1 year ago
  
  c488a0ce
Apr 14, 2023
- Make button in running MainMenu open Suggested Recipes view · 7db22c03
  HSoreide authored 1 year ago
  
  7db22c03
- Styling and layout of suggested recipe tiles · ba95587c
  HSoreide authored 1 year ago
  
  ba95587c
- Make Recipe controllers to provide test data and fill in grid with suggested recipes · b8d9b0b5
  HSoreide authored 1 year ago
  
  b8d9b0b5
- Make updateIngredientStatus of Recipe class provide number of missing ingredients · 3e3112ec
  HSoreide authored 1 year ago
  
  3e3112ec
- Create RecipeTile to represent suggested recipes with custom css styling · 8a69ecac
  HSoreide authored 1 year ago
  
  8a69ecac
- Create initial classes and fxml files for food recipes · e45bdeca
  HSoreide authored 1 year ago
  
  e45bdeca
Apr 11, 2023
- Merge branch 'FileHandlingAndreas' into 'master' · bb30da12
  Harry Linrui Xu authored 1 year ago
  
  Added exception to BudgetItem constructor and Overview now takes in a Budget See merge request !33
  bb30da12
- Added exception to BudgetItem constructor and Overview now takes in a Budget · 99a1b93d
  Andreas Kluge Svendsrud authored 1 year ago and Harry Linrui Xu committed 1 year ago
  
  99a1b93d
- Merge branch 'frontend-testing' into 'master' · 8dc645d6
  Andreas Kluge Svendsrud authored 1 year ago
  
  Added input validation to add dialog boxes. See merge request !32
  8dc645d6
- Added input validation to add dialog boxes. · 2297af96
  Harry Linrui Xu authored 1 year ago and Andreas Kluge Svendsrud committed 1 year ago
  
  2297af96
Apr 04, 2023
- Merge branch 'frontend-testing' into 'master' · 48ed9bb5
  Andreas Kluge Svendsrud authored 1 year ago
  
  Redesigned scenes See merge request !30
  48ed9bb5
- Redesigned scenes · 4726211d
  Harry Linrui Xu authored 1 year ago and Andreas Kluge Svendsrud committed 1 year ago
  
  4726211d
Mar 26, 2023
- Merge branch 'frontend-testing' into 'master' · 757d85dd
  Harry Linrui Xu authored 1 year ago
  
  Merging frontend-testing with master See merge request !24
  757d85dd
- Merging frontend-testing with master · d2d0c44e
  Harry Linrui Xu authored 1 year ago
  
  d2d0c44e
Mar 24, 2023
- Merge branch 'FileHandlingAndreas' into 'master' · 6140c592
  Hanne-Sofie Søreide authored 1 year ago
  
  Created class for FileHandling GeneralBudget objects See merge request !22
  6140c592
- Created class for FileHandling GeneralBudget objects · 593f999d
  Andreas Kluge Svendsrud authored 1 year ago and Hanne-Sofie Søreide committed 1 year ago
  
  593f999d
Mar 22, 2023
- Merge branch 'budget' into 'master' · b926b868
  Andreas Kluge Svendsrud authored 1 year ago
  
  Budget See merge request !11
  b926b868
- Adds javadoc to BudgetItem and GeneralBudget · d02e6617
  Adele Iren Westrum Kjølstad authored 1 year ago
  
  d02e6617