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

View new sensor models #158

Merged
merged 26 commits into from
Mar 23, 2020
Merged

View new sensor models #158

merged 26 commits into from
Mar 23, 2020

Commits on Mar 18, 2020

  1. 1) Updated views/sensor.py to refelct new database schema 

    2) Modified appearance and functioning of sensor.html page and associated javascript (sensor.js)
	2a) Included deleted row from add sensor view
    ray310 authored and ray310 committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    364bc7c View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2020

  1. Merge branch 'frontend-team' into ray_develop

    Ray310 committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    edd9837 View commit details
    Browse the repository at this point in the history

  2. Updated formatting

    ray310 authored and ray310 committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    ca69ea8 View commit details
    Browse the repository at this point in the history

  3. Fixed input validation for "Add Sensor"

    ray310 authored and ray310 committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    55b893b View commit details
    Browse the repository at this point in the history

  4. Updated sensor models in mercury/models.py

    ray310 authored and ray310 committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    a04f253 View commit details
    Browse the repository at this point in the history

  5. Modified how sensor is being created. Code needs to be tested.

    ray310 authored and ray310 committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    299c668 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2020

  1. Changed all imports for AG models from mercury/models.py to ag_data.m… 

    …odels.py
    @dandipietrantonio
    dandipietrantonio committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    b8875ed View commit details
    Browse the repository at this point in the history

  2. soled merge conflict

    @dandipietrantonio
    dandipietrantonio committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    57dc845 View commit details
    Browse the repository at this point in the history

  3. POST for adding type is working, now working on adding sensor

    @dandipietrantonio
    dandipietrantonio committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    992b73f View commit details
    Browse the repository at this point in the history

  4. Able to add sensors but the displaying breaks, need to fix

    @dandipietrantonio
    dandipietrantonio committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    647e05f View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2020

  1. Creating new sensor and sensor types working

    @dandipietrantonio
    dandipietrantonio committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    e6f1267 View commit details
    Browse the repository at this point in the history

  2. Delete sensors and delete sensor types both working, moving on to edi… 

    …ting
    @dandipietrantonio
    dandipietrantonio committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    802a2dd View commit details
    Browse the repository at this point in the history

  3. Can now edit existing sensors, still need to fix a few bugs, add tran… 

    …sformation preview, and add a ton of tests
    @dandipietrantonio
    dandipietrantonio committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    1eba0a6 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2020

  1. Adding, updating, deleting both sensors and sensor types completed, j… 

    …ust needs to be tested
    @dandipietrantonio
    dandipietrantonio committed Mar 22, 2020
    Configuration menu
    Copy the full SHA
    176709c View commit details
    Browse the repository at this point in the history

  2. forgot to add migration to git

    @dandipietrantonio
    dandipietrantonio committed Mar 22, 2020
    Configuration menu
    Copy the full SHA
    e627e26 View commit details
    Browse the repository at this point in the history

  3. Added some tests to sensors view, still needs more

    @dandipietrantonio
    dandipietrantonio committed Mar 22, 2020
    Configuration menu
    Copy the full SHA
    6ca0145 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2020

  1. Resolve merge conflict - not removing old models yet, saving this for… 

    … a later commit.
    @daisycrego
    daisycrego committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    ffed11d View commit details
    Browse the repository at this point in the history

  2. Sync branch with frontend-team. Get grafana changes into branch.

    @daisycrego
    daisycrego committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    9b22456 View commit details
    Browse the repository at this point in the history

  3. Added tests to sensor view

    @dandipietrantonio
    dandipietrantonio committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    3f2104e View commit details
    Browse the repository at this point in the history

  4. Modify GF config post view to create a dashboard and datasource each … 

    …time a new API token/data source combo is added. No error handling yet. Modify add sensor view to create a new grafana panel with the new sensor model each time a new sensor is saved.
    @daisycrego
    daisycrego committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    6ec0af6 View commit details
    Browse the repository at this point in the history

  5. Getting grafana functionality into configure sensors view.

    @daisycrego
    daisycrego committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    274069b View commit details
    Browse the repository at this point in the history

  6. Fixed formatting for tests

    @dandipietrantonio
    dandipietrantonio committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    e986fb4 View commit details
    Browse the repository at this point in the history

  7. Fix migrations files to handle recent merge.

    @daisycrego
    daisycrego committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    b1c999c View commit details
    Browse the repository at this point in the history

  8. Black and flake8.

    @daisycrego
    daisycrego committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    9c65299 View commit details
    Browse the repository at this point in the history

  9. Add AGEvent model back into the db, because it was being referenced i… 

    …n many places and simply deleting it broke a lot of things.
    @daisycrego
    daisycrego committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    c079965 View commit details
    Browse the repository at this point in the history

  10. Add reference to AGEvent model back into test which was failing.

    @daisycrego
    daisycrego committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    63e36c0 View commit details
    Browse the repository at this point in the history