Natalia Cholewa
2f56d7a760
feat: translations for pie chart
2026-01-23 14:52:34 +01:00
Natalia Cholewa
58cc86c843
feat: pie chart for nutrients
2026-01-23 13:48:48 +01:00
Natalia Cholewa
33e7c7386e
docs: agenda for week 09
2026-01-23 12:21:29 +01:00
Natalia Cholewa
a5cdcaac14
docs: agenda for week 09
2026-01-23 12:20:03 +01:00
Natalia Cholewa
2c54833c6b
docs: agenda for week 09
2026-01-23 12:18:34 +01:00
Maria Dumitrescu
b5348a4c24
feedback w8
2026-01-23 09:27:13 +01:00
e17a75fcd5
Merge branch 'lang/zh-XX' into 'main'
...
chore(lang): zh_CN & zh_TW translations into application
Closes #69
See merge request cse1105/2025-2026/teams/csep-team-76!69
2026-01-23 00:44:02 +01:00
827fe195a9
fix: static member of Config declaring all languages supported by the application
2026-01-23 00:38:25 +01:00
dda01f3bfe
chore(lang): adds Chinese that looks just a liiiiiiittle bit different
2026-01-23 00:38:24 +01:00
a3c08170d3
chore(lang): zh_TW
2026-01-23 00:37:14 +01:00
Aysegul Aydinlik
b82a8f7d33
Merge branch 'searchbar-fix' into 'main'
...
added searching multiple things
Closes #82
See merge request cse1105/2025-2026/teams/csep-team-76!91
2026-01-23 00:33:57 +01:00
1fd3b26faa
Merge branch 'feature/shopping-list-crud' into 'main'
...
CRUD functionality for shopping list
Closes #80
See merge request cse1105/2025-2026/teams/csep-team-76!85
2026-01-23 00:33:08 +01:00
186e74ddd3
Merge branch 'feature/client-shopping-list-view' into 'main'
...
Client shopping list view
Closes #79
See merge request cse1105/2025-2026/teams/csep-team-76!84
2026-01-23 00:31:57 +01:00
Rithvik Sriram
f1fc55f674
Merge branch 'extra-server-tests' into 'main'
...
Added a few extra tests in RecipeControllerTest
See merge request cse1105/2025-2026/teams/csep-team-76!90
2026-01-22 23:24:26 +01:00
bfe6505c54
Merge branch 'fix/favourites-rendering' into 'main'
...
fix: favourites rendering properly after a list change propagated from server.
See merge request cse1105/2025-2026/teams/csep-team-76!89
2026-01-22 23:21:48 +01:00
f281ce1333
chore: cleanup unused code in foodpal
2026-01-22 22:56:07 +01:00
1542117ac6
fix: refresh the favourites list if any change occurs to the original list
2026-01-22 22:55:56 +01:00
Rithvik Sriram
4d57f84ccb
Added a few extra tests in RecipeControllerTest
2026-01-22 22:37:49 +01:00
Aysegul Aydinlik
be1b4b9ee3
added a feature and meaningful addition
2026-01-22 21:50:13 +01:00
ad199ea244
Merge branch 'feature/client-search-fix' into 'main'
...
fix: Search bar immediately clears search params and returns server contents after ESCAPE key-press
See merge request cse1105/2025-2026/teams/csep-team-76!87
2026-01-22 21:42:59 +01:00
7cddc0303c
fix: Search bar immediately clears search params and returns server contents after ESCAPE key-press
2026-01-22 21:04:28 +01:00
4c341aadec
Merge branch 'bugfix/ingredients-list-ctrl-renderer' into 'main'
...
fix: into initializeComponents
See merge request cse1105/2025-2026/teams/csep-team-76!86
2026-01-22 20:54:57 +01:00
d23eb34a00
fix: into initializeComponents
2026-01-22 20:51:10 +01:00
234c8c3d64
feat(client/shopping): fxml definition for various UI elements
2026-01-22 19:54:49 +01:00
670de432c5
feat(client/shopping): delegate list view cell rendering and make add element handler
2026-01-22 19:54:33 +01:00
795926298e
feat(client/shopping): create custom editable shopping list cell element
2026-01-22 19:53:27 +01:00
f03c12cc0f
feat(client/shopping): create add ingredient modal
2026-01-22 19:52:53 +01:00
143b73c23f
Merge branch 'feature/add-duplicate-error-message' into 'main'
...
Added a special warning message when user tries to add duplicate ingredients
See merge request cse1105/2025-2026/teams/csep-team-76!58
2026-01-22 19:03:01 +01:00
76852fcd4f
Merge branch 'prevent-server-dependancy' into 'main'
...
added a Dialog sequence for when the server is not up
Closes #58
See merge request cse1105/2025-2026/teams/csep-team-76!79
2026-01-22 18:59:15 +01:00
483617c5bf
feat(client/fxml): add relevant components
2026-01-22 18:46:52 +01:00
21b2465b91
feat(client/service/shop): functional service backend
2026-01-22 18:46:33 +01:00
c0107d752a
feat(client/shoplist): UI control logic for add all to list
2026-01-22 18:46:06 +01:00
40cfc0b98e
fix(client/logging): added slf4j-api to client pom.xml
2026-01-22 18:44:25 +01:00
Natalia Cholewa
d732aee6de
fix: pipeline not passing :(
2026-01-22 17:33:53 +01:00
Natalia Cholewa
6cfd6ab82c
feat: shopping list view
2026-01-22 17:22:39 +01:00
70dfc7e983
fix: non-functional API
2026-01-22 17:21:50 +01:00
5315fe3df4
feat(client/nutrition-model): init modules for shopping list; missing impl but it has interface :)
2026-01-22 17:21:50 +01:00
Mei Chang van der Werff
9077df5164
Merge branch 'fix/Ingredients-ordered' into 'main'
...
Sorts ingredients in alphabetic order
Closes #75
See merge request cse1105/2025-2026/teams/csep-team-76!80
2026-01-22 16:43:47 +01:00
Rithvik Sriram
22dd603746
stray typo fix
2026-01-22 16:12:58 +01:00
Rithvik Sriram
cb4a93aeab
Fixed merge conflicts and rebased
2026-01-22 16:12:20 +01:00
Rithvik Sriram
a1df0f5b24
Made a Duplicate Exception class and made that be called instead for better robustness and consistency
2026-01-22 16:01:17 +01:00
Rithvik Sriram
e5f7df7318
Fixed pipeline issues and added comment
2026-01-22 15:51:21 +01:00
Rithvik Sriram
b985aa283f
added a special warning message when user tries to add duplicate ingredients
2026-01-22 15:51:21 +01:00
Mei Chang van der Werff
274a48c5c2
Merge branch 'ImprovedServerTests' into 'main'
...
Fixed PortChecker Server Test
See merge request cse1105/2025-2026/teams/csep-team-76!81
2026-01-22 15:34:58 +01:00
23d6d6bbf6
Merge branch 'client/feature-servings' into 'main'
...
feat(client/servings): inferring serving size from user input
Closes #72
See merge request cse1105/2025-2026/teams/csep-team-76!74
2026-01-22 15:24:46 +01:00
Aysegul Aydinlik
14a4e157ea
Merge branch 'testing-client' into 'main'
...
added IngredientControllerTest
Closes #77
See merge request cse1105/2025-2026/teams/csep-team-76!82
2026-01-22 15:17:03 +01:00
4e901f7847
fix: servings minimum as One
2026-01-22 14:52:33 +01:00
d83494c2a1
chore: move things around
2026-01-22 14:52:33 +01:00
6931367145
feat(client/main): append main UI logic to handle serving size rendering
2026-01-22 14:52:33 +01:00
8615187628
feat(client/serving): declare UI infrastructure and data deps for servings
2026-01-22 14:52:33 +01:00
