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

Sync hardware-team with master #113

Merged
merged 38 commits into from Mar 12, 2020
Merged

Sync hardware-team with master #113

merged 38 commits into from Mar 12, 2020

Conversation

@ab7289
Copy link
Contributor

ab7289 commented Mar 12, 2020

No description provided.

daisycrego and others added 30 commits Mar 8, 2020
Updating frontend branch
Move all changes from sprints 0 and 1 to class repo.
Remove unused piece of selenium test suite.
…y the backend team. Changes include:

1. Changing the model and making migrations. Also added the AGSensor and AGMeasurement models provided by the backend team.
2. Update urls.py to route to the delete_event and update_event views based on UUID rather than int.
3. Update forms.py to handle new AGEvent attribute names.
4. Add migrations files for the new DB changes.
5. Update event.html and dashboard.html to handle new AGEvent attribute names.
6. Fix event tests to handle new AGEvent attribute names.
7. Started to fix selenium create event test, but unable to complete.
8. Fix events.py and event.py (even though one will eventually be discarded) to avoid breaking anything.
9. Fix simulator.py, dashboard.py to handle new AGEvent attribute names.
1. Change sensor.js and sensor.html to handle new changes to AGSensor model. Changed implemented to use Django templating approach over pure javascript approach used previously.
2. Add test of configure sensors feature which posts to the sensors view.
3. Add jacksimulator.py and jack_common.py. These will eventually be removed but teammates will need this to generate data in order to work with the configure sensors feature during development (a version of these files will be provided by the backend team, but this is still pending).
dandipietrantonio
…nd breaking into unit tests.
…ed more fully by the backend team.
Configure sensors
…name is required, at least 1 field is required, sensor name not already in use, field names are unique (amongst those used for the current sensor). Errors are all passed back to sensor.html via the django messaging framework. Update sensor.html to display the sensor name and all fields if the form is rejected, rather than displaying a blank form each time there is a validatiion error. Modify test_configure_sensor.py to conform with changes to the view.
added grafana localhost
Issue #11: Add validation to Create Sensor form. Validations: sensor …
Hardware team - Script Updates
Hardware team - Documentation Updates
…sts. Following cases tested: sensor name missing, field missing, duplicate field names. Black & flake8 reformmatting.
…ken shouldn't create a new object in the DB.
dandipietrantonio and others added 8 commits Mar 12, 2020
Configure sensors
Configure sensors - fixing test error
Get frontend-team in sync with master.
Configure sensors
Frontend team
@PrabhanshuAttri PrabhanshuAttri merged commit 43812ac into hardware-team Mar 12, 2020
3 checks passed
3 checks passed
Travis CI - Branch Build Passed
Details
Travis CI - Pull Request Build Passed
Details
coverage/coveralls Coverage increased (+0.3%) to 98.704%
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
You can’t perform that action at this time.