Roland Geider
54b40696da
Postmerge fixes
2025-10-19 15:23:17 +02:00
Roland Geider
98f2fb0096
Merge branch 'master' into powersync
...
# Conflicts:
# Gemfile.lock
# android/settings.gradle
# fastlane/report.xml
# integration_test/1_dashboard.dart
# integration_test/2_workout.dart
# integration_test/3_gym_mode.dart
# integration_test/5_nutritional_plan.dart
# integration_test/6_weight.dart
# lib/helpers/i18n.dart
# lib/helpers/ui.dart
# lib/main.dart
# lib/models/nutrition/meal.g.dart
# lib/models/nutrition/nutritional_plan.dart
# lib/providers/auth.dart
# lib/providers/nutrition.dart
# lib/screens/add_exercise_screen.dart
# lib/screens/auth_screen.dart
# lib/screens/dashboard.dart
# lib/screens/exercises_screen.dart
# lib/screens/home_tabs_screen.dart
# lib/screens/log_meal_screen.dart
# lib/screens/log_meals_screen.dart
# lib/screens/nutritional_plan_screen.dart
# lib/screens/routine_list_screen.dart
# lib/screens/workout_plan_screen.dart
# lib/widgets/add_exercise/steps/step1basics.dart
# lib/widgets/add_exercise/steps/step5images.dart
# lib/widgets/add_exercise/steps/step_2_variations.dart
# lib/widgets/add_exercise/steps/step_3_description.dart
# lib/widgets/add_exercise/steps/step_4_translations.dart
# lib/widgets/core/about.dart
# lib/widgets/core/settings.dart
# lib/widgets/dashboard/calendar.dart
# lib/widgets/dashboard/widgets.dart
# lib/widgets/exercises/exercises.dart
# lib/widgets/gallery/overview.dart
# lib/widgets/measurements/categories_card.dart
# lib/widgets/measurements/charts.dart
# lib/widgets/measurements/entries.dart
# lib/widgets/measurements/forms.dart
# lib/widgets/measurements/helpers.dart
# lib/widgets/nutrition/charts.dart
# lib/widgets/nutrition/forms.dart
# lib/widgets/nutrition/helpers.dart
# lib/widgets/nutrition/meal.dart
# lib/widgets/nutrition/nutritional_diary_table.dart
# lib/widgets/nutrition/nutritional_plan_detail.dart
# lib/widgets/nutrition/nutritional_plans_list.dart
# lib/widgets/nutrition/widgets.dart
# lib/widgets/routines/charts.dart
# lib/widgets/routines/workout_logs.dart
# lib/widgets/weight/forms.dart
# lib/widgets/weight/weight_overview.dart
# lib/widgets/workouts/app_bar.dart
# lib/widgets/workouts/day.dart
# lib/widgets/workouts/forms.dart
# lib/widgets/workouts/gym_mode.dart
# lib/widgets/workouts/workout_plan_detail.dart
# lib/widgets/workouts/workout_plans_list.dart
# linux/flutter/generated_plugin_registrant.cc
# linux/flutter/generated_plugins.cmake
# pubspec.lock
# pubspec.yaml
# test/auth/auth_screen_test.dart
# test/core/settings_test.dart
# test/core/settings_test.mocks.dart
# test/nutrition/nutritional_meal_form_test.mocks.dart
# test/nutrition/nutritional_meal_item_form_test.dart
# test/nutrition/nutritional_plan_form_test.mocks.dart
# test/nutrition/nutritional_plan_screen_test.dart
# test/nutrition/nutritional_plans_screen_test.dart
# test/routine/repetition_unit_form_widget_test.dart
# test/routine/routine_screen_test.dart
# test/routine/routines_screen_test.dart
# test/routine/weight_unit_form_widget_test.dart
# test/workout/gym_mode_screen_test.dart
# test/workout/workout_day_form_test.dart
# test/workout/workout_form_test.dart
# test/workout/workout_set_form_test.dart
2025-10-19 14:48:15 +02:00
Roland Geider
64dc10cdb2
Fix import for localization strings
2025-10-19 14:23:58 +02:00
Roland Geider
c551b176fb
Merge pull request #950 from wger-project/feature/day-type
...
Set day and set types
2025-10-17 00:13:50 +02:00
Roland Geider
b0d1bce9aa
Consistently show the day and type name
2025-10-16 23:48:15 +02:00
Roland Geider
b4c77bf238
Move plate calculator visibility logic to the exercise itself
2025-10-16 21:59:56 +02:00
Roland Geider
1f6d22d85a
Tweak a bit how and when the types are shown
2025-10-09 23:11:10 +02:00
Roland Geider
39b503e03a
Format files as in master
2025-10-09 17:54:24 +02:00
Roland Geider
85ba00b654
Merge branch 'master' into feature/day-type
...
# Conflicts:
# lib/models/workouts/day.g.dart
# lib/models/workouts/day_data.g.dart
# lib/models/workouts/set_config_data.g.dart
# lib/models/workouts/slot_data.g.dart
# lib/models/workouts/slot_entry.g.dart
# lib/models/workouts/weight_unit.g.dart
# test/auth/auth_screen_test.mocks.dart
# test/core/settings_test.mocks.dart
# test/exercises/contribute_exercise_test.mocks.dart
# test/gallery/gallery_form_test.mocks.dart
# 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_meal_form_test.mocks.dart
# test/nutrition/nutritional_plan_form_test.mocks.dart
# test/nutrition/nutritional_plan_screen_test.mocks.dart
# test/nutrition/nutritional_plans_screen_test.mocks.dart
# test/other/base_provider_test.mocks.dart
# test/routine/day_form_test.mocks.dart
# test/routine/gym_mode_screen_test.mocks.dart
# test/routine/gym_mode_session_screen_test.mocks.dart
# test/routine/repetition_unit_form_widget_test.mocks.dart
# test/routine/routine_edit_screen_test.mocks.dart
# test/routine/routine_edit_test.mocks.dart
# test/routine/routine_form_test.mocks.dart
# test/routine/routine_logs_screen_test.mocks.dart
# test/routine/routine_screen_test.mocks.dart
# test/routine/routines_provider_test.mocks.dart
# test/routine/routines_screen_test.mocks.dart
# test/routine/slot_entry_form_test.mocks.dart
# test/routine/weight_unit_form_widget_test.mocks.dart
# test/user/provider_test.mocks.dart
# test/weight/weight_provider_test.mocks.dart
# test/weight/weight_screen_test.mocks.dart
2025-10-09 17:39:39 +02:00
Roland Geider
93a11a16e4
Recreate generated files and reformat the repo
...
Seems the default dart formatting rules changed recently, and this was causing
huge diffs in branches
2025-10-09 17:39:02 +02:00
Roland Geider
6146201531
Allow setting the slot entry type as well
2025-10-09 17:28:23 +02:00
Roland Geider
4b9afa5c98
Actually send the correct image fields to the server
2025-10-08 14:34:23 +02:00
Roland Geider
c63057fe35
Reuse AddExerciseTextArea in the image form
2025-10-08 14:05:50 +02:00
Roland Geider
949ad02ab6
Add generated files
...
It seems a recent update changes the way dart code is formatted
2025-10-08 12:45:37 +02:00
Roland Geider
1a78011a7d
Refactor image handling in the exercise submission process
...
Now the images are kept in a single list, instead of having two for
the files themselves and the metadata.
2025-10-08 12:45:37 +02:00
Roland Geider
fa7f670e9f
Some light cleanup
2025-10-06 12:31:12 +02:00
Roland Geider
39be6a3edf
Allow setting the day type in the edit form
2025-10-06 11:36:27 +02:00
Roland Geider
a10b7eb9f7
Pass parameter to create new variation and link exercises
2025-09-28 15:03:28 +02:00
Roland Geider
960abc9bec
Merge branch 'master' into feature/exercise-submission
2025-09-28 14:38:22 +02:00
Roland Geider
ccbaf0b42a
Allow multiple weight entries per day
2025-09-26 12:21:50 +02:00
Roland Geider
7f8657376a
Delete unused files
2025-09-24 13:03:00 +02:00
Roland Geider
5f7116ca92
Use correct json key names
2025-09-24 12:26:41 +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
a7ee4ff5b3
Merge pull request #855 from wger-project/nutrition-plan-stats
...
Nutrition plan stats
2025-09-22 16:19:04 +02:00
Roland Geider
ba34570a3d
Add image upload methods
...
We use the "manual" way as it was before, since there were some problems
making this work and most of the errors were happening during the exercise
creation itself.
2025-09-19 22:27:04 +02:00
Roland Geider
711d7c0aba
Update exercise submission model and related files
...
This now uses the combined endpoint, which creates the different objects
itself within a transaction, ensuring that no orphans can be created.
2025-09-18 21:57:27 +02:00
Roland Geider
798406eaa9
Make routineId nullable in session and related files
...
Sessions can be added ad-hoc, without needing to be part of any specific
routine.
2025-09-16 14:47:47 +02:00
Roland Geider
dbd3fa915d
Refactor PlanForm
...
* Date values are now localized
* Remove text controllers since we were setting the values in the plan
object directly as well as setting them in the controllers anyway. Note
that this is still not an ideal solution since if we change something
in the form and close it, the changes are still reflected in the UI, just
not preserved to the server.
* Move basic date sanity cheks to the model
2025-09-12 16:24:56 +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
f6f81318fc
Add logging to the Exercise model
2025-09-12 14:03:18 +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
Roland Geider
1dc3776e7e
Improve video error handling
...
Users now see a smaller error message in the exercise description, instead
of the big general popup.
2025-09-02 14:49:28 +02:00
Roland Geider
92295c54b8
Merge branch 'master' into fix/timezone-problems
2025-08-28 22:19:31 +02:00
Roland Geider
e63616a403
Recreate generated files
2025-08-25 19:55:26 +02:00
Dieter Plaetinck
a0e2659e60
dart format --line-length=100 .
2025-06-27 23:37:56 +02:00
Dieter Plaetinck
450b4da046
fix
2025-06-27 23:08:54 +02:00
Dieter Plaetinck
f18a60bfb5
dart run build_runner build
2025-06-27 20:47:17 +02:00
Dieter Plaetinck
8049bcf617
support NutritionalPlan start & end dates
2025-06-27 20:37:26 +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
Roland Geider
a4c103c6b4
Remove default rounding values
...
These only make sense when using automatic progression rules (and then, only with
increase steps with percentages). If no rounding values are set, the value will
be simply used as-is.
2025-05-14 11:35:58 +02:00
Roland Geider
d663bcd88a
Move common logic to SessionForm
...
Refactor and polish a bit the form in the log overview.
2025-05-09 21:12:49 +02:00
Roland Geider
7f42b47f97
Actually set the RiR value in the logs
2025-04-27 16:10:41 +02:00
Roland Geider
1ecbfa88d1
Correctly set the start and end time to null, if this is what comes from the API
2025-04-18 00:40:05 +02:00
Roland Geider
bc0672d81b
Correctly initialize the data in form from existing session
...
Also, add some simple tests for this
2025-04-17 17:30:01 +02:00
Roland Geider
88d66b336c
Properly update the UI when deleting workout logs
...
The problem was that we were passing the exercises and session from the
calendar events, which wasn't being reloaded when the logs were deleted. Now
we only pass the selected date and fetch the logs from the routine.
2025-04-17 10:26:44 +02:00
Roland Geider
9055514dec
Migrate models to work with freezed 3.0.0
2025-04-01 21:48:00 +02:00
Roland Geider
6742c8091a
Return the actions enum directly, no need for a dict here
2025-04-01 21:39:45 +02:00
Roland Geider
e31c54365b
Also convert the rpe to a number
...
This was causing some errors when loading routines that had a defined RiR
2025-03-29 14:32:39 +01:00
Roland Geider
cacb89f8b1
Replace WEIGHT_UNIT_KG_ID
...
No need to have two constants for the same thing
2025-03-28 17:21:41 +01:00
