Merge pull request #2611 from alphagov/student-finance-form-new-outcome

ikennaokpala · web-flow · commit 863d247633ae · 2016-07-08T10:53:53.000+01:00
Loan Grant Logic, Content &amp; Links Changes affecting UK and EU part time students
diff --git a/lib/smart_answer_flows/student-finance-forms.rb b/lib/smart_answer_flows/student-finance-forms.rb
@@ -245,7 +245,12 @@ def define
           when 'year-1617'
             case response
             when 'course-start-before-01092012'
-              outcome :outcome_uk_pt_1617_grant
+              case continuing_student
+              when 'continuing-student'
+                outcome :outcome_uk_pt_1617_grant_continuing
+              when 'new-student'
+                outcome :outcome_uk_pt_1617_grant_new
+              end
             when 'course-start-after-01092012'
               case continuing_student
               when 'continuing-student'
@@ -280,7 +285,8 @@ def define
       outcome :outcome_proof_identity_1617
       outcome :outcome_travel
       outcome :outcome_uk_pt_1617_continuing
-      outcome :outcome_uk_pt_1617_grant
+      outcome :outcome_uk_pt_1617_grant_continuing
+      outcome :outcome_uk_pt_1617_grant_new
       outcome :outcome_uk_pt_1617_new
       outcome :outcome_uk_ft_1516_continuing
       outcome :outcome_uk_ft_1516_new
diff --git a/lib/smart_answer_flows/student-finance-forms/outcomes/_uk_pt_1617_grant.govspeak.erb b/lib/smart_answer_flows/student-finance-forms/outcomes/_uk_pt_1617_grant.govspeak.erb
@@ -0,0 +1,24 @@
+<% content_for :body do %>
+
+  You can apply up to 9 months after your course starts.
+
+  ## You or your partner get benefits
+
+  You need to download and fill in [form CB1 (PDF, 462KB)](http://media.slc.co.uk/sfe/1617/pt/sfe_pt_cb1_form_1617_d.pdf) if you or your partner gets:
+
+  - Universal Credit
+  - Income Support
+  - Income-based Jobseeker’s Allowance (JSA)
+  - Income-related Employment Support Allowance (ESA)
+  - Housing Benefit
+  - Local Housing Allowance
+
+  ## Your circumstances have changed
+
+  You need to download and fill in [form CO2 (PDF, 472KB)](http://media.slc.co.uk/sfe/1617/pt/sfe_pt_co2_form_1617_d.pdf) if you’ve changed:
+
+  - your course, or left it
+  - university or college
+  - your name, address or contact details
+
+<% end %>
diff --git a/lib/smart_answer_flows/student-finance-forms/outcomes/outcome_eu_pt_1617_continuing.govspeak.erb b/lib/smart_answer_flows/student-finance-forms/outcomes/outcome_eu_pt_1617_continuing.govspeak.erb
@@ -10,14 +10,16 @@
   2016 to 2017 | [EUPTLC - form (PDF, 613KB)](http://media.slc.co.uk/sfe/1617/eu/eu_ptlc_form_1617_d.pdf)
   2016 to 2017 | [EUPTLC - guidance notes (PDF, 96KB)](http://media.slc.co.uk/sfe/1617/eu/eu_ptlc_notes_1617_d.pdf)
 
-  If you started your course before 1 September 2012 you may be eligible for a Tuition Fee Grant. The application forms will be available later in the summer.
+  If you started your course before 1 September 2012 you may be eligible for a Tuition Fee Grant.
 
+  **Academic year** | **Form** |-
+  2016 to 2017 | [EUPTG1 - form (PDF, 747KB)](http://media.slc.co.uk/sfe/1617/eu/eu_ptg1_form_1617_d.pdf)
+  2016 to 2017 | [EUPTG1 - guidance notes (PDF, 466KB)](http://media.slc.co.uk/sfe/1617/eu/eu_ptg1_notes_1617_d.pdf)
 
   ##Additional information
-
   You may need to include additional information on the following forms.
 
-  Form | When to use the form
+  **Form** | **When to use the form**
   - | -
   [EUTFLR - form (PDF, 441KB)](http://media.slc.co.uk/sfe/1617/eu/eu_tuition_fee_loan_request_form_d.pdf) | To change the amount of loan you want to apply for
   [Evidence factsheet (PDF, 82KB)](http://media.slc.co.uk/sfe/1617/eu/eu_evidence_fs_1617_d.pdf) | List of evidence to send with your application, eg proof of identity or income
diff --git a/lib/smart_answer_flows/student-finance-forms/outcomes/outcome_uk_pt_1617_grant.govspeak.erb b/lib/smart_answer_flows/student-finance-forms/outcomes/outcome_uk_pt_1617_grant.govspeak.erb
diff --git a/lib/smart_answer_flows/student-finance-forms/outcomes/outcome_uk_pt_1617_grant_continuing.govspeak.erb b/lib/smart_answer_flows/student-finance-forms/outcomes/outcome_uk_pt_1617_grant_continuing.govspeak.erb
@@ -0,0 +1,15 @@
+<% content_for :title do %>
+  Student finance - application form
+<% end %>
+
+<% content_for :body do %>
+
+  To apply for a Fee Grant and Course Grant download and fill in form PTGC.
+
+  **Academic year** | **Form**
+  2016 to 2017 | [PTGC - form (PDF, 185KB)](http://media.slc.co.uk/sfe/1617/pt/sfe_ptgc_form_1617_d.pdf)
+  2016 to 2017 | [PTGC - guidance notes (PDF, 599KB)](http://media.slc.co.uk/sfe/1617/pt/sfe_ptgc_notes_1617_d.pdf)
+
+<% end %>
+
+<%= render partial: 'uk_pt_1617_grant.govspeak.erb' %>
diff --git a/lib/smart_answer_flows/student-finance-forms/outcomes/outcome_uk_pt_1617_grant_new.govspeak.erb b/lib/smart_answer_flows/student-finance-forms/outcomes/outcome_uk_pt_1617_grant_new.govspeak.erb
@@ -0,0 +1,14 @@
+<% content_for :title do %>
+  Student finance - application form
+<% end %>
+
+<% content_for :body do %>
+
+  To apply for a Fee Grant and Course Grant download and fill in form PTGN.
+
+  **Academic year** | **Form**
+  2016 to 2017 | [PTGN - form (PDF, 280KB)](http://media.slc.co.uk/sfe/1617/pt/sfe_ptgn_form_1617_d.pdf)
+  2016 to 2017 | [PTGN - guidance notes (PDF, 609KB)](http://media.slc.co.uk/sfe/1617/pt/sfe_ptgn_notes_1617_d.pdf)
+<% end %>
+
+<%= render partial: 'uk_pt_1617_grant.govspeak.erb' %>
diff --git a/test/artefacts/student-finance-forms/eu-part-time/year-1617/continuing-student.txt b/test/artefacts/student-finance-forms/eu-part-time/year-1617/continuing-student.txt
@@ -7,13 +7,16 @@ If you started your course on or after 1 September 2012 you may be eligible for
 2016 to 2017 | [EUPTLC - form (PDF, 613KB)](http://media.slc.co.uk/sfe/1617/eu/eu_ptlc_form_1617_d.pdf)
 2016 to 2017 | [EUPTLC - guidance notes (PDF, 96KB)](http://media.slc.co.uk/sfe/1617/eu/eu_ptlc_notes_1617_d.pdf)
 
-If you started your course before 1 September 2012 you may be eligible for a Tuition Fee Grant. The application forms will be available later in the summer.
+If you started your course before 1 September 2012 you may be eligible for a Tuition Fee Grant.
 
-##Additional information
+**Academic year** | **Form** |-
+2016 to 2017 | [EUPTG1 - form (PDF, 747KB)](http://media.slc.co.uk/sfe/1617/eu/eu_ptg1_form_1617_d.pdf)
+2016 to 2017 | [EUPTG1 - guidance notes (PDF, 466KB)](http://media.slc.co.uk/sfe/1617/eu/eu_ptg1_notes_1617_d.pdf)
 
+##Additional information
 You may need to include additional information on the following forms.
 
-Form | When to use the form
+**Form** | **When to use the form**
 - | -
 [EUTFLR - form (PDF, 441KB)](http://media.slc.co.uk/sfe/1617/eu/eu_tuition_fee_loan_request_form_d.pdf) | To change the amount of loan you want to apply for
 [Evidence factsheet (PDF, 82KB)](http://media.slc.co.uk/sfe/1617/eu/eu_evidence_fs_1617_d.pdf) | List of evidence to send with your application, eg proof of identity or income
diff --git a/test/artefacts/student-finance-forms/uk-part-time/apply-loans-grants/year-1617/continuing-student/course-start-before-01092012.txt b/test/artefacts/student-finance-forms/uk-part-time/apply-loans-grants/year-1617/continuing-student/course-start-before-01092012.txt
@@ -1,7 +1,32 @@
+Student finance - application form
 
 
+To apply for a Fee Grant and Course Grant download and fill in form PTGC.
 
-The forms to apply for a Fee Grant and Course Grant will be available later in the summer. 
+**Academic year** | **Form**
+2016 to 2017 | [PTGC - form (PDF, 185KB)](http://media.slc.co.uk/sfe/1617/pt/sfe_ptgc_form_1617_d.pdf)
+2016 to 2017 | [PTGC - guidance notes (PDF, 599KB)](http://media.slc.co.uk/sfe/1617/pt/sfe_ptgc_notes_1617_d.pdf)
+
+You can apply up to 9 months after your course starts.
+
+## You or your partner get benefits
+
+You need to download and fill in [form CB1 (PDF, 462KB)](http://media.slc.co.uk/sfe/1617/pt/sfe_pt_cb1_form_1617_d.pdf) if you or your partner gets:
+
+- Universal Credit
+- Income Support
+- Income-based Jobseeker’s Allowance (JSA)
+- Income-related Employment Support Allowance (ESA)
+- Housing Benefit
+- Local Housing Allowance
+
+## Your circumstances have changed
+
+You need to download and fill in [form CO2 (PDF, 472KB)](http://media.slc.co.uk/sfe/1617/pt/sfe_pt_co2_form_1617_d.pdf) if you’ve changed:
+
+- your course, or left it
+- university or college
+- your name, address or contact details
 
 
 
diff --git a/test/artefacts/student-finance-forms/uk-part-time/apply-loans-grants/year-1617/new-student/course-start-before-01092012.txt b/test/artefacts/student-finance-forms/uk-part-time/apply-loans-grants/year-1617/new-student/course-start-before-01092012.txt
@@ -1,7 +1,32 @@
+Student finance - application form
 
 
+To apply for a Fee Grant and Course Grant download and fill in form PTGN.
 
-The forms to apply for a Fee Grant and Course Grant will be available later in the summer. 
+**Academic year** | **Form**
+2016 to 2017 | [PTGN - form (PDF, 280KB)](http://media.slc.co.uk/sfe/1617/pt/sfe_ptgn_form_1617_d.pdf)
+2016 to 2017 | [PTGN - guidance notes (PDF, 609KB)](http://media.slc.co.uk/sfe/1617/pt/sfe_ptgn_notes_1617_d.pdf)
+
+You can apply up to 9 months after your course starts.
+
+## You or your partner get benefits
+
+You need to download and fill in [form CB1 (PDF, 462KB)](http://media.slc.co.uk/sfe/1617/pt/sfe_pt_cb1_form_1617_d.pdf) if you or your partner gets:
+
+- Universal Credit
+- Income Support
+- Income-based Jobseeker’s Allowance (JSA)
+- Income-related Employment Support Allowance (ESA)
+- Housing Benefit
+- Local Housing Allowance
+
+## Your circumstances have changed
+
+You need to download and fill in [form CO2 (PDF, 472KB)](http://media.slc.co.uk/sfe/1617/pt/sfe_pt_co2_form_1617_d.pdf) if you’ve changed:
+
+- your course, or left it
+- university or college
+- your name, address or contact details
 
 
 
diff --git a/test/data/student-finance-forms-files.yml b/test/data/student-finance-forms-files.yml
@@ -1,8 +1,9 @@
 ---
-lib/smart_answer_flows/student-finance-forms.rb: e2bdc0683b57d709bf3fbf571e158d4a
+lib/smart_answer_flows/student-finance-forms.rb: 54d798fccd0bbf3cb11f950693549580
 test/data/student-finance-forms-questions-and-responses.yml: 221dff2fa2821ce3fd5bc724d3ca7dd4
-test/data/student-finance-forms-responses-and-expected-results.yml: 9f7888f42cdca5f3da89a6de02b84e34
+test/data/student-finance-forms-responses-and-expected-results.yml: 6b5c09bef9fd9a9d905ff716101acb03
 lib/smart_answer_flows/student-finance-forms/outcomes/_circumstances_changed_co2_form.govspeak.erb: 236d81f3660a1958bb0dd3a8f229baf4
+lib/smart_answer_flows/student-finance-forms/outcomes/_uk_pt_1617_grant.govspeak.erb: 9325a15dc30fef3e934c34be055097ad
 lib/smart_answer_flows/student-finance-forms/outcomes/_when_you_can_apply.govspeak.erb: c3459b01f8733370279520306716f895
 lib/smart_answer_flows/student-finance-forms/outcomes/_where_to_send_your_forms_non_uk.govspeak.erb: 7cc0f616b4df674cd314ba6ffc0a675b
 lib/smart_answer_flows/student-finance-forms/outcomes/_where_to_send_your_forms_uk.govspeak.erb: e32479a47518d9f72b5786d00bbf8ca7
@@ -20,7 +21,7 @@ lib/smart_answer_flows/student-finance-forms/outcomes/outcome_eu_ft_1617_continu
 lib/smart_answer_flows/student-finance-forms/outcomes/outcome_eu_ft_1617_new.govspeak.erb: de40ad74ec044a07a702c9a4a72447a3
 lib/smart_answer_flows/student-finance-forms/outcomes/outcome_eu_pt_1516_continuing.govspeak.erb: 07189e16f1f8d4940fe6a778230ee479
 lib/smart_answer_flows/student-finance-forms/outcomes/outcome_eu_pt_1516_new.govspeak.erb: 02a6092382484da065e75e31194582b0
-lib/smart_answer_flows/student-finance-forms/outcomes/outcome_eu_pt_1617_continuing.govspeak.erb: e071401ec68ebe388556087dd0938bfb
+lib/smart_answer_flows/student-finance-forms/outcomes/outcome_eu_pt_1617_continuing.govspeak.erb: f2613a4435a7694756baad1b104d4f2e
 lib/smart_answer_flows/student-finance-forms/outcomes/outcome_eu_pt_1617_new.govspeak.erb: 320fa759eec25e2330a0581e84b27c2c
 lib/smart_answer_flows/student-finance-forms/outcomes/outcome_parent_partner_1516.govspeak.erb: 27880afc7ba3477ed3ee6c9a1e4c4182
 lib/smart_answer_flows/student-finance-forms/outcomes/outcome_parent_partner_1617.govspeak.erb: 41fea6bde7503488a9ee3e88fb3bbd90
@@ -34,7 +35,8 @@ lib/smart_answer_flows/student-finance-forms/outcomes/outcome_uk_ft_1617_new.gov
 lib/smart_answer_flows/student-finance-forms/outcomes/outcome_uk_pt_1516_continuing.govspeak.erb: c05b8ffbe69a266baeabf8e5f21e5a82
 lib/smart_answer_flows/student-finance-forms/outcomes/outcome_uk_pt_1516_new.govspeak.erb: eb4b7d72d488a1bef19c4a38fba2699a
 lib/smart_answer_flows/student-finance-forms/outcomes/outcome_uk_pt_1617_continuing.govspeak.erb: dc1540087c19c54be6180d0652922571
-lib/smart_answer_flows/student-finance-forms/outcomes/outcome_uk_pt_1617_grant.govspeak.erb: 913f0492262bd257f3f973342f1f6b56
+lib/smart_answer_flows/student-finance-forms/outcomes/outcome_uk_pt_1617_grant_continuing.govspeak.erb: fc3eda325266715d172ec0a7cd9fdbc0
+lib/smart_answer_flows/student-finance-forms/outcomes/outcome_uk_pt_1617_grant_new.govspeak.erb: 1794d81c3f1eb1ebf9ace499b6dd7228
 lib/smart_answer_flows/student-finance-forms/outcomes/outcome_uk_pt_1617_new.govspeak.erb: 44392e71e2ffe85dbb0b9522c60cda47
 lib/smart_answer_flows/student-finance-forms/outcomes/outcome_uk_ptgc_1516_grant.govspeak.erb: 87f7baad96e7af2774f38cad15a999bd
 lib/smart_answer_flows/student-finance-forms/outcomes/outcome_uk_ptgn_1516_grant.govspeak.erb: 484d5ba98b10f9dbf62e0d67b81d2b89
diff --git a/test/data/student-finance-forms-responses-and-expected-results.yml b/test/data/student-finance-forms-responses-and-expected-results.yml
@@ -187,7 +187,7 @@
   - year-1617
   - continuing-student
   - course-start-before-01092012
-  :next_node: :outcome_uk_pt_1617_grant
+  :next_node: :outcome_uk_pt_1617_grant_continuing
   :outcome_node: true
 - :current_node: :pt_course_start?
   :responses:
@@ -213,7 +213,7 @@
   - year-1617
   - new-student
   - course-start-before-01092012
-  :next_node: :outcome_uk_pt_1617_grant
+  :next_node: :outcome_uk_pt_1617_grant_new
   :outcome_node: true
 - :current_node: :pt_course_start?
   :responses:
diff --git a/test/integration/smart_answer_flows/student_finance_forms_test.rb b/test/integration/smart_answer_flows/student_finance_forms_test.rb
@@ -226,7 +226,7 @@ class StudentFinanceFormsTest < ActiveSupport::TestCase
       assert_current_node :outcome_ccg_expenses
     end
 
-    should "lead to outcome_uk_pt_1617_grant for continuing students" do
+    should "lead to outcome_uk_pt_1617_grant_continuing for continuing students" do
       add_response 'uk-part-time'
       assert_current_node :form_needed_for_2?
       add_response 'apply-loans-grants'
@@ -236,7 +236,7 @@ class StudentFinanceFormsTest < ActiveSupport::TestCase
       add_response 'continuing-student'
       assert_current_node :pt_course_start?
       add_response 'course-start-before-01092012'
-      assert_current_node :outcome_uk_pt_1617_grant
+      assert_current_node :outcome_uk_pt_1617_grant_continuing
     end
 
     should "lead to outcome_uk_pt_1617_continuing" do
@@ -252,7 +252,7 @@ class StudentFinanceFormsTest < ActiveSupport::TestCase
       assert_current_node :outcome_uk_pt_1617_continuing
     end
 
-    should "lead to outcome_uk_pt_1617_grant for new students" do
+    should "lead to outcome_uk_pt_1617_grant_new for new students" do
       add_response 'uk-part-time'
       assert_current_node :form_needed_for_2?
       add_response 'apply-loans-grants'
@@ -262,7 +262,7 @@ class StudentFinanceFormsTest < ActiveSupport::TestCase
       add_response 'new-student'
       assert_current_node :pt_course_start?
       add_response 'course-start-before-01092012'
-      assert_current_node :outcome_uk_pt_1617_grant
+      assert_current_node :outcome_uk_pt_1617_grant_new
     end
 
     should "lead to outcome_uk_pt_1617_new" do
