feat: display amount of awarded bonus points on home page

Author: FreekBes

src/routes/home.ts

@@ -98,6 +98,47 @@ export const setupHomeRoutes = function(app: Express, prisma: PrismaClient): voi
 			rankings[rankingType.type] = await getRanking(prisma, rankingType.type);
 		}
 
+		// Calculate when the bonus points awarding will start (7 days prior to end of the bloc)
+		const bonusPointsAwardingStartTime = currentBlocDeadline ? new Date(currentBlocDeadline.end_at.getTime() - 7 * 24 * 60 * 60 * 1000) : null;
+		const bonusPointsAwardingStarted = bonusPointsAwardingStartTime ? (now >= bonusPointsAwardingStartTime) : false;
+		const rankingBonusPoints: { [key: string]: {
+			total: number;
+			awarded: number;
+			remaining: number;
+		} } = {};
+		if (bonusPointsAwardingStartTime && bonusPointsAwardingStarted) {
+			// Calculate how many bonus points are left to award per ranking type
+			for (const rankingType of rankingTypes) {
+				const totalBonusPoints = rankingType.bonus_points;
+				if (!totalBonusPoints || totalBonusPoints <= 0) {
+					continue;
+				}
+				const bonusPointsPerHour = totalBonusPoints / (7 * 24);
+				// Bonus points are awarded every hour during the last 7 days
+				const awardedBonusPoints = Math.floor(((now.getTime() - bonusPointsAwardingStartTime.getTime()) / (60 * 60 * 1000)) * bonusPointsPerHour);
+				const remainingBonusPoints = totalBonusPoints - awardedBonusPoints;
+				rankingBonusPoints[rankingType.type] = {
+					total: totalBonusPoints,
+					awarded: Math.min(awardedBonusPoints, totalBonusPoints),
+					remaining: Math.max(remainingBonusPoints, 0),
+				};
+			}
+		}
+		else {
+			// No bonus points have been awarded yet
+			for (const rankingType of rankingTypes) {
+				const totalBonusPoints = rankingType.bonus_points;
+				if (!totalBonusPoints || totalBonusPoints <= 0) {
+					continue;
+				}
+				rankingBonusPoints[rankingType.type] = {
+					total: totalBonusPoints,
+					awarded: 0,
+					remaining: totalBonusPoints,
+				};
+			}
+		}
+
 		// Check if quiz is currently available
 		const quiz_available = await isQuizAvailable(user, prisma);
 
@@ -112,6 +153,8 @@ export const setupHomeRoutes = function(app: Express, prisma: PrismaClient): voi
 			sortedCoalitionScores,
 			rankingTypes,
 			rankings,
+			bonusPointsAwardingStarted,
+			rankingBonusPoints,
 		});
 	});
 

templates/home.njk

@@ -60,7 +60,16 @@
 					</div>
 					<div class="card-body p-0">
 						<p class="p-4 pb-0 mb-0"><b>{{ rankingType.description | striptags(true) | escape | nl2br }}</b></p>
-						<p class="p-4 pt-0 mb-0"><small>{{ (rankingType.bonus_points / 168) | round(0, 'floor') }} bonus points will be awarded to #1 <i>every hour</i> during the <i>final week of the season</i>!</small></p>
+						{% if bonusPointsAwardingStarted and rankingBonusPoints[rankingType.type] %}
+							<!-- bonus points awarded progress bar -->
+							<p>&nbsp;</p>
+							<div class="progress mb-2" role="progressbar" aria-label="Bonus points awarded for {{ rankingType.name }}" aria-valuenow="{{ rankingBonusPoints[rankingType.type].awarded }}" aria-valuemin="0" aria-valuemax="{{ rankingBonusPoints[rankingType.type].total }}">
+								<div class="progress-bar" style="width: {{ (rankingBonusPoints[rankingType.type].awarded / rankingBonusPoints[rankingType.type].total) * 100 }}%; background-color: var(--bs-yellow);"></div>
+							</div>
+							<p style="text-align: center;"><b>Bonus points awarding is ongoing!</b> {{ rankingBonusPoints[rankingType.type].awarded | thousands }} out of {{ rankingBonusPoints[rankingType.type].total | thousands }} bonus points awarded, with {{ rankingBonusPoints[rankingType.type].remaining | thousands }} remaining. Bonus points are awarded <i>every hour</i> until the end of the season.</p>
+						{% else %}
+							<p class="p-4 pt-0 mb-0"><small>{{ (rankingType.bonus_points / 168) | round(0, 'floor') }} bonus points will be awarded to #1 <i>every hour</i> during the <i>final week of the season</i>!</small></p>
+						{% endif %}
 						<table class="table coalition-colored mb-0">
 							<tbody>
 								{% for ranking in rankings[rankingType.type] %}