From 7bf6f02b3623fe09596ca218354235b0ca9de45c Mon Sep 17 00:00:00 2001 From: Henri Cook Date: Tue, 13 Feb 2018 13:16:08 +0000 Subject: [PATCH 1/3] JIRA-TBC: Add an under18 level 3 requirement to business --- app/connectors/exchange/SchemeInfo.scala | 2 +- .../application/personalDetails.scala.html | 18 ++++++++++++++++-- .../scheme/chooseyourschemes.scala.html | 4 ++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/app/connectors/exchange/SchemeInfo.scala b/app/connectors/exchange/SchemeInfo.scala index dbe4d15..b2f470c 100644 --- a/app/connectors/exchange/SchemeInfo.scala +++ b/app/connectors/exchange/SchemeInfo.scala @@ -18,7 +18,7 @@ package connectors.exchange import play.api.libs.json.Json -case class SchemeInfo(id: String, name: String, requiresALevel: Boolean, requiresALevelInStem: Boolean) +case class SchemeInfo(id: String, name: String, requiresALevel: Boolean, requiresALevelInStem: Boolean, requiresU18Level3: Boolean) object SchemeInfo { implicit val schemeInfoFormat = Json.format[SchemeInfo] diff --git a/app/views/application/personalDetails.scala.html b/app/views/application/personalDetails.scala.html index cdededa..894b17e 100644 --- a/app/views/application/personalDetails.scala.html +++ b/app/views/application/personalDetails.scala.html @@ -150,7 +150,7 @@

Qualification requirements

@@ -159,10 +159,24 @@

Qualification requirements

At least 5 GCSEs at grade C and above, or the new grade 4 and above, including English Language and Maths, or equivalent. + + + + + + At least 5 GCSEs at grade C and above, or the new grade 4 and above, including English Language and Maths, or equivalent. +

+ If you're under 18 on 31st August 2018 you will also need a level 3 qualification + + diff --git a/app/views/application/scheme/chooseyourschemes.scala.html b/app/views/application/scheme/chooseyourschemes.scala.html index 2d8ea1c..23bb4a7 100644 --- a/app/views/application/scheme/chooseyourschemes.scala.html +++ b/app/views/application/scheme/chooseyourschemes.scala.html @@ -42,6 +42,10 @@ 2 A levels, at grade D and above, and 5 GCSEs at grade C and above, or the new grade 4 and above, including English Language and Maths } else { 5 GCSEs at grade C and above, or the new grade 4 and above, including English Language and Maths + @if(scheme.requiresU18Level3) { +

+ If you're under 18 on 31st August 2018 you will also need a level 3 qualification + } } } } From f942647b001c9c7431a9b007889c01985f102b08 Mon Sep 17 00:00:00 2001 From: Henri Cook Date: Tue, 13 Feb 2018 13:31:14 +0000 Subject: [PATCH 2/3] Fix tests --- test/connectors/exchange/SchemeInfoExamples.scala | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/connectors/exchange/SchemeInfoExamples.scala b/test/connectors/exchange/SchemeInfoExamples.scala index b537a81..9d91e24 100644 --- a/test/connectors/exchange/SchemeInfoExamples.scala +++ b/test/connectors/exchange/SchemeInfoExamples.scala @@ -17,7 +17,9 @@ package connectors.exchange object SchemeInfoExamples { - val NoALevelsScheme = SchemeInfo("Business", "SchemeNoALevels", requiresALevel = false, requiresALevelInStem = false) - val ALevelsScheme = SchemeInfo("Commercial", "SchemeALevels", requiresALevel = true, requiresALevelInStem = false) - val ALevelsStemScheme = SchemeInfo("ProjectDelivery", "SchemeALevelsStem", requiresALevel = true, requiresALevelInStem = true) + val NoALevelsScheme = SchemeInfo("Business", "SchemeNoALevels", requiresALevel = false, requiresALevelInStem = false, + requiresU18Level3 = false) + val ALevelsScheme = SchemeInfo("Commercial", "SchemeALevels", requiresALevel = true, requiresALevelInStem = false, requiresU18Level3 = false) + val ALevelsStemScheme = SchemeInfo("ProjectDelivery", "SchemeALevelsStem", requiresALevel = true, requiresALevelInStem = true , + requiresU18Level3 = false) } From b8444119027d076826ed1e4f2a440dcd398bf331 Mon Sep 17 00:00:00 2001 From: Henri Cook Date: Tue, 13 Feb 2018 14:44:02 +0000 Subject: [PATCH 3/3] On the instead of on --- app/views/application/personalDetails.scala.html | 2 +- app/views/application/scheme/chooseyourschemes.scala.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/application/personalDetails.scala.html b/app/views/application/personalDetails.scala.html index 894b17e..5530145 100644 --- a/app/views/application/personalDetails.scala.html +++ b/app/views/application/personalDetails.scala.html @@ -170,7 +170,7 @@

Qualification requirements

At least 5 GCSEs at grade C and above, or the new grade 4 and above, including English Language and Maths, or equivalent.

- If you're under 18 on 31st August 2018 you will also need a level 3 qualification + If you're under 18 on the 31st August 2018 you will also need a level 3 qualification diff --git a/app/views/application/scheme/chooseyourschemes.scala.html b/app/views/application/scheme/chooseyourschemes.scala.html index 23bb4a7..f14a655 100644 --- a/app/views/application/scheme/chooseyourschemes.scala.html +++ b/app/views/application/scheme/chooseyourschemes.scala.html @@ -44,7 +44,7 @@ 5 GCSEs at grade C and above, or the new grade 4 and above, including English Language and Maths @if(scheme.requiresU18Level3) {

- If you're under 18 on 31st August 2018 you will also need a level 3 qualification + If you're under 18 on the 31st August 2018 you will also need a level 3 qualification } } }