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

compare feature for one buiding, multiple time periods #283

Merged
merged 48 commits into from
Jan 18, 2024
Merged

compare feature for one buiding, multiple time periods #283

merged 48 commits into from
Jan 18, 2024

Commits on Dec 12, 2023

  1. test multiple time periods

    @solderq35
    solderq35 committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    e837df0 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. commit this.comparebuildings log

    @solderq35
    solderq35 committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    3724f5d View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2023

  1. merge lint PR

    @solderq35
    solderq35 committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    f77a641 View commit details
    Browse the repository at this point in the history

  2. add comments

    @solderq35
    solderq35 committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    1fed9d1 View commit details
    Browse the repository at this point in the history

  3. more comments

    @solderq35
    solderq35 committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    b6c408a View commit details
    Browse the repository at this point in the history

  4. update comments

    @solderq35
    solderq35 committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    1af7a01 View commit details
    Browse the repository at this point in the history

  5. clarify call order

    @solderq35
    solderq35 committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    590c23d View commit details
    Browse the repository at this point in the history

  6. comment update for edit chart labels, vuex

    @solderq35
    solderq35 committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    1ac2954 View commit details
    Browse the repository at this point in the history

  7. vuex mutation testing

    @solderq35
    solderq35 committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    64451eb View commit details
    Browse the repository at this point in the history

  8. vuex theory

    @solderq35
    solderq35 committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    333a32a View commit details
    Browse the repository at this point in the history

  9. updated chart poc

    @solderq35
    solderq35 committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    021140a View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2023

  1. more date shift poc

    @solderq35
    solderq35 committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    2963856 View commit details
    Browse the repository at this point in the history

  2. more chart label research

    @solderq35
    solderq35 committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    d67c1bb View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2023

  1. working proof of concept with edit menu ui

    @solderq35
    solderq35 committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    aa44cd6 View commit details
    Browse the repository at this point in the history

  2. align charts to the left and fix tooltips

    @s-egge
    s-egge committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    f5932dd View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2023

  1. format

    @s-egge
    s-egge committed Dec 25, 2023
    Configuration menu
    Copy the full SHA
    328f433 View commit details
    Browse the repository at this point in the history

  2. format

    @s-egge
    s-egge committed Dec 25, 2023
    Configuration menu
    Copy the full SHA
    982a4cb View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2023

  1. Added compare multiple time periods button to building page

    @s-egge
    s-egge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    435fd6c View commit details
    Browse the repository at this point in the history

  2. Map multiple time period comparison dropdown added

    @s-egge
    s-egge committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    ceaea10 View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2023

  1. Compare time periods bug fix 

    Moved mgID outside the if-statement, otherwise no error was caught when attempting to compare multiple time periods on buildings with no electricty data.
Also added a check in navdir.vue so that the compare multiple time periods button won't show up if the building has no electricity data.
    @s-egge
    s-egge committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    c606d2f View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2023

  1. fix reload page bugs with navdir

    @solderq35
    solderq35 committed Dec 28, 2023
    Configuration menu
    Copy the full SHA
    11225b2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into multiple-time-periods

    @solderq35
    solderq35 committed Dec 28, 2023
    Configuration menu
    Copy the full SHA
    7b6be75 View commit details
    Browse the repository at this point in the history

  3. chart label fix for multiple time periods 

    Also fixed the issue when comparing two buildings, one of the building's names gets "reset" to the default label when changing the time period
    @s-egge
    s-egge committed Dec 28, 2023
    Configuration menu
    Copy the full SHA
    08e39e7 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2023

  1. x-axis labels fix

    @s-egge
    s-egge committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    e07fc50 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2023

  1. fix compare menu prompt and sideView, rename chart function

    @solderq35
    solderq35 committed Dec 30, 2023
    Configuration menu
    Copy the full SHA
    4cdfddc View commit details
    Browse the repository at this point in the history

  2. simplify multiple timestamps logic and add timestamp blocks

    @solderq35
    solderq35 committed Dec 30, 2023
    Configuration menu
    Copy the full SHA
    16b9f76 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2023

  1. formatting and fix some issues with saved time period blocks

    @solderq35
    solderq35 committed Dec 31, 2023
    Configuration menu
    Copy the full SHA
    c8c9190 View commit details
    Browse the repository at this point in the history

  2. remove cancel button functionality from time blocks

    @solderq35
    solderq35 committed Dec 31, 2023
    Configuration menu
    Copy the full SHA
    6835595 View commit details
    Browse the repository at this point in the history

  3. fix map page comparison popup navigation issue

    @solderq35
    solderq35 committed Dec 31, 2023
    Configuration menu
    Copy the full SHA
    dc19461 View commit details
    Browse the repository at this point in the history

  4. more consistent syntax

    @solderq35
    solderq35 committed Dec 31, 2023
    Configuration menu
    Copy the full SHA
    8a0b664 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2024

  1. Merge branch 'master' into multiple-time-periods

    @solderq35
    solderq35 committed Jan 2, 2024
    Configuration menu
    Copy the full SHA
    fef47f9 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2024

  1. Merge branch 'master' into multiple-time-periods

    @solderq35
    solderq35 committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    20354a2 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. Label update, delete time period progress 

    Added energy type to top chart labels. Delete time period is deleting some of the data but not the labels
    @s-egge
    s-egge committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    1511f04 View commit details
    Browse the repository at this point in the history

  2. fix delete issue

    @solderq35
    solderq35 committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    b17ea40 View commit details
    Browse the repository at this point in the history

  3. edited time period block ui, fixed cancel function

    @solderq35
    solderq35 committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    7244d76 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2024

  1. Compare meters other than Total Electricity

    @s-egge
    s-egge committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    fa13eb9 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2024

  1. Remove energy type string from top chart label

    @s-egge
    s-egge committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    2fd2f76 View commit details
    Browse the repository at this point in the history

  2. Formatting

    @s-egge
    s-egge committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    974a178 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. move prompt about ok button to tooltip

    @solderq35
    solderq35 committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    be15fcd View commit details
    Browse the repository at this point in the history

  2. fix map prompt for mobile

    @solderq35
    solderq35 committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    269ffd5 View commit details
    Browse the repository at this point in the history

  3. multiple energy type graphs for one building multiple time periods. F… 

    …ix map prompt number of buildings
    @solderq35
    solderq35 committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    ccb54fe View commit details
    Browse the repository at this point in the history

  4. mobile map prompt adjustments

    @solderq35
    solderq35 committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    a2b3023 View commit details
    Browse the repository at this point in the history

  5. mobile prompt adjustment

    @solderq35
    solderq35 committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    717c5bb View commit details
    Browse the repository at this point in the history

  6. prompt height for mobile

    @solderq35
    solderq35 committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    f690a5d View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. update comment on navdir

    @solderq35
    solderq35 committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    341e6f8 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. try to remove console logs from pr

    @solderq35
    solderq35 committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    98f9074 View commit details
    Browse the repository at this point in the history

  2. comment cleanup

    @solderq35
    solderq35 committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    67d6d18 View commit details
    Browse the repository at this point in the history

  3. Reset development env

    @s-egge
    s-egge committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    0d670e4 View commit details
    Browse the repository at this point in the history