Merge branch 'Release-2024.32' into Develop/feature/TD-3921-RegistrationPromptsController-refactor

Auldrin-Possa · web-flow · commit 5d97543a3485 · 2024-06-11T17:16:28.000+01:00
diff --git a/DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs b/DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs
@@ -560,7 +560,7 @@ public IEnumerable<SupervisorDashboardToDoItem> GetSupervisorDashboardToDoItemsF
                         AND sasv.CandidateAssessmentSupervisorID = cas.ID AND sar.DateTime = (
 						    SELECT TOP 1 sar2.DateTime
 						    FROM SelfAssessmentResults AS sar2
-						    WHERE sar2.SelfAssessmentID = sar.SelfAssessmentID AND sar2.CompetencyID = co.ID AND sar2.Result != 0 ORDER BY sar2.ID DESC
+						    WHERE sar2.ID = sar.ID AND sar2.SelfAssessmentID = sar.SelfAssessmentID AND sar2.CompetencyID = co.ID AND sar2.Result != 0 ORDER BY sar2.ID DESC
 					)
                 WHERE (sd.SupervisorAdminID = @adminId) AND (cas.Removed IS NULL) AND (sasv.Verified IS NULL) AND (sd.Removed IS NULL)
 				GROUP BY sa.ID, ca.ID, sd.ID, u.FirstName, u.LastName, sa.Name,cast(sasv.Requested as date)", new { adminId }
diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Dashboard/ContractDetailsController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Dashboard/ContractDetailsController.cs
@@ -1,11 +1,10 @@
 ﻿namespace DigitalLearningSolutions.Web.Controllers.TrackingSystem.Centre.Dashboard
 {
-    using DigitalLearningSolutions.Data.DataServices;
-    using DigitalLearningSolutions.Data.DataServices.UserDataService;
     using DigitalLearningSolutions.Data.Enums;
     using DigitalLearningSolutions.Web.Attributes;
     using DigitalLearningSolutions.Web.Helpers;
     using DigitalLearningSolutions.Web.Models.Enums;
+    using DigitalLearningSolutions.Web.Services;
     using DigitalLearningSolutions.Web.ViewModels.TrackingSystem.Centre.ContractDetails;
     using Microsoft.AspNetCore.Authorization;
     using Microsoft.AspNetCore.Mvc;
@@ -18,27 +17,27 @@
     [Route("/TrackingSystem/Centre/ContractDetails")]
     public class ContractDetailsController : Controller
     {
-        private readonly ICentresDataService centresDataService;
-        private readonly ICourseDataService courseDataService;
-        private readonly IUserDataService userDataService;
+        private readonly ICentresService centresService;
+        private readonly ICourseService courseService;
+        private readonly IUserService userService;
 
         public ContractDetailsController(
-            ICentresDataService centresDataService,
-            IUserDataService userDataService,
-            ICourseDataService courseDataService
+            ICentresService centresService,
+            IUserService userService,
+            ICourseService courseService
         )
         {
-            this.centresDataService = centresDataService;
-            this.userDataService = userDataService;
-            this.courseDataService = courseDataService;
+            this.centresService = centresService;
+            this.userService = userService;
+            this.courseService = courseService;
         }
 
         public IActionResult Index()
         {
             var centreId = User.GetCentreIdKnownNotNull();
-            var centreDetails = centresDataService.GetCentreDetailsById(centreId)!;
-            var adminUsersAtCentre = userDataService.GetAdminUsersByCentreId(centreId);
-            var numberOfCourses = courseDataService.GetNumberOfActiveCoursesAtCentreFilteredByCategory(centreId, null);
+            var centreDetails = centresService.GetCentreDetailsById(centreId)!;
+            var adminUsersAtCentre = userService.GetAdminUsersByCentreId(centreId);
+            var numberOfCourses = courseService.GetNumberOfActiveCoursesAtCentreFilteredByCategory(centreId, null);
 
             var model = new ContractDetailsViewModel(adminUsersAtCentre, centreDetails, numberOfCourses);
 
diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Dashboard/RankingController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Dashboard/RankingController.cs
@@ -1,6 +1,5 @@
 ﻿namespace DigitalLearningSolutions.Web.Controllers.TrackingSystem.Centre.Dashboard
 {
-    using DigitalLearningSolutions.Data.DataServices;
     using DigitalLearningSolutions.Data.Enums;
     using DigitalLearningSolutions.Web.Attributes;
     using DigitalLearningSolutions.Web.Helpers;
@@ -19,15 +18,15 @@
     public class RankingController : Controller
     {
         private readonly ICentresService centresService;
-        private readonly IRegionDataService regionDataService;
+        private readonly IRegionService regionService;
 
         public RankingController(
             ICentresService centresService,
-            IRegionDataService regionDataService
+            IRegionService regionService
         )
         {
             this.centresService = centresService;
-            this.regionDataService = regionDataService;
+            this.regionService = regionService;
         }
 
         public IActionResult Index(int? regionId = null, Period? period = null)
@@ -36,7 +35,7 @@ public IActionResult Index(int? regionId = null, Period? period = null)
 
             var centreId = User.GetCentreIdKnownNotNull();
 
-            var regions = regionDataService.GetRegionsAlphabetical();
+            var regions = regionService.GetRegionsAlphabetical();
 
             var centreRankings = centresService.GetCentresForCentreRankingPage(centreId, period.Days, regionId);
 
diff --git a/DigitalLearningSolutions.Web/Services/CentresService.cs b/DigitalLearningSolutions.Web/Services/CentresService.cs
@@ -43,6 +43,7 @@ void UpdateCentreManagerDetails(
         string? GetCentreName(int centreId);
         IEnumerable<(int, string)> GetCentresForDelegateSelfRegistrationAlphabetical();
         (bool autoRegistered, string? autoRegisterManagerEmail) GetCentreAutoRegisterValues(int centreId);
+        Centre? GetCentreDetailsById(int centreId);
     }
 
     public class CentresService : ICentresService
@@ -148,5 +149,10 @@ public void UpdateCentreManagerDetails(int centreId, string firstName, string la
         {
             return centresDataService.GetCentreAutoRegisterValues(centreId);
         }
+
+        public Centre? GetCentreDetailsById(int centreId)
+        {
+            return centresDataService.GetCentreDetailsById(centreId);
+        }
     }
 }
diff --git a/DigitalLearningSolutions.Web/Services/CourseService.cs b/DigitalLearningSolutions.Web/Services/CourseService.cs
@@ -130,6 +130,7 @@ int diagCompletionThreshold
         IEnumerable<CompletedCourse> GetCompletedCourses(int candidateId);
         IEnumerable<AvailableCourse> GetAvailableCourses(int candidateId, int? centreId);
         void EnrolOnSelfAssessment(int selfAssessmentId, int delegateUserId, int centreId);
+        int GetNumberOfActiveCoursesAtCentreFilteredByCategory(int centreId, int? categoryId);
     }
 
     public class CourseService : ICourseService
@@ -607,5 +608,10 @@ public void EnrolOnSelfAssessment(int selfAssessmentId, int delegateUserId, int
         {
             courseDataService.EnrolSelfAssessment(selfAssessmentId, delegateUserId, centreId);
         }
+
+        public int GetNumberOfActiveCoursesAtCentreFilteredByCategory(int centreId, int? categoryId)
+        {
+            return courseDataService.GetNumberOfActiveCoursesAtCentreFilteredByCategory(centreId, categoryId);
+        }
     }
 }
diff --git a/DigitalLearningSolutions.Web/Services/UserService.cs b/DigitalLearningSolutions.Web/Services/UserService.cs
@@ -144,6 +144,7 @@ string registrationConfirmationHash
         DelegateAccount? GetDelegateAccountById(int id);
         int? GetUserIdFromUsername(string username);
         int GetDelegateCountWithAnswerForPrompt(int centreId, int promptNumber);
+        List<AdminUser> GetAdminUsersByCentreId(int centreId);
     }
 
     public class UserService : IUserService
@@ -797,5 +798,9 @@ public int GetDelegateCountWithAnswerForPrompt(int centreId, int promptNumber)
         {
             return userDataService.GetDelegateCountWithAnswerForPrompt(centreId, promptNumber);
         }
+        public List<AdminUser> GetAdminUsersByCentreId(int centreId)
+        {
+            return userDataService.GetAdminUsersByCentreId(centreId);
+        }
     }
 }
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/_Structure.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/_Structure.cshtml
@@ -3,86 +3,86 @@
 <h2>Framework structure</h2>
 @if (Model.FrameworkCompetencyGroups.Any())
 {
-  foreach (var frameworkCompetencyGroup in Model.FrameworkCompetencyGroups)
-  {
-    <partial name="../Shared/_CompetencyGroupCard.cshtml" model="new CompetencyGroupCardViewModel
+    foreach (var frameworkCompetencyGroup in Model.FrameworkCompetencyGroups)
+    {
+        <partial name="../Shared/_CompetencyGroupCard.cshtml" model="new CompetencyGroupCardViewModel
       {
         CanModify = Model.DetailFramework.UserRole > 1,
         FrameworkCompetencyGroup =frameworkCompetencyGroup,
         CompetencyFlags = Model.CompetencyFlags
       }"
-         view-data='@new ViewDataDictionary(ViewData)
+         view-data='new ViewDataDictionary(ViewData)
       {
-        { "VocabSingular", @Model.VocabSingular() },
-        { "VocabPlural", @Model.VocabPlural() },
-        { "GroupCount", @Model.FrameworkCompetencyGroups.Count() }
+        { "VocabSingular", Model.VocabSingular() },
+        { "VocabPlural", Model.VocabPlural() },
+        { "GroupCount", Model.FrameworkCompetencyGroups.Count() }
       }' />
-  }
+    }
 }
 else
 {
-  @if (!Model.FrameworkCompetencies.Any())
-  {
-    <div class="nhsuk-warning-callout callout-green">
-      <h3 class="nhsuk-warning-callout__label">
-        <span role="text">
-          This is an empty framework.
-        </span>
-      </h3>
-      @if (Model.DetailFramework.UserRole <= 1)
-      {
-        <p>This framework doesn't contain any @Model.VocabSingular().ToLower() groups or @Model.VocabPlural().ToLower().</p>
-      }
-      @if (Model.DetailFramework.UserRole > 1)
-      {
-        <p>Start adding @Model.VocabSingular().ToLower() groups and @Model.VocabPlural().ToLower() to this framework using the buttons below.</p>
-        <p>Use the <strong>Details</strong> tab above to view and edit the framework details and working group.</p>
-      }
-      @if (Model.DetailFramework.UserRole > 0)
-      {
-        <p>Use the <strong>Comments</strong> tab to view, add and respond to comments from working group members on this framework.</p>
-      }
-      @if (Model.DetailFramework.UserRole > 1)
-      {
-        <p>When you are ready, use the <strong>Send for Review</strong> button above to request review and sign off of your framework.</p>
-      }
-    </div>
-  }
-  else
-  {
-    <p>No @Model.VocabSingular().ToLower() groups in this framework.</p>
-  }
+    @if (!Model.FrameworkCompetencies.Any())
+    {
+        <div class="nhsuk-warning-callout callout-green">
+            <h3 class="nhsuk-warning-callout__label">
+                <span role="text">
+                    This is an empty framework.
+                </span>
+            </h3>
+            @if (Model.DetailFramework.UserRole <= 1)
+            {
+                <p>This framework doesn't contain any @Model.VocabSingular().ToLower() groups or @Model.VocabPlural().ToLower().</p>
+            }
+            @if (Model.DetailFramework.UserRole > 1)
+            {
+                <p>Start adding @Model.VocabSingular().ToLower() groups and @Model.VocabPlural().ToLower() to this framework using the buttons below.</p>
+                <p>Use the <strong>Details</strong> tab above to view and edit the framework details and working group.</p>
+            }
+            @if (Model.DetailFramework.UserRole > 0)
+            {
+                <p>Use the <strong>Comments</strong> tab to view, add and respond to comments from working group members on this framework.</p>
+            }
+            @if (Model.DetailFramework.UserRole > 1)
+            {
+                <p>When you are ready, use the <strong>Send for Review</strong> button above to request review and sign off of your framework.</p>
+            }
+        </div>
+    }
+    else
+    {
+        <p>No @Model.VocabSingular().ToLower() groups in this framework.</p>
+    }
 }
 <div id="fc-ungrouped">
-  @if (Model.FrameworkCompetencies.Any())
-  {
-
-    foreach (var frameworkCompetency in Model.FrameworkCompetencies)
+    @if (Model.FrameworkCompetencies.Any())
     {
-      <partial name="../Shared/_CompetencyCard.cshtml" model="new CompetencyCardViewModel()
+
+        foreach (var frameworkCompetency in Model.FrameworkCompetencies)
+        {
+            <partial name="../Shared/_CompetencyCard.cshtml" model="new CompetencyCardViewModel()
             {
               CanModify = Model.DetailFramework.UserRole > 1,
               FrameworkCompetencyGroupId = null,
               FrameworkCompetency = frameworkCompetency,
               CompetencyFlags = Model.CompetencyFlags.Where(c => c.CompetencyId == frameworkCompetency.CompetencyID)
             }"
-           view-data='@new ViewDataDictionary(ViewData)
+             view-data='new ViewDataDictionary(ViewData)
               {
-                { "VocabSingular", @Model.VocabSingular() },
-                {"VocabPlural", @Model.VocabPlural()  }
+                { "VocabSingular", Model.VocabSingular() },
+                {"VocabPlural", Model.VocabPlural()  }
               }' />
-    }
+        }
 
-  }
+    }
 </div>
 @if (Model.DetailFramework.UserRole > 1)
 {
-  <div class="nhsuk-grid-row nhsuk-u-margin-top-3">
-    <div class="nhsuk-grid-column-full">
-      <a class="nhsuk-button" asp-action="AddEditFrameworkCompetencyGroup" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])">Add @Model.VocabSingular().ToLower() group</a>
-      <a class="nhsuk-button nhsuk-button--secondary" asp-action="AddEditFrameworkCompetency" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])">Add ungrouped @Model.VocabSingular().ToLower()</a>
-      <a class="nhsuk-button nhsuk-button--secondary" asp-action="ImportCompetencies" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-tabname="@(ViewContext.RouteData.Values["tabname"])">Import @Model.VocabPlural().ToLower() from Excel</a>
+    <div class="nhsuk-grid-row nhsuk-u-margin-top-3">
+        <div class="nhsuk-grid-column-full">
+            <a class="nhsuk-button" asp-action="AddEditFrameworkCompetencyGroup" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])">Add @Model.VocabSingular().ToLower() group</a>
+            <a class="nhsuk-button nhsuk-button--secondary" asp-action="AddEditFrameworkCompetency" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])">Add ungrouped @Model.VocabSingular().ToLower()</a>
+            <a class="nhsuk-button nhsuk-button--secondary" asp-action="ImportCompetencies" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-tabname="@(ViewContext.RouteData.Values["tabname"])">Import @Model.VocabPlural().ToLower() from Excel</a>
+        </div>
     </div>
-  </div>
 }
 

Original file line number	Diff line number	Diff line change
`@@ -560,7 +560,7 @@ public IEnumerable<SupervisorDashboardToDoItem> GetSupervisorDashboardToDoItemsF`
`560`	`560`	`AND sasv.CandidateAssessmentSupervisorID = cas.ID AND sar.DateTime = (`
`561`	`561`	`SELECT TOP 1 sar2.DateTime`
`562`	`562`	`FROM SelfAssessmentResults AS sar2`
`563`		`- WHERE sar2.SelfAssessmentID = sar.SelfAssessmentID AND sar2.CompetencyID = co.ID AND sar2.Result != 0 ORDER BY sar2.ID DESC`
	`563`	`+ WHERE sar2.ID = sar.ID AND sar2.SelfAssessmentID = sar.SelfAssessmentID AND sar2.CompetencyID = co.ID AND sar2.Result != 0 ORDER BY sar2.ID DESC`
`564`	`564`	`)`
`565`	`565`	`WHERE (sd.SupervisorAdminID = @adminId) AND (cas.Removed IS NULL) AND (sasv.Verified IS NULL) AND (sd.Removed IS NULL)`
`566`	`566`	`GROUP BY sa.ID, ca.ID, sd.ID, u.FirstName, u.LastName, sa.Name,cast(sasv.Requested as date)", new { adminId }`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`namespace DigitalLearningSolutions.Web.Controllers.TrackingSystem.Centre.Dashboard`
`2`	`2`	`{`
`3`		`- using DigitalLearningSolutions.Data.DataServices;`
`4`	`3`	`using DigitalLearningSolutions.Data.Enums;`
`5`	`4`	`using DigitalLearningSolutions.Web.Attributes;`
`6`	`5`	`using DigitalLearningSolutions.Web.Helpers;`
`@@ -19,15 +18,15 @@`
`19`	`18`	`public class RankingController : Controller`
`20`	`19`	`{`
`21`	`20`	`private readonly ICentresService centresService;`
`22`		`- private readonly IRegionDataService regionDataService;`
	`21`	`+ private readonly IRegionService regionService;`
`23`	`22`
`24`	`23`	`public RankingController(`
`25`	`24`	`ICentresService centresService,`
`26`		`- IRegionDataService regionDataService`
	`25`	`+ IRegionService regionService`
`27`	`26`	`)`
`28`	`27`	`{`
`29`	`28`	`this.centresService = centresService;`
`30`		`- this.regionDataService = regionDataService;`
	`29`	`+ this.regionService = regionService;`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`public IActionResult Index(int? regionId = null, Period? period = null)`
`@@ -36,7 +35,7 @@ public IActionResult Index(int? regionId = null, Period? period = null)`
`36`	`35`
`37`	`36`	`var centreId = User.GetCentreIdKnownNotNull();`
`38`	`37`
`39`		`- var regions = regionDataService.GetRegionsAlphabetical();`
	`38`	`+ var regions = regionService.GetRegionsAlphabetical();`
`40`	`39`
`41`	`40`	`var centreRankings = centresService.GetCentresForCentreRankingPage(centreId, period.Days, regionId);`
`42`	`41`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ void UpdateCentreManagerDetails(`
`43`	`43`	`string? GetCentreName(int centreId);`
`44`	`44`	`IEnumerable<(int, string)> GetCentresForDelegateSelfRegistrationAlphabetical();`
`45`	`45`	`(bool autoRegistered, string? autoRegisterManagerEmail) GetCentreAutoRegisterValues(int centreId);`
	`46`	`+ Centre? GetCentreDetailsById(int centreId);`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`public class CentresService : ICentresService`
`@@ -148,5 +149,10 @@ public void UpdateCentreManagerDetails(int centreId, string firstName, string la`
`148`	`149`	`{`
`149`	`150`	`return centresDataService.GetCentreAutoRegisterValues(centreId);`
`150`	`151`	`}`
	`152`	`+`
	`153`	`+ public Centre? GetCentreDetailsById(int centreId)`
	`154`	`+ {`
	`155`	`+ return centresDataService.GetCentreDetailsById(centreId);`
	`156`	`+ }`
`151`	`157`	`}`
`152`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,7 @@ int diagCompletionThreshold`
`130`	`130`	`IEnumerable<CompletedCourse> GetCompletedCourses(int candidateId);`
`131`	`131`	`IEnumerable<AvailableCourse> GetAvailableCourses(int candidateId, int? centreId);`
`132`	`132`	`void EnrolOnSelfAssessment(int selfAssessmentId, int delegateUserId, int centreId);`
	`133`	`+ int GetNumberOfActiveCoursesAtCentreFilteredByCategory(int centreId, int? categoryId);`
`133`	`134`	`}`
`134`	`135`
`135`	`136`	`public class CourseService : ICourseService`
`@@ -607,5 +608,10 @@ public void EnrolOnSelfAssessment(int selfAssessmentId, int delegateUserId, int`
`607`	`608`	`{`
`608`	`609`	`courseDataService.EnrolSelfAssessment(selfAssessmentId, delegateUserId, centreId);`
`609`	`610`	`}`
	`611`	`+`
	`612`	`+ public int GetNumberOfActiveCoursesAtCentreFilteredByCategory(int centreId, int? categoryId)`
	`613`	`+ {`
	`614`	`+ return courseDataService.GetNumberOfActiveCoursesAtCentreFilteredByCategory(centreId, categoryId);`
	`615`	`+ }`
`610`	`616`	`}`
`611`	`617`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,7 @@ string registrationConfirmationHash`
`144`	`144`	`DelegateAccount? GetDelegateAccountById(int id);`
`145`	`145`	`int? GetUserIdFromUsername(string username);`
`146`	`146`	`int GetDelegateCountWithAnswerForPrompt(int centreId, int promptNumber);`
	`147`	`+ List<AdminUser> GetAdminUsersByCentreId(int centreId);`
`147`	`148`	`}`
`148`	`149`
`149`	`150`	`public class UserService : IUserService`
`@@ -797,5 +798,9 @@ public int GetDelegateCountWithAnswerForPrompt(int centreId, int promptNumber)`
`797`	`798`	`{`
`798`	`799`	`return userDataService.GetDelegateCountWithAnswerForPrompt(centreId, promptNumber);`
`799`	`800`	`}`
	`801`	`+ public List<AdminUser> GetAdminUsersByCentreId(int centreId)`
	`802`	`+ {`
	`803`	`+ return userDataService.GetAdminUsersByCentreId(centreId);`
	`804`	`+ }`
`800`	`805`	`}`
`801`	`806`	`}`