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

First-Tier contribution analysis tab #1046

Open
wants to merge 37 commits into
base: main
Choose a base branch
from
Open

First-Tier contribution analysis tab #1046

wants to merge 37 commits into from
+524 −28

Commits on Sep 22, 2023

  1. Add first iteration of product contributions

    @marc-vdm
    marc-vdm committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    6359dd7 View commit details
    Browse the repository at this point in the history

  2. Add first iteration of product contributions

    @marc-vdm
    marc-vdm committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    ecdfad2 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. Merge branch 'master' into first_level_cont

    @marc-vdm
    marc-vdm committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    6aa72aa View commit details
    Browse the repository at this point in the history

  2. Fix cache_key similar to LCA-ActivityBrowser#1180

    @marc-vdm
    marc-vdm committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    762cf6c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'first_level_cont' of https://github.com/marc-vdm/activi… 

    …ty-browser into first_level_cont

� Conflicts:
�	activity_browser/layouts/tabs/LCA_results_tabs.py
    @marc-vdm
    marc-vdm committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    3de5787 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. Merge branch 'master' into first_level_cont

    @marc-vdm
    marc-vdm committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    86eccc5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'minor' into first_level_cont 

    # Conflicts:
#	activity_browser/controllers/database.py
#	activity_browser/layouts/tabs/LCA_results_tabs.py
    @marc-vdm
    marc-vdm committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    889108f View commit details
    Browse the repository at this point in the history

  3. re-add product tab to Tabs tuple

    @marc-vdm
    marc-vdm committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    5f66b0c View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. Merge branch 'refs/heads/main' into first_level_cont 

    # Conflicts:
#	activity_browser/controllers/database.py
#	activity_browser/layouts/tabs/LCA_results_tabs.py
    @marc-vdm
    marc-vdm committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    5e6128c View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. Merge branch 'main' into first_level_cont 

    # Conflicts:
#	activity_browser/layouts/tabs/LCA_results_tabs.py
    @marc-vdm
    marc-vdm committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    b8da5ee View commit details
    Browse the repository at this point in the history

  2. Update strings

    @marc-vdm
    marc-vdm committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    1e8e833 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2024

  1. refactor to use brightway directly instead of graph traversal code

    @marc-vdm
    marc-vdm committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    7486f70 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. minor changes + setup TODO

    @marc-vdm
    marc-vdm committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    d90dddc View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. Merge branch 'main' into first_level_cont

    @marc-vdm
    marc-vdm committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    e75f80e View commit details
    Browse the repository at this point in the history

  2. Enable scenarios for product contributions

    @marc-vdm
    marc-vdm committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    ffbd403 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. extend todo

    @marc-vdm
    marc-vdm committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    86cd6bf View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2024

  1. Several CA fixes 

    Add:
- CA data: use actual total instead of sum(abs)
- CA data: make distinction between positive and negative rest values (LCA-ActivityBrowser#886)
- CA data: sort based on average of row instead of first column (LCA-ActivityBrowser#887)
- CA table: consistent dropping of empty (rest) rows (LCA-ActivityBrowser#1044)
- CA figure: add marker to show total score when both positive and negative results present (LCA-ActivityBrowser#647)
    @marc-vdm
    marc-vdm committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    21cb6e5 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. Improve logging output + setting unit for rest values

    @marc-vdm
    marc-vdm committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    9c7924a View commit details
    Browse the repository at this point in the history

  2. resolve minor bug with total marker not always showing

    @marc-vdm
    marc-vdm committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    b41cf44 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into first_level_cont

    @marc-vdm
    marc-vdm committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    7190117 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into CA_updates

    @marc-vdm
    marc-vdm committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    d02a81f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'refs/heads/main' into CA_updates

    @marc-vdm
    marc-vdm committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    2b95a3f View commit details
    Browse the repository at this point in the history

  6. Update wiki for positive/negatige results + fix total marker always s… 

    …howing on negative totals
    @marc-vdm
    marc-vdm committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    a59814d View commit details
    Browse the repository at this point in the history

  7. Update wiki for positive/negatige results

    @marc-vdm
    marc-vdm committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    b0a610f View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into first_level_cont

    @marc-vdm
    marc-vdm committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    97378d2 View commit details
    Browse the repository at this point in the history

  9. refactor

    @marc-vdm
    marc-vdm committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    074b04b View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. use specific BW libs instead of bw

    @marc-vdm
    marc-vdm committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    55c2e45 View commit details
    Browse the repository at this point in the history

  2. Implement aggregation and normalize

    @marc-vdm
    marc-vdm committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    ca49483 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Implement cutoff

    @marc-vdm
    marc-vdm committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    589d6d8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into first_level_cont

    @marc-vdm
    marc-vdm committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    17e000d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into CA_updates

    @marc-vdm
    marc-vdm committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    19b79d2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'CA_updates' into first_level_cont

    @marc-vdm
    marc-vdm committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    680837b View commit details
    Browse the repository at this point in the history

  5. Fix minor issues

    @marc-vdm
    marc-vdm committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    af2feb8 View commit details
    Browse the repository at this point in the history

  6. rename to first-tier + only start on tab open + fix unit showing

    @marc-vdm
    marc-vdm committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    d8ff035 View commit details
    Browse the repository at this point in the history

  7. documentation for first-tier

    @marc-vdm
    marc-vdm committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    94bc6cc View commit details
    Browse the repository at this point in the history

  8. update sankey

    @marc-vdm
    marc-vdm committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    a9ca09f View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2024

  1. Merge branch 'main' into first_level_cont

    @marc-vdm
    marc-vdm committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    6cc980f View commit details
    Browse the repository at this point in the history