Working at home and Industry or Service added to CensusEntry command

src/main/java/scot/carricksoftware/grants/commands/census/CensusEntryCommand.java

@@ -8,6 +8,7 @@ package scot.carricksoftware.grants.commands.census;
 import scot.carricksoftware.grants.domains.census.Census;
 import scot.carricksoftware.grants.domains.people.Person;
 import scot.carricksoftware.grants.enums.censusentry.*;
+import scot.carricksoftware.grants.enums.general.YesNo;
 
 public interface CensusEntryCommand {
 
@@ -86,4 +87,12 @@ public interface CensusEntryCommand {
     String getYearsCompletedMarriage();
 
     void setYearsCompletedMarriage(String yearsCompletedMarriage);
+
+    YesNo getWorkingAtHome();
+
+    void setWorkingAtHome(YesNo workingAtHome);
+
+    String getIndustryOrService();
+
+    void setIndustryOrService(String industryOrService);
 }

src/main/java/scot/carricksoftware/grants/commands/census/CensusEntryCommandImpl.java

@@ -8,6 +8,7 @@ package scot.carricksoftware.grants.commands.census;
 import scot.carricksoftware.grants.domains.census.Census;
 import scot.carricksoftware.grants.domains.people.Person;
 import scot.carricksoftware.grants.enums.censusentry.*;
+import scot.carricksoftware.grants.enums.general.YesNo;
 
 public class CensusEntryCommandImpl implements CensusEntryCommand {
 
@@ -49,6 +50,10 @@ public class CensusEntryCommandImpl implements CensusEntryCommand {
 
     private String yearsCompletedMarriage;
 
+    private YesNo workingAtHome;
+
+    private String industryOrService;
+
     public Long getId() {
         return id;
     }
@@ -236,4 +241,24 @@ public class CensusEntryCommandImpl implements CensusEntryCommand {
     public void setYearsCompletedMarriage(String yearsCompletedMarriage) {
         this.yearsCompletedMarriage = yearsCompletedMarriage;
     }
+
+    @Override
+    public YesNo getWorkingAtHome() {
+        return workingAtHome;
+    }
+
+    @Override
+    public void setWorkingAtHome(YesNo workingAtHome) {
+        this.workingAtHome = workingAtHome;
+    }
+
+    @Override
+    public String getIndustryOrService() {
+        return industryOrService;
+    }
+
+    @Override
+    public void setIndustryOrService(String industryOrService) {
+        this.industryOrService = industryOrService;
+    }
 }

src/test/java/scot/carricksoftware/grants/commands/census/CensusCommandEnumTest.java

@@ -48,4 +48,7 @@ class CensusCommandEnumTest {
         command.setCensusDate(censusDate);
         assertEquals(censusDate, command.getCensusDate());
     }
+
+
+
 }

src/test/java/scot/carricksoftware/grants/commands/census/CensusCommandPartOneTest.java

@@ -78,4 +78,5 @@ class CensusCommandPartOneTest {
     }
 
 
+
 }

src/test/java/scot/carricksoftware/grants/commands/census/CensusEntryCommandEnumTest.java

@@ -84,4 +84,6 @@ class CensusEntryCommandEnumTest {
     }
 
 
+
+
 }

src/test/java/scot/carricksoftware/grants/commands/census/CensusEntryCommandPartThreeTest.java

@@ -71,4 +71,7 @@ class CensusEntryCommandPartThreeTest {
     }
 
 
+
+
+
 }

src/test/java/scot/carricksoftware/grants/domains/census/CensusEntryPartThreeTest.java

@@ -86,4 +86,6 @@ class CensusEntryPartThreeTest {
     }
 
 
+
+
 }