Skip to content

Commit 54e6eeb

Browse files
rrelyearrelyea
committed
update to support 2025 & 2026 savings limits
1 parent bc7694f commit 54e6eeb

File tree

4 files changed

+37
-23
lines changed

4 files changed

+37
-23
lines changed

‎Pages/Portfolio-Review.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ else
571571
<br />
572572

573573
<label>Target Year:</label>
574-
<select @bind=appData.FamilyData.Year><option>2024</option><option>2025</option></select><br />
574+
<select @bind=appData.FamilyData.Year><option>2025</option><option>2026</option></select><br />
575575

576576
@{
577577
var taxFilers = appData?.IRSData?.TaxRateData?.TaxData?.TaxFilers;

‎Pages/Saving.razor‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Savings@(stepPath==null?" Planner":": "+stepPath.Replace('-',' ')) - MultiFol.io
8181
<div>
8282
<p ><b>Prerequisities:</b></p>
8383
<EditForm Model="familyData" style=margin-left:25px>
84-
<label>Target Year:</label> <select @bind=familyData.Year><option>2024</option><option>2025</option></select><br/>
84+
<label>Target Year:</label> <select @bind=familyData.Year><option>2025</option><option>2026</option></select><br/>
8585
<span>People Details:</span><br/>
8686
<div style=margin-left:25px>
8787
<label>Tax Filing Status:</label>
@@ -613,7 +613,7 @@ Savings@(stepPath==null?" Planner":": "+stepPath.Replace('-',' ')) - MultiFol.io
613613
break;
614614
case 1:
615615
<p ><b>Prerequisities:</b></p>
616-
<label>Target Year:</label> <select @bind=familyData.Year><option>2024</option><option>2025</option></select><br/>
616+
<label>Target Year:</label> <select @bind=familyData.Year><option>2025</option><option>2026</option></select><br/>
617617
<br />
618618

619619
<p><b>Worksheet:</b> </p>
@@ -638,7 +638,7 @@ Savings@(stepPath==null?" Planner":": "+stepPath.Replace('-',' ')) - MultiFol.io
638638
case 2:
639639
<p><b>Prerequisities:</b> </p>
640640
<EditForm Model="familyData" style=margin-left:25px>
641-
<label>Target Year:</label> <select @bind=familyData.Year><option>2024</option><option>2025</option></select><br/>
641+
<label>Target Year:</label> <select @bind=familyData.Year><option>2025</option><option>2026</option></select><br/>
642642

643643
<label>Tax Filing Status:</label> <select @bind=familyData.TaxFilingStatus>
644644
<option value="ChoiceNeeded">ChoiceNeeded</option>
@@ -698,7 +698,7 @@ Savings@(stepPath==null?" Planner":": "+stepPath.Replace('-',' ')) - MultiFol.io
698698
case 4:
699699
<p><b>Prerequisities:</b> </p>
700700
<EditForm Model="familyData" style=margin-left:25px>
701-
<label>Target Year:</label> <select @bind=familyData.Year><option>2024</option><option>2025</option></select><br/>
701+
<label>Target Year:</label> <select @bind=familyData.Year><option>2025</option><option>2026</option></select><br/>
702702

703703
<label>Tax Filing Status:</label> <select @bind=familyData.TaxFilingStatus>
704704
<option value="ChoiceNeeded">ChoiceNeeded</option>
@@ -765,7 +765,7 @@ Savings@(stepPath==null?" Planner":": "+stepPath.Replace('-',' ')) - MultiFol.io
765765
case 5:
766766
<p><b>Prerequisities:</b> </p>
767767
<EditForm Model="familyData" style=margin-left:25px>
768-
<label>Target Year:</label> <select @bind=familyData.Year><option>2024</option><option>2025</option></select><br/>
768+
<label>Target Year:</label> <select @bind=familyData.Year><option>2025</option><option>2026</option></select><br/>
769769

770770
<label>Tax Filing Status:</label> <select @bind=familyData.TaxFilingStatus>
771771
<option value="ChoiceNeeded">ChoiceNeeded</option>
@@ -831,7 +831,7 @@ Savings@(stepPath==null?" Planner":": "+stepPath.Replace('-',' ')) - MultiFol.io
831831
<p><b>Prerequisities:</b> </p>
832832

833833
<EditForm Model="familyData" style=margin-left:25px>
834-
<label>Target Year:</label> <select @bind=familyData.Year><option>2024</option><option>2025</option></select><br/>
834+
<label>Target Year:</label> <select @bind=familyData.Year><option>2025</option><option>2026</option></select><br/>
835835

836836
<label>Tax Filing Status:</label> <select @bind=familyData.TaxFilingStatus>
837837
<option value="ChoiceNeeded">ChoiceNeeded</option>
@@ -874,7 +874,7 @@ Savings@(stepPath==null?" Planner":": "+stepPath.Replace('-',' ')) - MultiFol.io
874874
case 7:
875875
<p><b>Prerequisities:</b> </p>
876876
<EditForm Model="familyData" style=margin-left:25px>
877-
<label>Target Year:</label> <select @bind=familyData.Year><option>2024</option><option>2025</option></select><br/>
877+
<label>Target Year:</label> <select @bind=familyData.Year><option>2025</option><option>2026</option></select><br/>
878878

879879
<label>Tax Filing Status:</label> <select @bind=familyData.TaxFilingStatus>
880880
<option value="ChoiceNeeded">ChoiceNeeded</option>

‎library/Models/FamilyData/FamilyData.cs‎

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ public int PersonCount
754754
if (loadedData != null)
755755
{
756756
loadedData.AppData = appData;
757-
loadedData.Year = 2024;
757+
loadedData.Year = 2025;
758758
loadedData.SetBackPointers();
759759
if (loadedData.TaxFilingStatus == TaxFilingStatus.MarriedFilingSeperatelyAndLivingApart)
760760
{
@@ -1006,17 +1006,10 @@ enum MarketDay
10061006
WeekEnd
10071007
}
10081008

1009+
// holidays and halfDays retrieved from:
1010+
// - https://www.nyse.com/markets/hours-calendars
1011+
10091012
static readonly DateTime[] holidays = [
1010-
new(2024, 1, 1),
1011-
new(2024, 1 , 15),
1012-
new(2024, 2, 19),
1013-
new(2024, 3, 29),
1014-
new(2024, 5, 27),
1015-
new(2024, 6, 19),
1016-
new(2024, 7, 4),
1017-
new(2024, 9, 2),
1018-
new(2024, 11, 28),
1019-
new(2024, 12, 25),
10201013
new(2025, 1, 1),
10211014
new(2025, 1 , 20),
10221015
new(2025, 2, 17),
@@ -1027,15 +1020,36 @@ enum MarketDay
10271020
new(2025, 9, 1),
10281021
new(2025, 11, 27),
10291022
new(2025, 12, 25),
1023+
new(2026, 1, 1),
1024+
new(2026, 1 ,19),
1025+
new(2026, 2, 16),
1026+
new(2026, 4, 3),
1027+
new(2026, 5, 25),
1028+
new(2026, 6, 19),
1029+
new(2026, 7, 3),
1030+
new(2026, 9, 7),
1031+
new(2026, 11, 26),
1032+
new(2026, 12, 25),
1033+
new(2027, 1, 1),
1034+
new(2027, 1 ,18),
1035+
new(2027, 2, 15),
1036+
new(2027, 3, 26),
1037+
new(2027, 5, 31),
1038+
new(2027, 6, 18),
1039+
new(2027, 7, 5),
1040+
new(2027, 9, 6),
1041+
new(2027, 11, 25),
1042+
new(2027, 12, 24),
10301043
];
10311044

10321045
static readonly DateTime[] halfDays = [
1033-
new(2024, 7, 3),
1034-
new(2024, 11, 27),
1035-
new(2024, 12, 24),
10361046
new(2025, 7, 3),
10371047
new(2025, 11, 26),
10381048
new(2025, 12, 24),
1049+
new(2026, 11, 27),
1050+
new(2026, 12, 24),
1051+
new(2027, 11, 26),
1052+
new(2027, 12, 24),
10391053
];
10401054

10411055
private static MarketDay GetMarketDay(DateTime dateTime)

‎library/Models/IRS/IRSData.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace IRS
55
{
66
public class IRSData(RetirementData retirementDataY1, RetirementData retirementDataY2, TaxRateData taxRatesY1, TaxRateData taxRatesY2)
77
{
8-
private static int FIRST_YEAR = 2024;
8+
private static int FIRST_YEAR = 2025;
99
private static int SECOND_YEAR = FIRST_YEAR + 1;
1010

1111
public async static Task<IRSData?> Create(HttpClient httpClient)

0 commit comments

Comments
 (0)