Code

chore(data): New ingredients#814

Code

Merged

ccomb merged 105 commits intomasterMTES-MCT/ecobalyse:masterfrom ingredientsMTES-MCT/ecobalyse:ingredientsCopy head branch name to clipboardNov 20, 2024

+10,297-688

Commits

Commits on Jul 25, 2024

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  authored and

  ccomb

  committed
  d6c2ab6

  Copy full SHA for d6c2ab6

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  authored and

  ccomb

  committed
  9e47f8f

  Copy full SHA for 9e47f8f

• run format:json after copying the file

  ccomb

  committed
  d533182

  Copy full SHA for d533182

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  authored and

  ccomb

  committed
  3fd30b3

  Copy full SHA for 3fd30b3

• reformat

  ccomb

  committed
  713d063

  Copy full SHA for 713d063

Commits on Jul 29, 2024

• Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  d7ed9bf

  Copy full SHA for d7ed9bf

• Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  c305e9a

  Copy full SHA for c305e9a

Commits on Jul 31, 2024

• changed the prettier version and call in the ingredient editor

  ccomb

  committed
  7356c2e

  Copy full SHA for 7356c2e

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  committed
  27c463d

  Copy full SHA for 27c463d

Commits on Aug 1, 2024

• Created a button to compute the surface, don't recompute it each time.

  Show description for 93f8263
  ccomb

  committed
  93f8263

  Copy full SHA for 93f8263

• Merge branch 'ingredients' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  01578be

  Copy full SHA for 01578be

Commits on Aug 2, 2024

• use ccomb-5 which fix the comment separator for simapro csv import

  ccomb

  committed
  5ecf1c1

  Copy full SHA for 5ecf1c1

• Replace the newline with an HTML newline

  ccomb

  committed
  0a9a1b8

  Copy full SHA for 0a9a1b8

• new export

  ccomb

  committed
  e9836e0

  Copy full SHA for e9836e0

Commits on Aug 5, 2024

• renamed variable and removed an old print

  ccomb

  committed
  25fad0e

  Copy full SHA for 25fad0e

• unused variable

  ccomb

  committed
  78814ee

  Copy full SHA for 78814ee

• display the ecoscore in the bw explorer

  ccomb

  committed
  e10b699

  Copy full SHA for e10b699

• Merge branch 'explorer_ecoscore' into ingredients

  ccomb

  committed
  97c026b

  Copy full SHA for 97c026b

• Renamed the Score column to Amount, added a Score column

  ccomb

  committed
  34be9a4

  Copy full SHA for 34be9a4

• multiply by 1e6 to get uPts

  ccomb

  committed
  16243fc

  Copy full SHA for 16243fc

• Added Percent / PEF

  Show description for b8ed517
  ccomb

  committed
  b8ed517

  Copy full SHA for b8ed517

Commits on Aug 6, 2024

• changed display rounding of percent display

  ccomb

  committed
  6cbe998

  Copy full SHA for 6cbe998

• Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  ed08964

  Copy full SHA for ed08964

Commits on Aug 9, 2024

• merge food and textile into the default project. Improved bw explorer to

  Show description for 8598d39
  ccomb

  committed
  8598d39

  Copy full SHA for 8598d39

Commits on Aug 10, 2024

• added a make delete_database and moved sync_datapackage

  ccomb

  committed
  fcb1e71

  Copy full SHA for fcb1e71

• also remove negative ldu on greenhouse from urban on Ginko

  ccomb

  committed
  a194586

  Copy full SHA for a194586

Commits on Aug 12, 2024

• Added migrations for Ginko, improved the bw explorer

  ccomb

  committed
  ab9b311

  Copy full SHA for ab9b311

• Split import and export in the Makefile

  ccomb

  committed
  0bf76fd

  Copy full SHA for 0bf76fd

• fix search term

  ccomb

  committed
  ee795da

  Copy full SHA for ee795da

• corrected search term

  ccomb

  committed
  64b8fc5

  Copy full SHA for 64b8fc5

Commits on Aug 13, 2024

• Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  8d46310

  Copy full SHA for 8d46310

• Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  8318f17

  Copy full SHA for 8318f17

• removed test

  ccomb

  committed
  6554209

  Copy full SHA for 6554209

• - refactored the brightway explorer

  Show description for f02cc19
  ccomb

  committed
  f02cc19

  Copy full SHA for f02cc19

• missing files

  ccomb

  committed
  1ddde9f

  Copy full SHA for 1ddde9f

Commits on Aug 14, 2024

• doc

  ccomb

  committed
  0bec711

  Copy full SHA for 0bec711

• doc

  ccomb

  committed
  b325f5a

  Copy full SHA for b325f5a

Commits on Aug 15, 2024

• this is not an Amount but really a Score

  ccomb

  committed
  5cb5996

  Copy full SHA for 5cb5996

• Better column order: the unit refers to the amount, not score.

  ccomb

  committed
  32f63eb

  Copy full SHA for 32f63eb

Commits on Aug 16, 2024

• corrected lines missing a million (but the total was ok)

  ccomb

  committed
  4067169

  Copy full SHA for 4067169

• Better display of the production title.

  Show description for 16e3fbe
  ccomb

  committed
  16e3fbe

  Copy full SHA for 16e3fbe

Commits on Aug 24, 2024

• Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  bcc72c1

  Copy full SHA for bcc72c1

Commits on Aug 29, 2024

• Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  66f4de8

  Copy full SHA for 66f4de8

Commits on Aug 30, 2024

• new export

  ccomb

  committed
  f561acd

  Copy full SHA for f561acd

• Merge branch 'master' of github.com:MTES-MCT/ecobalyse into food_refactor

  ccomb

  committed
  d80cd4b

  Copy full SHA for d80cd4b

• Merge branch 'food_refactor' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  b57909b

  Copy full SHA for b57909b

• adapt tests

  ccomb

  committed
  01d0a54

  Copy full SHA for 01d0a54

Commits on Sep 2, 2024

• Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  7dd8b84

  Copy full SHA for 7dd8b84

Commits on Sep 4, 2024

• Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  531fd8b

  Copy full SHA for 531fd8b

Commits on Sep 26, 2024

• Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  b55a94c

  Copy full SHA for b55a94c

• fix key error

  ccomb

  committed
  59af169

  Copy full SHA for 59af169

Commits on Oct 1, 2024

• Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  3ae0942

  Copy full SHA for 3ae0942

Commits on Oct 24, 2024

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  committed
  1d22bcc

  Copy full SHA for 1d22bcc

Commits on Oct 28, 2024

• Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  2e3abf2

  Copy full SHA for 2e3abf2

• new export

  ccomb

  committed
  8f361ec

  Copy full SHA for 8f361ec

• adapted tests

  ccomb

  committed
  9df2884

  Copy full SHA for 9df2884

Commits on Oct 29, 2024

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  committed
  c60a110

  Copy full SHA for c60a110

• fixed right categories

  ccomb

  committed
  db6a8df

  Copy full SHA for db6a8df

• adapted feeds to new ingredient names

  ccomb

  committed
  ec0b3d4

  Copy full SHA for ec0b3d4

• adapted the ingredients editor

  ccomb

  committed
  2aaaad8

  Copy full SHA for 2aaaad8

• new export

  ccomb

  committed
  ef1d29b

  Copy full SHA for ef1d29b

Commits on Nov 3, 2024

• Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  4f30d93

  Copy full SHA for 4f30d93

Commits on Nov 4, 2024

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  committed
  ba7e9f3

  Copy full SHA for ba7e9f3

Commits on Nov 5, 2024

• variable nams

  ccomb

  committed
  b1f22bd

  Copy full SHA for b1f22bd

• Show translated fields for SE, and add a None option

  ccomb

  committed
  d8c0a91

  Copy full SHA for d8c0a91

• Remove empty SE when saving

  ccomb

  committed
  458ce02

  Copy full SHA for 458ce02

• forgot a field name change

  ccomb

  committed
  ed960f6

  Copy full SHA for ed960f6

• Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  13cb3b6

  Copy full SHA for 13cb3b6

• new export

  ccomb

  committed
  dde925c

  Copy full SHA for dde925c

• same name in encoder and decoder

  ccomb

  committed
  9a7182d

  Copy full SHA for 9a7182d

Commits on Nov 6, 2024

• new export for ingredients

  ccomb

  committed
  c49b1b9

  Copy full SHA for c49b1b9

• Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  4d69fe2

  Copy full SHA for 4d69fe2

Commits on Nov 7, 2024

• new export

  ccomb

  committed
  4be8806

  Copy full SHA for 4be8806

• fixed examples

  ccomb

  committed
  240757d

  Copy full SHA for 240757d

• force the export to use a unique search result

  ccomb

  committed
  2609309

  Copy full SHA for 2609309

• use the full name if the search returns more than one result. Adapt the activities.json

  ccomb

  committed
  094e48b

  Copy full SHA for 094e48b

• adapt textile activities as well

  ccomb

  committed
  4755c46

  Copy full SHA for 4755c46

• reformat

  ccomb

  committed
  3f818f1

  Copy full SHA for 3f818f1

• new export

  ccomb

  committed
  a00e973

  Copy full SHA for a00e973

• fixed cull cow

  ccomb

  committed
  4a95300

  Copy full SHA for 4a95300

• Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  0ae521c

  Copy full SHA for 0ae521c

• adapt the ingredient editor to the new search behaviour : disable the

  Show description for 451875b
  ccomb

  committed
  451875b

  Copy full SHA for 451875b

Commits on Nov 12, 2024

• avoid duplication

  ccomb

  committed
  d367696

  Copy full SHA for d367696

• variable naming

  ccomb

  committed
  008c968

  Copy full SHA for 008c968

• unuseful function

  ccomb

  committed
  4262bf5

  Copy full SHA for 4262bf5

• looks like a merge error, the activities creation should not be in the

  Show description for d323dee
  ccomb

  committed
  d323dee

  Copy full SHA for d323dee

• adapted to the new search behaviour

  ccomb

  committed
  eded760

  Copy full SHA for eded760

Commits on Nov 13, 2024

• new export

  ccomb

  committed
  8a9b45d

  Copy full SHA for 8a9b45d

• fixed wrong percentages

  ccomb

  committed
  d8ec868

  Copy full SHA for d8ec868

• new export

  ccomb

  committed
  36a9cf5

  Copy full SHA for 36a9cf5

• yet another wrong percentage

  ccomb

  committed
  71b20d6

  Copy full SHA for 71b20d6

• new export

  ccomb

  committed
  268637a

  Copy full SHA for 268637a

• format

  ccomb

  committed
  3274dbf

  Copy full SHA for 3274dbf

• Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  c223f97

  Copy full SHA for c223f97

Commits on Nov 18, 2024

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  committed
  a19dfe8

  Copy full SHA for a19dfe8

• new export

  paulboosz

  committed
  5368882

  Copy full SHA for 5368882

Commits on Nov 20, 2024

• Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  c48ff7e

  Copy full SHA for c48ff7e

• Merge branch 'ingredients' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  1bde94d

  Copy full SHA for 1bde94d

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  committed
  5650085

  Copy full SHA for 5650085

• Merge branch 'ingredients' of https://github.com/MTES-MCT/ecobalyse into ingredients

  

  Ingredient editor

  committed
  8e7772e

  Copy full SHA for 8e7772e

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  committed
  93c0588

  Copy full SHA for 93c0588

• new export

  ccomb

  committed
  aaec9c6

  Copy full SHA for aaec9c6

• Merge branch 'ingredients' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  6bc9f5e

  Copy full SHA for 6bc9f5e

• Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  a24fd41

  Copy full SHA for a24fd41

• new export with packaging

  ccomb

  committed
  761fc88

  Copy full SHA for 761fc88