@@ -661,26 +817,39 @@
const currentYear = new Date().getFullYear() + year;
const fireTarget = inputs.fireTarget * Math.pow(1 + inputs.inflationRate, year);
const annualSavings = currentIncome * inputs.savingsRate;
- const progress = (netWorth / fireTarget) * 100;
+
+ // Store starting net worth for the year
+ const startingNetWorth = netWorth;
+
+ // Calculate investment return for the year (return on starting net worth + savings)
+ const investmentReturn = (netWorth + annualSavings) * inputs.returnRate;
+
+ // Calculate ending net worth for the year
+ const endingNetWorth = (netWorth + annualSavings) * (1 + inputs.returnRate);
+
+ // Calculate progress based on ending net worth
+ const progress = (endingNetWorth / fireTarget) * 100;
projections.push({
age: age,
year: currentYear,
- netWorth: netWorth,
+ netWorth: endingNetWorth, // Store ENDING net worth
+ startingNetWorth: startingNetWorth, // Keep starting for modal calculation
fireTarget: fireTarget,
progress: progress,
- annualSavings: annualSavings
+ annualSavings: annualSavings,
+ investmentReturn: investmentReturn,
+ annualIncome: currentIncome,
+ returnRate: inputs.returnRate
});
// Project next year's net worth and income
- netWorth = (netWorth + annualSavings) * (1 + inputs.returnRate);
+ netWorth = endingNetWorth; // Next year starts with this year's ending
currentIncome = currentIncome * (1 + inputs.incomeGrowthRate);
}
return projections;
- }
-
- // Find the year FIRE is achieved
+ } // Find the year FIRE is achieved
function findFIREYear(projections) {
return projections.find(p => p.progress >= 100);
}
@@ -749,21 +918,27 @@
function updateTable(projections) {
let tableHTML = '';
- projections.forEach(proj => {
+ projections.forEach((proj, index) => {
const rowClass = proj.progress >= 100 ? 'fire-achieved' : '';
+
tableHTML += `
| ${proj.age} |
${proj.year} |
- ${formatCurrency(proj.netWorth)} |
+ ${formatCurrency(proj.annualIncome)} |
+ ${formatCurrency(proj.annualSavings)} |
+ ${formatCurrency(proj.investmentReturn)} |
+ ${formatCurrency(proj.netWorth)} |
${formatCurrency(proj.fireTarget)} |
${formatPercentage(proj.progress)} |
- ${formatCurrency(proj.annualSavings)} |
`;
});
document.getElementById('projectionTableBody').innerHTML = tableHTML;
+
+ // Store projections globally for modal access
+ window.currentProjections = projections;
}
// Adjust value with quick buttons
@@ -1132,13 +1307,100 @@
});
}
+ // Show Net Worth Calculation Modal
+ function showNetWorthCalculation(index) {
+ const proj = window.currentProjections[index];
+ const modal = document.getElementById('netWorthModal');
+ const content = document.getElementById('modalCalculationContent');
+
+ let calculationHTML = '';
+
+ // All years use the same calculation logic
+ const startNetWorth = proj.startingNetWorth;
+ const withSavings = startNetWorth + proj.annualSavings;
+ const endNetWorth = withSavings * (1 + proj.returnRate);
+ const returnPercent = (proj.returnRate * 100).toFixed(1);
+ const returnMultiplier = (1 + proj.returnRate).toFixed(2);
+
+ calculationHTML = `
+
+
Age ${proj.age} - Year ${proj.year}
+
Showing net worth growth during this year
+
+
+
+
Step 1: Starting Net Worth
+
${formatCurrency(startNetWorth)}
+ ${index === 0 ? '
(Your initial net worth)
' :
+ `
(This is what you ended age ${proj.age - 1} with)
`}
+
+
+
+
Step 2: Add Annual Savings
+
+ ${formatCurrency(proj.annualSavings)}
+
+ From income of ${formatCurrency(proj.annualIncome)}
+
+
+
+
+
Step 3: Subtotal Before Returns
+
= ${formatCurrency(withSavings)}
+
+
+
+
+
+
Final: Ending Net Worth
+
+ ${formatCurrency(endNetWorth)}
+
+
+ (This becomes your starting net worth for age ${proj.age + 1})
+
+
+
+
+
💡 Understanding the Formula
+
+ Net Worth (End) = (Net Worth (Start) + Annual Savings) × (1 + Return Rate)
+
+
+ `;
+
+ content.innerHTML = calculationHTML;
+ modal.style.display = 'flex';
+
+ // Close modal when clicking outside
+ modal.onclick = function(event) {
+ if (event.target === modal) {
+ closeNetWorthModal();
+ }
+ };
+ }
+
+ // Close Net Worth Calculation Modal
+ function closeNetWorthModal() {
+ document.getElementById('netWorthModal').style.display = 'none';
+ }
+
+ // Close modal with Escape key
+ document.addEventListener('keydown', function(event) {
+ if (event.key === 'Escape') {
+ closeNetWorthModal();
+ }
+ });
+
// Reset form
function resetForm() {
document.getElementById('currentAge').value = 35;
document.getElementById('targetAge').value = 50;
- document.getElementById('currentNetWorth').value = 300000;
+ document.getElementById('currentNetWorth').value = 200000;
document.getElementById('totalNetWorth').value = 900000;
- document.getElementById('annualExpenses').value = 150000;
+ document.getElementById('annualExpenses').value = 130000;
document.getElementById('annualIncome').value = 300000;
document.getElementById('savingsRate').value = 40;
document.getElementById('returnRate').value = 8;