Make links uniform in schedule (#1611)

Author: leotsarev

src/JoinRpg.Portal/Views/ShowSchedule/_AppointmentPartial.cshtml

@@ -14,7 +14,7 @@
         classNames += " appointment-all-rooms";
     }
     classNames += Model.Users.Count == 0 ? " appointment-no-users" : " appointment-has-users";
-    string url = Url.Action(Model.ErrorType.HasValue ? "Edit" : "Details", "Character", new { projectId = Model.ProjectId, characterId = Model.CharacterId });
+    string url = Url.Action("Details", "Character", new { projectId = Model.ProjectId, characterId = Model.CharacterId });
     string style = Model.ErrorMode
         ? string.Format("max-width: {0}px; height: {1}px;", Model.Width * 2, Model.ErrorType == AppointmentErrorType.NotLocated ? Model.Height + Model.Height / 2 : Model.Height)
         : string.Format("left: {0}px; top: {1}px; width: {2}px; height: {3}px", Model.Left, Model.Top, Model.Width - 1, Model.Height - 1);
@@ -34,7 +34,14 @@
      error-mode="@((Model.ErrorType == AppointmentErrorType.Intersection).ToString())"
      errors="@(Model.ErrorType.HasValue ? Model.ErrorType?.GetDisplayName() : "")">
     <div class="appointment-interior" title="@title">
-        <div class="appointment-header"><a href="@url" target="@target">@Model.DisplayName</a></div>
+        <div class="appointment-header">
+          <a asp-action="Details" asp-controller="Character" asp-route-ProjectId="@Model.ProjectId" asp-route-characterId="@Model.CharacterId" target="@target">@Model.DisplayName</a>
+          @if (Model.HasMasterAccess)
+          {
+              <a asp-action="Edit" asp-controller="Character" asp-route-ProjectId="@Model.ProjectId" asp-route-characterId="@Model.CharacterId">(ред.)</a>
+          }
+        </div>
+        
         @if (Model.ErrorType == AppointmentErrorType.NotLocated)
         {
             <div class="appointment-rooms"><b>Комнаты:</b> @if (Model.Rooms.Count > 0) { @(Model.AllRooms ? "все" : rooms) } else { <b class="text-danger">нет</b> }</div>

src/JoinRpg.WebPortal.Managers/Schedule/SchedulePageManager.cs

@@ -43,14 +43,15 @@ public async Task<SchedulePageViewModel> GetSchedule()
             };
 
             MergeSlots(viewModel);
-            BuildAppointments(viewModel);
+            BuildAppointments(project, viewModel);
 
             return viewModel;
         }
 
-        private void BuildAppointments(SchedulePageViewModel viewModel)
+        private void BuildAppointments(Project project, SchedulePageViewModel viewModel)
         {
             var result = new List<AppointmentViewModel>(64);
+            var hasMasterAccess = project.HasMasterAccess(CurrentUserAccessor.UserId);
 
             for (var i = 0; i < viewModel.Rows.Count; i++)
             {
@@ -65,6 +66,7 @@ private void BuildAppointments(SchedulePageViewModel viewModel)
 
                     var rowIndex = i;
                     var colIndex = j;
+
                     var appointment = new AppointmentViewModel(() => new Rect
                     {
                         Left = colIndex * viewModel.ColumnWidth,
@@ -79,6 +81,7 @@ private void BuildAppointments(SchedulePageViewModel viewModel)
                         AllRooms = slot.ColSpan == viewModel.Columns.Count,
                         RoomIndex = colIndex,
                         RoomCount = slot.ColSpan,
+                        HasMasterAccess = hasMasterAccess,
                         TimeSlotIndex = rowIndex,
                         TimeSlotsCount = slot.RowSpan,
                         DisplayName = slot.Name,
@@ -118,7 +121,8 @@ private void BuildAppointments(SchedulePageViewModel viewModel)
                         Description = source.Description.ToHtmlString(),
                         ProjectId = source.ProjectId,
                         CharacterId = source.Id,
-                        Users = source.Users
+                        Users = source.Users,
+                        HasMasterAccess = hasMasterAccess,
                     })
                 .ToList();
 
@@ -140,7 +144,8 @@ private void BuildAppointments(SchedulePageViewModel viewModel)
                         Description = source.Description.ToHtmlString(),
                         ProjectId = source.ProjectId,
                         CharacterId = source.Id,
-                        Users = source.Users
+                        Users = source.Users,
+                        HasMasterAccess = hasMasterAccess,
                     })
                 .ToList();
         }

src/JoinRpg.WebPortal.Models/Schedules/AppointmentViewModel.cs

@@ -51,6 +51,8 @@ public class AppointmentViewModel : AppointmentBaseViewModel
         public int Width => _bounds.Value.Width;
         public int Height => _bounds.Value.Height;
 
+        public bool HasMasterAccess { get; set; }
+
         public AppointmentViewModel(Func<Rect> getBounds) => _bounds = new Lazy<Rect>(getBounds);
     }
 }