Commit Graph

130 Commits

Author SHA1 Message Date
Marvin M
45a2a5f857 Fixes pt 1 2021-10-01 17:18:17 +02:00
Github-actions
19d079569a Automatic linting 2021-09-09 19:18:53 +00:00
ton-An
0b0da1405b Changed MeasurementEntry's value string to number
Reflects the changes made to the rest api. MeasurementEntry's value is
a number instead of a string when in json format
2021-08-26 15:40:26 +02:00
ton-An
89e0060ff5 (MeasurementProvider) Fixed error handling
MeasurementProvider
(Edited)
- Fixed error handling
- implemented findEntryById and findCategoryById

MeasurementCategory
(Added)
- findEntryById()
2021-08-26 14:41:26 +02:00
Roland Geider
4e9ca1db6b Fixes to use measurement provider with base provider as argument 2021-08-25 21:48:16 +02:00
Roland Geider
6cbe164ec8 Merge remote-tracking branch 'origin/feature/measurements' into feature/measurements
# Conflicts:
#	lib/models/measurements/measurement_entry.g.dart
2021-08-25 21:34:22 +02:00
Roland Geider
db976d0486 Add measurement category and entry overviews
This is still a work in progress, besides the UX it's not possible yet to
edit or add entries
2021-08-25 21:33:30 +02:00
Roland Geider
a2673fe764 Merge branch 'master' into feature/measurements
# Conflicts:
#	pubspec.lock
2021-08-25 16:52:15 +02:00
ton-An
755cdd5fae Pretty much finished the MeasurementProvider
-- MesurementProvider --
(Added)
- editCategory
- editEntry

-- MeasurementEntry --
(Added)
- copyWith

-- MeasurementCategory --
(Added)
- copyWith
2021-08-25 16:24:29 +02:00
ton-An
23a8226e72 Worked on the MeasurementProvider
(Added)
- addCategory()
- deleteCategory()
- addEntry()
- deleteEntry()
2021-08-25 14:43:53 +02:00
ton-An
19445c36a2 (Measurements) Added Equatable + Refactored
(MeasurementProvider)
- Passing in the WgerBaseProvider instead of extending with it
- Re-written tests
- Added the fixture reader to make test file less crowded

(Measurement Models)
- Added Equatable
- Re-written tests
2021-08-22 18:07:47 +02:00
Roland Geider
1222a70e61 Add content to the diary detail page 2021-08-16 18:29:38 +02:00
Roland Geider
d01986238f Show percent of energy and g per body-kg for macros 2021-08-16 16:24:12 +02:00
Roland Geider
be409333d6 Add measurement provider 2021-07-24 21:27:21 +02:00
Roland Geider
a43480fa8b Commit missing files 2021-07-24 13:14:03 +02:00
Roland Geider
5e64feea30 Fix tests
The measurement entries are not directly loaded from JSON
2021-07-24 13:13:32 +02:00
ton-An
a88298cc7b Changed the measurement entries key 2021-07-24 12:26:01 +02:00
ton-An
8be7b34368 Created tests for the measurement models
- Changed Measurement to MeasurementCategory
- Finished toJson and fromJson methods of the measurement models
2021-07-24 12:25:44 +02:00
ton-An
c76bfaca77 Added Measurement Models 2021-07-24 12:24:58 +02:00
Roland Geider
6646640b9c Show set notes on the workout and the gym mode
https://github.com/wger-project/wger/issues/702
2021-07-17 13:25:04 +02:00
Roland Geider
b13a9472e7 Correctly set the category for test exercises... 2021-07-08 18:25:23 +02:00
Github-actions
97de128557 Automatic linting 2021-07-08 16:23:21 +00:00
Roland Geider
2ce9a8c8f3 Don't load category ID
The info endpoint returns the category object
2021-07-08 18:21:43 +02:00
Roland Geider
05b66605af Regenerate mocks and generated files 2021-07-08 18:12:19 +02:00
Github-actions
c877e436b0 Automatic linting 2021-06-22 21:10:15 +00:00
Github-actions
7492b53c67 Automatic linting 2021-06-20 13:09:24 +00:00
Roland Geider
31edbb3b48 Loop through all result pages when loading logs 2021-05-19 22:34:36 +02:00
Roland Geider
e45115d26e Make RiR form element a slider
This allows the user to select the correct value faster
2021-05-19 21:35:07 +02:00
Roland Geider
be0b1bf157 Add missing options for RiR values 2021-05-19 16:07:11 +02:00
Roland Geider
d5521082a6 Override the equals operator for workout plan logs
Two logs are considered equal if their content is equal. This is used e.g.
 in the gym mode where we want to have unique values
2021-05-18 22:14:58 +02:00
Roland Geider
68552ea277 Rename conversion functions
This makes it clearer what gets converted to what
2021-05-18 22:14:58 +02:00
Roland Geider
b90d0a0008 Fetch plan details when visiting the detail page
See #14
2021-05-13 13:19:07 +02:00
Roland Geider
21cfa33978 Fix getter for images in exerciseinfo endpoint
This was renamed recently
2021-05-10 13:55:36 +02:00
Roland Geider
964af57f5b Commit generated files 2021-05-08 21:10:54 +02:00
Roland Geider
edbb49e688 Allow submitting images to the gallery 2021-05-08 12:13:34 +02:00
Roland Geider
431f749674 Start adding user gallery 2021-05-06 14:02:04 +02:00
Roland Geider
6ab3e26db4 Rename workout description to name 2021-05-06 13:18:32 +02:00
Roland Geider
f0fa8a5173 Nutritional plan time is nullable 2021-05-01 15:33:28 +02:00
Roland Geider
37e4cf3551 Save local date
This hopefully fixes an error where no logs would be shown in the calendar when
running the app on a real device
2021-04-25 16:17:16 +02:00
Roland Geider
f67cb1797b Calculates reps for a set locally
This saves us unneeded round trips to the server

See #14
2021-04-24 13:58:14 +02:00
Roland Geider
3c21650003 Translate week day names in workout screens 2021-04-24 12:31:08 +02:00
Roland Geider
2424199e09 Add tests for PlanForm 2021-04-23 12:47:12 +02:00
Roland Geider
1b7b78c640 Add tests for DayFormWidget 2021-04-23 11:32:00 +02:00
Roland Geider
5bc1ca699d Return a new instance when adding nutritional values
Changing the current one doesn't make sense
2021-04-22 10:28:53 +02:00
Roland Geider
8c31f2ef09 Add more tests 2021-04-21 22:05:50 +02:00
Roland Geider
3ae15688c5 Correctly order workout logs by date 2021-04-21 13:05:10 +02:00
Roland Geider
98981b0c68 Improve workout log page
This view now shows the logs performed on the selected day, as well as charts
for the individual exercises

Closes #17
2021-04-19 16:31:58 +02:00
Roland Geider
1f20c87a2d Update calendar widget to 3.0 2021-04-19 16:31:57 +02:00
Roland Geider
7e2ba3468d Show past logs in gym mode
See #13
2021-04-15 13:28:12 +02:00
Roland Geider
d2a7733703 Add simple widget test for gym mode screen 2021-04-14 20:28:49 +02:00