handle percent in the model, not view

rrelyea · rrelyea · commit 4807118505fc · 2024-06-09T12:06:39.000-07:00
diff --git a/Pages/AccountView.razor b/Pages/AccountView.razor
@@ -376,8 +376,8 @@ else if (loaded && appData?.FamilyData is not null)
                             </td>
                             @if (investment.IsIBond)
                             {
-                                <td style=text-align:right>@FormatUtilities.FormatPercent3(investment.InterestRate * 100.0)</td>
-                                <td style=text-align:right>@FormatUtilities.FormatPercent3(investment.CurrentRate * 100.0)</td>
+                                <td style=text-align:right>@FormatUtilities.FormatPercent3(investment.InterestRate)</td>
+                                <td style=text-align:right>@FormatUtilities.FormatPercent3(investment.CurrentRate)</td>
                             }
                             else
                             {
@@ -395,7 +395,7 @@ else if (loaded && appData?.FamilyData is not null)
                                     as of @FormatUtilities.FormatMonthPlus2DigitYear(@investment.NextRateStart):
                                 </td>
                                 <td style=text-align:right>
-                                    @FormatUtilities.FormatPercent3(investment.NextRate * 100.0)
+                                    @FormatUtilities.FormatPercent3(investment.NextRate)
                                 </td>
                                 <td></td>
                             </tr>
diff --git a/Pages/Portfolio.razor b/Pages/Portfolio.razor
@@ -450,8 +450,8 @@ else if (appData is not null && appData.FamilyData is not null)
                                                                 </td>
                                                                 @if (investment.IsIBond)
                                                                 {
-                                                                    <td style=text-align:right>@FormatUtilities.FormatPercent3(investment.InterestRate * 100.0)</td>
-                                                                    <td style=text-align:right>@FormatUtilities.FormatPercent3(investment.CurrentRate * 100.0)</td>
+                                                                    <td style=text-align:right>@FormatUtilities.FormatPercent3(investment.InterestRate)</td>
+                                                                    <td style=text-align:right>@FormatUtilities.FormatPercent3(investment.CurrentRate)</td>
                                                                 }
                                                                 else
                                                                 {
@@ -470,7 +470,7 @@ else if (appData is not null && appData.FamilyData is not null)
                                                                         as of @FormatUtilities.FormatMonthPlus2DigitYear(@investment.NextRateStart):
                                                                     </td>
                                                                     <td style=text-align:right>
-                                                                        @FormatUtilities.FormatPercent3(investment.NextRate * 100.0)
+                                                                        @FormatUtilities.FormatPercent3(investment.NextRate)
                                                                     </td>
                                                                     <td></td>
                                                                 </tr>
diff --git a/library/Models/FamilyData/Investment.cs b/library/Models/FamilyData/Investment.cs
@@ -600,11 +600,11 @@ static string GetRateDate(int month, int year)
                             i--;
                         }
 
-                        InterestRate = rates[0];
-                        CurrentRate = monthsToCompoundThisRound != 6 ? currentRate : rates[i];
+                        InterestRate = rates[0] * 100.0;
+                        CurrentRate = monthsToCompoundThisRound != 6 ? currentRate * 100.0 : rates[i] * 100.0;
                         if (monthsToCompoundThisRound != 6 && i > 0)
                         {
-                            NextRate = rates[i];
+                            NextRate = rates[i] * 100.0;
                             var nextMonthStart = nowMonth + 6 - monthsToCompoundThisRound + 1;
                             var nextYearStart = nowYear;
                             if (nextMonthStart > 12)

Original file line number	Diff line number	Diff line change
`@@ -376,8 +376,8 @@ else if (loaded && appData?.FamilyData is not null)`
`376`	`376`	`</td>`
`377`	`377`	`@if (investment.IsIBond)`
`378`	`378`	`{`
`379`		`- <td style=text-align:right>@FormatUtilities.FormatPercent3(investment.InterestRate * 100.0)</td>`
`380`		`- <td style=text-align:right>@FormatUtilities.FormatPercent3(investment.CurrentRate * 100.0)</td>`
	`379`	`+ <td style=text-align:right>@FormatUtilities.FormatPercent3(investment.InterestRate)</td>`
	`380`	`+ <td style=text-align:right>@FormatUtilities.FormatPercent3(investment.CurrentRate)</td>`
`381`	`381`	`}`
`382`	`382`	`else`
`383`	`383`	`{`
`@@ -395,7 +395,7 @@ else if (loaded && appData?.FamilyData is not null)`
`395`	`395`	`as of @FormatUtilities.FormatMonthPlus2DigitYear(@investment.NextRateStart):`
`396`	`396`	`</td>`
`397`	`397`	`<td style=text-align:right>`
`398`		`- @FormatUtilities.FormatPercent3(investment.NextRate * 100.0)`
	`398`	`+ @FormatUtilities.FormatPercent3(investment.NextRate)`
`399`	`399`	`</td>`
`400`	`400`	`<td></td>`
`401`	`401`	`</tr>`
Original file line number	Diff line number	Diff line change
`@@ -450,8 +450,8 @@ else if (appData is not null && appData.FamilyData is not null)`
`450`	`450`	`</td>`
`451`	`451`	`@if (investment.IsIBond)`
`452`	`452`	`{`
`453`		`- <td style=text-align:right>@FormatUtilities.FormatPercent3(investment.InterestRate * 100.0)</td>`
`454`		`- <td style=text-align:right>@FormatUtilities.FormatPercent3(investment.CurrentRate * 100.0)</td>`
	`453`	`+ <td style=text-align:right>@FormatUtilities.FormatPercent3(investment.InterestRate)</td>`
	`454`	`+ <td style=text-align:right>@FormatUtilities.FormatPercent3(investment.CurrentRate)</td>`
`455`	`455`	`}`
`456`	`456`	`else`
`457`	`457`	`{`
`@@ -470,7 +470,7 @@ else if (appData is not null && appData.FamilyData is not null)`
`470`	`470`	`as of @FormatUtilities.FormatMonthPlus2DigitYear(@investment.NextRateStart):`
`471`	`471`	`</td>`
`472`	`472`	`<td style=text-align:right>`
`473`		`- @FormatUtilities.FormatPercent3(investment.NextRate * 100.0)`
	`473`	`+ @FormatUtilities.FormatPercent3(investment.NextRate)`
`474`	`474`	`</td>`
`475`	`475`	`<td></td>`
`476`	`476`	`</tr>`
Original file line number	Diff line number	Diff line change
`@@ -600,11 +600,11 @@ static string GetRateDate(int month, int year)`
`600`	`600`	`i--;`
`601`	`601`	`}`
`602`	`602`
`603`		`- InterestRate = rates[0];`
`604`		`- CurrentRate = monthsToCompoundThisRound != 6 ? currentRate : rates[i];`
	`603`	`+ InterestRate = rates[0] * 100.0;`
	`604`	`+ CurrentRate = monthsToCompoundThisRound != 6 ? currentRate * 100.0 : rates[i] * 100.0;`
`605`	`605`	`if (monthsToCompoundThisRound != 6 && i > 0)`
`606`	`606`	`{`
`607`		`- NextRate = rates[i];`
	`607`	`+ NextRate = rates[i] * 100.0;`
`608`	`608`	`var nextMonthStart = nowMonth + 6 - monthsToCompoundThisRound + 1;`
`609`	`609`	`var nextYearStart = nowYear;`
`610`	`610`	`if (nextMonthStart > 12)`