Improvements to StatisticsDialog
It now shows statistics about logged time, reminders, etc. Sections are grouped for better readability. Improvements to Manage Reminders dialog to show date of alarm
This commit is contained in:
parent
3106d408ab
commit
206670454f
9 changed files with 438 additions and 91 deletions
|
|
@ -373,7 +373,7 @@ def test_db_gather_stats_empty_database(fresh_db):
|
|||
"""Test gather_stats on empty database."""
|
||||
stats = fresh_db.gather_stats()
|
||||
|
||||
assert len(stats) == 10
|
||||
assert len(stats) == 22
|
||||
(
|
||||
pages_with_content,
|
||||
total_revisions,
|
||||
|
|
@ -385,6 +385,18 @@ def test_db_gather_stats_empty_database(fresh_db):
|
|||
page_most_tags,
|
||||
page_most_tags_count,
|
||||
revisions_by_date,
|
||||
time_minutes_by_date,
|
||||
total_time_minutes,
|
||||
day_most_time,
|
||||
day_most_time_minutes,
|
||||
project_most_minutes_name,
|
||||
project_most_minutes,
|
||||
activity_most_minutes_name,
|
||||
activity_most_minutes,
|
||||
reminders_by_date,
|
||||
total_reminders,
|
||||
day_most_reminders,
|
||||
day_most_reminders_count,
|
||||
) = stats
|
||||
|
||||
assert pages_with_content == 0
|
||||
|
|
@ -421,6 +433,7 @@ def test_db_gather_stats_with_content(fresh_db):
|
|||
page_most_tags,
|
||||
page_most_tags_count,
|
||||
revisions_by_date,
|
||||
*_rest,
|
||||
) = stats
|
||||
|
||||
assert pages_with_content == 2
|
||||
|
|
@ -437,7 +450,7 @@ def test_db_gather_stats_word_counting(fresh_db):
|
|||
fresh_db.save_new_version("2024-01-01", "one two three four five", "test")
|
||||
|
||||
stats = fresh_db.gather_stats()
|
||||
_, _, _, _, words_by_date, total_words, _, _, _, _ = stats
|
||||
_, _, _, _, words_by_date, total_words, _, _, _, *_rest = stats
|
||||
|
||||
assert total_words == 5
|
||||
|
||||
|
|
@ -463,7 +476,7 @@ def test_db_gather_stats_with_tags(fresh_db):
|
|||
fresh_db.set_tags_for_page("2024-01-02", ["tag1"]) # Page 2 has 1 tag
|
||||
|
||||
stats = fresh_db.gather_stats()
|
||||
_, _, _, _, _, _, unique_tags, page_most_tags, page_most_tags_count, _ = stats
|
||||
_, _, _, _, _, _, unique_tags, page_most_tags, page_most_tags_count, *_rest = stats
|
||||
|
||||
assert unique_tags == 3
|
||||
assert page_most_tags == "2024-01-01"
|
||||
|
|
@ -479,7 +492,7 @@ def test_db_gather_stats_revisions_by_date(fresh_db):
|
|||
fresh_db.save_new_version("2024-01-02", "Fourth", "v1")
|
||||
|
||||
stats = fresh_db.gather_stats()
|
||||
_, _, _, _, _, _, _, _, _, revisions_by_date = stats
|
||||
_, _, _, _, _, _, _, _, _, revisions_by_date, *_rest = stats
|
||||
|
||||
assert date(2024, 1, 1) in revisions_by_date
|
||||
assert revisions_by_date[date(2024, 1, 1)] == 3
|
||||
|
|
@ -494,7 +507,7 @@ def test_db_gather_stats_handles_malformed_dates(fresh_db):
|
|||
fresh_db.save_new_version("2024-01-15", "Test", "v1")
|
||||
|
||||
stats = fresh_db.gather_stats()
|
||||
_, _, _, _, _, _, _, _, _, revisions_by_date = stats
|
||||
_, _, _, _, _, _, _, _, _, revisions_by_date, *_rest = stats
|
||||
|
||||
# Should have parsed the date correctly
|
||||
assert date(2024, 1, 15) in revisions_by_date
|
||||
|
|
@ -507,7 +520,7 @@ def test_db_gather_stats_current_version_only(fresh_db):
|
|||
fresh_db.save_new_version("2024-01-01", "one two three four five", "v2")
|
||||
|
||||
stats = fresh_db.gather_stats()
|
||||
_, _, _, _, words_by_date, total_words, _, _, _, _ = stats
|
||||
_, _, _, _, words_by_date, total_words, _, _, _, *_rest = stats
|
||||
|
||||
# Should count words from current version (5 words), not old version
|
||||
assert total_words == 5
|
||||
|
|
@ -519,7 +532,7 @@ def test_db_gather_stats_no_tags(fresh_db):
|
|||
fresh_db.save_new_version("2024-01-01", "No tags here", "test")
|
||||
|
||||
stats = fresh_db.gather_stats()
|
||||
_, _, _, _, _, _, unique_tags, page_most_tags, page_most_tags_count, _ = stats
|
||||
_, _, _, _, _, _, unique_tags, page_most_tags, page_most_tags_count, *_rest = stats
|
||||
|
||||
assert unique_tags == 0
|
||||
assert page_most_tags is None
|
||||
|
|
|
|||
|
|
@ -414,17 +414,6 @@ def test_upcoming_reminders_widget_check_reminders_no_db(qtbot, app):
|
|||
widget._check_reminders()
|
||||
|
||||
|
||||
def test_upcoming_reminders_widget_start_regular_timer(qtbot, app, fresh_db):
|
||||
"""Test starting the regular check timer."""
|
||||
widget = UpcomingRemindersWidget(fresh_db)
|
||||
qtbot.addWidget(widget)
|
||||
|
||||
widget._start_regular_timer()
|
||||
|
||||
# Timer should be running
|
||||
assert widget._check_timer.isActive()
|
||||
|
||||
|
||||
def test_manage_reminders_dialog_init(qtbot, app, fresh_db):
|
||||
"""Test ManageRemindersDialog initialization."""
|
||||
dialog = ManageRemindersDialog(fresh_db)
|
||||
|
|
@ -586,7 +575,7 @@ def test_manage_reminders_dialog_weekly_reminder_display(qtbot, app, fresh_db):
|
|||
qtbot.addWidget(dialog)
|
||||
|
||||
# Check that the type column shows the day
|
||||
type_item = dialog.table.item(0, 2)
|
||||
type_item = dialog.table.item(0, 3)
|
||||
assert "Wed" in type_item.text()
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ class FakeStatsDB:
|
|||
def __init__(self):
|
||||
d1 = _dt.date(2024, 1, 1)
|
||||
d2 = _dt.date(2024, 1, 2)
|
||||
|
||||
self.stats = (
|
||||
2, # pages_with_content
|
||||
5, # total_revisions
|
||||
|
|
@ -25,7 +26,20 @@ class FakeStatsDB:
|
|||
"2024-01-02", # page_most_tags
|
||||
2, # page_most_tags_count
|
||||
{d1: 1, d2: 2}, # revisions_by_date
|
||||
{d1: 60, d2: 120}, # time_minutes_by_date
|
||||
180, # total_time_minutes
|
||||
"2024-01-02", # day_most_time
|
||||
120, # day_most_time_minutes
|
||||
"Project A", # project_most_minutes_name
|
||||
120, # project_most_minutes
|
||||
"Activity A", # activity_most_minutes_name
|
||||
120, # activity_most_minutes
|
||||
{d1: 1, d2: 3}, # reminders_by_date
|
||||
4, # total_reminders
|
||||
"2024-01-02", # day_most_reminders
|
||||
3, # day_most_reminders_count
|
||||
)
|
||||
|
||||
self.called = False
|
||||
|
||||
def gather_stats(self):
|
||||
|
|
@ -57,7 +71,7 @@ def test_statistics_dialog_populates_fields_and_heatmap(qtbot):
|
|||
|
||||
# Heatmap is created and uses "words" by default
|
||||
words_by_date = db.stats[4]
|
||||
revisions_by_date = db.stats[-1]
|
||||
revisions_by_date = db.stats[9]
|
||||
|
||||
assert hasattr(dlg, "_heatmap")
|
||||
assert dlg._heatmap._data == words_by_date
|
||||
|
|
@ -80,13 +94,25 @@ class EmptyStatsDB:
|
|||
0, # pages_with_content
|
||||
0, # total_revisions
|
||||
None, # page_most_revisions
|
||||
0,
|
||||
0, # page_most_revisions_count
|
||||
{}, # words_by_date
|
||||
0, # total_words
|
||||
0, # unique_tags
|
||||
None, # page_most_tags
|
||||
0,
|
||||
0, # page_most_tags_count
|
||||
{}, # revisions_by_date
|
||||
{}, # time_minutes_by_date
|
||||
0, # total_time_minutes
|
||||
None, # day_most_time
|
||||
0, # day_most_time_minutes
|
||||
None, # project_most_minutes_name
|
||||
0, # project_most_minutes
|
||||
None, # activity_most_minutes_name
|
||||
0, # activity_most_minutes
|
||||
{}, # reminders_by_date
|
||||
0, # total_reminders
|
||||
None, # day_most_reminders
|
||||
0, # day_most_reminders_count
|
||||
)
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue