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

fix: remove warning in Display.pm related to Environmental Scoring #11172

Merged
merged 9 commits into from
Jan 7, 2025
Merged

fix: remove warning in Display.pm related to Environmental Scoring #11172

Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c063321
remove_warnings
benbenben2 Dec 16, 2024
c2e8317
make lint
benbenben2 Dec 17, 2024
dc3503e
return undef error
benbenben2 Dec 17, 2024
72f7e04
Merge branch 'main' into fix/remove_warnings
benbenben2 Dec 22, 2024
eea4c17
Merge branch 'main' into fix/remove_warnings
teolemon Dec 22, 2024
41c2996
Merge branch 'main' into fix-remove-warning
alexgarel Jan 7, 2025
ba3e780
fix: use environmental score new name
alexgarel Jan 7, 2025
6becc56
test: Update tests results
Jan 7, 2025
fc51807
chore: Linting changes
Jan 7, 2025
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
25 changes: 17 additions & 8 deletions lib/ProductOpener/Display.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,8 +421,15 @@ sub process_template ($template_filename, $template_data_ref, $result_content_re
};

$template_data_ref->{round} = sub ($var) {
return sprintf("%.0f", $var);
# Check if $var is defined and is numeric
if (defined $var && $var =~ /^-?\d+(\.\d+)?$/) {
return sprintf("%.0f", $var);
}
else {
return;
}
};

$template_data_ref->{sprintf} = sub ($var1, $var2) {
return sprintf($var1, $var2);
};
Expand Down Expand Up @@ -7953,13 +7960,15 @@ JS

localize_environmental_score($request_ref->{cc}, $product_ref);

$template_data_ref->{environmental_score_grade} = uc($product_ref->{environmental_score_data}{"grade"});
$template_data_ref->{environmental_score_grade_lc} = $product_ref->{environmental_score_data}{"grade"};
$template_data_ref->{environmental_score_score} = $product_ref->{environmental_score_data}{"score"};
$template_data_ref->{environmental_score_data} = $product_ref->{environmental_score_data};
$template_data_ref->{environmental_score_calculation_details}
= display_environmental_score_calculation_details($request_ref->{cc},
$product_ref->{environmental_score_data});
if (defined $product_ref->{ecoscore_data}{"grade"}) {
$template_data_ref->{ecoscore_grade} = uc($product_ref->{ecoscore_data}{"grade"});
$template_data_ref->{ecoscore_grade_lc} = $product_ref->{ecoscore_data}{"grade"};
}

$template_data_ref->{ecoscore_score} = $product_ref->{ecoscore_data}{"score"};
$template_data_ref->{ecoscore_data} = $product_ref->{ecoscore_data};
$template_data_ref->{ecoscore_calculation_details}
= display_ecoscore_calculation_details($request_ref->{cc}, $product_ref->{ecoscore_data});
alexgarel marked this conversation as resolved.
Show resolved Hide resolved
}

# Activate knowledge panels for all users
Expand Down
Loading