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.

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

Meters #1853

Merged
merged 105 commits into from
May 6, 2019
Merged

Meters #1853

merged 105 commits into from
May 6, 2019

Commits on Feb 12, 2019

  1. Configuration menu
    Copy the full SHA
    6130aea View commit details
    Browse the repository at this point in the history
  2. Meter and MeterReading models created and can be imported via FE - 1s…

    …t Iteration
    Adrian Lara committed Feb 12, 2019
    Configuration menu
    Copy the full SHA
    6909041 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2019

  1. Pint library used to replace the unit field for Meters. All MeterRead…

    …ings saved as kBtu - 1st iteration
    Adrian Lara committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    ff22ae7 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'gis-201902-release' into timeseries

    Adrian Lara committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    8d60015 View commit details
    Browse the repository at this point in the history
  3. Shift Meter/MeterReading migrations up

    Adrian Lara committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    feff1c7 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2019

  1. Monthly meters correctly associated multiple properties with same und…

    …erlying pm_property_ids
    Adrian Lara committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    75d5bbf View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    457b7c1 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2019

  1. Fix meter typo and assignment convention

    Adrian Lara committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    5159395 View commit details
    Browse the repository at this point in the history
  2. Meter is_virtual indicator added to model

    Adrian Lara committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    0596ca3 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'develop' into timeseries

    Adrian Lara committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    9ef2359 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2019

  1. Move Meter Parser from util to it's own class

    Adrian Lara committed Feb 21, 2019
    Configuration menu
    Copy the full SHA
    6b54b66 View commit details
    Browse the repository at this point in the history
  2. source_unit and conversion_factors during import are saved to MeterRe…

    …adings
    Adrian Lara committed Feb 21, 2019
    Configuration menu
    Copy the full SHA
    cb09432 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2019

  1. 1st iteration BE written to return types and units from meters file h…

    …eaders
    Adrian Lara committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    f73ed5c View commit details
    Browse the repository at this point in the history
  2. On meter upload, user confirms types and units parsed from column hea…

    …ders
    Adrian Lara committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    c78e6f1 View commit details
    Browse the repository at this point in the history
  3. Meter upload confirmation BE enhanced to have summary of meters to be…

    … imported
    Adrian Lara committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    5cdc4ef View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7f3c198 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2019

  1. Configuration menu
    Copy the full SHA
    5b69ef0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d05e1ef View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2019

  1. Install TimescaleDB in TravisCI

    * TravisCI - install timescaledb
    
    * flake8 linter
    adrian-lara authored Feb 27, 2019
    Configuration menu
    Copy the full SHA
    7c75871 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2019

  1. Meter uploads are split across celery tasks and updates viewable via …

    …progress bar
    Adrian Lara committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    553cf98 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2019

  1. Meter import error handling for meter with overlapping (by time) read…

    …ings
    Adrian Lara committed Mar 1, 2019
    Configuration menu
    Copy the full SHA
    23c2d23 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2019

  1. Inventory detail energy tab and page created

    Adrian Lara committed Mar 3, 2019
    Configuration menu
    Copy the full SHA
    fb03b66 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2019

  1. Configuration menu
    Copy the full SHA
    28b4879 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2019

  1. Configuration menu
    Copy the full SHA
    ee46a30 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    191b888 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    61351c3 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2019

  1. Organizations have display_meter_units preference

    Adrian Lara authored and adrian-lara committed Mar 8, 2019
    Configuration menu
    Copy the full SHA
    9603a9b View commit details
    Browse the repository at this point in the history
  2. Meter unit display preferences returned from get organization(s) endp…

    …oint
    Adrian Lara authored and adrian-lara committed Mar 8, 2019
    Configuration menu
    Copy the full SHA
    8b70e70 View commit details
    Browse the repository at this point in the history
  3. Meter API endpoint exists to return valid meter type and unit combina…

    …tions
    Adrian Lara authored and adrian-lara committed Mar 8, 2019
    Configuration menu
    Copy the full SHA
    e5afcc5 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ed1903c View commit details
    Browse the repository at this point in the history
  5. Users can update display meter unit preferences in the org. settings …

    …page
    Adrian Lara authored and adrian-lara committed Mar 8, 2019
    Configuration menu
    Copy the full SHA
    3652bca View commit details
    Browse the repository at this point in the history
  6. Meter Page presents meters in the units specified by org

    Adrian Lara authored and adrian-lara committed Mar 8, 2019
    Configuration menu
    Copy the full SHA
    30252bd View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    25501c9 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    44721bf View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2019

  1. Configuration menu
    Copy the full SHA
    3044f23 View commit details
    Browse the repository at this point in the history
  2. Energy page interval dropdown allows for the rendering of Exact and M…

    …onth readings
    Adrian Lara committed Mar 11, 2019
    Configuration menu
    Copy the full SHA
    50d14c4 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2019

  1. Energy page can show annual usage

    Adrian Lara committed Mar 12, 2019
    Configuration menu
    Copy the full SHA
    6bf47f9 View commit details
    Browse the repository at this point in the history
  2. Filtering added on Energy page

    Adrian Lara committed Mar 12, 2019
    Configuration menu
    Copy the full SHA
    0929453 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2019

  1. Configuration menu
    Copy the full SHA
    c654653 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2019

  1. Configuration menu
    Copy the full SHA
    d8e9ac1 View commit details
    Browse the repository at this point in the history
  2. Refactor MetersParser sub-monthly data intake flexibility

    Adrian Lara authored and adrian-lara committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    daa5a02 View commit details
    Browse the repository at this point in the history
  3. MetersParser can handle raw meters with start_time and duration

    Adrian Lara authored and adrian-lara committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    edeb57a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f92d427 View commit details
    Browse the repository at this point in the history
  5. GreenButton parsed_meters_confirmation returns prelim. info about imp…

    …ort file
    Adrian Lara authored and adrian-lara committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    8b935e7 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    eb57631 View commit details
    Browse the repository at this point in the history
  7. GreenButtonParser WIP with temp hardcoding type-units

    Adrian Lara authored and adrian-lara committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    bbdfb13 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    030ed7f View commit details
    Browse the repository at this point in the history
  9. All meter proposed_imports use generic "source_id" in back-end

    Adrian Lara authored and adrian-lara committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    f4343a9 View commit details
    Browse the repository at this point in the history
  10. Working (unrefined) GreenButton import from energy detail page

    Adrian Lara authored and adrian-lara committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    1dcc308 View commit details
    Browse the repository at this point in the history
  11. Python convention - prepend underscore for unused return values

    Adrian Lara authored and adrian-lara committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    982c134 View commit details
    Browse the repository at this point in the history
  12. GreenButtton XML reader can parse units and types

    Adrian Lara authored and adrian-lara committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    21b16d8 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    f2797b3 View commit details
    Browse the repository at this point in the history
  14. GreenButton progress bar and import results shown

    Adrian Lara authored and adrian-lara committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    140d1fa View commit details
    Browse the repository at this point in the history
  15. Show 2 decimal places for energy readings

    Adrian Lara authored and adrian-lara committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    4218600 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    8e9a2a9 View commit details
    Browse the repository at this point in the history
  17. Refactor thermal conversion caching for MetersParser

    Adrian Lara authored and adrian-lara committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    a81b586 View commit details
    Browse the repository at this point in the history
  18. GreenButton duplicate imports caught when batched together

    Adrian Lara authored and adrian-lara committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    fe93d57 View commit details
    Browse the repository at this point in the history
  19. Create button to refresh energy page on GB import complete

    Adrian Lara authored and adrian-lara committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    8cb1b53 View commit details
    Browse the repository at this point in the history
  20. Comments for GreenButton import task creator and tasks methods

    Adrian Lara authored and adrian-lara committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    424826f View commit details
    Browse the repository at this point in the history
  21. Remove convoluting reverse enum lookup for Meter sources

    Adrian Lara authored and adrian-lara committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    5066fb8 View commit details
    Browse the repository at this point in the history
  22. Clean up of ImportFile matching_results_data temporarily used during …

    …GB imports
    Adrian Lara authored and adrian-lara committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    2b2183b View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    17c7216 View commit details
    Browse the repository at this point in the history
  24. If meter imports are cancelled at confirmation step, delete imported …

    …file
    Adrian Lara committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    f200123 View commit details
    Browse the repository at this point in the history
  25. Disassociate cycle from meter importfiles

    Adrian Lara committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    4664a87 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2019

  1. Configuration menu
    Copy the full SHA
    83c7dd5 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2019

  1. Update translations relating to meters

    Adrian Lara committed Mar 31, 2019
    Configuration menu
    Copy the full SHA
    e47411a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8c4075e View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2019

  1. Configuration menu
    Copy the full SHA
    bf6b1a4 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'develop' into meters

    Adrian Lara committed Apr 1, 2019
    Configuration menu
    Copy the full SHA
    53d7e5f View commit details
    Browse the repository at this point in the history
  3. Shift Meters migrations

    Adrian Lara committed Apr 1, 2019
    Configuration menu
    Copy the full SHA
    c0ef515 View commit details
    Browse the repository at this point in the history
  4. linter - remove django.db.models.Q import

    Adrian Lara committed Apr 1, 2019
    Configuration menu
    Copy the full SHA
    140427b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b5fb5e7 View commit details
    Browse the repository at this point in the history
  6. Leave note about missed meter/energy translations

    Adrian Lara committed Apr 1, 2019
    Configuration menu
    Copy the full SHA
    4a8d14f View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2019

  1. GreenButton meter import error cases handled

    Adrian Lara committed Apr 2, 2019
    Configuration menu
    Copy the full SHA
    cc237a6 View commit details
    Browse the repository at this point in the history
  2. Property energy page with "No data" minimal styling

    Adrian Lara committed Apr 2, 2019
    Configuration menu
    Copy the full SHA
    95b2859 View commit details
    Browse the repository at this point in the history
  3. Remove TODO comment re: purposefully invalidating meter unit/type com…

    …binations
    
    Although preferred, predicting the possible might not have the best return on time/effort invested.
    Adrian Lara committed Apr 2, 2019
    Configuration menu
    Copy the full SHA
    78d7d74 View commit details
    Browse the repository at this point in the history
  4. PM meter import error cases handled

    Adrian Lara committed Apr 2, 2019
    Configuration menu
    Copy the full SHA
    be26e2e View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2019

  1. Configuration menu
    Copy the full SHA
    67b9071 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6409851 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2019

  1. Configuration menu
    Copy the full SHA
    973dd41 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fc0818b View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2019

  1. Configuration menu
    Copy the full SHA
    949c041 View commit details
    Browse the repository at this point in the history
  2. Energy Page columns allow periods

    Adrian Lara committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    c7095ca View commit details
    Browse the repository at this point in the history
  3. Typo in get_python_translations

    Adrian Lara committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    00d6518 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2019

  1. Configuration menu
    Copy the full SHA
    97714cc View commit details
    Browse the repository at this point in the history
  2. Update comments for PM and GB meter -related methods

    Adrian Lara committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    67ad8ce View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2019

  1. Configuration menu
    Copy the full SHA
    d6db31e View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2019

  1. Configuration menu
    Copy the full SHA
    2c8c996 View commit details
    Browse the repository at this point in the history
  2. merge migrations

    nllong committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    973c0d6 View commit details
    Browse the repository at this point in the history
  3. merge migrations

    nllong committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    723e879 View commit details
    Browse the repository at this point in the history
  4. update versions

    nllong committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    0b041c4 View commit details
    Browse the repository at this point in the history
  5. changelog

    nllong committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    aace0fc View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2019

  1. Travis/Docker updates

    axelstudios committed Apr 26, 2019
    Configuration menu
    Copy the full SHA
    da2d0f0 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2019

  1. Configuration menu
    Copy the full SHA
    c57a376 View commit details
    Browse the repository at this point in the history
  2. Lint fixes

    axelstudios committed Apr 29, 2019
    Configuration menu
    Copy the full SHA
    36bc3b1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    58a1712 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a584ef9 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a0671dc View commit details
    Browse the repository at this point in the history
  6. Meters timescale osx install docs update (#1864)

    * Update TimescaleDB OSX install instructions
    adrian-lara authored Apr 29, 2019
    Configuration menu
    Copy the full SHA
    3a237d3 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2019

  1. - Fixed a bug where numbers stored as text in Excel could cause a 500…

    … on meter data upload
    
    - More ui grid tweaks
    axelstudios committed Apr 30, 2019
    Configuration menu
    Copy the full SHA
    2d004f8 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2019

  1. add defaults to migration

    nllong committed May 2, 2019
    Configuration menu
    Copy the full SHA
    41a307c View commit details
    Browse the repository at this point in the history

Commits on May 3, 2019

  1. Meters-related clean up items

    Adrian Lara committed May 3, 2019
    Configuration menu
    Copy the full SHA
    9ee9b1c View commit details
    Browse the repository at this point in the history

Commits on May 5, 2019

  1. Configuration menu
    Copy the full SHA
    e32df03 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    839c3a5 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2019

  1. fix flake8

    nllong committed May 6, 2019
    Configuration menu
    Copy the full SHA
    ea61ad1 View commit details
    Browse the repository at this point in the history