fix sort by fact created

This commit is contained in:
Damien Elmes 2009-08-17 06:45:59 +09:00
parent b31ff97619
commit 2860b32222

View file

@ -33,6 +33,7 @@ CARD_EASE = 9
CARD_NO = 10 CARD_NO = 10
CARD_PRIORITY = 11 CARD_PRIORITY = 11
CARD_TAGS = 12 CARD_TAGS = 12
CARD_FACTCREATED = 13
# Deck editor # Deck editor
########################################################################## ##########################################################################
@ -174,6 +175,7 @@ where cards.factId = facts.id """
self.cards[index.row()] = self.deck.s.first(""" self.cards[index.row()] = self.deck.s.first("""
select id, question, answer, due, reps, factId, created, modified, select id, question, answer, due, reps, factId, created, modified,
interval, factor, noCount, priority, (select tags from facts where interval, factor, noCount, priority, (select tags from facts where
facts.id = cards.factId), (select created from facts where
facts.id = cards.factId) from cards where id = :id""", facts.id = cards.factId) from cards where id = :id""",
id=self.cards[index.row()][0]) id=self.cards[index.row()][0])
self.emit(SIGNAL("dataChanged(QModelIndex,QModelIndex)"), self.emit(SIGNAL("dataChanged(QModelIndex,QModelIndex)"),
@ -229,6 +231,8 @@ facts.id = cards.factId) from cards where id = :id""",
return self.easeColumn(index) return self.easeColumn(index)
elif self.sortKey == "noCount": elif self.sortKey == "noCount":
return self.noColumn(index) return self.noColumn(index)
elif self.sortKey == "fact":
return self.factCreatedColumn(index)
else: else:
return self.nextDue(index) return self.nextDue(index)
@ -245,6 +249,8 @@ facts.id = cards.factId) from cards where id = :id""",
k = _("Ease") k = _("Ease")
elif self.sortKey == "noCount": elif self.sortKey == "noCount":
k = _("Lapses") k = _("Lapses")
elif self.sortKey == "fact":
k = _("Fact Created")
else: else:
k = _("Due") k = _("Due")
self.columns[-1][0] = k self.columns[-1][0] = k
@ -253,6 +259,10 @@ facts.id = cards.factId) from cards where id = :id""",
return time.strftime("%Y-%m-%d", time.localtime( return time.strftime("%Y-%m-%d", time.localtime(
self.cards[index.row()][CARD_CREATED])) self.cards[index.row()][CARD_CREATED]))
def factCreatedColumn(self, index):
return time.strftime("%Y-%m-%d", time.localtime(
self.cards[index.row()][CARD_FACTCREATED]))
def modifiedColumn(self, index): def modifiedColumn(self, index):
return time.strftime("%Y-%m-%d", time.localtime( return time.strftime("%Y-%m-%d", time.localtime(
self.cards[index.row()][CARD_MODIFIED])) self.cards[index.row()][CARD_MODIFIED]))