diff --git a/anki/deck.py b/anki/deck.py index 0b5687047..6c4e3f182 100644 --- a/anki/deck.py +++ b/anki/deck.py @@ -1207,7 +1207,7 @@ and due < :now""", now=time.time()) def newCountAll(self): "All new cards, including spaced." return self.s.scalar( - "select count(id) from cards where type = 2") + "select count(id) from cards where type in (2,5)") # Card predicates ########################################################################## diff --git a/anki/stats.py b/anki/stats.py index e6d230549..ffa1b7bc5 100644 --- a/anki/stats.py +++ b/anki/stats.py @@ -344,19 +344,6 @@ class DeckStats(object): html += _("Average interval: ") + ("%s ") % fmtFloat(avgInt) + _("days") html += "
" html += "
" - inactive = d.inactiveCardCount() - suspended = d.suspendedCardCount() - active = total - inactive - suspended - inactiveP = inactive / float(total) * 100 - suspendedP = suspended / float(total) * 100 - activeP = active / float(total) * 100 - html += "" + _("Card State") + "
" - html += _("Active cards:") + " %(a)d (%(b)s)
" % { - 'a': active, 'b' : fmtPerc(activeP)} - html += _("Inactive cards:") + " %(a)d (%(b)s)
" % { - 'a': inactive, 'b' : fmtPerc(inactiveP)} - html += _("Suspended cards:") + " %(a)d (%(b)s)

" % { - 'a': suspended, 'b' : fmtPerc(suspendedP)} html += "" + _("Correct Answers") + "
" html += _("Mature cards: ") + " " + fmtPerc(stats['gMatureYes%']) + ( " " + _("(%(partOf)d of %(totalSum)d)") % {