mirror of
https://github.com/ankitects/anki.git
synced 2025-09-22 07:52:24 -04:00
remove separate cumul graph and render over due instead
This commit is contained in:
parent
b40dbd6fb8
commit
e090a64fbb
1 changed files with 10 additions and 21 deletions
|
@ -8,6 +8,7 @@ import anki.js
|
||||||
|
|
||||||
colYoung = "#7c7"
|
colYoung = "#7c7"
|
||||||
colMature = "#070"
|
colMature = "#070"
|
||||||
|
colCum = "rgba(0,0,0,0.9)"
|
||||||
colLearn = "#007"
|
colLearn = "#007"
|
||||||
colRelearn = "#700"
|
colRelearn = "#700"
|
||||||
colCram = "#ff0"
|
colCram = "#ff0"
|
||||||
|
@ -25,7 +26,6 @@ class Graphs(object):
|
||||||
|
|
||||||
def report(self):
|
def report(self):
|
||||||
txt = (self.dueGraph() +
|
txt = (self.dueGraph() +
|
||||||
self.cumDueGraph() +
|
|
||||||
self.repsGraph() +
|
self.repsGraph() +
|
||||||
self.timeGraph() +
|
self.timeGraph() +
|
||||||
self.ivlGraph() +
|
self.ivlGraph() +
|
||||||
|
@ -40,31 +40,20 @@ class Graphs(object):
|
||||||
d = self._stats['due']
|
d = self._stats['due']
|
||||||
yng = []
|
yng = []
|
||||||
mtr = []
|
mtr = []
|
||||||
|
tot = 0
|
||||||
|
totd = []
|
||||||
for day in d:
|
for day in d:
|
||||||
yng.append((day[0], day[1]))
|
yng.append((day[0], day[1]))
|
||||||
mtr.append((day[0], day[2]))
|
mtr.append((day[0], day[2]))
|
||||||
|
tot += day[1]+day[2]
|
||||||
|
totd.append((day[0], tot))
|
||||||
txt = self._graph(id="due", title=_("Due Forecast"), data=[
|
txt = self._graph(id="due", title=_("Due Forecast"), data=[
|
||||||
dict(data=mtr, color=colMature, label=_("Mature")),
|
dict(data=mtr, color=colMature, label=_("Mature")),
|
||||||
dict(data=yng, color=colYoung, label=_("Young"))
|
dict(data=yng, color=colYoung, label=_("Young")),
|
||||||
])
|
dict(data=totd, color=colCum, label=_("Cumulative"), yaxis=2,
|
||||||
return txt
|
bars={'show': False}, lines=dict(show=True))
|
||||||
|
], conf=dict(
|
||||||
def cumDueGraph(self):
|
yaxes=[{}, {'position': 'right'}]))
|
||||||
self._calcStats()
|
|
||||||
d = self._stats['due']
|
|
||||||
toty = 0
|
|
||||||
totm = 0
|
|
||||||
ydays = []
|
|
||||||
mdays = []
|
|
||||||
for day in d:
|
|
||||||
toty += day[1]
|
|
||||||
totm += day[2]
|
|
||||||
ydays.append((day[0], toty))
|
|
||||||
mdays.append((day[0], totm))
|
|
||||||
txt = self._graph(id="cum", title=_("Cumulative Due"), data=[
|
|
||||||
dict(data=mdays, color=colMature, label=_("Mature")),
|
|
||||||
dict(data=ydays, color=colYoung, label=_("Young")),
|
|
||||||
], type="fill")
|
|
||||||
return txt
|
return txt
|
||||||
|
|
||||||
def _due(self, days=7):
|
def _due(self, days=7):
|
||||||
|
|
Loading…
Reference in a new issue