Added UK 1939 Register as Census

Removed Address from column list - not necessary per person as it can be added in the header place field

Added Test Cases

Remove duplicated class & test case

Fixed case problems and added two more test cases

Renamed class for consistency

Comment refers to wrong class

1 files changed, 48 insertions, 0 deletions

diff --git a/app/Census/RegisterOfEngland1939.php b/app/Census/RegisterOfEngland1939.php
new file mode 100644
index 0000000000..971bef3d93
--- /dev/null
+++ b/app/Census/RegisterOfEngland1939.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2016 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Definitions for a census
+ */
+class RegisterOfEngland1939 extends CensusOfEngland implements CensusInterface {
+	/**
+	 * When did this census occur.
+	 *
+	 * @return string
+	 */
+	public function censusDate() {
+		return '29 SEP 1939';
+	}
+
+	/**
+	 * The columns of the census.
+	 *
+	 * @return CensusColumnInterface[]
+	 */
+	public function columns() {
+		return array(
+			new CensusColumnNull($this, 'Schedule', 'Schedule Number'),
+			new CensusColumnNull($this, 'SubNum', 'Schedule Sub Number'),
+			new CensusColumnSurnameGivenNames($this, 'Name', 'Surname & other names'),
+			new CensusColumnNull($this, 'Role', 'Officer, Visitor, Servant, Patient, Inmate'),
+			new CensusColumnSexMF($this, 'Gender', 'Male or Female'),
+			new CensusColumnBirthDayMonthSlashYear($this, 'DoB', 'Date of birth'),
+			new CensusColumnConditionEnglish($this, 'Marr Status', 'Single, Married, Widowed or Divorced'),
+			new CensusColumnOccupation($this, 'Occupation', 'Occupation')
+		);
+	}
+}