From 09e002c8d619aef305b65fa181e0b963c6a86c9d Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Mon, 15 Jun 2009 11:57:25 +0900 Subject: [PATCH] when generating cards in ordered mode, set due = fact creation + ordinal --- anki/cards.py | 9 ++++++--- anki/deck.py | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/anki/cards.py b/anki/cards.py index 8fd2bbcbb..599ef0ab5 100644 --- a/anki/cards.py +++ b/anki/cards.py @@ -68,7 +68,7 @@ cardsTable = Table( class Card(object): "A card." - def __init__(self, fact=None, cardModel=None): + def __init__(self, fact=None, cardModel=None, due=None): self.tags = u"" self.id = genID() # new cards start as new & due @@ -77,8 +77,11 @@ class Card(object): self.timerStarted = False self.timerStopped = False self.modified = time.time() - self.due = self.modified - self.combinedDue = self.modified + if due: + self.due = due + else: + self.due = self.modified + self.combinedDue = self.due if fact: self.fact = fact if cardModel: diff --git a/anki/deck.py b/anki/deck.py index d88b47943..16a61ce26 100644 --- a/anki/deck.py +++ b/anki/deck.py @@ -1033,7 +1033,8 @@ where type = 2 and priority in (1,2,3,4)""") or 0 select count(id) from cards where factId = :fid and cardModelId = :cmid""", fid=fact.id, cmid=cardModel.id) == 0: - card = anki.cards.Card(fact, cardModel) + card = anki.cards.Card( + fact, cardModel, due=fact.created+cardModel.ordinal) self.updateCardTags([card.id]) self.updatePriority(card) self.cardCount += 1