Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nutrition cleanup & further enhancements #566

Merged
merged 27 commits into from
May 12, 2024

Conversation

Dieterbe
Copy link
Contributor

@Dieterbe Dieterbe commented Apr 27, 2024

Description (Proposed Changes)

  • cleanup nutrition code
  • nutrition dashboard widget: use new barchart such that we can see our progress towards the goal
  • nutrition dashboard widget: 3 levels of detail (don't show all the meals by default)
  • nutrition dashboard widget: show caloric balance
  • suggestion: replace chart and horizontal table with vertical table (this one may be contentious / need more discussion), remove FlNutritionalDiaryChartWidget
  • new "progress towards goals" widget for nutrional plans, both for dashboard widget and nutritional details page

Link to the issue :

(Add link of the issue you have proposed changes to)

  • Link :

Tests

Please make sure to add tests when implementing new features.

Checklist

Please check that the PR fulfills all requirements listed below by checking the relevant checkboxes ([x]). This will ensure a smooth and quick review process.

  • Set a 100 character limit in your editor/IDE to avoid white space diffs in the PR
  • Tests for the changes have been added (for bug fixes / features)
  • Updated/added relevant documentation (doc comments with ///).
  • Added relevant reviewers.

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?
... because showing all meals by default is a bit too much info
@Dieterbe Dieterbe force-pushed the nutrition-cleanup branch from ba7ab24 to 3b70cb3 Compare April 27, 2024 14:31
@Dieterbe Dieterbe changed the title WIP: Nutrition cleanup & further enhancements Nutrition cleanup & further enhancements Apr 28, 2024
@Dieterbe Dieterbe force-pushed the nutrition-cleanup branch from d65260c to 8c5eded Compare April 30, 2024 19:15
@Dieterbe Dieterbe requested a review from rolandgeider April 30, 2024 19:22
lib/widgets/nutrition/charts.dart Outdated Show resolved Hide resolved
lib/widgets/nutrition/charts.dart Show resolved Hide resolved
lib/widgets/dashboard/widgets.dart Show resolved Hide resolved
lib/widgets/nutrition/charts.dart Show resolved Hide resolved
Dieterbe added 3 commits May 4, 2024 14:20
differentiate between a goal being set (but as 0) vs a goal not being
set. fixes various correctness issues
This reverts commit 55aac23033dda47895ffb63154fcbc6fe5524d40.
@Dieterbe Dieterbe force-pushed the nutrition-cleanup branch from 5fd6e6f to cb3493b Compare May 4, 2024 13:56
@Dieterbe Dieterbe force-pushed the nutrition-cleanup branch from cb3493b to 1ae3eaf Compare May 4, 2024 16:13
Dieterbe added 4 commits May 4, 2024 23:20
* 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
@Dieterbe Dieterbe force-pushed the nutrition-cleanup branch from 4ecfcf5 to de40b40 Compare May 7, 2024 22:01
to make golden tests work, we no longer plot the "now time" for "other logs"
this was pretty silly anyway...
@rolandgeider rolandgeider merged commit 478464f into wger-project:master May 12, 2024
2 checks passed
@Dieterbe Dieterbe deleted the nutrition-cleanup branch May 14, 2024 10:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants