Skip to content

Refactor report.ts: clarify variable names and extract magic numbers #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kennhung merged 4 commits into from
Jan 30, 2026
Merged

Refactor report.ts: clarify variable names and extract magic numbers #40

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5fda6ff
Initial plan
Copilot Jan 30, 2026
f7d1a78
Improve code readability with better variable names and constants
Copilot Jan 30, 2026
1a9e61e
Move ROWS_PER_COLUMN constant to module level for better visibility
Copilot Jan 30, 2026
48a90fb
Complete code readability improvements
Copilot Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions src/lib/data/report.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,20 @@ type HeadCountOptions = {
maxTime: Date;
}

const ROWS_PER_COLUMN = 6;

function headcount(logs: Pick<TimeLog | TimeLogDTO, "inTime" | "outTime" | "userId">[], options?: Partial<HeadCountOptions>): number[] {
const {
bucketSize = 10 * 60 * 1000, // 10 minutes in ms
} = options || {};

type Event = { time: number, user: string, type: "in" | "out" };
const events: Event[] = logs
.map((l) => {
const evts: Event[] = [];
evts.push({ time: l.inTime.getTime(), user: l.userId, type: "in" });
evts.push({ time: l.outTime?.getTime() ?? Date.now(), user: l.userId, type: "out" });
return evts;
.map((log) => {
const userEvents: Event[] = [];
userEvents.push({ time: log.inTime.getTime(), user: log.userId, type: "in" });
userEvents.push({ time: log.outTime?.getTime() ?? Date.now(), user: log.userId, type: "out" });
return userEvents;
})
.flat();

Expand All @@ -41,20 +43,20 @@ function headcount(logs: Pick<TimeLog | TimeLogDTO, "inTime" | "outTime" | "user

const result: number[] = [];

let idx = 0;
for (let t = bucketStart; t <= maxTime; t += bucketSize) {
let eventIndex = 0;
for (let bucketTime = bucketStart; bucketTime <= maxTime; bucketTime += bucketSize) {
let bucketUsers = new Set(currentlyInUsers);

while (idx < events.length && events[idx].time < t + bucketSize) {
if (events[idx].type === "in") {
currentlyInUsers.add(events[idx].user);
while (eventIndex < events.length && events[eventIndex].time < bucketTime + bucketSize) {
if (events[eventIndex].type === "in") {
currentlyInUsers.add(events[eventIndex].user);
} else {
currentlyInUsers.delete(events[idx].user);
currentlyInUsers.delete(events[eventIndex].user);
}

bucketUsers = bucketUsers.union(currentlyInUsers);

idx++;
eventIndex++;
}

result.push(bucketUsers.size);
Expand Down Expand Up @@ -118,9 +120,9 @@ export async function getDailyReportData(dateRange: [Date, Date]): Promise<Daily

const headcountResult = headcount(processedLogs, { minTime: dateRange[0], maxTime: dateRange[1] });

const headcountData = Array.from({ length: 6 }, (_, row) =>
const headcountData = Array.from({ length: ROWS_PER_COLUMN }, (_, row) =>
Array.from({ length: 24 }, (_, col) => {
const index = row + col * 6;
const index = row + col * ROWS_PER_COLUMN;
return index < headcountResult.length ? headcountResult[index] : 0;
})
);
Expand Down