Closed alecperkins closed 10 years ago
Got some screenshots?
Tim
On 20 March 2012 01:09, Alec Perkins < reply@reply.github.com
wrote:
Here's the graphing stuff. I ended up making it so the front-end graphing JavaScript (no CoffeeScript needed) is flexible and doesn't require changing just to add a new graph. All that's needed is appending a "graph definition", which is just a dictionary with the title and a list of the series. The graphs will optionally auto-refresh every 10 seconds, and the viewing range can be varied between the previous 10 minutes, 30 minutes, 1 hour, and 2 hours.
There are also sample graph and annotation snippets that can be enabled to check the styling. Keeping unchanging time-based data visible in a graph based on "now" gets trickier and trickier as time goes on.
You can merge this Pull Request by running:
git pull https://github.com/typeish/timsvideo feature/graphs
Or you can view, comment on it, or merge it online at:
https://github.com/timsvideo/timsvideo/pull/19
-- Commit Summary --
- Add jQuery.flot for graphs
- Graph data endpoint
- Graph frontend JS and CSS
- Change graph to show only past hour.
- Move graphs to own page, updated jQuery.flot and jQuery.flot.stack to working versions.
- Add auto-refresh of graph data.
- Leave averages as ints. No need for the precision.
- Rework so front-end JS is generic
- Loading feedback, flexible data time range, cleanup
- tidyup
- Allow the server to set stacking.
-- File Changes --
A website/frontend/static/css/graphs.css (7) A website/frontend/static/js/overall_graphs.js (236) A website/frontend/static/third_party/jquery.flot.js (2599) A website/frontend/static/third_party/jquery.flot.stack.js (184) M website/frontend/templates/index.html (1) A website/tracker/templates/graphs.html (45) M website/tracker/urls.py (4) M website/tracker/views.py (163)
-- Patch Links --
https://github.com/timsvideo/timsvideo/pull/19.patch https://github.com/timsvideo/timsvideo/pull/19.diff
Reply to this email directly or view it on GitHub: https://github.com/timsvideo/timsvideo/pull/19
Here's a screenshot with the sample data and annotation, and correct stacking.
Really sorry I haven't gotten around to merging this. I've been snowed under with work.
I'm hoping to get to it in about 2 weeks when I get back from the current trip.
Sorry about the delay.
Tim
On 20 March 2012 16:43, Alec Perkins < reply@reply.github.com
wrote:
Here's a screenshot with the sample data and annotation, and correct stacking.
Reply to this email directly or view it on GitHub: https://github.com/timsvideo/timsvideo/pull/19#issuecomment-4599703
No worries. I'm pretty swamped, too. It's not as though pull requests have expiration dates anyway :)
Hi @alecperkins!
I really apologise for taking so long (over 2 years :() to merge this pull request. @aps-sids did some work to fix it up and it is now merged!
Thank you for your help with this.
Tim
No problem, glad it hadn’t gotten too stale!
Here's the graphing stuff. I ended up making it so the front-end graphing JavaScript (no CoffeeScript needed) is flexible and doesn't require changing just to add a new graph. All that's needed is appending a "graph definition", which is just a dictionary with the title and a list of the series. The graphs will optionally auto-refresh every 10 seconds, and the viewing range can be varied between the previous 10 minutes, 30 minutes, 1 hour, and 2 hours.
There are also sample graph and annotation snippets that can be enabled to check the styling. Keeping unchanging time-based data visible in a graph based on "now" gets trickier and trickier as time goes on.