Skip to content

Commit cef4ce1

Browse files
committed
fix: correct duration estimated
1 parent bdad8bf commit cef4ce1

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

core/storage.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ func (s *SQLiteStorage) estimateDuration(tx *sql.Tx, date string, now time.Time)
127127
var lastTS int64
128128
err := tx.QueryRow(`
129129
SELECT COALESCE(MAX(timestamp), 0) FROM activities
130-
WHERE date(timestamp, 'unixepoch', 'localtime') = ?
130+
WHERE strftime('%Y-%m-%d', timestamp, 'unixepoch') = ?
131131
AND timestamp < ?
132132
`, date, now.Unix()).Scan(&lastTS)
133133
if err != nil {

stats/api.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,35 +47,35 @@ func (c *Calculator) CalculateAPI(storage core.Storage, opts APIOptions) (*APISt
4747
lastMonthStart := util.StartOfMonth(now.AddDate(0, -1, 0), c.timezone)
4848

4949
todaySummary, _ := storage.GetPeriodSummary(todayStart, now)
50-
yesterdaySummary, _ := storage.GetPeriodSummary(yesterdayStart, todayStart)
50+
yesterdaySummary, _ := storage.GetPeriodSummary(yesterdayStart, yesterdayStart)
5151
thisWeekSummary, _ := storage.GetPeriodSummary(thisWeekStart, now)
52-
lastWeekSummary, _ := storage.GetPeriodSummary(lastWeekStart, thisWeekStart)
52+
lastWeekSummary, _ := storage.GetPeriodSummary(lastWeekStart, thisWeekStart.AddDate(0, 0, -1))
5353
thisMonthSummary, _ := storage.GetPeriodSummary(thisMonthStart, now)
54-
lastMonthSummary, _ := storage.GetPeriodSummary(lastMonthStart, thisMonthStart)
54+
lastMonthSummary, _ := storage.GetPeriodSummary(lastMonthStart, thisMonthStart.AddDate(0, 0, -1))
5555
allTimeSummary, _ := storage.GetPeriodSummary(time.Time{}, now)
5656

5757
todayLangs, _ := storage.GetLanguageSummary(todayStart, now)
58-
yesterdayLangs, _ := storage.GetLanguageSummary(yesterdayStart, todayStart)
58+
yesterdayLangs, _ := storage.GetLanguageSummary(yesterdayStart, yesterdayStart)
5959
thisWeekLangs, _ := storage.GetLanguageSummary(thisWeekStart, now)
60-
lastWeekLangs, _ := storage.GetLanguageSummary(lastWeekStart, thisWeekStart)
60+
lastWeekLangs, _ := storage.GetLanguageSummary(lastWeekStart, thisWeekStart.AddDate(0, 0, -1))
6161
thisMonthLangs, _ := storage.GetLanguageSummary(thisMonthStart, now)
62-
lastMonthLangs, _ := storage.GetLanguageSummary(lastMonthStart, thisMonthStart)
62+
lastMonthLangs, _ := storage.GetLanguageSummary(lastMonthStart, thisMonthStart.AddDate(0, 0, -1))
6363
allTimeLangs, _ := storage.GetLanguageSummary(time.Time{}, now)
6464

6565
todayProjs, _ := storage.GetProjectSummary(todayStart, now)
66-
yesterdayProjs, _ := storage.GetProjectSummary(yesterdayStart, todayStart)
66+
yesterdayProjs, _ := storage.GetProjectSummary(yesterdayStart, yesterdayStart)
6767
thisWeekProjs, _ := storage.GetProjectSummary(thisWeekStart, now)
68-
lastWeekProjs, _ := storage.GetProjectSummary(lastWeekStart, thisWeekStart)
68+
lastWeekProjs, _ := storage.GetProjectSummary(lastWeekStart, thisWeekStart.AddDate(0, 0, -1))
6969
thisMonthProjs, _ := storage.GetProjectSummary(thisMonthStart, now)
70-
lastMonthProjs, _ := storage.GetProjectSummary(lastMonthStart, thisMonthStart)
70+
lastMonthProjs, _ := storage.GetProjectSummary(lastMonthStart, thisMonthStart.AddDate(0, 0, -1))
7171
allTimeProjs, _ := storage.GetProjectSummary(time.Time{}, now)
7272

7373
todayEditors, _ := storage.GetEditorSummary(todayStart, now)
74-
yesterdayEditors, _ := storage.GetEditorSummary(yesterdayStart, todayStart)
74+
yesterdayEditors, _ := storage.GetEditorSummary(yesterdayStart, yesterdayStart)
7575
thisWeekEditors, _ := storage.GetEditorSummary(thisWeekStart, now)
76-
lastWeekEditors, _ := storage.GetEditorSummary(lastWeekStart, thisWeekStart)
76+
lastWeekEditors, _ := storage.GetEditorSummary(lastWeekStart, thisWeekStart.AddDate(0, 0, -1))
7777
thisMonthEditors, _ := storage.GetEditorSummary(thisMonthStart, now)
78-
lastMonthEditors, _ := storage.GetEditorSummary(lastMonthStart, thisMonthStart)
78+
lastMonthEditors, _ := storage.GetEditorSummary(lastMonthStart, thisMonthStart.AddDate(0, 0, -1))
7979
allTimeEditors, _ := storage.GetEditorSummary(time.Time{}, now)
8080

8181
lifetimeHours := make(map[string]float64)

0 commit comments

Comments
 (0)