Больше ссылочек на группы хороших и разных (#3047)

Author: leotsarev

src/JoinRpg.Domain/CharacterFields/FieldWithValue.cs

@@ -66,7 +66,7 @@ public IEnumerable<ProjectFieldVariant> GetPossibleValues(AccessArguments modelA
 
     public IEnumerable<ProjectFieldVariant> GetDropdownValues() => Field.SortedVariants.Where(v => SelectedIds.Contains(v.Id.ProjectFieldVariantId));
 
-    public IEnumerable<int> GetSpecialGroupsToApply() => Field.HasSpecialGroup ? GetDropdownValues().Select(c => c.CharacterGroupId).WhereNotNull() : Enumerable.Empty<int>();
+    public IEnumerable<int> GetSpecialGroupsToApply() => Field.HasSpecialGroup ? GetDropdownValues().Select(c => c.CharacterGroupId).WhereNotNull() : [];
 
     public override string ToString() => $"{Field.Name}={Value}";
 

src/JoinRpg.Portal/Views/CharacterList/_CharacterList.cshtml

@@ -5,7 +5,7 @@
 @using JoinRpg.Web.Models.Characters
 @model CharacterListViewModel
 @{
-  ViewBag.CountString = Html.DisplayCount_OfX(Model.Items.Count(), "персонаж", "персонажа", "персонажей");
+    ViewBag.CountString = Html.DisplayCount_OfX(Model.Items.Count(), "персонаж", "персонажа", "персонажей");
 }
 
 @await Html.PartialAsync("_ListOperationsDropdown", Model)
@@ -32,14 +32,14 @@
         <th>@Html.DisplayNameFor(model => firstItem!.Problems)</th>
         @foreach (var field in Model.Fields)
         {
-          if (!field.CanHaveValue)
-          {
+            if (!field.CanHaveValue)
+            {
                 <th>&nbsp;</th>
-          }
-          else
-          {
-              <th>@field.Name</th>
-          }
+            }
+            else
+            {
+                <th>@field.Name</th>
+            }
         }
 
     </tr>
@@ -55,9 +55,9 @@
             <td>
                 @if (item.Player is not null)
                 {
-                   <text>
-                    @Html.DisplayFor(modelItem => item.Player) (@Html.ActionLink("заявка", "Edit", "Claim", new { Model.ProjectId, ClaimId = item.ApprovedClaimId }, null))
-                   </text>
+                    <text>
+                        @Html.DisplayFor(modelItem => item.Player) (@Html.ActionLink("заявка", "Edit", "Claim", new { Model.ProjectId, ClaimId = item.ApprovedClaimId }, null))
+                    </text>
                 }
                 else
                 {
@@ -79,12 +79,12 @@
             {
                 <td>
                     @Html.DisplayFor(model => item.Groups)
-              </td>
+                </td>
             }
             <td>
                 @foreach (var pr in item.Problems)
                 {
-                  @Html.DisplayFor(model => pr)
+                    @Html.DisplayFor(model => pr)
                 }
             </td>
 
@@ -96,11 +96,31 @@
                 }
                 else
                 {
-                  var fieldValueViewModel = item.Fields.SingleOrDefault(f => f.Field.Id.ProjectFieldId == field.Id.ProjectFieldId);
+                    var fieldValueViewModel = item.Fields.SingleOrDefault(f => f.Field.Id.ProjectFieldId == field.Id.ProjectFieldId);
                     <td>
                         @if (fieldValueViewModel != null)
                         {
+                            if (fieldValueViewModel.Field.HasValueList)
+                            {
+                                var sep = "";
+                                foreach (var variant in fieldValueViewModel.GetDropdownValues())
+                                {
+                                    @sep
+                                    if (variant.CharacterGroupId is int characterGroupId)
+                                    {
+                                        <a asp-controller="CharacterList" asp-action="ByGroup" asp-route-ProjectId="@Model.ProjectId" asp-route-CharacterGroupId="@characterGroupId">@variant.Label</a>
+                                    }
+                                    else
+                                    {
+                                        @variant.Label
+                                    }
+                                    sep = " • ";
+                                }
+                          }
+                          else
+                          {
                             @fieldValueViewModel.DisplayString
+                          }
                         }
                     </td>
                 }

src/JoinRpg.Portal/Views/Shared/EditorTemplates/FieldValueViewModel.cshtml

@@ -210,7 +210,7 @@
         foreach (var value in Model.ValueList.Where(v => v.SpecialGroupId != null))
         {
           @sep
-          Html.ActionLink(value.Label, "Details", "GameGroups", new { Model.ProjectId, CharacterGroupId = value.SpecialGroupId }, null);
+          <a asp-controller="GameGroups" asp-action="Details" asp-route-ProjectId="@Model.ProjectId" asp-route-CharacterGroupId="@value.SpecialGroupId">@value.Label</a>
           sep = " • ";
         }
       }