improve portfolio table - account + account type columns

multifol-io · Jun 19, 2023 · 843c1a1 · 843c1a1
1 parent 60dfb35
commit 843c1a1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/Pages/Portfolio-Review.razor b/Pages/Portfolio-Review.razor
@@ -650,7 +650,6 @@ Portfolio Review@(stepPath==null?"":": "+stepPath.Replace('-',' ')) - bogle.tool
                                                 <option>Solo 401k</option>
                                                 <option>Taxable</option>
                                                 <option>Traditional IRA</option>
-                                                <option>Treasury Direct</option>
                                             </select>
                                             <span> at <input style="width:140px" type=text @bind-Value=account.Custodian @bind-Value:event=oninput placeholder='custodian' /></span><br/>
                                             <span><label for=@accountId>Note: </label><input id=@accountId type=text @bind-value=account.Note @bind-value:event=oninput placeholder='account note'/></span>

diff --git a/Pages/Portfolio.razor b/Pages/Portfolio.razor
@@ -155,19 +155,21 @@ Portfolio@(stepPath==null?": review":": "+stepPath.Replace('-',' ')) - bogle.too
                                         <table>
                                             <tr>
                                                 <th>Account</th>
-                                                <th>Ticker</th>
-                                                <th>$ / share</th>
-                                                <th>Shares</th>
-                                                <th>Value</th>
+                                                <th style=padding-left:8px>Type</th>
+                                                <th style=padding-left:8px>Ticker</th>
+                                                <th style=padding-left:8px>$ / share</th>
+                                                <th style=padding-left:8px>Shares</th>
+                                                <th style=padding-left:8px>$ Value</th>
                                             </tr>
                                             @foreach (var account in familyData.Accounts) {
                                                 @foreach (var investment in account.Investments) {
                                                     <tr>
-                                                        <td>@((MarkupString)((account.Identifier != null ? "<span>"+account.Identifier+"&nbsp;</span>" : "") + account.AccountType + (account.Custodian != null ? " at " + account.Custodian : "")))</td>
-                                                        <td title=@investment.Name>@investment.Ticker</td>
-                                                        <td style=text-align:right;padding-left:5px>@investment.Price</td>
-                                                        <td style=text-align:right;padding-left:5px>@investment.Shares</td>
-                                                        <td style=text-align:right;padding-left:5px>@investment.Value</td>
+                                                        <td>@((account.Custodian != null ? account.Custodian + " ": "")+ account.Note)</td>
+                                                        <td style=padding-left:8px>@((MarkupString)((account.Identifier != null ? "<span>"+account.Identifier+"&nbsp;</span>" : "") + account.AccountType))</td>
+                                                        <td style=padding-left:8px title=@investment.Name>@investment.Ticker</td>
+                                                        <td style=text-align:right;padding-left:8px>@formatDoubleTwoDecimal(investment.Price)</td>
+                                                        <td style=text-align:right;padding-left:8px>@formatDoubleFourDecimal(investment.Shares)</td>
+                                                        <td style=text-align:right;padding-left:8px>@formatDoubleTwoDecimal(investment.Value)</td>
                                                     </tr>
                                                 }
                                             }
@@ -500,7 +502,6 @@ Portfolio@(stepPath==null?": review":": "+stepPath.Replace('-',' ')) - bogle.too
                                                 <option>Solo 401k</option>
                                                 <option>Taxable</option>
                                                 <option>Traditional IRA</option>
-                                                <option>Treasury Direct</option>
                                             </select>
                                             <span> at <input style="width:140px" type=text @bind-Value=account.Custodian @bind-Value:event=oninput placeholder='custodian' /></span><br/>
                                             <span><label for=@accountId>Note: </label><input id=@accountId type=text @bind-value=account.Note @bind-value:event=oninput placeholder='account note'/></span>
@@ -765,6 +766,14 @@ Portfolio@(stepPath==null?": review":": "+stepPath.Replace('-',' ')) - bogle.too
     {
         return String.Format("${0:#,0.##}", amount);
     }
+    public string formatDoubleTwoDecimal(double? amount) 
+    {
+        return String.Format("{0:#,0.00}", amount);
+    }
+    public string formatDoubleFourDecimal(double? amount) 
+    {
+        return String.Format("{0:#,0.0000}", amount);
+    }
     public string formatMoneyThousands(double? amount) 
     {
         if (amount == null) return "";

diff --git a/Shared/Models/FamilyData/Importer.cs b/Shared/Models/FamilyData/Importer.cs
@@ -204,7 +204,7 @@ public static async Task<List<Account>> ImportCSV(string[] lines, IList<Fund> fu
                         {
                             newAccount = new() {
                                 Custodian = "Fidelity",
-                                Note = "*"+ accountNumber.Substring(accountNumber.Length-4,4) + " " + accountName
+                                Note = "*"+ accountNumber.Substring(accountNumber.Length-4,4)
                             };
                             newAccount.GuessAccountType();
                             importedAccounts.Add(newAccount);