Commit Graph

151 Commits

Author SHA1 Message Date
Adrian Halko
831d74d90d Added code property to Ingredient model. Generate ingredient.g.dart. 2021-11-22 19:22:59 +01:00
Github-actions
ab885b1145 Automatic linting 2021-11-10 14:19:52 +00:00
Roland Geider
d8b7d45291 Upgrade dependencies and recreate generated files 2021-11-10 15:16:25 +01:00
Roland Geider
89fa03de83 Fix typo in filename 2021-10-28 18:03:26 +02:00
Roland Geider
ff0e675860 Some refactoring for last used ingredients
It's easier to just use the already existing meal items rather than create
new logs that have the same infos.
2021-10-28 18:00:18 +02:00
Roland Geider
a4e381e4c8 Make order of sets a required attribute
Closes #109
2021-10-28 11:43:32 +02:00
Roland Geider
c593086692 Mark meal ID in logs as optional 2021-10-24 22:14:00 +02:00
Github-actions
a2ae840c62 Automatic linting 2021-10-23 13:46:41 +00:00
Roland Geider
6a19a0697e Merge pull request #105 from sandimilohanic/master
add reference from log to meal
2021-10-23 15:44:52 +02:00
Sandi Milohanić
364b37c106 Correction reference mealId in log 2021-10-23 07:37:14 +02:00
Sandi Milohanić
3ca1960e6a add reference from log to meal 2021-10-22 08:32:02 +02:00
Marvin M
1e8080cc02 always_declare_return_types 2021-10-07 20:43:55 +02:00
Marvin M
e5a6d930cb Minor changes 2021-10-07 19:58:56 +02:00
Github-actions
18622b0c62 Automatic linting 2021-10-07 06:00:51 +00:00
unknown
81944cbe19 Merge branch 'fix/preset-time-session-form-31' of https://github.com/TomerPacific/flutter into fix/preset-time-session-form-31 2021-10-06 22:16:56 +03:00
unknown
769043598b fix/preset-time-session-form creating constructor in session to initialize timeStart/end 2021-10-06 22:16:44 +03:00
Tomer Ben-Rachel
12da49ed65 Merge branch 'master' into fix/preset-time-session-form-31 2021-10-06 21:22:07 +03:00
unknown
320e61d2c2 fix/preset-time-session-form adding default values to timeStart/end 2021-10-06 20:57:21 +03: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
Marvin M
eae34f0b36 Fixes pt 2 2021-10-01 17:32:31 +02: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
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