-
Notifications
You must be signed in to change notification settings - Fork 55
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.
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
Apply GHG and GHGI unit versions to canonical columns #4462
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
haneslinger
approved these changes
Jan 19, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good. How will this handle migrating data?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Any background context you want to provide?
GHG and GHGI units were selctable un column settings and mappings, however displayed values did not reflect these settings.
What's this PR do?
Applies unit conversion for canonical GHG and GHGI columns during the backend's retrieval from the db.
NOTE
This does not work for extra data columns. This is a known issue and needs further discussion.How should this be manually tested?
Upload a file with canonical columns "Total GHG Emissions" and "Total GHG Emissions Intensity" (or map to those canonical columns) then use the org settings to change the display units. The values on the inventory list and details should be updated.
What are the relevant tickets?
#2605
Screenshots (if appropriate)
settings
![Screenshot 2024-01-05 at 1 29 39 PM](https://private-user-images.githubusercontent.com/58446472/294605323-bfce9916-5e01-4666-8748-cb462b48b577.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTgyOTc2NjksIm5iZiI6MTcxODI5NzM2OSwicGF0aCI6Ii81ODQ0NjQ3Mi8yOTQ2MDUzMjMtYmZjZTk5MTYtNWUwMS00NjY2LTg3NDgtY2I0NjJiNDhiNTc3LnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDA2MTMlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwNjEzVDE2NDkyOVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWYwZWNjNmY3MDM0YWVjYzQ3ODcyYTNhY2RlZDExNDU2MGFkOTI0NDNjNGM2MDdiMTVkOTE2YWEyNzU2NzU4Y2YmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.qo_oP8O7_6sGqFnpEZOtAuB1Zgb9cAI1NKBfACwoZWE)
GHG - Mt/year & GHGI - Mt/ft2/year
![Screenshot 2024-01-05 at 1 29 04 PM](https://private-user-images.githubusercontent.com/58446472/294605326-b8d8b778-2591-4bcb-ad03-f576757206bc.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTgyOTc2NjksIm5iZiI6MTcxODI5NzM2OSwicGF0aCI6Ii81ODQ0NjQ3Mi8yOTQ2MDUzMjYtYjhkOGI3NzgtMjU5MS00YmNiLWFkMDMtZjU3Njc1NzIwNmJjLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDA2MTMlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwNjEzVDE2NDkyOVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWUyMWQzNDU1ZGM5ZDQ1NjhhOWU3YWY2YWJkZGMyMjBhOWU0ODVjZjliZjk5OGE0ZDRkMjRmMDg5MDNjYjNjYjcmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.he50SzyHBEfxNG6nu2Rogq1ZLHPnHzcJfeD6zkwYvZg)
![Screenshot 2024-01-05 at 1 48 38 PM](https://private-user-images.githubusercontent.com/58446472/294609341-9b90607b-60a9-4a0f-91f5-637f2ec56360.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTgyOTc2NjksIm5iZiI6MTcxODI5NzM2OSwicGF0aCI6Ii81ODQ0NjQ3Mi8yOTQ2MDkzNDEtOWI5MDYwN2ItNjBhOS00YTBmLTkxZjUtNjM3ZjJlYzU2MzYwLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDA2MTMlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwNjEzVDE2NDkyOVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWU4ZGJjOWIyZDllMDNmM2NmMjlkNDBkODhkODZjNDIwNGFlNWUxMTk2ZWZiMzdkMTM1Yzk5NTA4MTAyZWFiYjAmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.LDTqsJfuE3u9Goivn9ebbLR6klZ9rKV7sV3i3iWbjgc)
GHG - kg/year & GHGI - Mt/m2/year
GHG - kg/year & GHGI - kg/ft2/year
![Screenshot 2024-01-05 at 1 30 03 PM](https://private-user-images.githubusercontent.com/58446472/294605316-1c162260-e6f6-4cb7-ad57-26e0acf7483b.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTgyOTc2NjksIm5iZiI6MTcxODI5NzM2OSwicGF0aCI6Ii81ODQ0NjQ3Mi8yOTQ2MDUzMTYtMWMxNjIyNjAtZTZmNi00Y2I3LWFkNTctMjZlMGFjZjc0ODNiLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDA2MTMlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwNjEzVDE2NDkyOVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTA5M2EzZGIxY2IxZWFmNGU1NWY1ODhmOWE1MDRmNTg3OWE4MDQ2ZTE5NjZlZjNkNzZjYjIwZjI3NjE5OWNkNzEmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.pdSjm58-IIXBUjdGqagajztapXn3TDMou0qukU7sUXc)
![Screenshot 2024-01-05 at 1 43 23 PM](https://private-user-images.githubusercontent.com/58446472/294607518-daacc44c-7f44-4e0e-8a96-857bec60ca84.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTgyOTc2NjksIm5iZiI6MTcxODI5NzM2OSwicGF0aCI6Ii81ODQ0NjQ3Mi8yOTQ2MDc1MTgtZGFhY2M0NGMtN2Y0NC00ZTBlLThhOTYtODU3YmVjNjBjYTg0LnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDA2MTMlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwNjEzVDE2NDkyOVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWFjZWI2NmFiZWJjM2M0ZTczYjAxYWUzMGMxZmU5NDgzZGFlZDczZDkwN2ZjZjc1MTA2ZGE2MWJkMTU4YmFiNTkmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.FCj3Y0DeNHn10Gg3Cn7I-l2qcqSaCKpUhYaHdl6Ils4)
GHG - kg/year & GHGI - kg/m2/year