Skip to content

fix: make additives and nutrient level attributes clickable (#8492) #14321

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

Open
sarthaklole wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −4
Open

fix: make additives and nutrient level attributes clickable (#8492) #14321

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 27 additions & 4 deletions lib/ProductOpener/Attributes.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,6 +1059,18 @@ sub compute_attribute_additives ($product_ref, $target_lc) {

$attribute_ref->{icon_url} = "$static_subdomain/images/attributes/dist/$n-additives.svg";

if ($additives > 0) {
$attribute_ref->{panel_id} = "additives";
}
elsif (not($product_ref->{ingredients_n})) {
# If we don't have ingredients, link to the ingredients panel (with add action)
$attribute_ref->{panel_id} = "ingredients";
}
else {
# If we have ingredients, link to the ingredients analysis panel
$attribute_ref->{panel_id} = "ingredients_analysis";
}

}
else {
$attribute_ref->{status} = "unknown";
Expand All @@ -1071,11 +1083,21 @@ sub compute_attribute_additives ($product_ref, $target_lc) {
= lang_in_other_lc($target_lc, "attribute_additives_unknown_description_short");
$attribute_ref->{missing} = lang_in_other_lc($target_lc, "missing_ingredients_list");
}

if (not($product_ref->{ingredients_n})) {
# If we don't have ingredients, link to the ingredients panel (with add action)
$attribute_ref->{panel_id} = "ingredients";
}
else {
# If we have ingredients, link to the ingredients analysis panel
$attribute_ref->{panel_id} = "ingredients_analysis";
}
}

return $attribute_ref;
}


=head2 compute_attribute_has_tag ( $product_ref, $target_lc, $tagtype, $tagid )

Checks if the product has a specific tag (e.g. a label)
Expand Down Expand Up @@ -1228,6 +1250,8 @@ sub compute_attribute_nutrient_level ($product_ref, $target_lc, $level, $nid) {
if ((not defined $product_ref->{nutrient_levels}) or (not defined $product_ref->{nutrient_levels}{$nid})) {
$attribute_ref->{status} = "unknown";
$attribute_ref->{icon_url} = "$static_subdomain/images/attributes/dist/nutrient-level-$nid-unknown.svg";
$attribute_ref->{panel_id} = "nutrition_facts_table";

if ($target_lc ne "data") {
$attribute_ref->{title} = sprintf(
lang_in_other_lc($target_lc, "nutrient_in_quantity"),
Expand All @@ -1240,7 +1264,6 @@ sub compute_attribute_nutrient_level ($product_ref, $target_lc, $level, $nid) {
else {
$attribute_ref->{missing} = lang_in_other_lc($target_lc, "missing_nutrition_facts");
}
$attribute_ref->{panel_id} = "nutrition_facts_table";
}
}
else {
Expand Down Expand Up @@ -1294,6 +1317,9 @@ sub compute_attribute_nutrient_level ($product_ref, $target_lc, $level, $nid) {

$attribute_ref->{match} = $match;

$attribute_ref->{panel_id} = "nutrient_level_" . $nid;
$attribute_ref->{panel_id} =~ s/-/_/g;

if ($target_lc ne "data") {
$attribute_ref->{title} = sprintf(
lang_in_other_lc($target_lc, "nutrient_in_quantity"),
Expand All @@ -1304,9 +1330,6 @@ sub compute_attribute_nutrient_level ($product_ref, $target_lc, $level, $nid) {
$attribute_ref->{description_short}
= sprintf(lang_in_other_lc($target_lc, 'g_per_100g'), (sprintf('%.2e', $value) + 0.0));
}

$attribute_ref->{panel_id} = "nutrient_level_" . $nid;
$attribute_ref->{panel_id} =~ s/-/_/g;
}
}
}
Expand Down