Merge pull request #81 from hmrc/business-u18

JIRA-TBC: Add an under18 level 3 requirement to business
hmrc · Feb 13, 2018 · e7eab6b · e7eab6b
2 parents e3fa309 + b844411
commit e7eab6b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git 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
@@ -150,7 +150,7 @@ <h3 class="heading-medium">Qualification requirements</h3>
                   <tr>
                     <td>
                         <ul class="">
-                        @availableSchemes.filter(scheme => !scheme.requiresALevel && !scheme.requiresALevelInStem).map { scheme =>
+                        @availableSchemes.filter(scheme => !scheme.requiresALevel && !scheme.requiresALevelInStem && !scheme.requiresU18Level3).map { scheme =>
                             <li>@scheme.name</li>
                         }
                         </ul>
@@ -159,10 +159,24 @@ <h3 class="heading-medium">Qualification requirements</h3>
                       At least 5 GCSEs at grade C and above, or the new grade 4 and above, including English Language and Maths, or <a href="https://www.gov.uk/what-different-qualification-levels-mean/list-of-qualification-levels" rel="external" target="_blank">equivalent</a>.
                     </td>
                   </tr>
+                 <tr>
+                  <td>
+                   <ul class="">
+                   @availableSchemes.filter(scheme => !scheme.requiresALevel && !scheme.requiresALevelInStem && scheme.requiresU18Level3).map { scheme =>
+                    <li>@scheme.name</li>
+                   }
+                   </ul>
+                  </td>
+                  <td>
+                   At least 5 GCSEs at grade C and above, or the new grade 4 and above, including English Language and Maths, or <a href="https://www.gov.uk/what-different-qualification-levels-mean/list-of-qualification-levels" rel="external" target="_blank">equivalent</a>.
+                   <br /><br />
+                   If you're under 18 on the 31st August 2018 you will also need a level 3 qualification
+                  </td>
+                 </tr>
                   <tr>
                     <td>
                         <ul class="">
-                        @availableSchemes.filter(scheme => scheme.requiresALevel && !scheme.requiresALevelInStem).map { scheme =>
+                        @availableSchemes.filter(scheme => scheme.requiresALevel && !scheme.requiresALevelInStem && !scheme.requiresU18Level3).map { scheme =>
                             <li>@scheme.name</li>
                         }
                         </ul>

diff --git 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) {
+                <br /><br />
+                If you're under 18 on the 31st August 2018 you will also need a level 3 qualification
+            }
         }
     }
 }

diff --git 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)
 }