From 315838a56b4c2595c5293f05a00f76a5550aa3fe Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sun, 27 May 2012 13:14:58 +0900 Subject: [PATCH] fix answer buttons on review card --- anki/sched.py | 3 +++ tests/test_sched.py | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/anki/sched.py b/anki/sched.py index bcceae499..55b8f1c60 100644 --- a/anki/sched.py +++ b/anki/sched.py @@ -116,6 +116,9 @@ order by due""" % self._deckLimit(), def answerButtons(self, card): if card.odue: + # normal review in dyn deck? + if card.odid and card.queue == 2: + return 4 conf = self._lapseConf(card) if len(conf['delays']) > 1: return 3 diff --git a/tests/test_sched.py b/tests/test_sched.py index b70d27b50..d11302e5d 100644 --- a/tests/test_sched.py +++ b/tests/test_sched.py @@ -583,19 +583,18 @@ def test_cram(): # make it due d.reset() assert d.sched.counts() == (0,0,0) - c.due = 0 + c.due = -5 c.ivl = 100 c.flush() d.reset() assert d.sched.counts() == (0,0,1) # cram again did = d.decks.newDyn("Cram") - # if cramRev is false, it's placed in the review queue instead - # fixme: cards pulled from a deck with cramRev=True remain in that state - d.decks.get(did)['cramRev'] = False d.sched.rebuildDyn(did) d.reset() assert d.sched.counts() == (0,0,1) + c.load() + assert d.sched.answerButtons(c) == 4 # add a sibling so we can test minSpace, etc c2 = copy.deepcopy(c) c2.id = 123