Column ordering updated

DFE-Digital · Dec 18, 2024 · 1dca8ff · 1dca8ff
1 parent d8b5b5f
commit 1dca8ff
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/DfE.FindInformationAcademiesTrusts/Services/Export/ExportService.cs b/DfE.FindInformationAcademiesTrusts/Services/Export/ExportService.cs
@@ -186,13 +186,13 @@ public async Task<byte[]> ExportOfstedDataToSpreadsheetAsync(string uid)
             "Early Years Provision",
             "Sixth Form Provision",
             "Date of Previous Inspection",
+            BeforeOrAfterJoiningHeader,
             "Previous Quality of Education",
             "Previous Behaviour and Attitudes",
             "Previous Personal Development",
             "Previous Leadership and Management",
             "Previous Early Years Provision",
             "Previous Sixth Form Provision",
-            BeforeOrAfterJoiningHeader,
             "Effective Safeguarding",
             "Category of Concern"
         };
@@ -267,23 +267,24 @@ private static void GenerateOfstedRow(
         // Previous Inspection Date
         SetDateCell(worksheet, rowNumber, 11, previousRating.InspectionDate);
 
-        // Previous Ratings
-        SetTextCell(worksheet, rowNumber, 12, previousRating.QualityOfEducation.ToDisplayString());
-        SetTextCell(worksheet, rowNumber, 13, previousRating.BehaviourAndAttitudes.ToDisplayString());
-        SetTextCell(worksheet, rowNumber, 14, previousRating.PersonalDevelopment.ToDisplayString());
-        SetTextCell(worksheet, rowNumber, 15, previousRating.EffectivenessOfLeadershipAndManagement.ToDisplayString());
-        SetTextCell(worksheet, rowNumber, 16, previousRating.EarlyYearsProvision.ToDisplayString());
-        SetTextCell(worksheet, rowNumber, 17, previousRating.SixthFormProvision.ToDisplayString());
-
         // Before/After Joining (Previous)
-        SetTextCell(worksheet, rowNumber, 18,
+        SetTextCell(worksheet, rowNumber, 12,
             IsOfstedRatingBeforeOrAfterJoining(
                 previousRating.OverallEffectiveness,
                 ofstedData?.DateAcademyJoinedTrust,
                 previousRating.InspectionDate
             )
         );
 
+        // Previous Ratings
+        SetTextCell(worksheet, rowNumber, 13, previousRating.QualityOfEducation.ToDisplayString());
+        SetTextCell(worksheet, rowNumber, 14, previousRating.BehaviourAndAttitudes.ToDisplayString());
+        SetTextCell(worksheet, rowNumber, 15, previousRating.PersonalDevelopment.ToDisplayString());
+        SetTextCell(worksheet, rowNumber, 16, previousRating.EffectivenessOfLeadershipAndManagement.ToDisplayString());
+        SetTextCell(worksheet, rowNumber, 17, previousRating.EarlyYearsProvision.ToDisplayString());
+        SetTextCell(worksheet, rowNumber, 18, previousRating.SixthFormProvision.ToDisplayString());
+
+
         // Safeguarding Effective
         SetTextCell(worksheet, rowNumber, 19, currentRating.SafeguardingIsEffective.ToDisplayString());