TMI2-355: updated enums (#62)

* updated orgType and fundingLocation enums * formatting
cabinetoffice · Nov 8, 2023 · c94ab30 · c94ab30
1 parent 0ea0c3a
commit c94ab30
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.../java/gov/cabinetoffice/gap/adminbackend/enums/GrantMandatoryQuestionFundingLocation.java b/.../java/gov/cabinetoffice/gap/adminbackend/enums/GrantMandatoryQuestionFundingLocation.java
@@ -4,11 +4,11 @@
 
 public enum GrantMandatoryQuestionFundingLocation {
 
-    NORTH_EAST_ENGLAND("North East England"), NORTH_WEST_ENGLAND("North West England"),
+    NORTH_EAST_ENGLAND("North East (England)"), NORTH_WEST_ENGLAND("North West (England)"),
     YORKSHIRE_AND_THE_HUMBER("Yorkshire and the Humber"), EAST_MIDLANDS_ENGLAND("East Midlands (England)"),
-    WEST_MIDLANDS("West Midlands"), EAST_ENGLAND("East England"), LONDON("London"),
-    SOUTH_EAST_ENGLAND("South East England"), SOUTH_WEST_ENGLAND("South West England"), MIDLANDS("Midlands"),
-    SCOTLAND("Scotland"), WALES("Wales"), NORTHERN_IRELAND("Northern Ireland"), OUTSIDE_UK("Outside UK");
+    WEST_MIDLANDS("West Midlands (England)"), EAST_ENGLAND("East England"), LONDON("London"),
+    SOUTH_EAST_ENGLAND("South East (England)"), SOUTH_WEST_ENGLAND("South West (England)"), MIDLANDS("Midlands"),
+    SCOTLAND("Scotland"), WALES("Wales"), NORTHERN_IRELAND("Northern Ireland"), OUTSIDE_UK("Outside of the UK");
 
     private final String name;
 

diff --git a/src/main/java/gov/cabinetoffice/gap/adminbackend/enums/GrantMandatoryQuestionOrgType.java b/src/main/java/gov/cabinetoffice/gap/adminbackend/enums/GrantMandatoryQuestionOrgType.java
@@ -5,7 +5,8 @@
 public enum GrantMandatoryQuestionOrgType {
 
     LIMITED_COMPANY("Limited company"), NON_LIMITED_COMPANY("Non-limited company"),
-    REGISTERED_CHARITY("Registered charity"), UNREGISTERED_CHARITY("Unregistered charity"), OTHER("Other");
+    REGISTERED_CHARITY("Registered charity"), UNREGISTERED_CHARITY("Unregistered charity"), CHARITY("Charity"),
+    INDIVIDUAL("I am applying as an Individual"), OTHER("Other");
 
     private String name;