Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Extended Card Stats During Review #192

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update Extended Card Stats During Review #192

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acb08ba
Update Extended Card Stats During Review
zjosua Sep 10, 2022
4f9d4a2
Remove obsolete argument from format_timespan
zjosua Nov 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 37 additions & 22 deletions src/reviewer_card_stats/reviewer_card_stats.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
from aqt.webview import AnkiWebView
import aqt.stats
import time
import datetime
from anki.lang import _
from anki.utils import fmtTimeSpan
from anki.stats import CardStats


Expand All @@ -45,12 +42,13 @@ def closeEvent(self, evt):
QDockWidget.closeEvent(self, evt)
dock = DockableWithClose(title, mw)
dock.setObjectName(title)
dock.setAllowedAreas(Qt.LeftDockWidgetArea | Qt.RightDockWidgetArea)
dock.setFeatures(QDockWidget.DockWidgetClosable)
dock.setAllowedAreas(Qt.DockWidgetArea.LeftDockWidgetArea |
Qt.DockWidgetArea.RightDockWidgetArea)
dock.setFeatures(QDockWidget.DockWidgetFeature.DockWidgetClosable)
dock.setWidget(w)
if mw.width() < 600:
mw.resize(QSize(600, mw.height()))
mw.addDockWidget(Qt.RightDockWidgetArea, dock)
mw.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, dock)
return dock

def _remDockable(self, dock):
Expand All @@ -62,7 +60,7 @@ class ThinAnkiWebView(AnkiWebView):
def sizeHint(self):
return QSize(200, 100)
self.web = ThinAnkiWebView()
self.shown = self._addDockable(_("Card Info"), self.web)
self.shown = self._addDockable("Card Info", self.web)
self.shown.closed.connect(self._onClosed)

self._update()
Expand Down Expand Up @@ -91,16 +89,15 @@ def _revlogData(self, card, cs):
"from revlog where cid = ?", card.id)
if not entries:
return ""
s = "<table width=100%%><tr><th align=left>%s</th>" % _("Date")
s = "<table width=100%%><tr><th align=left>%s</th>" % "Date"
s += ("<th align=right>%s</th>" * 6) % (
_("Type"), _("Rating"), _("Interval"), "IntDate", _("Ease"), _("Time"))
"Type", "Rating", "Interval", "IntDate", "Ease", "Time")
cnt = 0
for (date, ease, ivl, factor, taken, type) in reversed(entries):
cnt += 1
s += "<tr><td>%s</td>" % time.strftime(_("<b>%Y-%m-%d</b> @ %H:%M"),
s += "<tr><td>%s</td>" % time.strftime("<b>%Y-%m-%d</b> @ %H:%M",
time.localtime(date))
tstr = [_("Learn"), _("Review"), _("Relearn"), _("Filtered"),
_("Resched")][type]
tstr = ["Learn", "Review", "Relearn", "Filtered", "Resched"][type]
import anki.stats as st

fmt = "<span style='color:%s'>%s</span>"
Expand All @@ -120,12 +117,12 @@ def _revlogData(self, card, cs):
int_due = "na"
if ivl > 0:
int_due_date = time.localtime(date + (ivl * 24 * 60 * 60))
int_due = time.strftime(_("%Y-%m-%d"), int_due_date)
int_due = time.strftime("%Y-%m-%d", int_due_date)
####################
if ivl == 0:
ivl = _("0d")
ivl = "0d"
elif ivl > 0:
ivl = fmtTimeSpan(ivl * 86400, short=True)
ivl = mw.col.format_timespan(ivl * 86400)
else:
ivl = cs.time(-ivl)

Expand All @@ -138,11 +135,29 @@ def _revlogData(self, card, cs):
cs.time(taken)) + "</tr>"
s += "</table>"
if cnt < card.reps:
s += _("""\
s += """\
Note: Some of the history is missing. For more information, \
please see the browser documentation.""")
please see the browser documentation."""
return s

def _format_date(self, secs):
return time.strftime("%Y-%m-%d", time.localtime(secs))

def _format_card_stats(self, data):
txt = f"Card Type: {data.card_type}<br/>"
txt += f"Note Type: {data.notetype}<br/>"
txt += f"Deck: {data.deck}<br/>"
txt += f"Date Added: {self._format_date(data.added)}<br/>"
txt += f"First Reviewed: {self._format_date(data.first_review)}<br/>"
txt += f"Last Reviewed: {self._format_date(data.latest_review)}<br/>"
txt += f"Due Date: {self._format_date(data.latest_review)}<br/>"
txt += f"Ease: {data.ease}<br/>"
txt += f"Reviews: {data.reviews}<br/>"
txt += f"Card Id: {data.card_id}<br/>"
txt += f"Note Id: {data.note_id}"

return txt

def _update(self):
if not self.shown:
return
Expand All @@ -152,18 +167,18 @@ def _update(self):
cs = CardStats(d, r.card)
cc = r.card
if cc:
txt += _("<h3>Current</h3>")
txt += d.cardStats(cc)
txt += "<h3>Current</h3>"
txt += self._format_card_stats(d.card_stats_data(cc.id))
txt += "<p>"
txt += self._revlogData(cc, cs)
lc = r.lastCard()
if lc:
txt += _("<h3>Last</h3>")
txt += d.cardStats(lc)
txt += "<h3>Last</h3>"
txt += self._format_card_stats(d.card_stats_data(lc.id))
txt += "<p>"
txt += self._revlogData(lc, cs)
if not txt:
txt = _("No current card or last card.")
txt = "No current card or last card."
style = self._style()
self.web.setHtml("""
<html><head>
Expand Down