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

fix due date

Browse source
This commit is contained in:
Damien Elmes 2011-04-10 16:58:24 +09:00
parent 6816163c08
commit 5e4c469ecc
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
aqt/browser.py
View file

@ -133,16 +133,16 @@ class DeckModel(QAbstractTableModel):
def nextDue(self, index): def nextDue(self, index):
c = self.getCard(index) c = self.getCard(index)
d = c.due if c.type == 0:
reps = c.reps return _("(new card)")
secs = d - time.time() elif c.type == 1:
if secs <= 0: diff = c.due - time.time()
if not reps: elif c.type == 2:
return _("(new card)") diff = (c.due - self.deck.sched.today)*86400
else: if diff <= 0:
return _("%s ago") % fmtTimeSpan(abs(secs), pad=0) return _("%s ago") % fmtTimeSpan(abs(diff), pad=0)
else: else:
return _("in %s") % fmtTimeSpan(secs, pad=0) return _("in %s") % fmtTimeSpan(diff, pad=0)
def thirdColumn(self, index): def thirdColumn(self, index):
if self.sortKey == "created": if self.sortKey == "created":
@ -706,7 +706,7 @@ where id in (%s)""" % ",".join([
# card has been deleted # card has been deleted
return return
# ensure the change timer doesn't fire after deletion but before reset # ensure the change timer doesn't fire after deletion but before reset
self.editor.saveFieldsNow() self.editor.saveNow()
self.editor.fact = None self.editor.fact = None
self.dialog.tableView.setFocus() self.dialog.tableView.setFocus()
self.deck.setUndoStart(n) self.deck.setUndoStart(n)
@ -719,7 +719,7 @@ where id in (%s)""" % ",".join([
def addTags(self, tags=None, label=None): def addTags(self, tags=None, label=None):
# focus lost hook may not have chance to fire # focus lost hook may not have chance to fire
self.editor.saveFieldsNow() self.editor.saveNow()
if tags is None: if tags is None:
(tags, r) = ui.utils.getTag(self, self.deck, _("Enter tags to add:")) (tags, r) = ui.utils.getTag(self, self.deck, _("Enter tags to add:"))
else: else:
@ -734,7 +734,7 @@ where id in (%s)""" % ",".join([
def deleteTags(self, tags=None, label=None): def deleteTags(self, tags=None, label=None):
# focus lost hook may not have chance to fire # focus lost hook may not have chance to fire
self.editor.saveFieldsNow() self.editor.saveNow()
if tags is None: if tags is None:
(tags, r) = ui.utils.getTag(self, self.deck, _("Enter tags to delete:")) (tags, r) = ui.utils.getTag(self, self.deck, _("Enter tags to delete:"))
else: else:
@ -756,7 +756,7 @@ where id in (%s)""" % ",".join([
def onSuspend(self, sus): def onSuspend(self, sus):
# focus lost hook may not have chance to fire # focus lost hook may not have chance to fire
self.editor.saveFieldsNow() self.editor.saveNow()
if sus: if sus:
self._onSuspend() self._onSuspend()
else: else:
@ -1099,21 +1099,21 @@ select fm.id, fm.name from fieldmodels fm""")
def onFirstCard(self): def onFirstCard(self):
if not self.model.cards: if not self.model.cards:
return return
self.editor.saveFieldsNow() self.editor.saveNow()
self.dialog.tableView.selectionModel().clear() self.dialog.tableView.selectionModel().clear()
self.dialog.tableView.selectRow(0) self.dialog.tableView.selectRow(0)
def onLastCard(self): def onLastCard(self):
if not self.model.cards: if not self.model.cards:
return return
self.editor.saveFieldsNow() self.editor.saveNow()
self.dialog.tableView.selectionModel().clear() self.dialog.tableView.selectionModel().clear()
self.dialog.tableView.selectRow(len(self.model.cards) - 1) self.dialog.tableView.selectRow(len(self.model.cards) - 1)
def onPreviousCard(self): def onPreviousCard(self):
if not self.model.cards: if not self.model.cards:
return return
self.editor.saveFieldsNow() self.editor.saveNow()
row = self.dialog.tableView.currentIndex().row() row = self.dialog.tableView.currentIndex().row()
row = max(0, row - 1) row = max(0, row - 1)
self.dialog.tableView.selectionModel().clear() self.dialog.tableView.selectionModel().clear()
@ -1122,7 +1122,7 @@ select fm.id, fm.name from fieldmodels fm""")
def onNextCard(self): def onNextCard(self):
if not self.model.cards: if not self.model.cards:
return return
self.editor.saveFieldsNow() self.editor.saveNow()
row = self.dialog.tableView.currentIndex().row() row = self.dialog.tableView.currentIndex().row()
row = min(len(self.model.cards) - 1, row + 1) row = min(len(self.model.cards) - 1, row + 1)
self.dialog.tableView.selectionModel().clear() self.dialog.tableView.selectionModel().clear()