Commit Graph

121 Commits

Author SHA1 Message Date
Roland Geider
c593086692 Mark meal ID in logs as optional 2021-10-24 22:14:00 +02:00
Marvin M
2bc2d472d0 unnecessary_await_in_return 2021-10-08 15:11:45 +02:00
Marvin M
9d479e89b0 const_constructors
info: Prefer const with constant constructors. prefer_const_constructors
2021-10-07 20:40:09 +02:00
Marvin M
c2e881c139 Minor changes 2021-10-07 18:50:33 +02:00
Roland Geider
dae1e39ea7 Merge pull request #89 from ThilinaTCH/master
Allow user to give meals a description #70
2021-10-03 21:54:27 +02:00
Thilina Herath
7da45e93f7 test: update meal tests to include name property 2021-10-03 11:19:08 +08:00
Github-actions
1a84fec097 Automatic linting 2021-10-02 10:58:18 +00:00
Marvin M
45a2a5f857 Fixes pt 1 2021-10-01 17:18:17 +02:00
Thilina Herath
d6eb3deda7 Allow user to give meals a description #70
Add name field to meal form
2021-09-30 21:22:28 +08:00
Github-actions
19d079569a Automatic linting 2021-09-09 19:18:53 +00:00
Roland Geider
829f152734 Merge master 2021-09-07 17:37:20 +02:00
Roland Geider
8543652581 Merge branch 'master' into feature/measurements
# Conflicts:
#	lib/screens/dashboard.dart
#	test/base_provider_test.mocks.dart
#	test/gallery_screen_test.mocks.dart
#	test/nutritional_plan_form_test.mocks.dart
#	test/workout_form_test.mocks.dart
#	test/workout_set_form_test.mocks.dart
2021-09-07 17:03:15 +02:00
Roland Geider
3874a49fe0 Add measurement entries in the dashboard calendar 2021-09-06 18:33:54 +02:00
Roland Geider
c704f561db Show entries graph in the category overview 2021-09-06 18:08:07 +02:00
Roland Geider
376ad83000 Add first version of tests for measurement screens 2021-09-01 18:07:59 +02:00
Github-actions
d0f5139c56 Automatic linting 2021-09-01 14:23:38 +00:00
Roland Geider
6bb9ef4354 Update test
The date can now only be entered via the datepicker
2021-09-01 16:21:55 +02:00
Roland Geider
4a2e9c5e57 Re-create mocks 2021-09-01 16:13:07 +02:00
Roland Geider
b2195d4f55 Allow deleting and editing entries 2021-08-29 22:34:30 +02:00
Roland Geider
c9838ad8f5 Fix the tests 2021-08-28 22:16:29 +02:00
Roland Geider
93b159b3b9 Show chart with measurement entries values in detail view 2021-08-28 22:07:54 +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
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
a2673fe764 Merge branch 'master' into feature/measurements
# Conflicts:
#	pubspec.lock
2021-08-25 16:52:15 +02:00
ton-An
7f5a8c1e2f Removed unnecessary tests 2021-08-25 16:28:08 +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
0462e41b20 Expand test for nutrition diary detail view 2021-08-17 11:45:52 +02:00
Roland Geider
c191b3e27e Wrap detail diary widget in a card
This is needed because the icon button needs a parent that is a Material widget
2021-08-17 11:24:34 +02:00
Roland Geider
d8adbb8e7c Nutritional view now needs the body weight provider as well 2021-08-17 11:07:01 +02:00
Roland Geider
94f2ee1a65 Merge branch 'master' into feature/diary-page 2021-08-11 19:48:29 +02:00
Roland Geider
1515806c93 Check that initially there are no categories loaded 2021-07-24 22:20:06 +02:00
Roland Geider
7b792f5837 Group test files thematically 2021-07-24 22:16:07 +02:00
Roland Geider
be409333d6 Add measurement provider 2021-07-24 21:27:21 +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
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
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
Github-actions
97de128557 Automatic linting 2021-07-08 16:23:21 +00: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
857d0453cc Automatic linting 2021-06-22 20:29:22 +00:00
Arun Muralidharan
50043269b9 Test
Added tests for TimeOfDay comparsion extensions.
2021-06-22 22:02:40 +02:00
Github-actions
7492b53c67 Automatic linting 2021-06-20 13:09:24 +00:00
Roland Geider
e57220938b Start working on nutritional diary detail page 2021-06-16 18:42:06 +02:00
Roland Geider
180e419e7e Group the plates for easier reading 2021-06-15 23:11:34 +02:00
Roland Geider
039b195e7a Fix error in plate calculator
The smallest plate was never being taken into consideration, as the loop never
reached it
2021-06-15 17:33:39 +02:00
Roland Geider
70e0620fe1 Don't make the +/- buttons part of the input field
This only makes the field focused which makes the keyboard appear, which is
exactly what we want to avoid when using the shortcuts
2021-06-15 16:30:12 +02:00
Roland Geider
b88c3290c1 Start implementing a plate calculator 2021-06-13 20:22:15 +02:00
Roland Geider
31edbb3b48 Loop through all result pages when loading logs 2021-05-19 22:34:36 +02:00