📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
fixed quarterly reports
Blue Mouse8f0928c2ca05
diff --git a/src/analytics/analytics.service.ts b/src/analytics/analytics.service.tsindex deee02492..d10833acf 100644--- a/src/analytics/analytics.service.ts+++ b/src/analytics/analytics.service.ts@@ -419,7 +419,7 @@ export class AnalyticsService {return Boolean(session)}- async getSummary(pids: string[], period: 'w' | 'M' = 'w'): Promise<Object> {+ async getSummary(pids: string[], period: 'w' | 'M' = 'w', amountToSubtract = 1): Promise<Object> {const result = {}for (let i = 0; i < _size(pids); ++i) {@@ -430,9 +430,9 @@ export class AnalyticsService {)const now = dayjs.utc().format('YYYY-MM-DD HH:mm:ss')- const oneWRaw = dayjs.utc().subtract(1, period)+ const oneWRaw = dayjs.utc().subtract(amountToSubtract, period)const oneWeek = oneWRaw.format('YYYY-MM-DD HH:mm:ss')- const twoWeeks = oneWRaw.subtract(1, period).format('YYYY-MM-DD HH:mm:ss')+ const twoWeeks = oneWRaw.subtract(amountToSubtract, period).format('YYYY-MM-DD HH:mm:ss')const query1 = `SELECT unique, count() FROM analytics WHERE pid = {pid:FixedString(12)} AND created BETWEEN {oneWeek:String} AND {now:String} GROUP BY unique`const query2 = `SELECT unique, count() FROM analytics WHERE pid = {pid:FixedString(12)} AND created BETWEEN {twoWeeks:String} AND {oneWeek:String} GROUP BY unique`diff --git a/src/task-manager/task-manager.service.ts b/src/task-manager/task-manager.service.tsindex 29704aae5..f91dc54b1 100644--- a/src/task-manager/task-manager.service.ts+++ b/src/task-manager/task-manager.service.ts@@ -371,7 +371,7 @@ export class TaskManagerService {}const ids = _map(projects, p => p.id)- const data = await this.analyticsService.getSummary(ids, 'M')+ const data = await this.analyticsService.getSummary(ids, 'M', 3)const result = {type: 'Q', // quarterly@@ -415,7 +415,7 @@ export class TaskManagerService {const projects = await this.projectService.getSubscriberProjects(id)const ids = projects.map(project => project.id)- const data = await this.analyticsService.getSummary(ids, 'M')+ const data = await this.analyticsService.getSummary(ids, 'M', 3)const result = {type: 'Q', // quarter