Roland Geider
cebb53c31a
Merge branch 'log-fractional-meals'
2024-05-29 11:22:58 +02:00
Roland Geider
7f4dafd5ae
Merge pull request #593 from wger-project/log-fractional-meals
...
log meal: separate confirmation page with portion choice
2024-05-29 11:20:47 +02:00
Roland Geider
3e138d24dd
Merge pull request #592 from wger-project/ingredient-form-ux
...
IngredientForm UX fixes
2024-05-29 10:48:33 +02:00
Roland Geider
cbd3d431c3
Localize header text
2024-05-29 10:23:32 +02:00
Dieter Plaetinck
686fb44933
filter suggestions by search string
2024-05-28 12:19:53 +02:00
Dieter Plaetinck
a4bdf70582
consistent, improved deduplication behavior across mealitems and logs
...
deduplicate by ingredient AND amount: so if you use the same
ingredient, but in a different amount, the different amount
will show up
this increases the list of suggestions for editing meals,
and decreases the list logging an ingredient (significantly,
if you often log the same ingredient in the same amount)
2024-05-28 11:58:38 +02:00
Dieter Plaetinck
68799b0112
log meal: separate confirmation page with portion choice
2024-05-27 23:53:22 +02:00
Dieter Plaetinck
436ee2a723
hide id
2024-05-27 10:09:20 +02:00
Dieter Plaetinck
ad64eb2c14
cleanup
2024-05-27 09:37:04 +02:00
Dieter Plaetinck
864c6fc82b
properly set/unset value via helper functions. fix #591
2024-05-26 22:10:35 +02:00
Dieter Plaetinck
b21c19ae65
various ingredient form UX issues
...
* upon scan completion, give more useful preview of the found ingredient
* use ID field to track whether the form is "loaded" with a valid
ingredient or not
* don't trigger search if an ingredient is loaded, unless user changes
the pattern
* always show meal item preview, whether loaded from recent items, or
from scan result
2024-05-26 22:10:34 +02:00
Dieter Plaetinck
caa2866bdf
Merge branch 'master' into goal-fiber
2024-05-25 09:53:47 +02:00
Dieter Plaetinck
d4d298ad9e
fix tests
2024-05-23 19:59:57 +02:00
Dieter Plaetinck
74002350ba
unify IngredientLogForm and MealItemForm
2024-05-23 19:59:57 +02:00
Dieter Plaetinck
58122d40b5
get ready to support showing images in the ingredient preview
...
note: the image doesn't seem to
be set yet, but at least the UI is now ready for it
2024-05-23 19:59:57 +02:00
Dieter Plaetinck
1c84d91834
convert form to stateful, show ingredient preview
2024-05-23 19:59:57 +02:00
Dieter Plaetinck
63d37175c4
show reminder of macro's on ingredient tiles
2024-05-23 19:59:57 +02:00
Dieter Plaetinck
5ae30e6788
cleaner way to show line of macros
2024-05-23 19:59:57 +02:00
Roland Geider
5d237e1ddf
Consistently use "fiber"
2024-05-23 17:54:50 +02:00
Dieter Plaetinck
a13b389fec
Merge pull request #583 from wger-project/tiny-tweaks
...
Tiny tweaks
2024-05-21 21:09:08 +02:00
Dieter Plaetinck
c8dbb8971e
fix various lint issues
2024-05-21 16:25:21 +02:00
Dieter Plaetinck
d896fab4ad
cleanup
2024-05-21 16:25:21 +02:00
Dieter Plaetinck
cb696cc585
fix non-final field on immutable class
2024-05-21 16:25:21 +02:00
Dieter Plaetinck
abd531be1f
bugfix: show error message when scan fails
...
due to the extra Navigator.pop(), we would immediately close the error
dialog after opening it, rendering it practically invisible.
to handle back button in non-error cases, we now simply accept the null value
2024-05-21 16:25:21 +02:00
Dieter Plaetinck
721dd5e298
fix async gap
2024-05-21 16:25:21 +02:00
Roland Geider
239e1a1caa
Consistently use "fibers" instead of "fibres"
2024-05-20 22:06:47 +02:00
Dieter Plaetinck
55d36eb301
improve design
2024-05-18 22:42:18 +02:00
Dieter Plaetinck
12c1d0044c
support fibers goal
2024-05-18 21:32:29 +02:00
Dieter Plaetinck
72a85e1cae
not needed param
2024-05-17 09:09:03 +02:00
Dieter Plaetinck
234b915ea4
code cleanup
2024-05-15 15:49:17 +02:00
Dieter Plaetinck
594fe0038f
fix
2024-05-15 12:02:42 +02:00
Dieter Plaetinck
70690c41aa
use "protein, carbs, fat" ordering on pie chart, just like elsewhere
2024-05-15 11:57:21 +02:00
Dieter Plaetinck
a1e57fda0d
simplify showingSections()
2024-05-15 11:57:21 +02:00
Dieter Plaetinck
b9f7a2c736
fix UI bug
2024-05-15 11:57:21 +02:00
Dieter Plaetinck
c0e7a0c66e
replace MealItemExpandedRow widget with NutritionDiaryheader
...
* it is designed to be used along with NutritionDiaryEntry
* and use on nutrition diary page
2024-05-15 11:57:21 +02:00
Dieter Plaetinck
fbc347cfa4
DRY legend labels part 2
2024-05-15 11:06:24 +02:00
Dieter Plaetinck
1cfc363af9
make padding same as other widgets
2024-05-15 10:35:52 +02:00
Dieter Plaetinck
8ace0ef63c
DRY legend labels
2024-05-15 10:32:23 +02:00
Dieter Plaetinck
a3d060cd8e
move chart legend into actual chart
2024-05-15 10:20:53 +02:00
Dieter Plaetinck
d875d81a5e
style the table better
2024-05-10 17:53:59 +02:00
Dieter Plaetinck
25aa08f3f3
allow picking date when logging ingredient
2024-05-08 22:48:26 +02:00
Dieter Plaetinck
cfd47bc20b
fix a random bug
2024-05-08 22:48:26 +02:00
Dieter Plaetinck
578d56a0df
fix tests, introduce golden tests
...
to make golden tests work, we no longer plot the "now time" for "other logs"
this was pretty silly anyway...
2024-05-08 22:48:26 +02:00
Dieter Plaetinck
e9d7a39ab9
nutrition plan details: use 3 levels of detail
...
* no need to see the ingredients of every meal in such detail by default
* also, handle it nicer when a meal has no ingredients defined yet
2024-05-07 11:50:31 +02:00
Dieter Plaetinck
9a67a073d3
fix: use goal derived from goals or meals
2024-05-05 10:39:23 +02:00
Dieter Plaetinck
2a9ac23a10
move MacronutrientsTable into its own file
2024-05-05 10:31:36 +02:00
Dieter Plaetinck
2347657dcd
fixes
2024-05-04 23:20:16 +02:00
Dieter Plaetinck
36697a660d
proper nullable "nutritional goals" with inference
...
differentiate between a goal being set (but as 0) vs a goal not being
set. fixes various correctness issues
2024-05-04 14:20:00 +02:00
Dieter Plaetinck
00b5cc2f57
tweak design
2024-05-03 13:06:24 +02:00
Dieter Plaetinck
820dee2c0d
move nutritional diary table into separate file, clean up a bit
2024-05-03 10:57:39 +02:00
