improve this

dlidstrom · Sep 17, 2022 · d9972a0 · d9972a0
1 parent ff3d813
commit d9972a0
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 19 deletions.
diff --git a/Snittlistan.Web/Areas/V2/Controllers/RosterController.cs b/Snittlistan.Web/Areas/V2/Controllers/RosterController.cs
@@ -48,12 +48,16 @@ public ActionResult Index(int? season)
             Array.Empty<InitialDataViewModel.SelectedTurn>();
         if (User?.CustomIdentity.PlayerId is not null)
         {
-            selectedTurns = rosters
+            Roster[] futureRosters = rosters
                 .Where(x => x.Preliminary == false
                     && x.Date.AddDays(1).Date > SystemTime.UtcNow.ToLocalTime()
                     && x.Players.Contains(User.CustomIdentity.PlayerId))
+                .ToArray();
+            selectedTurns = futureRosters
                 .GroupBy(x => x.Turn)
-                .Select(x => new InitialDataViewModel.SelectedTurn(x.Key))
+                .Select(x => new InitialDataViewModel.SelectedTurn(
+                    x.Key,
+                    x.All(r => r.AcceptedPlayers.Contains(User.CustomIdentity.PlayerId))))
                 .ToArray();
         }
 
@@ -682,7 +686,7 @@ public InitialDataViewModel(
 
         public bool IsFiltered { get; }
 
-        public record SelectedTurn(int Turn);
+        public record SelectedTurn(int Turn, bool Accepted);
 
         public abstract class ScheduledItem
         {

diff --git a/Snittlistan.Web/Areas/V2/Views/Roster/DisplayTemplates/IndexHeader.cshtml b/Snittlistan.Web/Areas/V2/Views/Roster/DisplayTemplates/IndexHeader.cshtml
@@ -31,14 +31,32 @@
     <h3>Välkommen @User.Identity.Name!</h3>
     if (Model.SelectedTurns.Any())
     {
-        <div class="alert alert-block">
-            <span>Du är uttagen till:</span>
-            <ul>
-                @foreach (var selectedRoster in Model.SelectedTurns)
+        <div class="alert alert-success">
+            <strong>Du är uttagen till:</strong>
+            <dl>
+                @foreach (var selectedTurn in Model.SelectedTurns.OrderBy(x => x.Turn))
                 {
-                    <li>Omgång @selectedRoster.Turn</li>
+                    <dt>
+                        @Html.ActionLink(
+                           $"Omgång {selectedTurn.Turn}",
+                           "View",
+                           "Roster",
+                           new { season = Model.SeasonStart, turn = selectedTurn.Turn })
+                    </dt>
+                    if (selectedTurn.Accepted)
+                    {
+                        <dd>
+                            <span class="label label-success">BEKRÄFTAT</span>
+                        </dd>
+                    }
+                    else
+                    {
+                        <dd>
+                            <span class="label label-important">OBEKRÄFTAT</span>
+                        </dd>
+                    }
                 }
-            </ul>
+            </dl>
         </div>
     }
 }

diff --git a/Snittlistan.Web/Areas/V2/Views/Roster/DisplayTemplates/IndexHeader.generated.cs b/Snittlistan.Web/Areas/V2/Views/Roster/DisplayTemplates/IndexHeader.generated.cs
@@ -128,43 +128,73 @@ public override void Execute()
 
             #line default
             #line hidden
-WriteLiteral("        <div class=\"alert alert-block\">\r\n            <span>Du är uttagen till:</s" +
-"pan>\r\n            <ul>\r\n");
+WriteLiteral("        <div class=\"alert alert-success\">\r\n            <strong>Du är uttagen till" +
+":</strong>\r\n            <dl>\r\n");
 
 
 
             #line 37 "..\..\Areas\V2\Views\Roster\DisplayTemplates\IndexHeader.cshtml"
-                 foreach (var selectedRoster in Model.SelectedTurns)
+                 foreach (var selectedTurn in Model.SelectedTurns.OrderBy(x => x.Turn))
                 {
 
 
             #line default
             #line hidden
-WriteLiteral("                    <li>Omgång ");
+WriteLiteral("                    <dt>\r\n                        ");
 
 
 
-            #line 39 "..\..\Areas\V2\Views\Roster\DisplayTemplates\IndexHeader.cshtml"
-                          Write(selectedRoster.Turn);
+            #line 40 "..\..\Areas\V2\Views\Roster\DisplayTemplates\IndexHeader.cshtml"
+                   Write(Html.ActionLink(
+                           $"Omgång {selectedTurn.Turn}",
+                           "View",
+                           "Roster",
+                           new { season = Model.SeasonStart, turn = selectedTurn.Turn }));
 
 
             #line default
             #line hidden
-WriteLiteral("</li>\r\n");
+WriteLiteral("\r\n                    </dt>\r\n");
 
 
 
-            #line 40 "..\..\Areas\V2\Views\Roster\DisplayTemplates\IndexHeader.cshtml"
+            #line 46 "..\..\Areas\V2\Views\Roster\DisplayTemplates\IndexHeader.cshtml"
+                    if (selectedTurn.Accepted)
+                    {
+
+
+            #line default
+            #line hidden
+WriteLiteral("                        <dd>\r\n                            <span class=\"label labe" +
+"l-success\">BEKRÄFTAT</span>\r\n                        </dd>\r\n");
+
+
+
+            #line 51 "..\..\Areas\V2\Views\Roster\DisplayTemplates\IndexHeader.cshtml"
+                    }
+                    else
+                    {
+
+
+            #line default
+            #line hidden
+WriteLiteral("                        <dd>\r\n                            <span class=\"label labe" +
+"l-important\">OBEKRÄFTAT</span>\r\n                        </dd>\r\n");
+
+
+
+            #line 57 "..\..\Areas\V2\Views\Roster\DisplayTemplates\IndexHeader.cshtml"
+                    }
                 }
 
 
             #line default
             #line hidden
-WriteLiteral("            </ul>\r\n        </div>\r\n");
+WriteLiteral("            </dl>\r\n        </div>\r\n");
 
 
 
-            #line 43 "..\..\Areas\V2\Views\Roster\DisplayTemplates\IndexHeader.cshtml"
+            #line 61 "..\..\Areas\V2\Views\Roster\DisplayTemplates\IndexHeader.cshtml"
     }
 }