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.

Sign up for GitHub

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

Jump to bottom

feat: #13851, #13853, #13855 update food emissions #19

Merged
merged 29 commits into from
Sep 11, 2024
Merged

feat: #13851, #13853, #13855 update food emissions #19

merged 29 commits into from
Sep 11, 2024

Commits on Sep 2, 2024

  1. Update translations

    @SaraKoskelainen
    SaraKoskelainen committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    be725d5 View commit details
    Browse the repository at this point in the history

  2. Update result translations, WIP

    @SaraKoskelainen
    SaraKoskelainen committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    60b64bc View commit details
    Browse the repository at this point in the history

  3. Update food input and result categories

    @SaraKoskelainen
    SaraKoskelainen committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    af7a094 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. Add more colors to DoughnutChart

    @SaraKoskelainen
    SaraKoskelainen committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    ffb1547 View commit details
    Browse the repository at this point in the history

  2. Rearrange food inputs & add main category titles

    @SaraKoskelainen
    SaraKoskelainen committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    db25e13 View commit details
    Browse the repository at this point in the history

  3. Show description of food category below the category name

    @SaraKoskelainen
    SaraKoskelainen committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    b2d4bd0 View commit details
    Browse the repository at this point in the history

  4. Update default value text to use plurals

    @SaraKoskelainen
    SaraKoskelainen committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    0d08506 View commit details
    Browse the repository at this point in the history

  5. Add small styling updates & fix text overflow

    @SaraKoskelainen
    SaraKoskelainen committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    5d5cd28 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2024

  1. Update terminology

    @SaraKoskelainen
    SaraKoskelainen committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    31d6c24 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. Use amounts as inputs & set default values based on diet

    @SaraKoskelainen
    SaraKoskelainen committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    7ad7777 View commit details
    Browse the repository at this point in the history

  2. Get initial consumption default values from defaults const

    @SaraKoskelainen
    SaraKoskelainen committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    0d0ce7b View commit details
    Browse the repository at this point in the history

  3. Get input as grams, set max values to max avg * 5 ceil to closest 500

    @SaraKoskelainen
    SaraKoskelainen committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    129b83b View commit details
    Browse the repository at this point in the history

  4. set max values to max avg * 5 ceil to closest 100

    @SaraKoskelainen
    SaraKoskelainen committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    e75aec5 View commit details
    Browse the repository at this point in the history

  5. Fix consumption reset

    @SaraKoskelainen
    SaraKoskelainen committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    6625af4 View commit details
    Browse the repository at this point in the history

  6. Update instruction texts

    @SaraKoskelainen
    SaraKoskelainen committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    9def75d View commit details
    Browse the repository at this point in the history

  7. Update result category names

    @SaraKoskelainen
    SaraKoskelainen committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    fc779ae View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2024

  1. Update comment

    @SaraKoskelainen
    SaraKoskelainen committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    64f9774 View commit details
    Browse the repository at this point in the history

  2. Update tests

    @SaraKoskelainen
    SaraKoskelainen committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    b1edea2 View commit details
    Browse the repository at this point in the history

  3. Fix test

    @SaraKoskelainen
    SaraKoskelainen committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    5281ef0 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. Change category order

    @SaraKoskelainen
    SaraKoskelainen committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    343adc6 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. Add reusable input element for food consumption, WIP

    @SaraKoskelainen
    SaraKoskelainen committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    85b56af View commit details
    Browse the repository at this point in the history

  2. Use FoodConsumptionInput element for all food inputs

    @SaraKoskelainen
    SaraKoskelainen committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    636e913 View commit details
    Browse the repository at this point in the history

  3. Update units

    @SaraKoskelainen
    SaraKoskelainen committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    74b2828 View commit details
    Browse the repository at this point in the history

  4. Update max values

    @SaraKoskelainen
    SaraKoskelainen committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    f22400e View commit details
    Browse the repository at this point in the history

  5. Fix usage of different units

    @SaraKoskelainen
    SaraKoskelainen committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    b1bf3b1 View commit details
    Browse the repository at this point in the history

  6. clean up

    @SaraKoskelainen
    SaraKoskelainen committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    7ab97e9 View commit details
    Browse the repository at this point in the history

  7. Update terms

    @SaraKoskelainen
    SaraKoskelainen committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    ead1140 View commit details
    Browse the repository at this point in the history

  8. Update terms

    @SaraKoskelainen
    SaraKoskelainen committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    14d3ccd View commit details
    Browse the repository at this point in the history

  9. Update terms

    @SaraKoskelainen
    SaraKoskelainen committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    d7614e5 View commit details
    Browse the repository at this point in the history