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

Enable reading validation via admin input #989

Merged
merged 103 commits into from
Aug 26, 2023
Merged

Enable reading validation via admin input #989

merged 103 commits into from
Aug 26, 2023

Commits on Jul 24, 2023

  1. Merge remote-tracking branch 'spearec/reactstrap' into new_UI_setChecks

    @codehomie1
    codehomie1 committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    e4600f3 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. Set conditionSet through UI (Draft)

    @carlsonrob
    carlsonrob committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    c59f419 View commit details
    Browse the repository at this point in the history

  2. Update

    @carlsonrob
    carlsonrob committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    e85111a View commit details
    Browse the repository at this point in the history

  3. Update

    @carlsonrob
    carlsonrob committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    35c355d View commit details
    Browse the repository at this point in the history

  4. added minVal condset val

    @codehomie1
    codehomie1 committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    cfa6b71 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'new_UI_setChecks' of https://github.com/TrongQuocLe/OED … 

    …into new_UI_setChecks
    @codehomie1
    codehomie1 committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    53c6294 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. change conditionSetMap to conditionSet

    @carlsonrob
    carlsonrob committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    197b8b8 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

  1. add default condset vals to admin Panel

    @codehomie1
    codehomie1 committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    e79a85c View commit details
    Browse the repository at this point in the history

  2. meter values default to admin values

    @codehomie1
    codehomie1 committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    0846e18 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. Merge branch 'OpenEnergyDashboard:development' into new_UI_setChecks

    @carlsonrob
    carlsonrob authored Jul 31, 2023
    Configuration menu
    Copy the full SHA
    eb3c78f View commit details
    Browse the repository at this point in the history

  2. changed Meter Page UI

    Trong Le committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    3cabd02 View commit details
    Browse the repository at this point in the history

  3. resolve bugs

    Trong Le committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    45cb757 View commit details
    Browse the repository at this point in the history

  4. Include disableChecks in db

    @carlsonrob
    carlsonrob committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    232d40c View commit details
    Browse the repository at this point in the history

  5. Add conditionSet objet to Mamac

    @carlsonrob
    carlsonrob committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    2e67753 View commit details
    Browse the repository at this point in the history

  6. Update Mamac w/ disabledChecks

    @carlsonrob
    carlsonrob committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    b96b5cd View commit details
    Browse the repository at this point in the history

  7. Add conditionSet object to Obvius

    @carlsonrob
    carlsonrob committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    f252b4c View commit details
    Browse the repository at this point in the history

  8. Add conditionSet object to Egauge

    @carlsonrob
    carlsonrob committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    3bd3a60 View commit details
    Browse the repository at this point in the history

  9. fix bugs

    Trong Le committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    406f19e View commit details
    Browse the repository at this point in the history

  10. test preference api to save admin minval to db

    @codehomie1
    codehomie1 committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    7178f68 View commit details
    Browse the repository at this point in the history

  11. fixed merge conflict in createmetermodalcomponent

    @codehomie1
    codehomie1 committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    21e1af4 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. update UI

    Trong Le committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    c631155 View commit details
    Browse the repository at this point in the history

  2. Add disableChecks to conditionSet for Mamac, Obvius and Egauge

    @carlsonrob
    carlsonrob committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    6cdbd82 View commit details
    Browse the repository at this point in the history

  3. Validate data if checks are enabled

    @carlsonrob
    carlsonrob committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    d8764da View commit details
    Browse the repository at this point in the history

  4. Define conditionSet inline

    @carlsonrob
    carlsonrob committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    bebe268 View commit details
    Browse the repository at this point in the history

  5. Update meter field names

    @carlsonrob
    carlsonrob committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    6138189 View commit details
    Browse the repository at this point in the history

  6. default database for

    Trong Le committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    dc0ff3c View commit details
    Browse the repository at this point in the history

  7. error to errors

    Trong Le committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    761cdce View commit details
    Browse the repository at this point in the history

  8. fix name values

    Trong Le committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    ab039fc View commit details
    Browse the repository at this point in the history

  9. made adminstate default same as db default

    @codehomie1
    codehomie1 committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    e83ad9b View commit details
    Browse the repository at this point in the history

  10. DB Update

    @carlsonrob
    carlsonrob committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    9600ad0 View commit details
    Browse the repository at this point in the history

  11. remove all disable checks in admin

    Trong Le committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    93d379a View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. test

    Trong Le committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    beab172 View commit details
    Browse the repository at this point in the history

  2. test debug

    Trong Le committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    7dc327e View commit details
    Browse the repository at this point in the history

  3. threshold to reading gap

    Trong Le committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    382c3c3 View commit details
    Browse the repository at this point in the history

  4. remove todo regarding add conditionSet params

    Trong Le committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    ceea178 View commit details
    Browse the repository at this point in the history

  5. change wording

    @codehomie1
    codehomie1 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    42a45cf View commit details
    Browse the repository at this point in the history

  6. update preferences stuff

    @codehomie1
    codehomie1 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    236c596 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2023

  1. Set default parameters for Meter

    @carlsonrob
    carlsonrob committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    36bc969 View commit details
    Browse the repository at this point in the history

  2. Modified default values

    @carlsonrob
    carlsonrob committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    3eb6c20 View commit details
    Browse the repository at this point in the history

  3. added required, assigned moment for conditionSet

    Trong Le committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    b37a17d View commit details
    Browse the repository at this point in the history

  4. Update sql with default values

    @carlsonrob
    carlsonrob committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    4141829 View commit details
    Browse the repository at this point in the history

  5. added default conditionSet in Meter.js models

    Trong Le committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    b4b9018 View commit details
    Browse the repository at this point in the history

  6. trying to debug

    Trong Le committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    8b116df View commit details
    Browse the repository at this point in the history

  7. working admin.js

    Trong Le committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    ede98d7 View commit details
    Browse the repository at this point in the history

  8. added moment default in admin.js

    Trong Le committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    d3962fe View commit details
    Browse the repository at this point in the history

  9. Placeholder update

    @carlsonrob
    carlsonrob committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    d6eeb8d View commit details
    Browse the repository at this point in the history

  10. update minval and maxval values

    @codehomie1
    codehomie1 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    bc36e85 View commit details
    Browse the repository at this point in the history

  11. update create meters minval minval to bigint

    @codehomie1
    codehomie1 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    493ebaf View commit details
    Browse the repository at this point in the history

  12. Update minVal, maxVal default parameter in Meter constructor

    @carlsonrob
    carlsonrob committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    72af2ec View commit details
    Browse the repository at this point in the history

  13. Update minVal, maxVal to bigInt in routes/meter

    @carlsonrob
    carlsonrob committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    293cd41 View commit details
    Browse the repository at this point in the history

  14. added bound validation maxError, minVal, maxVal

    Trong Le committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    032b7d0 View commit details
    Browse the repository at this point in the history

  15. trying to git pull

    Trong Le committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    3f7b786 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2023

  1. added minVal, maxVal, maxError bounds validation

    Trong Le committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    7c66d01 View commit details
    Browse the repository at this point in the history

  2. updated meter validation commennts

    Trong Le committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    0676531 View commit details
    Browse the repository at this point in the history

  3. added default conditionSet validation in admin pannel

    Trong Le committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    03f1f1f View commit details
    Browse the repository at this point in the history

  4. removed debug console.log

    Trong Le committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    e4274b2 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2023

  1. removed used comment in routes/meters.js

    Trong Le committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    abe3f8f View commit details
    Browse the repository at this point in the history

  2. added a space removed on an import in PreferencesComponent.tsx

    Trong Le committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    847a3f2 View commit details
    Browse the repository at this point in the history

  3. Reverse merging of tooltipmarkercomponent from eb3c78f

    @carlsonrob
    carlsonrob committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    0e889e8 View commit details
    Browse the repository at this point in the history

  4. Change minError to maxError in meter.js

    @carlsonrob
    carlsonrob committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    5ab3645 View commit details
    Browse the repository at this point in the history

  5. update validate meter params type

    @codehomie1
    codehomie1 committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    781c5bb View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. db validation for min_val , max_val

    @codehomie1
    codehomie1 committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    259a7ff View commit details
    Browse the repository at this point in the history

  2. fix type to bigint

    @codehomie1
    codehomie1 committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    f221813 View commit details
    Browse the repository at this point in the history

  3. Change minVal,maxVal to bigint to prevent error

    @carlsonrob
    carlsonrob committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    e29aada View commit details
    Browse the repository at this point in the history

  4. added maxDate and minDate validation in MeterModalComponent

    Trong Le committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    4ee7c63 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. fix default reading value check type being string

    Trong Le committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    907dc69 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. fixed code as suggested format

    Trong Le committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    ea82fb3 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. remove validIntervals as it's redundant in processData with msReading… 

    …Gap comparision. modify test to use checkIntervals as validIntervals is removed
    @carlsonrob
    carlsonrob committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    c7dca54 View commit details
    Browse the repository at this point in the history

  2. remove comment for validIntervals

    @carlsonrob
    carlsonrob committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    82121f3 View commit details
    Browse the repository at this point in the history

  3. try to resolve test

    Trong Le committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    adcfc5e View commit details
    Browse the repository at this point in the history

  4. Real Precision Change

    @carlsonrob
    carlsonrob authored and Trong Le committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    6b7ea04 View commit details
    Browse the repository at this point in the history

  5. remove unused comments

    Trong Le committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    5185ea2 View commit details
    Browse the repository at this point in the history

  6. removed changes while testing

    Trong Le committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    d6079a0 View commit details
    Browse the repository at this point in the history

  7. Remove space

    @carlsonrob
    carlsonrob committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    98f1807 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2023

  1. Added default meter min date, max date validation

    Trong Le committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    7fdb08f View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2023

  1. Merge remote-tracking branch 'origin/development' into pr/carlsonrob/989

    @huss
    huss committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    33230ee View commit details
    Browse the repository at this point in the history

  2. add migration

    @huss
    huss committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    df9cfc8 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. split line to meet 150-character limit

    Trong Le committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    e0d8522 View commit details
    Browse the repository at this point in the history

  2. add braces and TODO for preferences

    Trong Le committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    9dfd12f View commit details
    Browse the repository at this point in the history

  3. Remove tab

    @carlsonrob
    carlsonrob committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    2835942 View commit details
    Browse the repository at this point in the history

  4. Put UpdateDefaultMeterMaximumErrorsAction after UpdateDefaultMeterRea… 

    …dingGapAction
    @carlsonrob
    carlsonrob committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    6340b00 View commit details
    Browse the repository at this point in the history

  5. Print meterName variable

    @carlsonrob
    carlsonrob committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    cfa4da9 View commit details
    Browse the repository at this point in the history

  6. parseFloat to parseInt

    @carlsonrob
    carlsonrob committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    788c20a View commit details
    Browse the repository at this point in the history

  7. create and rename constants

    Trong Le committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    dc224cf View commit details
    Browse the repository at this point in the history

  8. utilize moment functions for validation in Meter

    Trong Le committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    c6bc1e5 View commit details
    Browse the repository at this point in the history

  9. apply similar changes in Meter to preferences

    Trong Le committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    6c84e37 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'OpenEnergyDashboard:development' into new_UI_setChecks

    @TrongQuocLe
    TrongQuocLe authored Aug 22, 2023
    Configuration menu
    Copy the full SHA
    28e1746 View commit details
    Browse the repository at this point in the history

  11. Add new translation keys in other languages.

    Trong Le committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    c2b6896 View commit details
    Browse the repository at this point in the history

  12. Change data type for min and max value in database

    Trong Le committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    ff35fb8 View commit details
    Browse the repository at this point in the history

  13. Correct timestamp reference in error message

    Trong Le committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    e63321b View commit details
    Browse the repository at this point in the history

  14. Integrate site preferences when instantiating a new Meter object

    @carlsonrob
    carlsonrob committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    6d721aa View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2023

  1. Add meterName parameter to validateReadings

    @carlsonrob
    carlsonrob committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    752d941 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. Append errMsg from validateReadings onto msgTotal in processData

    @carlsonrob
    carlsonrob committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    8f20f9c View commit details
    Browse the repository at this point in the history

  2. Remove comment

    @carlsonrob
    carlsonrob committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    10b0d8d View commit details
    Browse the repository at this point in the history

  3. Add default disable checks

    Trong Le committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    ebd5f9d View commit details
    Browse the repository at this point in the history

  4. Add default disable checks

    Trong Le committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    5992b92 View commit details
    Browse the repository at this point in the history

  5. Fix TypeScript error by adding type guard for 'min' and 'max' properties 

    The TypeScript compiler was throwing errors because it couldn't find the properties 'min' and 'max' on the type 'BarReading'. The issue arises because TypeScript is unaware that 'min' and 'max' are only accessed when 'readings' is an array of 'LineReadings'. This commit adds a type guard to explicitly inform TypeScript about the type of 'reading', resolving the issue.
    @carlsonrob
    carlsonrob committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    dcd0a8b View commit details
    Browse the repository at this point in the history

  6. reuse value set in variable 

    Fixed for a comment that was not clear in my review to resolve this.
    @huss
    huss committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    8f8b7db View commit details
    Browse the repository at this point in the history

  7. non-en has same order

    @huss
    huss committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    07fac64 View commit details
    Browse the repository at this point in the history

  8. Fix lint error

    @huss
    huss committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    5a21bdb View commit details
    Browse the repository at this point in the history

  9. update migrations

    @huss
    huss committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    a59ab93 View commit details
    Browse the repository at this point in the history

  10. add missing JSDoc param

    @huss
    huss committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    48bd778 View commit details
    Browse the repository at this point in the history

  11. blank line in validate html

    @huss
    huss committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    c90e2c5 View commit details
    Browse the repository at this point in the history