Implemented Complete By date edit link

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs

@@ -163,6 +163,8 @@ int GetSelfAssessmentActivityDelegatesExportCount(string searchString, string so
         void RemoveDelegateSelfAssessment(int candidateAssessmentsId);
         int? GetSupervisorsCountFromCandidateAssessmentId(int candidateAssessmentsId);
         bool CheckForSameCentre(int centreId, int candidateAssessmentsId);
+        int? GetDelegateUserId(int CandidateAssessmentId, int selfAssessmentId);
+        int? GetDelegateAccountId(int centreId, int delegateUserId);
         int CheckDelegateSelfAssessment(int candidateAssessmentsId);
     }
 
@@ -684,6 +686,22 @@ public bool CheckForSameCentre(int centreId, int candidateAssessmentsId)
             );
             return ResultCount == 1 ? true : false;
         }
+        public int? GetDelegateUserId(int CandidateAssessmentId, int selfAssessmentId)
+        {
+            return connection.QueryFirstOrDefault<int>(
+                  @"SELECT DelegateUserID FROM CandidateAssessments 
+                      WHERE (SelfAssessmentID = @selfAssessmentId) AND ( ID =@CandidateAssessmentId)",
+                  new { CandidateAssessmentId, selfAssessmentId}
+              );
+        }
+        public int? GetDelegateAccountId(int centreId, int delegateUserId)
+        {
+            return connection.QueryFirstOrDefault<int>(
+                  @"SELECT ID FROM DelegateAccounts 
+                      WHERE (CentreID = @centreId) AND ( UserId =@delegateUserId)",
+                  new { centreId, delegateUserId }
+              );
+        }
         public int CheckDelegateSelfAssessment(int candidateAssessmentsId)
         {
             return connection.QueryFirstOrDefault<int>(

DigitalLearningSolutions.Data/Models/SelfAssessments/CurrentSelfAssessment.cs

@@ -22,5 +22,6 @@ public class CurrentSelfAssessment : SelfAssessment
         public bool NonReportable { get; set; }
         public int? SupervisorCount { get; set; }
         public bool IsSameCentre { get; set; }
+        public int? DelegateUserId { get; set; }
     }
 }

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/ActivityDelegatesController.cs

@@ -14,6 +14,7 @@
     using DigitalLearningSolutions.Web.Models.Enums;
     using DigitalLearningSolutions.Web.ServiceFilter;
     using DigitalLearningSolutions.Web.Services;
+    using DigitalLearningSolutions.Web.ViewModels.Supervisor;
     using DigitalLearningSolutions.Web.ViewModels.TrackingSystem.Delegates;
     using DigitalLearningSolutions.Web.ViewModels.TrackingSystem.Delegates.CourseDelegates;
     using Microsoft.AspNetCore.Authorization;
@@ -544,8 +545,17 @@ DelegateAccessRoute accessedVia
             ReturnPageQuery? returnPageQuery = formData.ReturnPageQuery;
             var routeData = returnPageQuery!.Value.ToRouteDataDictionary();
             routeData.Add("selfAssessmentId", selfAssessmentId.ToString());
-
-            return RedirectToAction("Index", "ActivityDelegates", routeData, returnPageQuery.Value.ItemIdToReturnTo);
+            
+            if (accessedVia.Id==1 && accessedVia.Name == "ViewDelegate")
+            {
+                var centreId = User.GetCentreIdKnownNotNull();
+                var delegateAccountId = selfAssessmentService.GetDelegateAccountId(centreId, delegateUserId);
+                return RedirectToAction("Index", "ViewDelegate", new { delegateId = delegateAccountId });
+            }
+            else
+            {
+                return RedirectToAction("Index", "ActivityDelegates", routeData, returnPageQuery.Value.ItemIdToReturnTo);
+            }
         }        
     }
 }

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/ViewDelegateController.cs

@@ -90,6 +90,7 @@ public IActionResult Index(int delegateId, string? callType)
             {
                 selfassessment.SupervisorCount = selfAssessmentService.GetSupervisorsCountFromCandidateAssessmentId(selfassessment.CandidateAssessmentId);
                 selfassessment.IsSameCentre = selfAssessmentService.CheckForSameCentre(centreId, selfassessment.CandidateAssessmentId);
+                selfassessment.DelegateUserId = selfAssessmentService.GetDelegateUserId(selfassessment.CandidateAssessmentId, selfassessment.Id);
             }
 
             var model = new ViewDelegateViewModel(delegateUserCard, customFields, delegateCourses, selfAssessments);

DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs

@@ -138,7 +138,9 @@ public int GetSelfAssessmentActivityDelegatesExportCount(string searchString,  s
         RemoveSelfAssessmentDelegate GetDelegateSelfAssessmentByCandidateAssessmentsId(int candidateAssessmentsId);
        void RemoveDelegateSelfAssessment(int candidateAssessmentsId);
        public int? GetSupervisorsCountFromCandidateAssessmentId(int candidateAssessmentsId);
-        public bool CheckForSameCentre(int centreId, int candidateAssessmentsId);
+       public bool CheckForSameCentre(int centreId, int candidateAssessmentsId);        
+       public int? GetDelegateUserId(int CandidateAssessmentId, int selfAssessmentId);
+       public int? GetDelegateAccountId(int centreId, int delegateUserId);
         int CheckDelegateSelfAssessment(int candidateAssessmentsId);
     }
 
@@ -504,6 +506,14 @@ public bool CheckForSameCentre(int centreId, int candidateAssessmentsId)
         {
             return selfAssessmentDataService.CheckForSameCentre(centreId, candidateAssessmentsId);
         }
+        public int? GetDelegateUserId(int CandidateAssessmentId, int selfAssessmentId)
+        {
+            return selfAssessmentDataService.GetDelegateUserId(CandidateAssessmentId, selfAssessmentId);
+        }
+        public int? GetDelegateAccountId(int centreId, int delegateUserId)
+        {
+            return selfAssessmentDataService.GetDelegateAccountId(centreId, delegateUserId);
+        }
         public int CheckDelegateSelfAssessment(int candidateAssessmentsId)
         {
             return selfAssessmentDataService.CheckDelegateSelfAssessment(candidateAssessmentsId);

DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/Shared/_DelegateSelfAssessmentProgressDetails.cshtml

@@ -27,9 +27,19 @@
             Complete by
         </dt>
         <dd class="nhsuk-summary-list__value" data-name-for-sorting="complete-by-date">
-            @Model.CompleteByDate
+            @(Model.CompleteByDate != null ? Model.CompleteByDate : "-")
+        </dd>
+        <dd class="nhsuk-summary-list__actions">
+            <a data-return-page-enabled="true"
+               asp-controller="ActivityDelegates"
+               asp-action="EditCompleteByDate"
+               asp-route-delegateUserId="@Model.DelegateUserId"
+               asp-route-selfAssessmentId="@Model.Id"
+               asp-route-accessedVia="ViewDelegate"
+               asp-route-returnPageQuery="null">
+                Edit<span class="nhsuk-u-visually-hidden"> complete by date</span>
+            </a>
         </dd>
-        <dd class="nhsuk-summary-list__actions"></dd>
     </div>
 
     <div class="nhsuk-summary-list__row details-list-with-button__row">