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

Ingredients #849

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open

Ingredients #849

wants to merge 24 commits into from

Conversation

ccomb
Copy link
Collaborator

@ccomb ccomb commented Dec 5, 2024

🔧 Problem

Describe the problem you're trying to solve, the reason why you are creating this pull request. Provide a link to the Notion card if any.

🍰 Solution

Explain the solution that this PR implements to solve the problem above.

🚨 Points to watch/comments

If there is anything unusual or some clarifications needed for the reviewer to better understand the PR, discuss it here.

🏝️ How to test

What someone else than you should do to validate that the solution you implemented is working as expected. Don't hesitate to be too verbose and to explain in details, using bullet points for example, the steps to follow to test the expected behavior.

ccomb and others added 23 commits November 18, 2024 22:26
@ccomb
Add an irrigation exchange to the organic cotton using a "strategy"
fc695c4
@ccomb
Remove hardcoded impacts and use the modified EI organic cotton
bdb779c
@ccomb
new export
b3d216b
@ccomb
modify the right process
dba8423
@ccomb
Merge pastoeco in a single file
8c382ab
@ccomb
link pastoeco to agb 3.1
51e8f0a
@ccomb
switch to agb 3.2 final
5a511c2
@ccomb
change db name
a818ce6
@ccomb
Merge branch 'agb32_final' of github.com:MTES-MCT/ecobalyse into ingr…
df188aa 
…edients
@ccomb
Merge branch 'merge_pastoeco' of github.com:MTES-MCT/ecobalyse into i…
28fb9fc 
…ngredients
@ccomb
Merge branch 'organic_cotton' of github.com:MTES-MCT/ecobalyse into i…
066d177 
…ngredients
@ccomb
Prevent the editor to use an already existing name
aae4e9d
@ccomb
Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients
109af98
@ccomb
Merge branch 'editor_unique_name' of github.com:MTES-MCT/ecobalyse in…
d87522f 
…to ingredients
@ccomb
allow to save the currently edited activity
2aff750
@ccomb
Merge branch 'editor_unique_name' of github.com:MTES-MCT/ecobalyse in…
acc82c2 
…to ingredients
@ccomb
also clear the save output
c160223
wrong clear location
cb2340f
@ccomb
wrong clear location
7a2e46e
@ccomb
Merge branch 'ingredients' of github.com:MTES-MCT/ecobalyse into ingr…
49a758e 
…edients
@ccomb
also clear the save_output
fe09d92
@ccomb
Merge branch 'editor_unique_name' of github.com:MTES-MCT/ecobalyse in…
c1ea376 
…to ingredients
removed SE for transformed ingredients
0af34c1
JFraichou
JFraichou reviewed Dec 11, 2024
View reviewed changes
Copy link
Collaborator

@JFraichou JFraichou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the ecosystemic services (crop/animal group) are removed from every transformed ingredients

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JFraichou JFraichou JFraichou left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ccomb @JFraichou