diff --git a/public/home.js b/public/home.js
index dacb45d..a3974cd 100644
--- a/public/home.js
+++ b/public/home.js
@@ -139,6 +139,7 @@ async function updateHighest() {
Name |
Team |
Contract |
+ Annual Salary |
`;
tableHeader.appendChild(headerRow);
@@ -156,7 +157,8 @@ async function updateHighest() {
${player.Position} |
${player.PlayerName} |
${player.Team} |
- ${formatSalary(player.TotalValue)} |
+ ${formatSalary(player.TrueAvgPerYear * player.Years)} |
+ ${formatSalary(player.TrueAvgPerYear)} |
`;
tableBody.appendChild(row);
});
diff --git a/public/player.js b/public/player.js
index c853476..31b409b 100644
--- a/public/player.js
+++ b/public/player.js
@@ -112,7 +112,7 @@ async function createOverviewTable(playerObject) {
//});pass_attempts, complete_pass, total_yards, total_tds, interception, receptions, receiving_yards, receiving_touchdown, rush_attempts, rushing_yards, rush_touchdown, fumble
headerRow.innerHTML += `
Contract |
- APY |
+ Annual Salary |
Years |
Duration |
`;
diff --git a/public/utils.js b/public/utils.js
index 5d9d394..077a704 100644
--- a/public/utils.js
+++ b/public/utils.js
@@ -12,7 +12,8 @@ export function formatSalary(text) {
if (text == null) return "—";
try {
- var millions = (parseInt(text, 10) / 1000000).toFixed(2);
+ //vah=r millions = (parseInt(text, 10) / 1000000).toFixed(2);
+ let millions = Math.round(parseInt(text, 10) / 1000000);
return `$${millions} million`;
} catch (e) {
return "Unknown format"
diff --git a/server.js b/server.js
index 5f28345..8bc74ac 100644
--- a/server.js
+++ b/server.js
@@ -180,7 +180,7 @@ app.post("/getHighest", authenticate, async (req, res) => {
const result = await pool.request()
.input("amount", sql.Int, amount)
.query(`
- SELECT TOP (@amount) p.PlayerID, p.PlayerName, p.[Position], p.Team, TotalValue
+ SELECT TOP (@amount) p.PlayerID, p.PlayerName, p.[Position], p.Team, TotalValue, TrueAvgPerYear, Years
FROM Player AS p JOIN Contract AS c ON p.PlayerID = c.PlayerID
ORDER BY TotalValue DESC;
`);