only build history once in karma graph, do history
This commit is contained in:
parent
08da8ea9f3
commit
50f2b12c18
@ -26,7 +26,7 @@
|
|||||||
});
|
});
|
||||||
var ctx = $("#karma_history").get(0).getContext("2d");
|
var ctx = $("#karma_history").get(0).getContext("2d");
|
||||||
var data = {
|
var data = {
|
||||||
labels: ["EPOCH", {% for x in entry.history %}"{{ x.0 }}", {% endfor %}],
|
labels: ["EPOCH", {% for x in entry_history %}"{{ x.0 }}", {% endfor %}],
|
||||||
datasets: [
|
datasets: [
|
||||||
{
|
{
|
||||||
label: "{{ entry.key }}",
|
label: "{{ entry.key }}",
|
||||||
@ -36,17 +36,32 @@
|
|||||||
pointStrokeColor: "#fff",
|
pointStrokeColor: "#fff",
|
||||||
pointHighlightFill: "#fff",
|
pointHighlightFill: "#fff",
|
||||||
pointHighlightStroke: "rgba(220,220,220,1)",
|
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, {
|
var myLineChart = new Chart(ctx).AltLine(data, {
|
||||||
pointDot: false,
|
pointDot: false,
|
||||||
{% if entry.history|length > 100 %}
|
{% if entry_history|length > 100 %}
|
||||||
showTooltips: false,
|
showTooltips: false,
|
||||||
scaleShowVerticalLines: false,
|
scaleShowVerticalLines: false,
|
||||||
{% endif %}
|
{% endif %}
|
||||||
tooltipEvents: ["click"]
|
tooltipEvents: ["click"]
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
<h5>Log</h5>
|
||||||
|
<table border="1px">
|
||||||
|
<tr>
|
||||||
|
<th>Date</th>
|
||||||
|
<th>Delta</th>
|
||||||
|
<th>Score</th>
|
||||||
|
</tr>
|
||||||
|
{% for delta in entry_history %}
|
||||||
|
<tr>
|
||||||
|
<td>{{ delta.0 }}</td>
|
||||||
|
<td>{{ delta.1 }}</td>
|
||||||
|
<td>{{ delta.2 }}</td>
|
||||||
|
</tr>
|
||||||
|
{% endfor %}
|
||||||
|
</table>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
@ -14,4 +14,4 @@ def key_detail(request, karma_key):
|
|||||||
|
|
||||||
entry = get_object_or_404(KarmaKey, key=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()})
|
||||||
|
@ -9,3 +9,7 @@ html, body {
|
|||||||
padding: 0 25px;
|
padding: 0 25px;
|
||||||
padding-top: 75px;
|
padding-top: 75px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
table tr, table th, table td {
|
||||||
|
padding: 5px;
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user