6d56e684a3
fix(client): separate Main and UI for IDEA debugger to work
...
Reference: https://www.reddit.com/r/JavaFX/wiki/common-problems/#wiki_how_do_i_fix_.27error.3A_javafx_runtime_components_are_missing.27.3F
2026-01-06 18:10:51 +01:00
9f67800372
Merge branch 'commons/recipe-model-v2' into 'main'
...
refactor: New recipe & ingredients model to work with (in)formal quantities
Closes #43
See merge request cse1105/2025-2026/teams/csep-team-76!38
2026-01-05 17:38:23 +01:00
253da0b5bc
chore(test/printExport): delegate creation to DefaultValueFactory
2026-01-05 17:24:29 +01:00
39b2bb9d61
fix(commons/scaling): delegate scaleBy(int) to scaleBy(double) impl
2026-01-05 17:24:29 +01:00
b60284fa14
fix(client/serverUtils): immigrate nulling IDs to addRecipe(Recipe)
2026-01-05 17:24:29 +01:00
7bb2b06679
fix(test/unit): fix tests for cup(s)
2026-01-05 17:24:29 +01:00
62bd134084
feat(unit): kindly make some cup(s)
2026-01-05 17:24:29 +01:00
33a542672f
fix(test/client): implement pipeline testing skip in teardown function
2026-01-05 17:24:29 +01:00
88ef77d858
refactor(test/server): refactor server-side testing
2026-01-05 17:24:29 +01:00
c0add049be
refactor(test/client): refactor client-side tests
2026-01-05 17:24:29 +01:00
73c42303c4
refactor(test/commons): refactor tests for commons models
2026-01-05 17:24:29 +01:00
554d769305
chore(commons): implement missing equals/hashcode
2026-01-05 17:24:29 +01:00
71bb6d03ed
fix(client): server utils setting related IDs to null
2026-01-05 17:24:29 +01:00
d497ed108e
fix(server): fix duplicate Ingredient present in each recipe
...
An issue where multiple instances of a uniquely named Ingredient are
stored in the database. This is patched by checking server-side whether
an ingredient exists before persisting it. This now correctly implements
the Many-to-Many reference.
2026-01-05 17:24:29 +01:00
2d1df8fc11
feat(commons): create new Scalable<T extends RecipeIngredient> interface
...
Scalable<T extends Recipe> supplies two scaleBy() functions that
implementors should create. This allows for custom handling if more
types of ingredients are handled in the future.
2026-01-05 17:24:29 +01:00
b77f4aee76
fix(client): fixed some issues on the client-side
2026-01-05 17:24:29 +01:00
04a999147c
refactor(server): server-side integration of new recipe modelling
2026-01-05 17:24:29 +01:00
f04bbc037e
refactor(client): client-side refactor to new modelling
2026-01-05 17:24:29 +01:00
88a85f2e04
refactor: revised class layout for JPA entities
2026-01-05 17:24:29 +01:00
9958ae5fbe
Merge branch 'client/ingredient-input-v2' into 'main'
...
refactor: make ingredient input cells capable of informal & formal inputs
Closes #14
See merge request cse1105/2025-2026/teams/csep-team-76!37
2026-01-05 16:33:28 +01:00
560a00cd2a
Merge branch 'refactor/recipe-details' into 'main'
...
refactor: put recipe detail controller into its own file
Closes #38
See merge request cse1105/2025-2026/teams/csep-team-76!36
2026-01-05 16:22:08 +01:00
Natalia Cholewa
ee66b643ec
refactor: make callbacks clean
2026-01-05 16:05:27 +01:00
6ca38e6613
chore: correct wrong reference to super in commitEdit calls
2025-12-22 00:21:16 +02:00
e4fc67e816
refactor: make ingredient input cells capable of informal & formal inputs
2025-12-21 23:41:48 +02:00
Natalia Cholewa
d2ad5337b9
refactor: put recipe detail controller into its own file, don't use guice for injecting fxml controllers
2025-12-20 22:53:00 +01:00
Natalia Cholewa
16482a7017
Merge branch 'highlight-list-view' into 'main'
...
added highlighting fav recipes + list
Closes #32
See merge request cse1105/2025-2026/teams/csep-team-76!35
2025-12-20 18:51:46 +01:00
Aysegul Aydinlik
086b8539c3
added highlighting fav recipes + list
2025-12-20 09:26:41 +01:00
2566eb450f
chore: update gitignore - prevent accidentally committing client config
2025-12-20 01:07:31 +02:00
Natalia Cholewa
625982dcd2
Merge branch 'feature/client-side-search' into 'main'
...
feat: Client side search box
Closes #34
See merge request cse1105/2025-2026/teams/csep-team-76!34
2025-12-19 23:49:03 +01:00
Natalia Cholewa
96eb19d74c
merge main into feature/client-side-search
2025-12-19 23:43:39 +01:00
dee91f9245
fix: add period to PrintExportService as MR written before new checkstyle
2025-12-20 00:31:44 +02:00
4fc4ca7327
Merge branch 'feature/client_printExport' into 'main'
...
Print/Export functionality
See merge request cse1105/2025-2026/teams/csep-team-76!19
2025-12-19 23:28:49 +01:00
5db8721148
Merge branch 'client/lang-button-dropdown' into 'main'
...
feat: Client language switching as dropdown menu
Closes #18
See merge request cse1105/2025-2026/teams/csep-team-76!21
2025-12-19 22:57:31 +01:00
00e4bb03f4
refactor: newest delivery from main
2025-12-19 23:54:45 +02:00
Mei Chang van der Werff
c56344d88a
Merge branch 'RecipeIngredientTest' into 'main'
...
Made tests for the RecipeIngredient class
Closes #20
See merge request cse1105/2025-2026/teams/csep-team-76!29
2025-12-19 22:34:41 +01:00
ca7c5cbfb9
fix(logic): immigrates LangSelectMenu to own controller
...
fix(println): also disappears the debug println statement from prod code
TODO: in the distant future, consider using a nice logging framework
(log4j?? or whatever spring boot is using..)
2025-12-19 23:29:27 +02:00
7e69976e5e
feat: controller for language list control
2025-12-19 23:10:50 +02:00
6b0d728ad3
chore: acquired flag images of langs
2025-12-19 23:10:50 +02:00
f7ff7497a2
feat: lang button into combo box
2025-12-19 23:10:50 +02:00
6c7a9434ca
chore: create display texts for langs
2025-12-19 23:10:50 +02:00
Mei Chang van der Werff
bb5e4a85a4
minutes for meeting week 6
2025-12-19 21:37:15 +01:00
Natalia Cholewa
d802d8627e
fix: checkstyle violations
2025-12-19 20:16:21 +01:00
Natalia Cholewa
4b28d073b9
Merge branch 'main' into 'feature/client-side-search'
...
# Conflicts:
# client/src/main/java/client/MyModule.java
# client/src/main/java/client/scenes/FoodpalApplicationCtrl.java
2025-12-19 20:12:51 +01:00
Natalia Cholewa
3c45143d76
feat: client side search box
2025-12-19 20:08:30 +01:00
Aysegul Aydinlik
96eff80653
Merge branch 'favourite-button-ui' into 'main'
...
added a star for favouriting a recipe and also unfavouriting it
See merge request cse1105/2025-2026/teams/csep-team-76!32
2025-12-19 20:03:21 +01:00
Aysegul Aydinlik
7a58153cd6
added a star for favouriting a recipe and also unfavouriting it
2025-12-19 20:00:54 +01:00
Aysegul Aydinlik
c07bae8d74
Merge branch 'favouriteMessage' into 'main'
...
Created a message for favourite Recipe
Closes #23
See merge request cse1105/2025-2026/teams/csep-team-76!30
2025-12-19 18:30:35 +01:00
Aysegul Aydinlik
3b53dd8ec6
Merge branch 'client/nutrition-view' into 'main'
...
feat: init ui definition nutrition view
Closes #9
See merge request cse1105/2025-2026/teams/csep-team-76!23
2025-12-19 18:29:40 +01:00
Mei Chang van der Werff
b0272fd276
Merge branch 'removeExampleCode' into 'main'
...
Removed all left over example code
Closes #27
See merge request cse1105/2025-2026/teams/csep-team-76!28
2025-12-19 00:48:19 +01:00
Rithvik Sriram
5feab76d94
Edit agenda-05.md
2025-12-18 20:44:14 +01:00
