fix: Nutri Score Nutriments with an asterisk #8205

MonalikaPatnaik · 2023-03-14T17:52:44Z

What

So, to calculate nutriscore-- fats,saturated-fats, sugar and salt are the required nutriments to be considered, so I have made necessary changes in the code to show these nutriments with an asterisk in the nutrition table:)

Screenshot

Related issue(s) and discussion

it fixes In Edit Mode, indicate the required nutriments to compute the Nutri-Score by an asterisk #7610

jnsereko

Thanks for working on this @MonalikaPatnaik
fix some formatting issue though

templates/web/pages/product_edit/product_edit_form_display.tt.html

stephanegigandet · 2023-03-15T09:51:19Z

templates/web/pages/product_edit/product_edit_form_display.tt.html

@@ -207,7 +207,11 @@ <h1>[% title %]</h1>
                                    <td>
                                        <!--label starts-->
                                        [% IF nutriment.name.defined %]
-                                            <label class="nutriment_label" for="nutriment_[% nutriment.enid %]">[% nutriment.prefix %][% nutriment.name %]</label>
+                                        [% IF nutriment.nid == 'fat' || nutriment.nid == 'saturated-fat' || nutriment.nid == 'salt'|| nutriment.nid =='sugars' %]


energy in kJ and fibers are also used for the Nutri-Score.

Hi @MonalikaPatnaik , thanks for the PR!

If we put a *, we need to explicitly tell users what this * means, otherwise there is no way to guess. Could you add a string after the table that states "*: used to compute the Nutri-Score" or similar?

That string would need to be translatable, so you would need to use the lang() function, and add it in the translation files: po/common/common.pot + po/common/en.po

Thanks for the review..will make necessary changes :)

stephanegigandet · 2023-03-15T09:53:30Z

Hi @MonalikaPatnaik , thanks for the PR!

If we put a *, we need to explicitly tell users what this * means, otherwise there is no way to guess.
Could you add a string after the table that states "*: used to compute the Nutri-Score" or similar?

That string would need to be translatable, so you would need to use the lang() function, and add it in the translation files: po/common/common.pot + po/common/en.po

…html Co-authored-by: jnsereko <58003327+jnsereko@users.noreply.github.com>

po/common/en.po

Co-authored-by: Stéphane Gigandet <stephane@openfoodfacts.org>

yuktea

tested it out 👍
you should probably remove the extra changes that got staged

MonalikaPatnaik · 2023-03-17T08:55:47Z

tested it out 👍 you should probably remove the extra changes that got staged

Okay..Thanks<3

MonalikaPatnaik · 2023-03-17T11:16:26Z

Heyy..done the req changes..check once!! Should I squash the commits into one!

stephanegigandet · 2023-03-17T13:00:08Z

templates/web/pages/product_edit/product_edit_form_display.tt.html

@@ -25,6 +25,7 @@ <h1>[% title %]</h1>
    [% END %]

    [% IF errors_index >=0 %]
+        <p>[% lang("correct_the_following_errors") %]</p>


This string has been added twice

stephanegigandet · 2023-03-17T13:00:34Z

templates/web/pages/product_edit/product_edit_form_display.tt.html

@@ -59,6 +60,9 @@ <h1>[% title %]</h1>
                <p id="barcode_paragraph"> [% lang("barcode") %][% sep %]:
                    <span id="barcode" property="food:code" itemprop="gtin13" style="speak-as:digits;">[% code %]</span>
                </p>
+                <p id="barcode_paragraph"> [% lang("barcode") %][% sep %]:


same here, strings have been added twice

stephanegigandet · 2023-03-17T13:01:58Z

templates/web/pages/product_edit/product_edit_form_display.tt.html

@@ -209,7 +213,11 @@ <h1>[% title %]</h1>
                                    <td>
                                        <!--label starts-->
                                        [% IF nutriment.name.defined %]
+                                        [% IF nutriment.nid == 'energy-kj' || nutriment.nid == 'saturated-fat' || nutriment.nid == 'salt'|| nutriment.nid =='sugars' || nutriment.nid == 'fiber' %]


it's missing fat (needed for some food categories) and proteins

stephanegigandet · 2023-03-17T13:02:55Z

taxonomies/nutrient_levels.txt

@@ -117,7 +117,7 @@ nb:Fett i liten kvantitet
 nd:Fat in low quantity
 ne:Fat in low quantity
 ng:Fat in low quantity
-nl:Vetten in kleine hoeveelheid
+nl:Vetten in low quantity


can you remove the changes in this file? they are unrelated...

you can do "git checkout taxonomies/nutrient_levels.txt" to get back the original file

sonarqubecloud · 2023-03-17T14:29:28Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
0.0% Duplication

po/common/common.pot

yuktea

Thank you for making the changes to it Monalika.
Like I said in the previous comment, you should remove the unrelated changed taxonomy file.

MonalikaPatnaik · 2023-03-17T15:04:50Z

Thank you for making the changes to it Monalika. Like I said in the previous comment, you should remove the unrelated changed taxonomy file.

Yup..I have discarded the changes and commited the previous state of the file only

yuktea · 2023-03-17T15:21:18Z

Yup..I have discarded the changes and commited the previous state of the file only

I don't think it should be a problem. but it's still showing up in your changed file diff even when there is no apparent change.
I'd say as a general rule, only stage those files that you need to commit. 🙂

Edit: you might have to do a force-push to get that file out from changed files. but I really don't think it matters here since there seems to be no apparent change.

yuktea · 2023-03-17T15:29:16Z

Above is just a nit-pick. This should be good to merge I believe. Thank you so much! 💯

MonalikaPatnaik · 2023-03-17T15:38:21Z

Yup..I have discarded the changes and commited the previous state of the file only

I don't think it should be a problem. but it's still showing up in your changed file diff even when there is no apparent change. I'd say as a general rule, only stage those files that you need to commit. 🙂

Edit: you might have to do a force-push to get that file out from changed files. but I really don't think it matters here since there seems to be no apparent change.

Okay..I'll keep this in mind..if u say I could squash all my commits into one having the necessary changed files only!

stephanegigandet

Looks good, thank you for addressing all the comments @MonalikaPatnaik!

nutri-score-nutriments-with-asterisk

7c17620

MonalikaPatnaik requested a review from a team as a code owner March 14, 2023 17:52

github-actions bot assigned MonalikaPatnaik Mar 14, 2023

github-actions bot added ✏️ Editing Template::Toolkit The templating toolkit used by product opener. The starting point for HTML/JS/CSS fixes. labels Mar 14, 2023

jnsereko suggested changes Mar 14, 2023

View reviewed changes

templates/web/pages/product_edit/product_edit_form_display.tt.html Outdated Show resolved Hide resolved

teolemon added the 🚦Nutri-Score https://world.openfoodfacts.org/nutriscore label Mar 15, 2023

stephanegigandet reviewed Mar 15, 2023

View reviewed changes

Update templates/web/pages/product_edit/product_edit_form_display.tt.…

19b9eb7

…html Co-authored-by: jnsereko <58003327+jnsereko@users.noreply.github.com>

github-actions bot removed the 🚦Nutri-Score https://world.openfoodfacts.org/nutriscore label Mar 15, 2023

asterisk-definition-for-nutri-score

2109c53

github-actions bot added CSS 🧬 Taxonomies https://wiki.openfoodfacts.org/Global_taxonomies Translations We use a non-standard version of GetText, lack language variants support translate.openfoodfacts.org labels Mar 16, 2023

Merge branch 'openfoodfacts:main' into fix-asterisk

25caccb

stephanegigandet reviewed Mar 17, 2023

View reviewed changes

po/common/en.po Outdated Show resolved Hide resolved

Update po/common/en.po

c4b9dee

Co-authored-by: Stéphane Gigandet <stephane@openfoodfacts.org>

yuktea approved these changes Mar 17, 2023

View reviewed changes

MonalikaPatnaik and others added 4 commits March 17, 2023 15:47

Merge branch 'openfoodfacts:main' into fix-asterisk

a0a412d

Merge branch 'openfoodfacts:main' into fix-asterisk

460e527

fixed-changes

83e9a45

Merge branch 'openfoodfacts:main' into fix-asterisk

70c50e8

stephanegigandet reviewed Mar 17, 2023

View reviewed changes

Merge branch 'openfoodfacts:main' into fix-asterisk

044e492

MonalikaPatnaik added 3 commits March 17, 2023 19:47

resolved-changes

c0e9c1a

final-commit

9389288

final--commit

74c1c87

yuktea reviewed Mar 17, 2023

View reviewed changes

po/common/common.pot Show resolved Hide resolved

yuktea self-requested a review March 17, 2023 14:47

yuktea requested changes Mar 17, 2023

View reviewed changes

yuktea approved these changes Mar 17, 2023

View reviewed changes

stephanegigandet approved these changes Mar 20, 2023

View reviewed changes

stephanegigandet merged commit 4ba6017 into openfoodfacts:main Mar 20, 2023

openfoodfacts-bot mentioned this pull request Mar 20, 2023

chore(main): release 2.9.0 #8231

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Nutri Score Nutriments with an asterisk #8205

fix: Nutri Score Nutriments with an asterisk #8205

MonalikaPatnaik commented Mar 14, 2023

jnsereko left a comment

stephanegigandet Mar 15, 2023

MonalikaPatnaik Mar 15, 2023

stephanegigandet commented Mar 15, 2023 •

edited

Loading

yuktea left a comment

MonalikaPatnaik commented Mar 17, 2023

MonalikaPatnaik commented Mar 17, 2023 •

edited

Loading

stephanegigandet Mar 17, 2023

stephanegigandet Mar 17, 2023

stephanegigandet Mar 17, 2023

stephanegigandet Mar 17, 2023

sonarqubecloud bot commented Mar 17, 2023

yuktea left a comment

MonalikaPatnaik commented Mar 17, 2023

yuktea commented Mar 17, 2023 •

edited

Loading

yuktea commented Mar 17, 2023

MonalikaPatnaik commented Mar 17, 2023

stephanegigandet left a comment

fix: Nutri Score Nutriments with an asterisk #8205

fix: Nutri Score Nutriments with an asterisk #8205

Conversation

MonalikaPatnaik commented Mar 14, 2023

What

Screenshot

Related issue(s) and discussion

jnsereko left a comment

Choose a reason for hiding this comment

stephanegigandet Mar 15, 2023

Choose a reason for hiding this comment

MonalikaPatnaik Mar 15, 2023

Choose a reason for hiding this comment

stephanegigandet commented Mar 15, 2023 • edited Loading

yuktea left a comment

Choose a reason for hiding this comment

MonalikaPatnaik commented Mar 17, 2023

MonalikaPatnaik commented Mar 17, 2023 • edited Loading

stephanegigandet Mar 17, 2023

Choose a reason for hiding this comment

stephanegigandet Mar 17, 2023

Choose a reason for hiding this comment

stephanegigandet Mar 17, 2023

Choose a reason for hiding this comment

stephanegigandet Mar 17, 2023

Choose a reason for hiding this comment

sonarqubecloud bot commented Mar 17, 2023

yuktea left a comment

Choose a reason for hiding this comment

MonalikaPatnaik commented Mar 17, 2023

yuktea commented Mar 17, 2023 • edited Loading

yuktea commented Mar 17, 2023

MonalikaPatnaik commented Mar 17, 2023

stephanegigandet left a comment

Choose a reason for hiding this comment

stephanegigandet commented Mar 15, 2023 •

edited

Loading

MonalikaPatnaik commented Mar 17, 2023 •

edited

Loading

yuktea commented Mar 17, 2023 •

edited

Loading