michael/tickettracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Remove non-billable data from statistics"

Browse Source 
This reverts commit 971d493015.
This commit is contained in:
michael
2026-08-05 22:38:14 +02:00
parent bc184fef56
commit 7d4d373863
4 changed files with 75 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/index.ts
+5 -7
View File
@@ -768,7 +768,7 @@ async function getStatisticsOverview(period: ParsedPeriod, userId: string) {
`
${baseCte}
SELECT
COUNT(DISTINCT ticket_id) FILTER (WHERE billing_status = 'billed')::int AS tickets,
COUNT(DISTINCT ticket_id)::int AS tickets,
COUNT(*)::int AS sessions,
COALESCE(SUM(rounded_minutes) FILTER (WHERE billing_status = 'billed'), 0)::int AS minutes,
COALESCE(SUM(rounded_minutes) FILTER (WHERE billing_status = 'billed'), 0)::int AS billed_minutes,
@@ -832,8 +832,8 @@ async function getStatisticsOverview(period: ParsedPeriod, userId: string) {
SELECT
organization_id::text AS organization_id,
organization_name,
COUNT(DISTINCT ticket_id) FILTER (WHERE total_minutes > 0)::int AS tickets,
COALESCE(SUM(billed_sessions), 0)::int AS sessions,
COUNT(DISTINCT ticket_id)::int AS tickets,
SUM(session_count)::int AS sessions,
COALESCE(SUM(total_minutes), 0)::int AS total_minutes,
COALESCE(SUM(COALESCE(billed_minutes, 0)), 0)::int AS billed_minutes,
COALESCE(SUM(COALESCE(non_billable_minutes, 0)), 0)::int AS non_billable_minutes,
@@ -844,7 +844,6 @@ async function getStatisticsOverview(period: ParsedPeriod, userId: string) {
COALESCE(SUM(crm_billed_minutes), 0)::int AS crm_billed_minutes
FROM session_group_with_crm
GROUP BY organization_id, organization_name
HAVING COALESCE(SUM(total_minutes), 0) > 0
ORDER BY total_minutes DESC, organization_name ASC;
`,
[period.startIso, period.endIso, userId]
@@ -854,8 +853,8 @@ async function getStatisticsOverview(period: ParsedPeriod, userId: string) {
${baseCte}
SELECT
work_type,
COUNT(DISTINCT ticket_id) FILTER (WHERE total_minutes > 0)::int AS tickets,
COALESCE(SUM(billed_sessions), 0)::int AS sessions,
COUNT(DISTINCT ticket_id)::int AS tickets,
SUM(session_count)::int AS sessions,
COALESCE(SUM(total_minutes), 0)::int AS total_minutes,
COALESCE(SUM(COALESCE(billed_minutes, 0)), 0)::int AS billed_minutes,
COALESCE(SUM(COALESCE(non_billable_minutes, 0)), 0)::int AS non_billable_minutes,
@@ -866,7 +865,6 @@ async function getStatisticsOverview(period: ParsedPeriod, userId: string) {
COALESCE(SUM(crm_billed_minutes), 0)::int AS crm_billed_minutes
FROM session_group_with_crm
GROUP BY work_type
HAVING COALESCE(SUM(total_minutes), 0) > 0
ORDER BY total_minutes DESC, work_type ASC;
`,
[period.startIso, period.endIso, userId]