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

feat: displayName in the textile explorer, reordered columns #737

Merged
merged 11 commits into from
Sep 12, 2024
Merged

feat: displayName in the textile explorer, reordered columns #737

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8ed9931
DB delete example with space
ccomb Sep 11, 2024
be4aee1
fixed wrong key
ccomb Sep 11, 2024
9ac6f46
Added a displayName on processes
ccomb Sep 11, 2024
1c7a08d
displayName in elm de/encoder
ccomb Sep 11, 2024
fac31d2
displayName in the textile explorer
ccomb Sep 11, 2024
a571917
unused import
ccomb Sep 11, 2024
cecb861
adapted tests
ccomb Sep 11, 2024
08fc4c7
Revert "fixed wrong key"
ccomb Sep 12, 2024
dc71e94
pipe style
ccomb Sep 12, 2024
e771b7c
different import style
ccomb Sep 12, 2024
b49c474
different import style
ccomb Sep 12, 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
2 changes: 1 addition & 1 deletion data/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ d'abord un `make clean_data` (qui supprime le volume docker).
- `make import_method` : pour importer EF 3.1 adapted dans Brightway.
Assurez-vous d'avoir le bon fichier de données dans `data/`
- `make export_food` : pour exporter les json pour le builder alimentaire
- `make delete_database DB=<dbname>` : pour supprimer une base de données
- `make delete_database DB=<dbname>` : pour supprimer une base de données (Ex avec espace: make delete_database DB="Ecoinvent\ 3.9.1")
- `make delete_method` : pour supprimer la méthode EF3.1
- `make sync_datapackages` : lance un fix parfois nécessaire pour la synchro brightway
- `make import` : lance toutes les commandes d'import
Expand Down
6 changes: 3 additions & 3 deletions data/notebooks/explore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ def display_main_data(method, impact_category, activity):
name = ", ".join(m[1:])
scores[name] = {
"Indicateur": name,
"Amount": lca.score,
"Score": lca.score,
"Unité": bw2data.methods[m].get("unit", "(no unit)"),
}

Expand All @@ -428,8 +428,8 @@ def display_main_data(method, impact_category, activity):
}
scores["Ecotoxicity, freshwater"] = {
"Indicateur": "Ecotoxicity, freshwater",
"Amount": scores["Ecotoxicity, freshwater - part 1"]["Amount"]
+ scores["Ecotoxicity, freshwater - part 2"]["Amount"],
"Score": scores["Ecotoxicity, freshwater - part 1"]["Score"]
+ scores["Ecotoxicity, freshwater - part 2"]["Score"],
"Unité": scores["Ecotoxicity, freshwater - part 1"]["Unité"],
}
for trigram in [
Expand Down
Loading