|
|
@ -667,6 +667,7 @@ function ReaderStatistics:addToMainMenu(menu_items)
|
|
|
|
callback = function()
|
|
|
|
callback = function()
|
|
|
|
UIManager:show(KeyValuePage:new{
|
|
|
|
UIManager:show(KeyValuePage:new{
|
|
|
|
title = _("Statistics"),
|
|
|
|
title = _("Statistics"),
|
|
|
|
|
|
|
|
value_overflow_align = "right",
|
|
|
|
kv_pairs = self:getCurrentStat(self.id_curr_book),
|
|
|
|
kv_pairs = self:getCurrentStat(self.id_curr_book),
|
|
|
|
})
|
|
|
|
})
|
|
|
|
end,
|
|
|
|
end,
|
|
|
@ -715,6 +716,7 @@ function ReaderStatistics:statMenu()
|
|
|
|
local total_msg, kv_pairs = self:getTotalStats()
|
|
|
|
local total_msg, kv_pairs = self:getTotalStats()
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
title = total_msg,
|
|
|
|
title = total_msg,
|
|
|
|
|
|
|
|
value_overflow_align = "right",
|
|
|
|
kv_pairs = kv_pairs,
|
|
|
|
kv_pairs = kv_pairs,
|
|
|
|
callback_return = function()
|
|
|
|
callback_return = function()
|
|
|
|
UIManager:show(kv)
|
|
|
|
UIManager:show(kv)
|
|
|
@ -731,6 +733,7 @@ function ReaderStatistics:statMenu()
|
|
|
|
UIManager:close(self.kv)
|
|
|
|
UIManager:close(self.kv)
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
title = _("Last week"),
|
|
|
|
title = _("Last week"),
|
|
|
|
|
|
|
|
value_overflow_align = "right",
|
|
|
|
kv_pairs = self:getDatesFromAll(7, "daily_weekday"),
|
|
|
|
kv_pairs = self:getDatesFromAll(7, "daily_weekday"),
|
|
|
|
callback_return = function()
|
|
|
|
callback_return = function()
|
|
|
|
UIManager:show(kv)
|
|
|
|
UIManager:show(kv)
|
|
|
@ -746,6 +749,7 @@ function ReaderStatistics:statMenu()
|
|
|
|
UIManager:close(self.kv)
|
|
|
|
UIManager:close(self.kv)
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
title = _("Last month by day"),
|
|
|
|
title = _("Last month by day"),
|
|
|
|
|
|
|
|
value_overflow_align = "right",
|
|
|
|
kv_pairs = self:getDatesFromAll(30, "daily_weekday"),
|
|
|
|
kv_pairs = self:getDatesFromAll(30, "daily_weekday"),
|
|
|
|
callback_return = function()
|
|
|
|
callback_return = function()
|
|
|
|
UIManager:show(kv)
|
|
|
|
UIManager:show(kv)
|
|
|
@ -761,6 +765,7 @@ function ReaderStatistics:statMenu()
|
|
|
|
UIManager:close(self.kv)
|
|
|
|
UIManager:close(self.kv)
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
title = _("Last year by day"),
|
|
|
|
title = _("Last year by day"),
|
|
|
|
|
|
|
|
value_overflow_align = "right",
|
|
|
|
kv_pairs = self:getDatesFromAll(365, "daily"),
|
|
|
|
kv_pairs = self:getDatesFromAll(365, "daily"),
|
|
|
|
callback_return = function()
|
|
|
|
callback_return = function()
|
|
|
|
UIManager:show(kv)
|
|
|
|
UIManager:show(kv)
|
|
|
@ -776,6 +781,7 @@ function ReaderStatistics:statMenu()
|
|
|
|
UIManager:close(self.kv)
|
|
|
|
UIManager:close(self.kv)
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
title = _("Last year by week"),
|
|
|
|
title = _("Last year by week"),
|
|
|
|
|
|
|
|
value_overflow_align = "right",
|
|
|
|
kv_pairs = self:getDatesFromAll(365, "weekly"),
|
|
|
|
kv_pairs = self:getDatesFromAll(365, "weekly"),
|
|
|
|
callback_return = function()
|
|
|
|
callback_return = function()
|
|
|
|
UIManager:show(kv)
|
|
|
|
UIManager:show(kv)
|
|
|
@ -791,6 +797,7 @@ function ReaderStatistics:statMenu()
|
|
|
|
UIManager:close(self.kv)
|
|
|
|
UIManager:close(self.kv)
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
title = _("All stats by month"),
|
|
|
|
title = _("All stats by month"),
|
|
|
|
|
|
|
|
value_overflow_align = "right",
|
|
|
|
kv_pairs = self:getDatesFromAll(0, "monthly"),
|
|
|
|
kv_pairs = self:getDatesFromAll(0, "monthly"),
|
|
|
|
callback_return = function()
|
|
|
|
callback_return = function()
|
|
|
|
UIManager:show(kv)
|
|
|
|
UIManager:show(kv)
|
|
|
@ -807,6 +814,7 @@ function ReaderStatistics:statMenu()
|
|
|
|
UIManager:close(self.kv)
|
|
|
|
UIManager:close(self.kv)
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
title = _("Books by week"),
|
|
|
|
title = _("Books by week"),
|
|
|
|
|
|
|
|
value_overflow_align = "right",
|
|
|
|
kv_pairs = self:getDatesFromAll(0, "weekly", true),
|
|
|
|
kv_pairs = self:getDatesFromAll(0, "weekly", true),
|
|
|
|
callback_return = function()
|
|
|
|
callback_return = function()
|
|
|
|
UIManager:show(kv)
|
|
|
|
UIManager:show(kv)
|
|
|
@ -822,6 +830,7 @@ function ReaderStatistics:statMenu()
|
|
|
|
UIManager:close(self.kv)
|
|
|
|
UIManager:close(self.kv)
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
title = _("Books by month"),
|
|
|
|
title = _("Books by month"),
|
|
|
|
|
|
|
|
value_overflow_align = "right",
|
|
|
|
kv_pairs = self:getDatesFromAll(0, "monthly", true),
|
|
|
|
kv_pairs = self:getDatesFromAll(0, "monthly", true),
|
|
|
|
callback_return = function()
|
|
|
|
callback_return = function()
|
|
|
|
UIManager:show(kv)
|
|
|
|
UIManager:show(kv)
|
|
|
@ -1017,6 +1026,7 @@ function ReaderStatistics:getBookStat(id_book)
|
|
|
|
UIManager:close(self.kv)
|
|
|
|
UIManager:close(self.kv)
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
title = _("Read in days"),
|
|
|
|
title = _("Read in days"),
|
|
|
|
|
|
|
|
value_overflow_align = "right",
|
|
|
|
kv_pairs = self:getDatesForBook(id_book),
|
|
|
|
kv_pairs = self:getDatesForBook(id_book),
|
|
|
|
callback_return = function()
|
|
|
|
callback_return = function()
|
|
|
|
UIManager:show(kv)
|
|
|
|
UIManager:show(kv)
|
|
|
@ -1095,6 +1105,7 @@ function ReaderStatistics:callbackMonthly(begin, finish, date_text, book_mode)
|
|
|
|
if book_mode then
|
|
|
|
if book_mode then
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
title = T(_("Books from: %1"), date_text),
|
|
|
|
title = T(_("Books from: %1"), date_text),
|
|
|
|
|
|
|
|
value_overflow_align = "right",
|
|
|
|
kv_pairs = self:getBooksFromPeriod(begin, finish),
|
|
|
|
kv_pairs = self:getBooksFromPeriod(begin, finish),
|
|
|
|
callback_return = function()
|
|
|
|
callback_return = function()
|
|
|
|
UIManager:show(kv)
|
|
|
|
UIManager:show(kv)
|
|
|
@ -1104,6 +1115,7 @@ function ReaderStatistics:callbackMonthly(begin, finish, date_text, book_mode)
|
|
|
|
else
|
|
|
|
else
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
title = date_text,
|
|
|
|
title = date_text,
|
|
|
|
|
|
|
|
value_overflow_align = "right",
|
|
|
|
kv_pairs = self:getDaysFromPeriod(begin, finish),
|
|
|
|
kv_pairs = self:getDaysFromPeriod(begin, finish),
|
|
|
|
callback_return = function()
|
|
|
|
callback_return = function()
|
|
|
|
UIManager:show(kv)
|
|
|
|
UIManager:show(kv)
|
|
|
@ -1120,6 +1132,7 @@ function ReaderStatistics:callbackWeekly(begin, finish, date_text, book_mode)
|
|
|
|
if book_mode then
|
|
|
|
if book_mode then
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
title = T(_("Books from: %1"), date_text),
|
|
|
|
title = T(_("Books from: %1"), date_text),
|
|
|
|
|
|
|
|
value_overflow_align = "right",
|
|
|
|
kv_pairs = self:getBooksFromPeriod(begin, finish),
|
|
|
|
kv_pairs = self:getBooksFromPeriod(begin, finish),
|
|
|
|
callback_return = function()
|
|
|
|
callback_return = function()
|
|
|
|
UIManager:show(kv)
|
|
|
|
UIManager:show(kv)
|
|
|
@ -1129,6 +1142,7 @@ function ReaderStatistics:callbackWeekly(begin, finish, date_text, book_mode)
|
|
|
|
else
|
|
|
|
else
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
title = date_text,
|
|
|
|
title = date_text,
|
|
|
|
|
|
|
|
value_overflow_align = "right",
|
|
|
|
kv_pairs = self:getDaysFromPeriod(begin, finish),
|
|
|
|
kv_pairs = self:getDaysFromPeriod(begin, finish),
|
|
|
|
callback_return = function()
|
|
|
|
callback_return = function()
|
|
|
|
UIManager:show(kv)
|
|
|
|
UIManager:show(kv)
|
|
|
@ -1144,6 +1158,7 @@ function ReaderStatistics:callbackDaily(begin, finish, date_text)
|
|
|
|
UIManager:close(kv)
|
|
|
|
UIManager:close(kv)
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
title = date_text,
|
|
|
|
title = date_text,
|
|
|
|
|
|
|
|
value_overflow_align = "right",
|
|
|
|
kv_pairs = self:getBooksFromPeriod(begin, finish),
|
|
|
|
kv_pairs = self:getBooksFromPeriod(begin, finish),
|
|
|
|
callback_return = function()
|
|
|
|
callback_return = function()
|
|
|
|
UIManager:show(kv)
|
|
|
|
UIManager:show(kv)
|
|
|
@ -1286,6 +1301,7 @@ function ReaderStatistics:getDaysFromPeriod(period_begin, period_end)
|
|
|
|
UIManager:close(kv)
|
|
|
|
UIManager:close(kv)
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
title = T(_("Books in %1"), result_book[1][i]),
|
|
|
|
title = T(_("Books in %1"), result_book[1][i]),
|
|
|
|
|
|
|
|
value_overflow_align = "right",
|
|
|
|
kv_pairs = self:getBooksFromPeriod(time_begin, time_begin + 86400),
|
|
|
|
kv_pairs = self:getBooksFromPeriod(time_begin, time_begin + 86400),
|
|
|
|
callback_return = function()
|
|
|
|
callback_return = function()
|
|
|
|
UIManager:show(kv)
|
|
|
|
UIManager:show(kv)
|
|
|
@ -1326,6 +1342,7 @@ function ReaderStatistics:getBooksFromPeriod(period_begin, period_end)
|
|
|
|
UIManager:close(self.kv)
|
|
|
|
UIManager:close(self.kv)
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
title = _("Read in days"),
|
|
|
|
title = _("Read in days"),
|
|
|
|
|
|
|
|
value_overflow_align = "right",
|
|
|
|
kv_pairs = self:getDatesForBook(tonumber(result_book[4][i])),
|
|
|
|
kv_pairs = self:getDatesForBook(tonumber(result_book[4][i])),
|
|
|
|
callback_return = function()
|
|
|
|
callback_return = function()
|
|
|
|
UIManager:show(kv)
|
|
|
|
UIManager:show(kv)
|
|
|
@ -1460,6 +1477,7 @@ function ReaderStatistics:getTotalStats()
|
|
|
|
|
|
|
|
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
self.kv = KeyValuePage:new{
|
|
|
|
title = book_title,
|
|
|
|
title = book_title,
|
|
|
|
|
|
|
|
value_overflow_align = "right",
|
|
|
|
kv_pairs = self:getBookStat(id_book),
|
|
|
|
kv_pairs = self:getBookStat(id_book),
|
|
|
|
callback_return = function()
|
|
|
|
callback_return = function()
|
|
|
|
UIManager:show(kv)
|
|
|
|
UIManager:show(kv)
|
|
|
@ -1543,6 +1561,7 @@ function ReaderStatistics:resetBook()
|
|
|
|
end
|
|
|
|
end
|
|
|
|
kv_reset_book = KeyValuePage:new{
|
|
|
|
kv_reset_book = KeyValuePage:new{
|
|
|
|
title = _("Reset book statistics"),
|
|
|
|
title = _("Reset book statistics"),
|
|
|
|
|
|
|
|
value_overflow_align = "right",
|
|
|
|
kv_pairs = total_stats,
|
|
|
|
kv_pairs = total_stats,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
UIManager:show(kv_reset_book)
|
|
|
|
UIManager:show(kv_reset_book)
|
|
|
|