Changes made according to comments

DFE-Digital · Oct 3, 2023 · d7d5444 · d7d5444
1 parent 99e2c5b
commit d7d5444
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 21 deletions.
diff --git a/app/view_objects/assessor_interface/application_forms_show_view_object.rb b/app/view_objects/assessor_interface/application_forms_show_view_object.rb
@@ -21,7 +21,7 @@ def duplicate_matches
   def task_list_sections
     [
       pre_assessment_task_list_section,
-      initial_assessment_task_list_section,
+      assessment_task_list_section,
       verification_task_list_section,
     ].compact
   end
@@ -119,19 +119,19 @@ def await_professional_standing_task_list_item
     }
   end
 
-  def initial_assessment_task_list_section
+  def assessment_task_list_section
     return unless pre_assessment_complete?
 
     {
       title:
         I18n.t(
-          "assessor_interface.application_forms.show.assessment_tasks.sections.initial_assessment",
+          "assessor_interface.application_forms.show.assessment_tasks.sections.assessment",
         ),
       items:
         (
           assessment_section_task_list_items(preliminary: false) +
             [initial_assessment_recommendation_task_list_item] +
-            further_information_task_list_section[:items]
+            further_information_task_list_items
         ),
     }
   end
@@ -209,19 +209,13 @@ def initial_assessment_recommendation_task_list_item
     }
   end
 
-  def further_information_task_list_section
-    {
-      title:
-        I18n.t(
-          "assessor_interface.application_forms.show.assessment_tasks.sections.further_information_requests",
-        ),
-      items:
-        further_information_requests.map do |further_information_request|
-          further_information_request_task_list_item(
-            further_information_request,
-          )
-        end,
-    }
+  def further_information_task_list_items
+    I18n.t(
+      "assessor_interface.application_forms.show.assessment_tasks.sections.further_information_requests",
+    )
+    further_information_requests.map do |further_information_request|
+      further_information_request_task_list_item(further_information_request)
+    end
   end
 
   def further_information_request_task_list_item(further_information_request)
@@ -268,7 +262,7 @@ def verification_task_list_section
     {
       title:
         I18n.t(
-          "assessor_interface.application_forms.show.assessment_tasks.sections.verification_requests",
+          "assessor_interface.application_forms.show.assessment_tasks.sections.verification",
         ),
       items:,
     }

diff --git a/config/locales/assessor_interface.en.yml b/config/locales/assessor_interface.en.yml
@@ -14,10 +14,9 @@ en:
       show:
         assessment_tasks:
           sections:
-            further_information_requests: Further information requests
-            initial_assessment: Assessment
+            assessment: Assessment
             pre_assessment_tasks: Pre-assessment tasks
-            verification_requests: Verification
+            verification: Verification
           items:
             assessment_recommendation: Assessment recommendation
             await_professional_standing_request: Awaiting third-party professional standing