From 50f2b12c1845794fa691349c4413dcad68ba94b6 Mon Sep 17 00:00:00 2001 From: "Brian S. Stephan" Date: Wed, 30 Mar 2016 18:04:19 -0500 Subject: [PATCH] only build history once in karma graph, do history --- dr_botzo/karma/templates/karma/karma_key.html | 21 ++++++++++++++++--- dr_botzo/karma/views.py | 2 +- dr_botzo/static/css/core.css | 4 ++++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dr_botzo/karma/templates/karma/karma_key.html b/dr_botzo/karma/templates/karma/karma_key.html index 8953ba3..5687ed6 100644 --- a/dr_botzo/karma/templates/karma/karma_key.html +++ b/dr_botzo/karma/templates/karma/karma_key.html @@ -26,7 +26,7 @@ }); var ctx = $("#karma_history").get(0).getContext("2d"); var data = { - labels: ["EPOCH", {% for x in entry.history %}"{{ x.0 }}", {% endfor %}], + labels: ["EPOCH", {% for x in entry_history %}"{{ x.0 }}", {% endfor %}], datasets: [ { label: "{{ entry.key }}", @@ -36,17 +36,32 @@ pointStrokeColor: "#fff", pointHighlightFill: "#fff", pointHighlightStroke: "rgba(220,220,220,1)", - data: [0, {% for x in entry.history %}{{ x.2 }}, {% endfor %}] + data: [0, {% for x in entry_history %}{{ x.2 }}, {% endfor %}] } ] }; var myLineChart = new Chart(ctx).AltLine(data, { pointDot: false, - {% if entry.history|length > 100 %} + {% if entry_history|length > 100 %} showTooltips: false, scaleShowVerticalLines: false, {% endif %} tooltipEvents: ["click"] }); +
Log
+ + + + + + + {% for delta in entry_history %} + + + + + + {% endfor %} +
DateDeltaScore
{{ delta.0 }}{{ delta.1 }}{{ delta.2 }}
{% endblock %} diff --git a/dr_botzo/karma/views.py b/dr_botzo/karma/views.py index 6959dac..dab855c 100644 --- a/dr_botzo/karma/views.py +++ b/dr_botzo/karma/views.py @@ -14,4 +14,4 @@ def key_detail(request, karma_key): entry = get_object_or_404(KarmaKey, key=karma_key) - return render(request, 'karma/karma_key.html', {'entry': entry}) + return render(request, 'karma/karma_key.html', {'entry': entry, 'entry_history': entry.history()}) diff --git a/dr_botzo/static/css/core.css b/dr_botzo/static/css/core.css index 5bfc478..61b7ec4 100644 --- a/dr_botzo/static/css/core.css +++ b/dr_botzo/static/css/core.css @@ -9,3 +9,7 @@ html, body { padding: 0 25px; padding-top: 75px; } + +table tr, table th, table td { + padding: 5px; +}