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

fix: Show missing nutrients in Nutri-Score panel #10655

Merged
merged 16 commits into from
Aug 13, 2024
Merged

fix: Show missing nutrients in Nutri-Score panel #10655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c50a17f
fix: use owners_tags indexed field in producers dashboard query
Jul 30, 2024
8d2c308
fix: run save_org_product_data_daily_off_pro.pl daily on pro platform
Jul 30, 2024
2dde67c
Merge branch 'main' into pro-dashboard-query
stephanegigandet Jul 30, 2024
acfac21
return
Jul 30, 2024
6aefc73
Merge branch 'main' into pro-dashboard-query
Aug 5, 2024
c946532
small changes to producers dashboard table
Aug 5, 2024
51c0b7f
fix link
Aug 5, 2024
ae849e0
add link
Aug 5, 2024
20b768e
improve po/pot test
stephanegigandet Aug 5, 2024
aafea67
fix utf8 decode
stephanegigandet Aug 6, 2024
87875b4
Merge branch 'main' into pro-dashboard-query
stephanegigandet Aug 6, 2024
ce1b732
fix .po / .pot files
stephanegigandet Aug 6, 2024
16c6b65
ucfirst fix
stephanegigandet Aug 6, 2024
43dc059
fix: show missing nutrients in Nutri-Score panel
stephanegigandet Aug 7, 2024
2e4003a
Merge branch 'main' into nutriscore-panel-missing-nutrition
stephanegigandet Aug 7, 2024
007ce81
update tests
stephanegigandet Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion lib/ProductOpener/Display.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9308,7 +9308,20 @@ sub data_to_display_nutriscore ($product_ref, $version = "2021") {

# Missing nutrition facts?
if (has_tag($product_ref, "misc", "en:nutriscore-missing-nutrition-data")) {
push @nutriscore_warnings, lang("nutriscore_missing_nutrition_data");

my $missing_nutrients = "";
foreach my $misc_tag (@{$product_ref->{misc_tags}}) {
if ($misc_tag =~ /^en:nutriscore-missing-nutrition-data-(.*)$/) {
$missing_nutrients .= display_taxonomy_tag_name($lc, "nutrients", $1) . ", ";
}
}
$missing_nutrients =~ s/, $//;

push @nutriscore_warnings,
lang("nutriscore_missing_nutrition_data") . "<p>"
. lang("nutriscore_missing_nutrition_data_details") . " <b>"
. $missing_nutrients . "</b>" . "</p>";

if (not has_tag($product_ref, "misc", "en:nutriscore-missing-category")) {
$result_data_ref->{nutriscore_unknown_reason} = "missing_nutrition_data";
$result_data_ref->{nutriscore_unknown_reason_short}
Expand Down
4 changes: 4 additions & 0 deletions po/common/common.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5942,6 +5942,10 @@ msgctxt "nutriscore_missing_nutrition_data"
msgid "The nutrition facts of the product must be specified in order to compute the Nutri-Score."
msgstr "The nutrition facts of the product must be specified in order to compute the Nutri-Score."

msgctxt "nutriscore_missing_nutrition_data_details"
msgid "Missing nutrition facts:"
msgstr "Missing nutrition facts:"

msgctxt "nutriscore_missing_category_and_nutrition_data"
msgid "The category and the nutrition facts of the product must be specified in order to compute the Nutri-Score."
msgstr "The category and the nutrition facts of the product must be specified in order to compute the Nutri-Score."
Expand Down
4 changes: 4 additions & 0 deletions po/common/en.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5966,6 +5966,10 @@ msgctxt "nutriscore_missing_nutrition_data"
msgid "The nutrition facts of the product must be specified in order to compute the Nutri-Score."
msgstr "The nutrition facts of the product must be specified in order to compute the Nutri-Score."

msgctxt "nutriscore_missing_nutrition_data_details"
msgid "Missing nutrition facts:"
msgstr "Missing nutrition facts:"

msgctxt "nutriscore_missing_category_and_nutrition_data"
msgid "The category and the nutrition facts of the product must be specified in order to compute the Nutri-Score."
msgstr "The category and the nutrition facts of the product must be specified in order to compute the Nutri-Score."
Expand Down
4 changes: 4 additions & 0 deletions po/common/fr.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5894,6 +5894,10 @@ msgctxt "nutriscore_missing_nutrition_data"
msgid "The nutrition facts of the product must be specified in order to compute the Nutri-Score."
msgstr "Les données nutritionnelles du produit doivent être spécifiées afin de calculer le Nutri-Score."

msgctxt "nutriscore_missing_nutrition_data_details"
msgid "Missing nutrition facts:"
msgstr "Données nutritionnelles manquantes :"

msgctxt "nutriscore_missing_category_and_nutrition_data"
msgid "The category and the nutrition facts of the product must be specified in order to compute the Nutri-Score."
msgstr "La catégorie et la valeur nutritionnelle du produit doivent être précisées afin de calculer le Nutri-Score."
Expand Down
25 changes: 19 additions & 6 deletions templates/api/knowledge-panels/health/nutriscore/nutriscore_2023.tt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,19 @@
"grade": "[% panel.nutriscore_grade %]",
},
"elements": [
// Explanation of Nutri-Score
{
"element_type": "panel",
"panel_element": {
"panel_id": "nutriscore_description",
// First display warnings
[% IF panel.nutriscore_warnings %]
[% FOREACH warning IN panel.nutriscore_warnings %]
{
"element_type": "text",
"text_element": {
"type": "warning",
"html": `[% warning %]
`,
}
},
},
[% END %]
[% END %]
// Display actions if we are missing data to compute the Nutri-Score
[% IF panel.nutriscore_unknown_reason == "missing_category" OR panel.nutriscore_unknown_reason == "missing_nutrition_data" OR panel.nutriscore_unknown_reason == "missing_category_and_nutrition_data" %]
{
Expand All @@ -39,6 +45,13 @@
}
},
[% END %]
// Explanation of Nutri-Score
{
"element_type": "panel",
"panel_element": {
"panel_id": "nutriscore_description",
},
},
// Start with negative points first, as the positive points depend on negative points
[% IF product.nutriscore.2023.data.components.negative.size > 0 %]
{
Expand Down
10 changes: 6 additions & 4 deletions templates/web/panels/panel.tt.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,10 +285,12 @@ <h4 class="panel_title">
[% action_element.html %]

[% FOREACH action IN action_element.actions %]
<a class="button small action-[% action %]"
href="[% product_action_url(product.code, action) %]">
[% lang("action_$action") %]
</a>
<div>
<a class="button small action-[% action %]"
href="[% product_action_url(product.code, action) %]">
[% lang("action_$action") %]
</a>
</div>
[% END %]

</div>
Expand Down
14 changes: 14 additions & 0 deletions ...ntegration/expected_test_results/api_v2_product_read/get-fields-all-knowledge-panels.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1568,6 +1568,20 @@
},
"nutriscore_2023" : {
"elements" : [
{
"element_type" : "text",
"text_element" : {
"html" : "Warning: the nutrition facts are not specified. They have been estimated from the list of ingredients.\n ",
"type" : "warning"
}
},
{
"element_type" : "text",
"text_element" : {
"html" : "Warning: the amount of fruits, vegetables and nuts is not specified on the label, it was estimated from the list of ingredients: 62\n ",
"type" : "warning"
}
},
{
"element_type" : "panel",
"panel_element" : {
Expand Down
14 changes: 14 additions & 0 deletions ...ed_test_results/api_v2_product_read/get-fields-attribute-groups-all-knowledge-panels.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2216,6 +2216,20 @@
},
"nutriscore_2023" : {
"elements" : [
{
"element_type" : "text",
"text_element" : {
"html" : "Warning: the nutrition facts are not specified. They have been estimated from the list of ingredients.\n ",
"type" : "warning"
}
},
{
"element_type" : "text",
"text_element" : {
"html" : "Warning: the amount of fruits, vegetables and nuts is not specified on the label, it was estimated from the list of ingredients: 62\n ",
"type" : "warning"
}
},
{
"element_type" : "panel",
"panel_element" : {
Expand Down
14 changes: 14 additions & 0 deletions tests/integration/expected_test_results/api_v2_product_read/get-knowledge-panels-fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,6 +876,20 @@
},
"nutriscore_2023" : {
"elements" : [
{
"element_type" : "text",
"text_element" : {
"html" : "Attention : les valeurs nutritionnelles ne sont pas précisées. Elles ont été estimées à partir de la liste des ingrédients.\n ",
"type" : "warning"
}
},
{
"element_type" : "text",
"text_element" : {
"html" : "Avertissement : Le taux de fruits, légumes et noix n'est pas indiqué sur l'étiquette, il a été estimé en fonction de la liste des ingrédients : 62\n ",
"type" : "warning"
}
},
{
"element_type" : "panel",
"panel_element" : {
Expand Down
14 changes: 14 additions & 0 deletions tests/integration/expected_test_results/api_v2_product_read/get-knowledge-panels.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,6 +876,20 @@
},
"nutriscore_2023" : {
"elements" : [
{
"element_type" : "text",
"text_element" : {
"html" : "Warning: the nutrition facts are not specified. They have been estimated from the list of ingredients.\n ",
"type" : "warning"
}
},
{
"element_type" : "text",
"text_element" : {
"html" : "Warning: the amount of fruits, vegetables and nuts is not specified on the label, it was estimated from the list of ingredients: 62\n ",
"type" : "warning"
}
},
{
"element_type" : "panel",
"panel_element" : {
Expand Down
14 changes: 14 additions & 0 deletions ...ntegration/expected_test_results/api_v3_product_read/get-fields-all-knowledge-panels.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1570,6 +1570,20 @@
},
"nutriscore_2023" : {
"elements" : [
{
"element_type" : "text",
"text_element" : {
"html" : "Warning: the nutrition facts are not specified. They have been estimated from the list of ingredients.\n ",
"type" : "warning"
}
},
{
"element_type" : "text",
"text_element" : {
"html" : "Warning: the amount of fruits, vegetables and nuts is not specified on the label, it was estimated from the list of ingredients: 62\n ",
"type" : "warning"
}
},
{
"element_type" : "panel",
"panel_element" : {
Expand Down
14 changes: 14 additions & 0 deletions ...ed_test_results/api_v3_product_read/get-fields-attribute-groups-all-knowledge-panels.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2218,6 +2218,20 @@
},
"nutriscore_2023" : {
"elements" : [
{
"element_type" : "text",
"text_element" : {
"html" : "Warning: the nutrition facts are not specified. They have been estimated from the list of ingredients.\n ",
"type" : "warning"
}
},
{
"element_type" : "text",
"text_element" : {
"html" : "Warning: the amount of fruits, vegetables and nuts is not specified on the label, it was estimated from the list of ingredients: 62\n ",
"type" : "warning"
}
},
{
"element_type" : "panel",
"panel_element" : {
Expand Down
14 changes: 14 additions & 0 deletions tests/integration/expected_test_results/api_v3_product_read/get-knowledge-panels-fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,6 +877,20 @@
},
"nutriscore_2023" : {
"elements" : [
{
"element_type" : "text",
"text_element" : {
"html" : "Attention : les valeurs nutritionnelles ne sont pas précisées. Elles ont été estimées à partir de la liste des ingrédients.\n ",
"type" : "warning"
}
},
{
"element_type" : "text",
"text_element" : {
"html" : "Avertissement : Le taux de fruits, légumes et noix n'est pas indiqué sur l'étiquette, il a été estimé en fonction de la liste des ingrédients : 62\n ",
"type" : "warning"
}
},
{
"element_type" : "panel",
"panel_element" : {
Expand Down
14 changes: 14 additions & 0 deletions tests/integration/expected_test_results/api_v3_product_read/get-knowledge-panels.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,6 +877,20 @@
},
"nutriscore_2023" : {
"elements" : [
{
"element_type" : "text",
"text_element" : {
"html" : "Warning: the nutrition facts are not specified. They have been estimated from the list of ingredients.\n ",
"type" : "warning"
}
},
{
"element_type" : "text",
"text_element" : {
"html" : "Warning: the amount of fruits, vegetables and nuts is not specified on the label, it was estimated from the list of ingredients: 62\n ",
"type" : "warning"
}
},
{
"element_type" : "panel",
"panel_element" : {
Expand Down
20 changes: 17 additions & 3 deletions .../api_v3_product_write/patch-request-fields-updated-attribute-groups-knowledge-panels.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,9 +558,17 @@
"nutriscore_2023" : {
"elements" : [
{
"element_type" : "panel",
"panel_element" : {
"panel_id" : "nutriscore_description"
"element_type" : "text",
"text_element" : {
"html" : "The category of the product must be specified in order to compute the Nutri-Score.\n ",
"type" : "warning"
}
},
{
"element_type" : "text",
"text_element" : {
"html" : "The nutrition facts of the product must be specified in order to compute the Nutri-Score.<p>Missing nutrition facts: <b>Energy, Fat, Proteins, Saturated fat, Sodium, Sugars</b></p>\n ",
"type" : "warning"
}
},
{
Expand All @@ -572,6 +580,12 @@
"html" : "Could you add the information needed to compute the Nutri-Score?"
},
"element_type" : "action"
},
{
"element_type" : "panel",
"panel_element" : {
"panel_id" : "nutriscore_description"
}
}
],
"level" : "info",
Expand Down
13 changes: 10 additions & 3 deletions tests/integration/expected_test_results/data_quality_knowledge_panel/data-quality.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,9 +634,10 @@
"nutriscore_2023" : {
"elements" : [
{
"element_type" : "panel",
"panel_element" : {
"panel_id" : "nutriscore_description"
"element_type" : "text",
"text_element" : {
"html" : "The nutrition facts of the product must be specified in order to compute the Nutri-Score.<p>Missing nutrition facts: <b>Fat, Proteins, Saturated fat, Sugars</b></p>\n ",
"type" : "warning"
}
},
{
Expand All @@ -647,6 +648,12 @@
"html" : "Could you add the information needed to compute the Nutri-Score?"
},
"element_type" : "action"
},
{
"element_type" : "panel",
"panel_element" : {
"panel_id" : "nutriscore_description"
}
}
],
"level" : "info",
Expand Down
13 changes: 10 additions & 3 deletions tests/integration/expected_test_results/data_quality_knowledge_panel/no-data-quality.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,9 +552,10 @@
"nutriscore_2023" : {
"elements" : [
{
"element_type" : "panel",
"panel_element" : {
"panel_id" : "nutriscore_description"
"element_type" : "text",
"text_element" : {
"html" : "The nutrition facts of the product must be specified in order to compute the Nutri-Score.<p>Missing nutrition facts: <b>Energy, Fat, Proteins, Saturated fat, Sodium, Sugars</b></p>\n ",
"type" : "warning"
}
},
{
Expand All @@ -565,6 +566,12 @@
"html" : "Could you add the information needed to compute the Nutri-Score?"
},
"element_type" : "action"
},
{
"element_type" : "panel",
"panel_element" : {
"panel_id" : "nutriscore_description"
}
}
],
"level" : "info",
Expand Down
Loading
Loading