diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py
index 5853d06cf..368af8240 100644
--- a/ankiqt/ui/main.py
+++ b/ankiqt/ui/main.py
@@ -7,7 +7,7 @@ from PyQt4.QtCore import *
from PyQt4.QtWebKit import QWebPage
import os, sys, re, types, gettext, stat, traceback
-import shutil, time, glob, tempfile
+import shutil, time, glob, tempfile, datetime
from PyQt4.QtCore import *
from PyQt4.QtGui import *
@@ -956,20 +956,56 @@ To upgrade an old deck, download Anki 0.9.8.7."""))
h['lapsed'] = '%s' % s['failed']
h['ret'] = s['rev']
h['new'] = '%s' % s['new']
- h['repsToday'] = '%s' % s['dTotal']
- h['repsIn5'] = '%s' % self.deck.s.scalar(
+ dtoday = s['dTotal']
+ yesterday = self.deck._dailyStats.day - datetime.timedelta(1)
+ res = self.deck.s.first("""
+select reps, reviewTime from stats where type = 1 and
+day = :d""", d=yesterday)
+ if res:
+ (dyest, tyest) = res
+ else:
+ dyest = 0; tyest = 0
+ dchange = dtoday - dyest
+ if dchange >= 0:
+ dchange = "+%d" % dchange
+ else:
+ dchange = str(dchange)
+ h['repsToday'] = '%s' % dtoday
+ h['repsTodayChg'] = '(%s)' % dchange
+ last10 = self.deck.s.scalar(
"select count(*) from reviewHistory where time > :t",
- t = time.time() - 300)
+ t=time.time()-600)
+ last20 = self.deck.s.scalar(
+ "select count(*) from reviewHistory where "
+ "time > :t and time < :t2",
+ t=time.time()-1200, t2=time.time()-600)
+ change = last10 - last20
+ if change >= 0:
+ change = "+%d" % change
+ else:
+ change = str(change)
+ h['repsIn10'] = '%s' % last10
+ h['repsIn10Chg'] = '(%s)' % change
+ ttoday = s['dReviewTime']
+ change = ttoday - tyest
+ if change >= 0:
+ change = "+%s" % anki.utils.fmtTimeSpan(change, short=True)
+ else:
+ change = anki.utils.fmtTimeSpan(change, short=True)
h['timeToday'] = '%s' % (
- anki.utils.fmtTimeSpan(s['dReviewTime'], short=True))
+ anki.utils.fmtTimeSpan(ttoday, short=True))
+ h['timeTodayChg'] = '(%s)' % change
self.mainWin.optionsLabel.setText(top + _("""\
-Reps done today: | %(repsToday)s |
-Reps in last 5 mins: | %(repsIn5)s |
-Total time today: | %(timeToday)s |
+Reps done today: | %(repsToday)s |
+%(repsTodayChg)s |
+Reps in last 10 mins: | %(repsIn10)s |
+%(repsIn10Chg)s |
+Total time today: | %(timeToday)s |
+ %(timeTodayChg)s |
|
|