Merge pull request #3056 from bitzesty/cherrypick-form-changes

Cherrypick form changes

app/models/reports/cases_status_report.rb

@@ -14,6 +14,10 @@ class Reports::CasesStatusReport
       label: "CompanyOrNominee",
       method: :company_or_nominee_name,
     },
+    {
+      label: "Organisation Name for Certificate B4.1",
+      method: :brand_name,
+    },
     {
       label: "SIC Code",
       method: :sic_code,

app/models/reports/form_answer.rb

@@ -115,6 +115,10 @@ def mso_grade_agreed
     end.join(",")
   end
 
+  def brand_name
+    @obj.document["brand_name"]
+  end
+
   def sic_code
     @obj.document["sic_code"]
   end

forms/award_years/v2025/innovation/innovation_step1.rb

@@ -182,12 +182,12 @@ def innovation_step1
           )
         end
 
-        textarea :major_issues_overcome, "Please explain any major issues that you have overcome in recent years and the remedial steps you have taken." do
+        textarea :major_issues_overcome, "Please explain any major internal issues you have overcome in recent years and the remedial steps you have taken." do
           ref "A 2.2"
           classes "sub-question text-words-max"
           required
           context %(
-            <p class="govuk-body">For example, what steps did you take following a major Health and Safety incident.</p>
+            <p class="govuk-body">For example, what remedial steps did you take following a significant issue that affected your workforce, such as a major Health & Safety incident?</p>
           )
           words_max 200
         end

forms/award_years/v2025/innovation/innovation_step2.rb

@@ -111,14 +111,14 @@ def innovation_step2
           text_words_max 50
         end
 
-        text :brand_name, "Organisation name as you would like it to appear on award certificate and announcements." do
+        text :brand_name, "Organisation name as you would like it to appear on the Royal award certificate and announcements." do
           classes "sub-question text-words-max"
           ref "B 4.1"
           required
           context %(
             <p>Usually, this is the same name as your organisation's full legal name.</p>
 
-            <p>However, you may choose to include the name you are trading as or a brand name. If you do so, you may be asked to provide evidence that the legal entity uses the trading name or owns the brand. Also, the evidence in the application form must be clearly linked to the provided trading name or brand.</p>
+            <p>We can't grant an award to a different legal entity but can grant it to a brand or trading name of the legal entity that has passed the KAE due diligence process. If you choose a brand or trading name, you may be asked to provide evidence that the legal entity uses the trading name or owns the brand.</p>
 
             <p>Please note that this is the name that will appear on your Award certificate if you are successful. We recommend not capitalising all letters as it may affect legibility, as the document uses an ornate typeface.</p>
           )

forms/award_years/v2025/international_trade/international_trade_step1.rb

@@ -184,12 +184,12 @@ def trade_step1
           )
         end
 
-        textarea :major_issues_overcome, "Please explain any major issues that you have overcome in recent years and the remedial steps you have taken." do
+        textarea :major_issues_overcome, "Please explain any major internal issues you have overcome in recent years and the remedial steps you have taken." do
           ref "A 2.2"
           classes "sub-question text-words-max"
           required
           context %(
-            <p class="govuk-body">For example, what steps did you take following a major Health and Safety incident.</p>
+            <p class="govuk-body">For example, what remedial steps did you take following a significant issue that affected your workforce, such as a major Health & Safety incident?</p>
           )
           words_max 200
         end

forms/award_years/v2025/international_trade/international_trade_step2.rb

@@ -109,18 +109,17 @@ def trade_step2
           text_words_max 50
         end
 
-        text :brand_name, "Organisation name as you would like it to appear on award certificate and announcements." do
+        text :brand_name, "Organisation name as you would like it to appear on the Royal award certificate and announcements." do
           classes "sub-question text-words-max"
           ref "B 4.1"
           required
           context %(
-            <p class="govuk-hint">Usually, this is the same name as your organisation's full legal name.</p>
+            <p>Usually, this is the same name as your organisation's full legal name.</p>
 
-            <p class="govuk-hint">However, you may choose to include the name you are trading as or a brand name. If you do so, you may be asked to provide evidence that the legal entity uses the trading name or owns the brand. Also, the evidence in the application form must be clearly linked to the provided trading name or brand.</p>
+            <p>We can't grant an award to a different legal entity but can grant it to a brand or trading name of the legal entity that has passed the KAE due diligence process. If you choose a brand or trading name, you may be asked to provide evidence that the legal entity uses the trading name or owns the brand.</p>
 
-              <p class="govuk-hint">Please note that this is the name that will appear on your Award certificate if you are successful. We recommend not capitalising all letters as it may affect legibility, as the document uses an ornate typeface.</p>
+            <p>Please note that this is the name that will appear on your Award certificate if you are successful. We recommend not capitalising all letters as it may affect legibility, as the document uses an ornate typeface.</p>
           )
-          style "small"
           text_words_max 50
         end
 

forms/award_years/v2025/social_mobility/social_mobility_step1.rb

@@ -182,12 +182,12 @@ def mobility_step1
           )
         end
 
-        textarea :major_issues_overcome, "Please explain any major issues that you have overcome in recent years and the remedial steps you have taken." do
+        textarea :major_issues_overcome, "Please explain any major internal issues you have overcome in recent years and the remedial steps you have taken." do
           ref "A 2.2"
           classes "sub-question text-words-max"
           required
           context %(
-            <p class="govuk-body">For example, what steps did you take following a major Health and Safety incident.</p>
+            <p class="govuk-body">For example, what remedial steps did you take following a significant issue that affected your workforce, such as a major Health & Safety incident?</p>
           )
           words_max 200
         end

forms/award_years/v2025/social_mobility/social_mobility_step2.rb

@@ -106,16 +106,16 @@ def mobility_step2
           text_words_max 50
         end
 
-        text :brand_name, "Organisation name as you would like it to appear on award certificate and announcements." do
+        text :brand_name, "Organisation name as you would like it to appear on the Royal award certificate and announcements." do
           sub_ref "B 4.1"
           classes "sub-question text-words-max"
           required
           context %(
             <p>Usually, this is the same name as your organisation's full legal name.</p>
 
-            <p>However, you may choose to include the name you are trading as or a brand name. If you do so, you may be asked to provide evidence that the legal entity uses the trading name or owns the brand. Also, the evidence in the application form must be clearly linked to the provided trading name or brand.</p>
+            <p>We can't grant an award to a different legal entity but can grant it to a brand or trading name of the legal entity that has passed the KAE due diligence process. If you choose a brand or trading name, you may be asked to provide evidence that the legal entity uses the trading name or owns the brand.</p>
 
-              <p>Please note that this is the name that will appear on your Award certificate if you are successful. We recommend not capitalising all letters as it may affect legibility, as the document uses an ornate typeface.</p>
+            <p>Please note that this is the name that will appear on your Award certificate if you are successful. We recommend not capitalising all letters as it may affect legibility, as the document uses an ornate typeface.</p>
           )
           text_words_max 50
         end

forms/award_years/v2025/sustainable_development/sustainable_development_step1.rb

@@ -182,12 +182,12 @@ def development_step1
           )
         end
 
-        textarea :major_issues_overcome, "Please explain any major issues that you have overcome in recent years and the remedial steps you have taken." do
+        textarea :major_issues_overcome, "Please explain any major internal issues you have overcome in recent years and the remedial steps you have taken." do
           ref "A 2.2"
           classes "sub-question text-words-max"
           required
           context %(
-            <p class="govuk-body">For example, what steps did you take following a major Health and Safety incident.</p>
+            <p class="govuk-body">For example, what remedial steps did you take following a significant issue that affected your workforce, such as a major Health & Safety incident?</p>
           )
           words_max 200
         end

forms/award_years/v2025/sustainable_development/sustainable_development_step2.rb

@@ -111,14 +111,14 @@ def development_step2
           text_words_max 50
         end
 
-        text :brand_name, "Organisation name as you would like it to appear on award certificate and announcements." do
+        text :brand_name, "Organisation name as you would like it to appear on the Royal award certificate and announcements." do
           classes "sub-question text-words-max"
           sub_ref "B 4.1"
           required
           context %(
             <p>Usually, this is the same name as your organisation's full legal name.</p>
 
-            <p>However, you may choose to include the name you are trading as or a brand name. If you do so, you may be asked to provide evidence that the legal entity uses the trading name or owns the brand. Also, the evidence in the application form must be clearly linked to the provided trading name or brand.</p>
+            <p>We can't grant an award to a different legal entity but can grant it to a brand or trading name of the legal entity that has passed the KAE due diligence process. If you choose a brand or trading name, you may be asked to provide evidence that the legal entity uses the trading name or owns the brand.</p>
 
             <p>Please note that this is the name that will appear on your Award certificate if you are successful. We recommend not capitalising all letters as it may affect legibility, as the document uses an ornate typeface.</p>
           )

spec/features/admin/form_answers/generation_of_csv_reports_spec.rb

@@ -32,7 +32,7 @@
     let(:id) { "cases-status" }
     it "produces proper output" do
       expect(output.size).to eq(2)
-      expect(output[1][9]).to eq("No")
+      expect(output[1][10]).to eq("No")
     end
   end