Commit Graph

1352 Commits

Author SHA1 Message Date
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
df5e2ca145 make errors selectable/copy-pasteable and scrollable when they're large
there seems to be no downside to this, short errors look the same
2024-05-17 09:07:49 +02:00
Dieter Plaetinck
234b915ea4 code cleanup 2024-05-15 15:49:17 +02:00
Milo Ivir
4b021633c2 Translated using Weblate (Croatian)
Currently translated at 100.0% (259 of 259 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/hr/
2024-05-15 13:28:03 +00:00
Fjuro
d27e46e3ef Translated using Weblate (Czech)
Currently translated at 100.0% (259 of 259 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/cs/
2024-05-15 13:28:03 +00:00
Chung-Wei Chung
44bba47a32 Translated using Weblate (Chinese (Traditional))
Currently translated at 15.0% (39 of 259 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/zh_Hant/
2024-05-15 13:28:02 +00: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
6f576b557c bugfix: 7day averages need to be divided by 7! 2024-05-15 10:52:54 +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
Roland Geider
765a6a37ca Merge pull request #571 from wger-project/feature/weblate
Translations update from Hosted Weblate
2024-05-12 14:20:18 +02:00
Roland Geider
ef78bc55e6 Remove BaseNutritionalValues, this wasn't used anymore 2024-05-12 14:09:05 +02:00
Dieter Plaetinck
d875d81a5e style the table better 2024-05-10 17:53:59 +02:00
Marcin Schoenknecht
50753e55fe Translated using Weblate (Polish)
Currently translated at 100.0% (257 of 257 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/pl/
2024-05-10 16:23:49 +02:00
Dieter Plaetinck
25aa08f3f3 allow picking date when logging ingredient 2024-05-08 22:48:26 +02:00
Dieter Plaetinck
9ad969527d fix 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
Xav Basco
f238320c6c Translated using Weblate (French)
Currently translated at 91.0% (234 of 257 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/fr/
2024-05-05 12:07:19 +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
faa417d183 fix test 2024-05-04 18:13:16 +02:00
Dieter Plaetinck
bffaa9a9c9 Revert freezed attempt. it needs a constructor without args... :/
This reverts commit 55aac23033dda47895ffb63154fcbc6fe5524d40.
2024-05-04 15:56:11 +02:00
Dieter Plaetinck
84f43bb5c2 trying to fix tests by using freezed 2024-05-04 15:56:11 +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
Dieter Plaetinck
8c5eded894 new "progress towards goals" widget for nutrional plans
both for dashboard widget and nutritional details page
2024-04-30 18:57:40 +02:00
Dieter Plaetinck
d2c8e4a4c3 remove FlNutritionalDiaryChartWidget, it is no longer used 2024-04-30 18:54:20 +02:00
Dieter Plaetinck
54e2aa4be8 suggestion: replace chart and horizontal table with vertical table 2024-04-30 18:54:20 +02:00
Dieter Plaetinck
b7df869695 display caloric balance on nutrition dashboard widget 2024-04-27 17:45:25 +02:00
Dieter Plaetinck
3b70cb37e5 nutrition dashboard widget: use 3 layers of detail
... because showing all meals by default is a bit too much info
2024-04-27 16:29:45 +02:00
Dieter Plaetinck
db83b138e9 remove aspectratio and padding from chart widget.
it doesn't seem to change how it looks on nutrition detail
and makes it look proper on nutrition dashboard widget

if we really do need such layout controls, maybe they should be done
at the call site, rather than the widget implementation?
2024-04-27 16:11:08 +02:00
Dieter Plaetinck
580b053591 use improved barchart widget on nutrition dashboard widget 2024-04-27 16:11:08 +02:00
Dieter Plaetinck
088f31b1f9 cleanup 2024-04-27 16:11:08 +02:00
Milo Ivir
05507f64e9 Translated using Weblate (Croatian)
Currently translated at 100.0% (257 of 257 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/hr/
2024-04-25 15:06:34 +02:00
Fjuro
61975fe597 Translated using Weblate (Czech)
Currently translated at 100.0% (257 of 257 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/cs/
2024-04-25 15:06:34 +02:00
Oğuz Ersen
28e7de19bd Translated using Weblate (Turkish)
Currently translated at 100.0% (257 of 257 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/tr/
2024-04-25 15:06:34 +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