Merge pull request #177 from SkillsFundingAgency/develop

Develop
SkillsFundingAgency · Mar 30, 2023 · 475065b · 475065b
2 parents b4c9b8d + e03a395
commit 475065b
Show file tree

Hide file tree

Showing 31 changed files with 11,971 additions and 1,691 deletions.
diff --git a/src/Sfa.Tl.ResultsAndCertification.Application/Services/OverallResultCalculationService.cs b/src/Sfa.Tl.ResultsAndCertification.Application/Services/OverallResultCalculationService.cs
@@ -51,7 +51,7 @@ public OverallResultCalculationService(
         public async Task<AssessmentSeries> GetResultCalculationAssessmentAsync(DateTime runDate)
         {
             var assessmentSeries = await _assessmentSeriesRepository.GetManyAsync().ToListAsync();
-            var currentAssessmentSeries = assessmentSeries.FirstOrDefault(a => a.ComponentType == ComponentType.Core && runDate >= a.StartDate && runDate <= a.EndDate);
+            var currentAssessmentSeries = assessmentSeries.FirstOrDefault(a => a.ComponentType == ComponentType.Core && runDate.Date >= a.StartDate && runDate.Date <= a.EndDate);
             if (currentAssessmentSeries == null)
                 throw new Exception($"There is no AssessmentSeries available for the date {runDate}");
 

diff --git a/src/Sfa.Tl.ResultsAndCertification.Application/Services/RegistrationService.cs b/src/Sfa.Tl.ResultsAndCertification.Application/Services/RegistrationService.cs
@@ -317,6 +317,14 @@ public async Task<RegistrationProcessResponse> CompareAndProcessRegistrationsAsy
 
                             if (hasTqRegistrationProfileRecordChanged)
                             {
+                                // populate existing data that cannot be changed from upload file
+                                amendedRegistration.Gender = existingRegistration.Gender;
+                                amendedRegistration.IsLearnerVerified = existingRegistration.IsLearnerVerified;
+                                amendedRegistration.IsEnglishAndMathsAchieved = existingRegistration.IsEnglishAndMathsAchieved;
+                                amendedRegistration.IsSendLearner = existingRegistration.IsSendLearner;
+                                amendedRegistration.IsRcFeed = existingRegistration.IsRcFeed;
+                                amendedRegistration.MathsStatus = existingRegistration.MathsStatus;
+                                amendedRegistration.EnglishStatus = existingRegistration.EnglishStatus;
                                 amendedRegistration.CreatedBy = existingRegistration.CreatedBy;
                                 amendedRegistration.CreatedOn = existingRegistration.CreatedOn;
                                 amendedRegistration.ModifiedBy = amendedRegistration.CreatedBy;

diff --git a/src/Sfa.Tl.ResultsAndCertification.Web/Content/Assessment/Dashboard.Designer.cs b/src/Sfa.Tl.ResultsAndCertification.Web/Content/Assessment/Dashboard.Designer.cs
diff --git a/src/Sfa.Tl.ResultsAndCertification.Web/Content/Assessment/Dashboard.resx b/src/Sfa.Tl.ResultsAndCertification.Web/Content/Assessment/Dashboard.resx
@@ -120,36 +120,30 @@
   <data name="Card_Heading_Link_Download_Assessments_Data" xml:space="preserve">
     <value>Download assessments data</value>
   </data>
-  <data name="Card_Heading_Link_Manage_An_Assessment" xml:space="preserve">
-    <value>Manage an assessment</value>
+  <data name="Card_Heading_Link_Manage_Assessments" xml:space="preserve">
+    <value>Manage assessments</value>
   </data>
-  <data name="Card_Heading_Link_Upload_Multiple_Assessments" xml:space="preserve">
-    <value>Upload multiple assessments</value>
+  <data name="Card_Heading_Link_Upload_Assessments" xml:space="preserve">
+    <value>Upload assessments</value>
   </data>
-  <data name="List_Add_An_Assessment_Period_For_One_Learner" xml:space="preserve">
-    <value>Add an assessment period for one learner</value>
-  </data>
-  <data name="List_Add_Or_Change_Assessment_Periods" xml:space="preserve">
-    <value>Add or change assessment periods for more than one learner</value>
-  </data>
-  <data name="List_Change_An_Assessment_Period_For_One_Learner" xml:space="preserve">
-    <value>Change an assessment period for one learner</value>
-  </data>
-  <data name="List_Download_A_Template_With_Assessments_Data_Formats_And_Rules_Guidance" xml:space="preserve">
-    <value>Download a template with assessments data formats and rules guidance</value>
-  </data>
-  <data name="List_Download_Your_Data_As_Csv_File" xml:space="preserve">
-    <value>Download your data as a CSV file</value>
-  </data>
-  <data name="List_View_A_Learners_AssessmentPeriod" xml:space="preserve">
-    <value>View a learner's assessment period</value>
+  <data name="In_This_Section" xml:space="preserve">
+    <value>In this section</value>
   </data>
   <data name="Page_Heading" xml:space="preserve">
     <value>Assessments</value>
   </data>
   <data name="Page_Title" xml:space="preserve">
     <value>Assessments</value>
   </data>
+  <data name="Para_Add_Or_Change_Assessment_Periods" xml:space="preserve">
+    <value>Add or change assessment periods for learners using a CSV file.</value>
+  </data>
+  <data name="Para_Add_View_Change_Assessment_Periods" xml:space="preserve">
+    <value>Add, view or change assessment periods for individual learners.</value>
+  </data>
+  <data name="Para_Download_Your_Data_As_Csv_File" xml:space="preserve">
+    <value>Download assessment data in a CSV file.</value>
+  </data>
   <data name="Para_Tell_Us_When_Your_Learners_Will_Be_Assessed" xml:space="preserve">
     <value>Tell us when your learners will be assessed</value>
   </data>