renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ReaderStatistics: allow reset statistics per period per book

Browse Source
This commit is contained in:
poire-z
2022-01-31 19:18:37 +01:00
parent f764a61b69
commit 67b17d0845
2 changed files with 68 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/statistics.koplugin/calendarview.lua
View File

@@ -755,7 +755,16 @@ function CalendarView:_populateItems()
title = day_text,
value_align = "right",
kv_pairs = self.reader_statistics:getBooksFromPeriod(day_ts, day_ts + 86400),
callback_return = function() end -- to just have that return button shown
close_callback = function()
-- Refresh calendar in case some day stats were reset for some books
-- (we don't know if some reset were done... so we refresh the current
-- display always - at tickAfterNext so there is no noticable slowness
-- when closing, and the re-painting happening after is not noticable;
-- but if some stat reset were done, this will make a nice noticable
-- repainting showing dynamically reset books disappearing :)
UIManager:tickAfterNext(function() self:_populateItems() end)
end,
callback_return = function() end, -- to just have that return button shown
})
end
})

60
plugins/statistics.koplugin/main.lua
View File

@@ -1833,6 +1833,11 @@ function ReaderStatistics:getBooksFromPeriod(period_begin, period_end, callback_
end
UIManager:show(self.kv)
end,
hold_callback = function(kv_page, kv_item)
self:resetStatsForBookForPeriod(result_book[4][i], period_begin, period_end, false, function()
kv_page:removeKeyValueItem(kv_item) -- Reset, refresh what's displayed
end)
end,
})
end
return results
@@ -1887,7 +1892,9 @@ function ReaderStatistics:getDatesForBook(id_book)
local sql_stmt = [[
SELECT date(start_time, 'unixepoch', 'localtime') AS dates,
count(DISTINCT page) AS pages,
sum(duration) AS durations
sum(duration) AS durations,
min(start_time) AS min_start_time,
max(start_time) AS max_start_time
FROM page_stat
WHERE id_book = %d
GROUP BY Date(start_time, 'unixepoch', 'localtime')
@@ -1903,12 +1910,61 @@ function ReaderStatistics:getDatesForBook(id_book)
for i=1, #result_book.dates do
table.insert(results, {
result_book[1][i],
T(_("Pages: (%1) Time: %2"), tonumber(result_book[2][i]), util.secondsToClockDuration(user_duration_format, tonumber(result_book[3][i]), false))
T(_("Pages: (%1) Time: %2"), tonumber(result_book[2][i]), util.secondsToClockDuration(user_duration_format, tonumber(result_book[3][i]), false)),
hold_callback = function(kv_page, kv_item)
self:resetStatsForBookForPeriod(id_book, result_book[4][i], result_book[5][i], result_book[1][i], function()
kv_page:removeKeyValueItem(kv_item) -- Reset, refresh what's displayed
end)
end,
})
end
return results
end
function ReaderStatistics:resetStatsForBookForPeriod(id_book, min_start_time, max_start_time, day_str, on_reset_confirmed_callback)
local confirm_text
if day_str then
-- From getDatesForBook(): we are showing a list of days, with book title at top title:
-- show the day string to confirm the long-press was on the right day
confirm_text = T(_("Do you want to reset statistics for day %1 for this book?"), day_str)
else
-- From getBooksFromPeriod(): we are showing a list of books, with the period as top title:
-- show the book title to confirm the long-press was on the right book
local conn = SQ3.open(db_location)
local sql_stmt = [[
SELECT title
FROM book
WHERE id = %d;
]]
local book_title = conn:rowexec(string.format(sql_stmt, id_book))
conn:close()
confirm_text = T(_("Do you want to reset statistics for this period for book:\n%1"), book_title)
end
UIManager:show(ConfirmBox:new{
text = confirm_text,
cancel_text = _("Cancel"),
cancel_callback = function()
return
end,
ok_text = _("Reset"),
ok_callback = function()
local conn = SQ3.open(db_location)
local sql_stmt = [[
DELETE FROM page_stat_data
WHERE id_book = ?
AND start_time between ? and ?
]]
local stmt = conn:prepare(sql_stmt)
stmt:reset():bind(id_book, min_start_time, max_start_time):step()
stmt:close()
conn:close()
if on_reset_confirmed_callback then
on_reset_confirmed_callback()
end
end,
})
end
function ReaderStatistics:getTotalStats()
self:insertDB()
local conn = SQ3.open(db_location)