109 Commits

Author SHA1 Message Date
Roland Geider
c2f138cf9f Increase timeout durations for API requests 2026-01-30 13:50:35 +01:00
Roland Geider
077dcaf742 Handle HTML errors in WgerHttpException
These need to be handled separately when the server encounters an error and
returns HTML instead of JSON.
2025-12-17 18:59:45 +01:00
lenka369
27c80ed550 prevent duplicate ingredients in cache 2025-11-18 23:34:12 +01:00
lenka369
aaa91a4591 Update mock files 2025-11-16 08:53:18 +01:00
lenka369
fc48c707e8 Added tests 2025-11-04 05:21:18 +01:00
lenka369
ed938cd3d2 Replaced print statements with logger 2025-11-03 10:03:37 +01:00
lenka369
a7ba623005 fix: Save ingredient to cache on selection 2025-10-31 10:36:34 +01:00
Roland Geider
136d0e0825 Extract some logic to their own widgets 2025-10-06 12:43:05 +02:00
Roland Geider
530efd366e Some renaming 2025-09-24 12:31:28 +02:00
Roland Geider
84c29eb209 Use the regular ingredient endpoint, instead of the special search one 2025-09-24 01:35:03 +02:00
Roland Geider
6cc96310c5 Simplify currentPlan 2025-09-12 14:37:32 +02:00
Roland Geider
0fd2af030d Merge branch 'refs/heads/master' into nutrition-plan-stats 2025-09-12 14:05:38 +02:00
Roland Geider
c89ccb630c Use max pagination size when loading data
This is a workaround for #867, but not a real solution
2025-09-06 00:50:00 +02:00
Roland Geider
ac043baa68 Merge branch 'master' into nutrition-plan-stats
# Conflicts:
#	lib/models/nutrition/nutritional_plan.g.dart
#	lib/widgets/measurements/charts.dart
#	lib/widgets/measurements/entries.dart
#	lib/widgets/weight/weight_overview.dart
2025-09-03 15:25:17 +02:00
Dieter Plaetinck
29f6c87122 show charts for all nutritional plans + more elegant filtering 2025-06-28 18:36:30 +02:00
Dieter Plaetinck
a0e2659e60 dart format --line-length=100 . 2025-06-27 23:37:56 +02:00
Dieter Plaetinck
d1cfce7526 adjust older code for 'current plan' and showing weight during plan 2025-06-27 22:44:49 +02:00
Roland Geider
70fba34f0c Better handling of time zones
We now send the current time zone to the server when serializing datetime objects.
This was causing entries to be saved some hours wrong or depending on the time, on
a different day.
2025-05-26 11:13:53 +02:00
burny0202
0942739200 Allow the logging on meals with date times #789 2025-05-08 21:43:07 +01:00
Roland Geider
58e7a52e3d Use log levels when logging to console 2025-01-25 12:45:33 +01:00
Dieter Plaetinck
555f57d2de dart fix --apply 2024-10-16 15:33:03 +02:00
Roland Geider
906fa7257a Rename function 2024-09-29 11:45:31 +02:00
Roland Geider
dbdec5c9dd Add tests for db cache 2024-09-27 11:11:35 +02:00
Roland Geider
b1a49218ad Fix tests 2024-09-27 10:25:55 +02:00
Roland Geider
188dcddf23 Rename field to "lastFetched" and add migration class 2024-09-26 23:37:50 +02:00
Roland Geider
8ce9029459 Start migrating the ingredient cache to a local sqlite database 2024-09-26 21:18:54 +02:00
Dieter Plaetinck
25ad580a38 disable prefer-match-file-name for now.. 2024-09-18 21:23:18 +03:00
Dieter Plaetinck
2ef68ce24d cleanup 2024-07-12 14:11:07 +03:00
Dieter Plaetinck
7e7fa387d5 todo's 2024-07-12 14:11:07 +03:00
Dieter Plaetinck
d06ecabadf use ingredientinfo api, for image + new source and remote id fields
also update fixtures accordingly
2024-07-12 13:50:04 +03:00
Dieter Plaetinck
e1e27fb1dd for consistency and safety, always use prefs constants 2024-07-11 20:22:25 +03:00
Dieter Plaetinck
11ee38c03d dart fix --apply 2024-06-20 15:47:55 +03:00
Dieter Plaetinck
74289d9b00 dcm fix --only-rules=avoid-unnecessary-return lib 2024-06-07 14:59:11 +03:00
Dieter Plaetinck
7f74bff32c dcm fix --only-rules=prefer-trailing-comma lib 2024-06-07 14:59:00 +03:00
Roland Geider
432ac8bbc6 More refactorings, extracting widgets and polishing 2024-02-24 12:19:36 +01:00
Roland Geider
9b0985fbf3 Add chart for percentage of logged nutritional values for meals 2024-02-23 19:19:13 +01:00
Roland Geider
faf1018f2a Fixes for flutter typeahead 5.1.0
Also, add some models for the API response from the search
2024-01-29 12:07:26 +01:00
Roland Geider
03f6b555af Fix order of log entries 2023-10-08 21:52:07 +02:00
Roland Geider
e377db76fa Explicitly return null 2023-04-15 11:32:44 +02:00
Roland Geider
525fc8efd3 Fix typo 2023-04-09 11:29:55 +02:00
Roland Geider
6197e4dd2a Use paginated api when fetching log entries 2023-03-20 17:17:53 +01:00
Roland Geider
984df49c41 Add switch to search for ingredients in English as well 2023-03-20 17:14:12 +01:00
Roland Geider
fa8dd7e46f Fix merge errors 2023-03-20 14:19:29 +01:00
Roland Geider
b60e19cb16 Merge branch 'master' into feature/ingredient-images
# Conflicts:
#	lib/main.dart
#	lib/providers/nutrition.dart
#	pubspec.yaml
#	test/nutrition/nutritional_plan_screen_test.dart
#	test/nutrition/nutritional_plans_screen_test.dart
2023-03-20 13:58:31 +01:00
Roland Geider
aa62c27cdb Add refresh indicators to the entry lists
This allows the user to manually trigger an update if desired

See wger-project/wger/issues/1253
2023-02-09 18:08:31 +01:00
Roland Geider
7bb9ac28fd Merge branch 'master' into feature/ingredient-images
# Conflicts:
#	lib/main.dart
#	lib/models/exercises/exercise.g.dart
#	lib/widgets/core/core.dart
#	pubspec.lock
#	test/gallery/gallery_screen_test.mocks.dart
#	test/measurements/measurement_categories_screen_test.mocks.dart
#	test/measurements/measurement_provider_test.mocks.dart
#	test/nutrition/nutritional_plan_form_test.mocks.dart
#	test/other/base_provider_test.mocks.dart
#	test/workout/workout_form_test.mocks.dart
#	test/workout/workout_set_form_test.mocks.dart
2023-02-08 12:48:00 +01:00
Roland Geider
94b2359903 Add stub with nutrition provider tests 2022-08-09 20:48:56 +02:00
Roland Geider
8a3351159a Pass the base provider to the nutritional provider as an argument
This makes it easier to test and is the same behaviour as the measurement
provider
2022-08-09 20:04:41 +02:00
Roland Geider
cb4bce7653 Show ingredient images 2022-08-09 18:51:37 +02:00
Roland Geider
badc3257d0 Merge branch 'master' into feature/exercise-crowdsourcing
# Conflicts:
#	assets/images/muscles/back.svg
#	assets/images/muscles/main/muscle-1.svg
#	assets/images/muscles/main/muscle-10.svg
#	assets/images/muscles/main/muscle-11.svg
#	assets/images/muscles/main/muscle-12.svg
#	assets/images/muscles/main/muscle-13.svg
#	assets/images/muscles/main/muscle-14.svg
#	assets/images/muscles/main/muscle-15.svg
#	assets/images/muscles/main/muscle-16.svg
#	assets/images/muscles/main/muscle-2.svg
#	assets/images/muscles/main/muscle-3.svg
#	assets/images/muscles/main/muscle-4.svg
#	assets/images/muscles/main/muscle-5.svg
#	assets/images/muscles/main/muscle-6.svg
#	assets/images/muscles/main/muscle-7.svg
#	assets/images/muscles/main/muscle-8.svg
#	assets/images/muscles/main/muscle-9.svg
#	assets/images/muscles/secondary/muscle-1.svg
#	assets/images/muscles/secondary/muscle-10.svg
#	assets/images/muscles/secondary/muscle-11.svg
#	assets/images/muscles/secondary/muscle-12.svg
#	assets/images/muscles/secondary/muscle-13.svg
#	assets/images/muscles/secondary/muscle-14.svg
#	assets/images/muscles/secondary/muscle-15.svg
#	assets/images/muscles/secondary/muscle-16.svg
#	assets/images/muscles/secondary/muscle-2.svg
#	assets/images/muscles/secondary/muscle-3.svg
#	assets/images/muscles/secondary/muscle-4.svg
#	assets/images/muscles/secondary/muscle-5.svg
#	assets/images/muscles/secondary/muscle-6.svg
#	assets/images/muscles/secondary/muscle-7.svg
#	assets/images/muscles/secondary/muscle-8.svg
#	assets/images/muscles/secondary/muscle-9.svg
#	lib/helpers/consts.dart
#	lib/l10n/app_en.arb
#	lib/models/exercises/exercise.dart
#	lib/models/exercises/exercise.g.dart
#	lib/providers/exercises.dart
#	lib/widgets/exercises/exercises.dart
#	pubspec.lock
#	pubspec.yaml
#	test/exercises/exercises_detail_widget_test.dart
#	test/nutrition/nutritional_plan_form_test.mocks.dart
#	test/workout/workout_set_form_test.mocks.dart
2022-02-19 22:07:47 +01:00