Skip to content

Commit 6822739

Browse files
committed
fixes
1 parent d176a90 commit 6822739

File tree

3 files changed

+47
-30
lines changed

3 files changed

+47
-30
lines changed

Snittlistan.Web/Areas/V2/Controllers/RosterController.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,13 @@ public ActionResult Index(int? season)
4444
Roster[] rosters = CompositionRoot.DocumentSession.Query<Roster, RosterSearchTerms>()
4545
.Where(r => r.Season == season)
4646
.ToArray();
47-
InitialDataViewModel.SelectedTurn[] selectedTurns = Array.Empty<InitialDataViewModel.SelectedTurn>();
47+
InitialDataViewModel.SelectedTurn[] selectedTurns =
48+
Array.Empty<InitialDataViewModel.SelectedTurn>();
4849
if (User?.CustomIdentity.PlayerId is not null)
4950
{
5051
selectedTurns = rosters
51-
.Where(x => x.Players.Contains(User.CustomIdentity.PlayerId))
52+
.Where(x => x.Preliminary == false
53+
&& x.Players.Contains(User.CustomIdentity.PlayerId))
5254
.GroupBy(x => x.Turn)
5355
.Select(x => new InitialDataViewModel.SelectedTurn(x.Key))
5456
.ToArray();

Snittlistan.Web/Areas/V2/Views/Roster/DisplayTemplates/IndexHeader.cshtml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,21 @@
2626
</div>
2727
</div>
2828

29-
<h3>Välkommen @User.Identity.Name!</h3>
30-
@if (Model.SelectedTurns.Any())
29+
@if (Request.IsAuthenticated)
3130
{
32-
<div class="alert alert-block">
33-
<span>Du är uttagen till:</span>
34-
<ul>
35-
@foreach (var selectedRoster in Model.SelectedTurns)
36-
{
37-
<li>Omgång @selectedRoster.Turn</li>
38-
}
39-
</ul>
40-
</div>
31+
<h3>Välkommen @User.Identity.Name!</h3>
32+
if (Model.SelectedTurns.Any())
33+
{
34+
<div class="alert alert-block">
35+
<span>Du är uttagen till:</span>
36+
<ul>
37+
@foreach (var selectedRoster in Model.SelectedTurns)
38+
{
39+
<li>Omgång @selectedRoster.Turn</li>
40+
}
41+
</ul>
42+
</div>
43+
}
4144
}
4245

4346
<hr />

Snittlistan.Web/Areas/V2/Views/Roster/DisplayTemplates/IndexHeader.generated.cs

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -96,45 +96,56 @@ public override void Execute()
9696
#line hidden
9797
WriteLiteral("\">\r\n <i class=\"sprite-glyphicons_045_calendar\"></i>\r\n " +
9898
" Lägg till i din kalender\r\n </a>\r\n </div>\r\n </div>\r\n</div" +
99-
">\r\n\r\n<h3>Välkommen ");
99+
">\r\n\r\n");
100100

101101

102102

103103
#line 29 "..\..\Areas\V2\Views\Roster\DisplayTemplates\IndexHeader.cshtml"
104-
Write(User.Identity.Name);
104+
if (Request.IsAuthenticated)
105+
{
105106

106107

107108
#line default
108109
#line hidden
109-
WriteLiteral("!</h3>\r\n");
110+
WriteLiteral(" <h3>Välkommen ");
110111

111112

112113

113-
#line 30 "..\..\Areas\V2\Views\Roster\DisplayTemplates\IndexHeader.cshtml"
114-
if (Model.SelectedTurns.Any())
115-
{
114+
#line 31 "..\..\Areas\V2\Views\Roster\DisplayTemplates\IndexHeader.cshtml"
115+
Write(User.Identity.Name);
116116

117117

118118
#line default
119119
#line hidden
120-
WriteLiteral(" <div class=\"alert alert-block\">\r\n <span>Du är uttagen till:</span>\r\n " +
121-
" <ul>\r\n");
120+
WriteLiteral("!</h3>\r\n");
122121

123122

124123

125-
#line 35 "..\..\Areas\V2\Views\Roster\DisplayTemplates\IndexHeader.cshtml"
126-
foreach (var selectedRoster in Model.SelectedTurns)
127-
{
124+
#line 32 "..\..\Areas\V2\Views\Roster\DisplayTemplates\IndexHeader.cshtml"
125+
if (Model.SelectedTurns.Any())
126+
{
128127

129128

130129
#line default
131130
#line hidden
132-
WriteLiteral(" <li>Omgång ");
131+
WriteLiteral(" <div class=\"alert alert-block\">\r\n <span>Du är uttagen till:</s" +
132+
"pan>\r\n <ul>\r\n");
133133

134134

135135

136136
#line 37 "..\..\Areas\V2\Views\Roster\DisplayTemplates\IndexHeader.cshtml"
137-
Write(selectedRoster.Turn);
137+
foreach (var selectedRoster in Model.SelectedTurns)
138+
{
139+
140+
141+
#line default
142+
#line hidden
143+
WriteLiteral(" <li>Omgång ");
144+
145+
146+
147+
#line 39 "..\..\Areas\V2\Views\Roster\DisplayTemplates\IndexHeader.cshtml"
148+
Write(selectedRoster.Turn);
138149

139150

140151
#line default
@@ -143,17 +154,18 @@ public override void Execute()
143154

144155

145156

146-
#line 38 "..\..\Areas\V2\Views\Roster\DisplayTemplates\IndexHeader.cshtml"
147-
}
157+
#line 40 "..\..\Areas\V2\Views\Roster\DisplayTemplates\IndexHeader.cshtml"
158+
}
148159

149160

150161
#line default
151162
#line hidden
152-
WriteLiteral(" </ul>\r\n </div>\r\n");
163+
WriteLiteral(" </ul>\r\n </div>\r\n");
153164

154165

155166

156-
#line 41 "..\..\Areas\V2\Views\Roster\DisplayTemplates\IndexHeader.cshtml"
167+
#line 43 "..\..\Areas\V2\Views\Roster\DisplayTemplates\IndexHeader.cshtml"
168+
}
157169
}
158170

159171

0 commit comments

Comments
 (0)