Backend/develop #328
Merged
Backend/develop #328
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…or testing going forward, and can also be used to refactor existing tests/code.
… existing events. Each dashboard will have panels for all existing sensors.
… are no events then no dashboards are created on GF, if there is an event a dashboard is created on GF, if there is a sensor and event the sensor panel is added to the event dashboard.
Merge branch 'frontend-team' into grafana
- Update ag_data.models.AGSensor to include a __str__ method - needed for display purposes. - Create a ModelForm to allow the user to select which sensors to include in a dashboard. - Change some names in the Grafana API for clarity - Modify Grafana.delete_all_panels (deleting by dashboard uid) to delete by dashboard name, because this will make the method more useful. - Add Grafana.update_dashboard_panels(), which takes a dashboard/event name and array of sensors and updates the Event dashboard on Grafana with the new set of sensors. - Add Grafana.get_all_sensors(), which returns a list of all current sensors in a given dashboard. - Update GFConfig GET view to return data for each dashboard to the context, as well as DashboardSensorPanelsForm forms initialized with the existing sensors. - Update gfconfig template to display a form for each dashboard listing all panels, with the panels actually present in the dashboard checked. - Add Update/Refresh/Delete buttons to sensor forms.
… its name and sensor(s) are passed to the template and displayed.
…rect ModelForm type was passed to the template.
…ethod to Grafana API to return dashboard url when passed a dashboard name. Pass urls in the context and display them in the template.
…ate button is pressed, dashboard is updated to include only the currently selected sensor panels.
…was failing on Travis builds only, not on local.
…tipleChoiceField to provide labels for the sensors displayed by DashboardSensorPanelsForm. This is a better alternative to adding a __str__ method to the AGSensor model for processing form submissions. Remove __str__ method of ag_data.models.AGSensor. Add tests for Update Dashboard Panels to remove all panels, keep all panels, and keep only a subset of panels.
…shboard resets. Add a test which sets the panels in the dashboard to a subset of the total panels, then uses reset to restore all panels to the dashboard.
… Add test of delete feature which deletes a dashboard and confirms delete operation returns True
Export all events
Backend team
…pring2020-cs-gy-9223-class into backend/fetaure/measuerment_without_event
Merge branch 'frontend-team' of https://github.com/gcivil-nyu-org/spring2020-cs-gy-9223-class into frontend-team
…onfig instance were applied to another GFConfig instance (HTML form elements didn't all have distinct ids, so the wrong form elements were being seen in the reset/delete/update methods.
…hen catching some exceptions.
…uctive operations or operations that retrieve all dashboards from the current GFConfig because multiple tests are running in the same instance. This may be revised but for now the tests shouldn't use these kinds of methods.
…provided for the datasource.
…oku deployment, can't replicate on local to troubleshoot.
Merge branch 'grafana' of https://github.com/gcivil-nyu-org/spring2020-cs-gy-9223-class into grafana
…oku deployment, can't replicate on local to troubleshoot.
…oku deployment, can't replicate on local to troubleshoot.
…oku deployment, can't replicate on local to troubleshoot.
…nt_without_event Backend/feature/measurement without event
[WIP]Commit includes active event functionality
Frontend team
…-cs-gy-9223-class into backend/develop
Backend/merge master
alldne
approved these changes
Apr 9, 2020
|
It's green on Travis, here we go. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.