Skip to content

Fix currency calculation #475

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

Open
UCYT5040 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix currency calculation #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f586b2c
Fix currency calculation counting unapproved projects within the top …
UCYT5040 Jul 17, 2025
6bf29e0
Also fix currency calculation for the client
UCYT5040 Jul 18, 2025
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
28 changes: 25 additions & 3 deletions lib/project-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,20 @@ export function calculateProgressMetrics(projects: any[], purchasedProgressHours
});


// Get top 4 approved projects for currency calculation
const top4ApprovedProjects = top4Projects.filter(({project}) => getProjectApprovedHours(project) > 0).slice(0, 4);
const top4ApprovedProjectIds = new Set(top4ApprovedProjects.map(({project}) => project.projectID));

// Calculate how many approved hours the user is missing from their top 4 projects
let missingApprovedHours = 0;
top4Projects.forEach(({project}) => {
const approvedHours = getProjectApprovedHours(project);
if (approvedHours < 15) {
missingApprovedHours += (15 - approvedHours);
}
});

const phi = (1 + Math.sqrt(5)) / 2;
const top4ProjectIds = new Set(top4Projects.map(({ project }) => project.projectID));

allProjectsWithHours.forEach(({ project, hours }) => {
rawHours += hours;
Expand All @@ -120,14 +132,24 @@ export function calculateProgressMetrics(projects: any[], purchasedProgressHours


if (approvedHours > 0) {
if (top4ProjectIds.has(project.projectID)) {
if (top4ApprovedProjectIds.has(project.projectID)) {
// Top 4 projects: beyond 15 hours
if (approvedHours > 15) {
currency += (approvedHours - 15) * (phi * 10);
}
} else {
// All other shipped projects
currency += approvedHours * (phi * 10);
let validProjectHours;
// If the user is missing approved hours from their top 4 approved projects
if (missingApprovedHours > 0) {
// Add any overflow to the currency
validProjectHours = Math.min(approvedHours - missingApprovedHours, 0);
// Reduce missing approved hours by the project hours
missingApprovedHours = Math.max(0, missingApprovedHours - approvedHours);
} else {
validProjectHours = approvedHours;
}
currency += validProjectHours * (phi * 10);
}
}
}
Expand Down
27 changes: 24 additions & 3 deletions lib/project.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,9 +348,20 @@ export function calculateProgressMetrics(projects: any[]): ProgressMetrics {
}
});

// Get top 4 approved projects for currency calculation
const top4ApprovedProjects = top4Projects.filter(({project}) => getProjectApprovedHours(project) > 0).slice(0, 4);
const top4ApprovedProjectIds = new Set(top4ApprovedProjects.map(({project}) => project.projectID));

// Calculate how many approved hours the user is missing from their top 4 projects
let missingApprovedHours = 0;
top4Projects.forEach(({project}) => {
const approvedHours = getProjectApprovedHours(project);
if (approvedHours < 15) {
missingApprovedHours += (15 - approvedHours);
}
});

const phi = (1 + Math.sqrt(5)) / 2;
const top4ProjectIds = new Set(top4Projects.map(({ project }) => project.projectID));

allProjectsWithHours.forEach(({ project, hours }) => {
rawHours += hours;
Expand All @@ -361,14 +372,24 @@ export function calculateProgressMetrics(projects: any[]): ProgressMetrics {


if (approvedHours > 0) {
if (top4ProjectIds.has(project.projectID)) {
if (top4ApprovedProjectIds.has(project.projectID)) {
// Top 4 projects: beyond 15 hours
if (approvedHours > 15) {
currency += (approvedHours - 15) * (phi * 10);
}
} else {
// All other shipped projects
currency += approvedHours * (phi * 10);
let validProjectHours;
// If the user is missing approved hours from their top 4 approved projects
if (missingApprovedHours > 0) {
// Add any overflow to the currency
validProjectHours = Math.min(approvedHours - missingApprovedHours, 0);
// Reduce missing approved hours by the project hours
missingApprovedHours = Math.max(0, missingApprovedHours - approvedHours);
} else {
validProjectHours = approvedHours;
}
currency += validProjectHours * (phi * 10);
}
}
}
Expand Down