Peer review column header name changes

 - Corrected the column header name for
 the peer review excel download.

Author: dhvander

tests/test_utils/test_to_spreadsheet_peer_review.py

@@ -206,15 +206,15 @@ def test_recommendations_tab_has_risk_columns_for_independent_review(self):
         self.assertIn("Recommendation number", headers)
 
     def test_recommendations_tab_no_risk_columns_for_peer_review(self):
-        """Test that recommendations tab does NOT include 'Risk' and 'Recommendation number' for peer review."""
+        """Test that recommendations tab does NOT include 'Risk' and 'Risk number' for peer review."""
         excel_bytes = review_to_excel(self.peer_review)
         wb = load_workbook(BytesIO(excel_bytes))
         ws = wb["Recommendations"]
 
         # Get header row
         headers = [cell.value for cell in ws[1]]
         self.assertNotIn("Risk", headers)
-        self.assertNotIn("Recommendation number", headers)
+        self.assertNotIn("Risk number", headers)
 
     def test_recommendations_tab_column_count_differs_by_review_type(self):
         """Test that recommendations tab has different column counts for different review types."""
@@ -251,7 +251,7 @@ def test_all_sheets_present_for_both_review_types(self):
 
     def test_recommendations_tab_common_columns_present(self):
         """Test that common columns are present in recommendations tab for both review types."""
-        common_columns = ["Contributing outcome", "Target CAF profile", "Risk number", "Recommendation"]
+        common_columns = ["Contributing outcome", "Target CAF profile", "Recommendation number", "Recommendation"]
 
         # Test independent review
         excel_bytes = review_to_excel(self.independent_review)
@@ -346,14 +346,14 @@ def test_peer_review_does_not_have_review_comments_column(self):
         self.assertNotIn("Review comments", headers)
 
     def test_peer_review_does_not_have_risk_columns(self):
-        """Test that peer_review does NOT have 'Risk' and 'Recommendation number' columns."""
+        """Test that peer_review does NOT have 'Risk' and 'Risk number' columns."""
         review = self.reviews["peer_review"]
         excel_bytes = review_to_excel(review)
         wb = load_workbook(BytesIO(excel_bytes))
         ws = wb["Recommendations"]
         headers = [cell.value for cell in ws[1]]
         self.assertNotIn("Risk", headers)
-        self.assertNotIn("Recommendation number", headers)
+        self.assertNotIn("Risk number", headers)
 
 
 class TestReviewToExcelDataIntegrity(TestCase):

webcaf/webcaf/utils/to_spreadsheet.py

@@ -276,17 +276,17 @@ def _add_recommendations_tab(wb: Workbook, review: Review):
         [
             "Contributing outcome",
             "Target CAF profile",
-            "Risk number",
         ]
         + (
             [
+                "Risk number",
                 "Risk",
-                "Recommendation number",
             ]
             if review.assessment.review_type != "peer_review"
             else []
         )
         + [
+            "Recommendation number",
             "Recommendation",
         ]
     )
@@ -312,17 +312,17 @@ def _add_recommendations_tab(wb: Workbook, review: Review):
                     [
                         contributing_outcome_titles[recommendation.outcome],
                         profile_met,
-                        f"{prefix}{recommendation_group.group_index}",
                     ]
                     + (
                         [
+                            f"{prefix}{recommendation_group.group_index}",
                             recommendation.title,
-                            recommendation.id,
                         ]
                         if review.assessment.review_type != "peer_review"
                         else []
                     )
                     + [
+                        recommendation.id,
                         recommendation.text,
                     ]
                 )