Commit Graph

325 Commits

Author SHA1 Message Date
Dieter Plaetinck
dc1f220292 refactor
ingredient details dialog:
 - give it close/continue buttons to load into selection
 - always use image property from loaded ingredient
   this is a bit slower, but:
   * more consistent (no need to support absolute vs relative URL's
     separately)
   * cleaner (no need to pass it thru explicitly)
   * more future proof: we will get rid of the dedicated
     /ingredient/search endpoint which gives us images before we load
     the full ingredient. in the future we will simply load the
     ingredients, completely, all at once.
   * allows for easier code reuse with barcode scan result dialog

barcode scan result dialog:
 - show image and detailed nutrition table
 - support a loading spinner
 - simplify error handling
 - deduplicate code between found & not found
 - share code with ingredient details dialog
2024-07-16 11:34:11 +03:00
Dieter Plaetinck
5fa08894ce update nutritional plan info detail response fixture with new plan 2024-07-12 14:11:07 +03:00
Dieter Plaetinck
2ef68ce24d cleanup 2024-07-12 14:11:07 +03:00
Dieter Plaetinck
d06ecabadf use ingredientinfo api, for image + new source and remote id fields
also update fixtures accordingly
2024-07-12 13:50:04 +03:00
Dieter Plaetinck
e1e27fb1dd for consistency and safety, always use prefs constants 2024-07-11 20:22:25 +03:00
Dieter Plaetinck
4656612f54 update goldens 2024-07-11 19:19:34 +03:00
Roland Geider
c918e48f7e Commit generated files 2024-07-10 16:42:40 +02:00
Roland Geider
69c40d76b4 Add registration test 2024-07-10 16:02:05 +02:00
Dieter Plaetinck
11ee38c03d dart fix --apply 2024-06-20 15:47:55 +03:00
Dieter Plaetinck
7f96672b8b Merge branch 'master' into simplify-tables 2024-06-16 12:27:06 +03:00
Dieter Plaetinck
1c6d96e732 update goldens 2024-06-16 12:21:33 +03:00
Dieter Plaetinck
57f424547b update goldens 2024-06-10 23:23:33 +03:00
Dieter Plaetinck
82a6e8e6ab update goldens 2024-06-10 15:32:57 +03:00
Dieter Plaetinck
a7012070d8 improve design 2024-06-08 10:15:43 +03:00
Dieter Plaetinck
90ebeec146 also show kcal consumed for "other" logs 2024-06-08 10:09:51 +03:00
Dieter Plaetinck
b7a2830106 show kcal consumed vs planned, on meal tiles 2024-06-07 21:35:08 +03:00
Dieter Plaetinck
cad829986e flutter test --update-goldens 2024-06-06 18:28:32 +03:00
Dieter Plaetinck
6f3d690594 mealtile: show macros + replace 'Log' with diary button 2024-06-06 11:22:16 +03:00
Dieter Plaetinck
accc2e7293 flutter test --update-goldens 2024-06-05 19:55:18 +03:00
Dieter Plaetinck
ccda552f4c update goldens 2024-05-29 17:20:19 +02:00
Dieter Plaetinck
d5fa2b9c18 fiber rename fixes 2024-05-29 13:04:50 +02:00
Roland Geider
cebb53c31a Merge branch 'log-fractional-meals' 2024-05-29 11:22:58 +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
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
4fcacbcdce fix test 2024-05-27 10:05:13 +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
Roland Geider
5d237e1ddf Consistently use "fiber" 2024-05-23 17:54:50 +02:00
Roland Geider
239e1a1caa Consistently use "fibers" instead of "fibres" 2024-05-20 22:06:47 +02:00
Dieter Plaetinck
36d9dd55f1 update test fixtures 2024-05-18 22:53:16 +02:00
Dieter Plaetinck
7c4f85b820 flutter test --update-goldens 2024-05-18 22:44:00 +02:00
Dieter Plaetinck
1b1b6ab06d flutter test --update-goldens 2024-05-15 22:04:47 +02:00
Dieter Plaetinck
0634f300db flutter test --update-goldens 2024-05-15 12:07:21 +02:00
Dieter Plaetinck
f7981e4dfb flutter test --update-goldens 2024-05-15 11:09:01 +02:00
Dieter Plaetinck
7fffa94925 cleanup 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
1ae3eafd72 more tests 2024-05-04 18:13:24 +02:00
Dieter Plaetinck
faa417d183 fix test 2024-05-04 18:13: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
b756e5e11f test fix 2024-04-30 21:20:58 +02:00
Dieter Plaetinck
d2c8e4a4c3 remove FlNutritionalDiaryChartWidget, it is no longer used 2024-04-30 18:54:20 +02:00
Roland Geider
1e16179d78 Merge pull request #555 from wger-project/feature/nutrition-goals
Move planned vs logged calories closer to feature on web application
2024-04-21 18:46:02 +02:00
Roland Geider
0502c459af Fix tests 2024-04-21 18:39:58 +02:00
Dieter Plaetinck
cb17e48f8e tiny nutrition fixes 2024-04-10 19:03:22 +02:00
Roland Geider
a50c625114 Fix test 2024-02-24 12:29:50 +01:00
Roland Geider
84c9fe888e Some renamings 2024-02-23 20:37:10 +01:00
Roland Geider
ef51431e62 Fix provider test 2024-02-23 19:22:00 +01:00
Roland Geider
9b0985fbf3 Add chart for percentage of logged nutritional values for meals 2024-02-23 19:19:13 +01:00
Roland Geider
6ad549251f Merge pull request #512 from mutairibassam/test/colors-file
test: add unit test for generateChartColors() function in colors.dart…
2024-02-17 18:59:02 +01:00