Merge pull request #1566 from leotsarev/bug/charslots

A lot of bug fixes to charslots

Author: leotsarev

src/JoinRpg.Dal.Impl/Repositories/CharacterRepositoryImpl.cs

@@ -88,7 +88,7 @@ public async Task<CharacterView> GetCharacterViewAsync(int projectId, int charac
                 UpdatedAt = character.UpdatedAt,
                 IsActive = character.IsActive,
                 InGame = character.InGame,
-                CharacterTypeInfo = new(character.IsAvailable ? CharacterType.Player : CharacterType.NonPlayer, character.IsHot, character.CharacterSlotLimit),
+                CharacterTypeInfo = new(character.CharacterType, character.IsHot, character.CharacterSlotLimit),
                 JsonData = character.JsonData,
                 ApprovedClaim = await Ctx.Set<Claim>()
                     .Where(claim => claim.CharacterId == characterId &&

src/JoinRpg.Portal/Views/GameGroups/_CharacterPartial.cshtml

@@ -30,7 +30,13 @@
     @if (Model.IsAvailable)
     {
         <text>&nbsp;</text>
-        @Html.ActionLink("заявиться", "AddForCharacter", "Claim", new { Model.ProjectId, Model.CharacterId }, new { @class = "btn btn-default btn-xs" })
+        <a asp-controller="Claim" asp-action="AddForCharacter" asp-route-projectid="@Model.ProjectId" asp-route-characterId="@Model.CharacterId" class="btn btn-default btn-xs">
+          заявиться
+          @if (Model.SlotLimit is not null)
+          {
+            <text>&nbsp; (@Model.SlotLimit мест)</text>
+          }
+        </a>
         if (Model.IsHot)
         {
             <span class="label label-warning">Горячая роль</span>

src/JoinRpg.Web.CharacterGroups/CharacterTypeSelector.razor

@@ -13,7 +13,7 @@
 @if (characterType == CharacterTypeView.Slot)
 {
   <FormRow Label="Лимит персонажей в слоте" Description="Оставьте пустым, чтобы не ограничивать число персонажей, которые могут быть созданы из этого слота.">
-    <NumberInput @bind-Value="@characterSlotLimit" name="@(Name + ".SlotLimit")" />
+    <NumberInput @bind-Value="@characterSlotLimit" name="@(Name + ".SlotLimit")" Min="0"/>
   </FormRow>
 }
 

src/JoinRpg.WebComponents/NumberInput.razor

@@ -1,15 +1,21 @@
-<input type="number" class="form-control" @onchange="UpdateValue" name="@Name" value="@Value"/>
+<input type="number" class="form-control" @onchange="UpdateValue" name="@Name" value="@Value" min="@Min" max="@Max"/>
 
   @code {
       [Parameter]
-      public int? Value { get; set; } 
+      public int? Value { get; set; }
 
       [Parameter]
       public EventCallback<int?> ValueChanged { get; set; }
 
       [Parameter]
       public string Name { get; set; } = null!;
 
+      [Parameter]
+      public int? Min { get; set; }
+
+      [Parameter]
+      public int? Max { get; set; }
+
       private async Task UpdateValue(ChangeEventArgs eventArgs)
       {
         var value = eventArgs.Value?.ToString();

src/JoinRpg.WebPortal.Models/Characters/CharacterGroupListViewModel.cs

@@ -126,7 +126,8 @@ private CharacterViewModel GenerateCharacter(Character arg, CharacterGroup group
                     CharacterId = arg.CharacterId,
                     CharacterName = arg.CharacterName,
                     IsFirstCopy = !AlreadyOutputedChars.Contains(arg.CharacterId),
-                    IsAvailable = arg.IsAvailable,
+                    IsAvailable = arg.IsAvailable && arg.CharacterSlotLimit != 0,
+                    SlotLimit = arg.CharacterSlotLimit,
                     Description = arg.Description.ToHtmlString(),
                     IsPublic = arg.IsPublic,
                     IsActive = arg.IsActive,

src/JoinRpg.WebPortal.Models/Characters/CharacterViewModel.cs

@@ -18,6 +18,8 @@ public class CharacterViewModel :
 
         public bool IsAvailable { get; set; }
 
+        public int? SlotLimit { get; set; }
+
         public JoinHtmlString Description { get; set; }
 
         public bool IsPublic { get; set; }