GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-22 16:02:23 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

add selective study limits to remaining graphs

Browse source
This commit is contained in:
Damien Elmes 2011-03-30 19:57:34 +09:00
parent be7794bb56
commit 014cc035ee
1 changed files with 33 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
anki/graphs.py
View file

@ -3,7 +3,7 @@
# License: GNU GPL, version 3 or later; http://www.gnu.org/copyleft/gpl.html # License: GNU GPL, version 3 or later; http://www.gnu.org/copyleft/gpl.html
import os, sys, time, datetime, simplejson import os, sys, time, datetime, simplejson
from anki.utils import fmtTimeSpan from anki.utils import fmtTimeSpan, ids2str
from anki.lang import _ from anki.lang import _
import anki.js import anki.js
@ -200,11 +200,17 @@ group by day order by day""" % (self._limit(), lim),
return (ret, sum) return (ret, sum)
def _done(self, num=7, chunk=1): def _done(self, num=7, chunk=1):
# without selective for now lims = []
lim = ""
if num is not None: if num is not None:
lim += "where time > %d" % ( lims.append("time > %d" % (
(self.deck.sched.dayCutoff-(num*chunk*86400))*1000) (self.deck.sched.dayCutoff-(num*chunk*86400))*1000))
lim = self._revlogLimit()
if lim:
lims.append(lim)
if lims:
lim = "where " + " and ".join(lims)
else:
lim = ""
if self.type == 0: if self.type == 0:
tf = 60.0 # minutes tf = 60.0 # minutes
else: else:
@ -312,7 +318,10 @@ select count(), avg(ivl), max(ivl) from cards where queue = 2 %s""" %
for type in range(3): for type in range(3):
(bad, good) = types[type] (bad, good) = types[type]
tot = bad + good tot = bad + good
try:
pct = good / float(tot) * 100 pct = good / float(tot) * 100
except:
pct = 0
i.append(_( i.append(_(
"Correct: <b>%(pct)0.2f%%</b><br>(%(good)d of %(tot)d)") % dict( "Correct: <b>%(pct)0.2f%%</b><br>(%(good)d of %(tot)d)") % dict(
pct=pct, good=good, tot=tot)) pct=pct, good=good, tot=tot))
@ -322,15 +331,17 @@ select count(), avg(ivl), max(ivl) from cards where queue = 2 %s""" %
"</td></tr></table></center>") "</td></tr></table></center>")
def _eases(self): def _eases(self):
# ignores selective, at least for now lim = self._revlogLimit()
if lim:
lim = "where " + lim
return self.deck.db.all(""" return self.deck.db.all("""
select (case select (case
when type in (0,2) then 0 when type in (0,2) then 0
when lastIvl < 21 then 1 when lastIvl < 21 then 1
else 2 end) as thetype, else 2 end) as thetype,
ease, count() from revlog ease, count() from revlog %s
group by thetype, ease group by thetype, ease
order by thetype, ease""") order by thetype, ease""" % lim)
# Cards # Cards
###################################################################### ######################################################################
@ -353,8 +364,11 @@ order by thetype, ease""")
self._line(i, _("Lowest ease factor"), "%d%%" % low) self._line(i, _("Lowest ease factor"), "%d%%" % low)
self._line(i, _("Average ease factor"), "%d%%" % avg) self._line(i, _("Average ease factor"), "%d%%" % avg)
self._line(i, _("Highest ease factor"), "%d%%" % high) self._line(i, _("Highest ease factor"), "%d%%" % high)
min = self.deck.db.scalar(
"select min(crt) from cards where 1 " + self._limit())
if min:
self._line(i, _("First card created"), _("%s ago") % fmtTimeSpan( self._line(i, _("First card created"), _("%s ago") % fmtTimeSpan(
time.time() - self.deck.crt)) time.time() - min))
info = "<table width=100%>" + "".join(i) + "</table><p>" info = "<table width=100%>" + "".join(i) + "</table><p>"
info += _('''\ info += _('''\
A card's <i>ease factor</i> is the size of the next interval \ A card's <i>ease factor</i> is the size of the next interval \
@ -467,5 +481,13 @@ $(function () {
else: else:
return "" return ""
def _revlogLimit(self):
lim = self.deck.qconf['groups']
if self.selective and lim:
return ("cid in (select id from cards where gid in %s)" %
ids2str(lim))
else:
return ""
def _title(self, title, subtitle=""): def _title(self, title, subtitle=""):
return '<h1>%s</h1>%s' % (title, subtitle) return '<h1>%s</h1>%s' % (title, subtitle)