Updated census definitions

26 files changed, 531 insertions, 109 deletions

diff --git a/app/Census/CensusColumnConditionDanish.php b/app/Census/CensusColumnConditionDanish.php
new file mode 100644
index 0000000000..e387d91fbc
--- /dev/null
+++ b/app/Census/CensusColumnConditionDanish.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 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;
+
+use Fisharebest\Webtrees\Individual;
+
+/**
+ * Marital status.
+ */
+class CensusColumnConditionDanish extends AbstractCensusColumn implements CensusColumnInterface {
+	/**
+	 * Generate the likely value of this census column, based on available information.
+	 *
+	 * @param Individual $individual
+	 *
+	 * @return string
+	 */
+	public function generate(Individual $individual) {
+		// G = married
+		// U = unmarried
+		// S = separated or divorced
+		return '';
+	}
+}
diff --git a/app/Census/CensusOfDenmark.php b/app/Census/CensusOfDenmark.php
index a28082bc46..93b182a234 100644
--- a/app/Census/CensusOfDenmark.php
+++ b/app/Census/CensusOfDenmark.php
@@ -28,7 +28,9 @@ class CensusOfDenmark extends Census implements CensusPlaceInterface {
 		return array(
 			new CensusOfDenmark1787(),
 			new CensusOfDenmark1801(),
+			new CensusOfDenmark1803(),
 			new CensusOfDenmark1834(),
+			new CensusOfDenmark1835(),
 			new CensusOfDenmark1840(),
 			new CensusOfDenmark1845(),
 			new CensusOfDenmark1850(),
@@ -36,7 +38,9 @@ class CensusOfDenmark extends Census implements CensusPlaceInterface {
 			new CensusOfDenmark1860(),
 			new CensusOfDenmark1870(),
 			new CensusOfDenmark1880(),
+			new CensusOfDenmark1885(),
 			new CensusOfDenmark1890(),
+			new CensusOfDenmark1895(),
 			new CensusOfDenmark1901(),
 			new CensusOfDenmark1906(),
 			new CensusOfDenmark1911(),
@@ -44,6 +48,8 @@ class CensusOfDenmark extends Census implements CensusPlaceInterface {
 			new CensusOfDenmark1921(),
 			new CensusOfDenmark1925(),
 			new CensusOfDenmark1930(),
+			new CensusOfDenmark1940(),
+			new CensusOfDenmark1950(),
 		);
 	}
 
diff --git a/app/Census/CensusOfDenmark1787.php b/app/Census/CensusOfDenmark1787.php
index 2f2472beb7..68232e74d1 100644
--- a/app/Census/CensusOfDenmark1787.php
+++ b/app/Census/CensusOfDenmark1787.php
@@ -37,12 +37,11 @@ class CensusOfDenmark1787 extends CensusOfDenmark implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnFullName($this, '', ''),
-			new CensusColumnAge($this, '', ''),
-			new CensusColumnCondition($this, '', ''),
-			new CensusColumnRelationToHead($this, '', ''),
-			new CensusColumnOccupation($this, '', ''),
-			new CensusColumnBirthPlace($this, '', ''),
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnConditionDanish($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1801.php b/app/Census/CensusOfDenmark1801.php
index a278ed6eb2..facc79cb44 100644
--- a/app/Census/CensusOfDenmark1801.php
+++ b/app/Census/CensusOfDenmark1801.php
@@ -37,12 +37,11 @@ class CensusOfDenmark1801 extends CensusOfDenmark implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnFullName($this, '', ''),
-			new CensusColumnAge($this, '', ''),
-			new CensusColumnCondition($this, '', ''),
-			new CensusColumnRelationToHead($this, '', ''),
-			new CensusColumnOccupation($this, '', ''),
-			new CensusColumnBirthPlace($this, '', ''),
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1803.php b/app/Census/CensusOfDenmark1803.php
new file mode 100644
index 0000000000..16d934c6a9
--- /dev/null
+++ b/app/Census/CensusOfDenmark1803.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 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;
+
+use Fisharebest\Webtrees\Date;
+
+/**
+ * Definitions for a census
+ */
+class CensusOfDenmark1803 extends CensusOfDenmark implements CensusInterface {
+	/**
+	 * When did this census occur.
+	 *
+	 * @return string
+	 */
+	public function censusDate() {
+		return '01 FEB 1803';
+	}
+
+	/**
+	 * Where did this census occur, in GEDCOM format.
+	 *
+	 * @return string
+	 */
+	public function censusPlace() {
+		return 'Schleswig-Holstein, Deutschland';
+	}
+
+	/**
+	 * The columns of the census.
+	 *
+	 * @return CensusColumnInterface[]
+	 */
+	public function columns() {
+		return array(
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+		);
+	}
+}
diff --git a/app/Census/CensusOfDenmark1834.php b/app/Census/CensusOfDenmark1834.php
index b9419a6a5a..b14492dfd5 100644
--- a/app/Census/CensusOfDenmark1834.php
+++ b/app/Census/CensusOfDenmark1834.php
@@ -37,12 +37,11 @@ class CensusOfDenmark1834 extends CensusOfDenmark implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnFullName($this, '', ''),
-			new CensusColumnAge($this, '', ''),
-			new CensusColumnCondition($this, '', ''),
-			new CensusColumnRelationToHead($this, '', ''),
-			new CensusColumnOccupation($this, '', ''),
-			new CensusColumnBirthPlace($this, '', ''),
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1835.php b/app/Census/CensusOfDenmark1835.php
new file mode 100644
index 0000000000..33cb22591f
--- /dev/null
+++ b/app/Census/CensusOfDenmark1835.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 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;
+
+use Fisharebest\Webtrees\Date;
+
+/**
+ * Definitions for a census
+ */
+class CensusOfDenmark1835 extends CensusOfDenmark implements CensusInterface {
+	/**
+	 * When did this census occur.
+	 *
+	 * @return string
+	 */
+	public function censusDate() {
+		return '18 FEB 1834';
+	}
+
+	/**
+	 * Where did this census occur, in GEDCOM format.
+	 *
+	 * @return string
+	 */
+	public function censusPlace() {
+		return 'Schleswig-Holstein, Deutschland';
+	}
+
+	/**
+	 * The columns of the census.
+	 *
+	 * @return CensusColumnInterface[]
+	 */
+	public function columns() {
+		return array(
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+		);
+	}
+}
diff --git a/app/Census/CensusOfDenmark1840.php b/app/Census/CensusOfDenmark1840.php
index db33f70307..e274c9b6d0 100644
--- a/app/Census/CensusOfDenmark1840.php
+++ b/app/Census/CensusOfDenmark1840.php
@@ -37,12 +37,11 @@ class CensusOfDenmark1840 extends CensusOfDenmark implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnFullName($this, '', ''),
-			new CensusColumnAge($this, '', ''),
-			new CensusColumnCondition($this, '', ''),
-			new CensusColumnRelationToHead($this, '', ''),
-			new CensusColumnOccupation($this, '', ''),
-			new CensusColumnBirthPlace($this, '', ''),
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1845.php b/app/Census/CensusOfDenmark1845.php
index 7da23352ce..ab43b1dad8 100644
--- a/app/Census/CensusOfDenmark1845.php
+++ b/app/Census/CensusOfDenmark1845.php
@@ -37,12 +37,13 @@ class CensusOfDenmark1845 extends CensusOfDenmark implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnFullName($this, '', ''),
-			new CensusColumnAge($this, '', ''),
-			new CensusColumnCondition($this, '', ''),
-			new CensusColumnRelationToHead($this, '', ''),
-			new CensusColumnOccupation($this, '', ''),
-			new CensusColumnBirthPlace($this, '', ''),
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+			new CensusColumnBirthPlace($this, 'TBC', 'To be confirmed'),
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // Handicaps
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1850.php b/app/Census/CensusOfDenmark1850.php
index 0fe3797774..32fab6a653 100644
--- a/app/Census/CensusOfDenmark1850.php
+++ b/app/Census/CensusOfDenmark1850.php
@@ -37,12 +37,13 @@ class CensusOfDenmark1850 extends CensusOfDenmark implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnFullName($this, '', ''),
-			new CensusColumnAge($this, '', ''),
-			new CensusColumnCondition($this, '', ''),
-			new CensusColumnRelationToHead($this, '', ''),
-			new CensusColumnOccupation($this, '', ''),
-			new CensusColumnBirthPlace($this, '', ''),
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+			new CensusColumnBirthPlace($this, 'TBC', 'To be confirmed'),
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // Handicaps
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1855.php b/app/Census/CensusOfDenmark1855.php
index 41633cc8f5..3829e5e2b0 100644
--- a/app/Census/CensusOfDenmark1855.php
+++ b/app/Census/CensusOfDenmark1855.php
@@ -37,12 +37,14 @@ class CensusOfDenmark1855 extends CensusOfDenmark implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnFullName($this, '', ''),
-			new CensusColumnAge($this, '', ''),
-			new CensusColumnCondition($this, '', ''),
-			new CensusColumnRelationToHead($this, '', ''),
-			new CensusColumnOccupation($this, '', ''),
-			new CensusColumnBirthPlace($this, '', ''),
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+			new CensusColumnBirthPlace($this, 'TBC', 'To be confirmed'),
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // Religion
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // Handicaps
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1860.php b/app/Census/CensusOfDenmark1860.php
index 4157fd9a4f..127ca76783 100644
--- a/app/Census/CensusOfDenmark1860.php
+++ b/app/Census/CensusOfDenmark1860.php
@@ -37,12 +37,14 @@ class CensusOfDenmark1860 extends CensusOfDenmark implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnFullName($this, '', ''),
-			new CensusColumnAge($this, '', ''),
-			new CensusColumnCondition($this, '', ''),
-			new CensusColumnRelationToHead($this, '', ''),
-			new CensusColumnOccupation($this, '', ''),
-			new CensusColumnBirthPlace($this, '', ''),
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+			new CensusColumnBirthPlace($this, 'TBC', 'To be confirmed'),
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // Religion
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // Handicaps
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1870.php b/app/Census/CensusOfDenmark1870.php
index 1b8a376c53..713db901c4 100644
--- a/app/Census/CensusOfDenmark1870.php
+++ b/app/Census/CensusOfDenmark1870.php
@@ -37,12 +37,14 @@ class CensusOfDenmark1870 extends CensusOfDenmark implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnFullName($this, '', ''),
-			new CensusColumnAge($this, '', ''),
-			new CensusColumnCondition($this, '', ''),
-			new CensusColumnRelationToHead($this, '', ''),
-			new CensusColumnOccupation($this, '', ''),
-			new CensusColumnBirthPlace($this, '', ''),
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+			new CensusColumnBirthPlace($this, 'TBC', 'To be confirmed'),
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // Religion
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // Handicaps
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1880.php b/app/Census/CensusOfDenmark1880.php
index ff3445e995..d867dcf8d6 100644
--- a/app/Census/CensusOfDenmark1880.php
+++ b/app/Census/CensusOfDenmark1880.php
@@ -37,12 +37,15 @@ class CensusOfDenmark1880 extends CensusOfDenmark implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnFullName($this, '', ''),
-			new CensusColumnAge($this, '', ''),
-			new CensusColumnCondition($this, '', ''),
-			new CensusColumnRelationToHead($this, '', ''),
-			new CensusColumnOccupation($this, '', ''),
-			new CensusColumnBirthPlace($this, '', ''),
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnSexMF($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+			new CensusColumnBirthPlace($this, 'TBC', 'To be confirmed'),
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // religion
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // handicaps
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1885.php b/app/Census/CensusOfDenmark1885.php
new file mode 100644
index 0000000000..9378159555
--- /dev/null
+++ b/app/Census/CensusOfDenmark1885.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 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;
+
+use Fisharebest\Webtrees\Date;
+
+/**
+ * Definitions for a census
+ */
+class CensusOfDenmark1885 extends CensusOfDenmark implements CensusInterface {
+	/**
+	 * When did this census occur.
+	 *
+	 * @return string
+	 */
+	public function censusDate() {
+		return '01 FEB 1885';
+	}
+
+	/**
+	 * Where did this census occur, in GEDCOM format.
+	 *
+	 * @return string
+	 */
+	public function censusPlace() {
+		return 'København, Danmark';
+	}
+
+	/**
+	 * The columns of the census.
+	 *
+	 * @return CensusColumnInterface[]
+	 */
+	public function columns() {
+		return array(
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnSexMF($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+			new CensusColumnBirthPlace($this, 'TBC', 'To be confirmed'),
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // religion
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // handicaps
+		);
+	}
+}
diff --git a/app/Census/CensusOfDenmark1890.php b/app/Census/CensusOfDenmark1890.php
index ca8372b135..b5d23ca8fa 100644
--- a/app/Census/CensusOfDenmark1890.php
+++ b/app/Census/CensusOfDenmark1890.php
@@ -37,12 +37,15 @@ class CensusOfDenmark1890 extends CensusOfDenmark implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnFullName($this, '', ''),
-			new CensusColumnAge($this, '', ''),
-			new CensusColumnCondition($this, '', ''),
-			new CensusColumnRelationToHead($this, '', ''),
-			new CensusColumnOccupation($this, '', ''),
-			new CensusColumnBirthPlace($this, '', ''),
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnSexMF($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+			new CensusColumnBirthPlace($this, 'TBC', 'To be confirmed'),
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // religion
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // handicaps
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1895.php b/app/Census/CensusOfDenmark1895.php
new file mode 100644
index 0000000000..41a9387cd9
--- /dev/null
+++ b/app/Census/CensusOfDenmark1895.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 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;
+
+use Fisharebest\Webtrees\Date;
+
+/**
+ * Definitions for a census
+ */
+class CensusOfDenmark1895 extends CensusOfDenmark implements CensusInterface {
+	/**
+	 * When did this census occur.
+	 *
+	 * @return string
+	 */
+	public function censusDate() {
+		return '01 FEB 1895';
+	}
+
+	/**
+	 * Where did this census occur, in GEDCOM format.
+	 *
+	 * @return string
+	 */
+	public function censusPlace() {
+		return 'København, Danmark';
+	}
+
+	/**
+	 * The columns of the census.
+	 *
+	 * @return CensusColumnInterface[]
+	 */
+	public function columns() {
+		return array(
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnSexMF($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+			new CensusColumnBirthPlace($this, 'TBC', 'To be confirmed'),
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // religion
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // handicaps
+		);
+	}
+}
diff --git a/app/Census/CensusOfDenmark1901.php b/app/Census/CensusOfDenmark1901.php
index 79e2f5d199..3bddf915de 100644
--- a/app/Census/CensusOfDenmark1901.php
+++ b/app/Census/CensusOfDenmark1901.php
@@ -37,12 +37,16 @@ class CensusOfDenmark1901 extends CensusOfDenmark implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnFullName($this, '', ''),
-			new CensusColumnAge($this, '', ''),
-			new CensusColumnCondition($this, '', ''),
-			new CensusColumnRelationToHead($this, '', ''),
-			new CensusColumnOccupation($this, '', ''),
-			new CensusColumnBirthPlace($this, '', ''),
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnSexMF($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+			new CensusColumnBirthPlace($this, 'TBC', 'To be confirmed'),
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // religion
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // employment
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // handicaps
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1906.php b/app/Census/CensusOfDenmark1906.php
index 9e5f50f27b..50e2454453 100644
--- a/app/Census/CensusOfDenmark1906.php
+++ b/app/Census/CensusOfDenmark1906.php
@@ -37,12 +37,17 @@ class CensusOfDenmark1906 extends CensusOfDenmark implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnFullName($this, '', ''),
-			new CensusColumnAge($this, '', ''),
-			new CensusColumnCondition($this, '', ''),
-			new CensusColumnRelationToHead($this, '', ''),
-			new CensusColumnOccupation($this, '', ''),
-			new CensusColumnBirthPlace($this, '', ''),
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnSexMF($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+			new CensusColumnBirthPlace($this, 'TBC', 'To be confirmed'),
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // last address
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // religion
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // employment
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // handicaps
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1911.php b/app/Census/CensusOfDenmark1911.php
index 705927c20a..b7bebc4b83 100644
--- a/app/Census/CensusOfDenmark1911.php
+++ b/app/Census/CensusOfDenmark1911.php
@@ -37,12 +37,16 @@ class CensusOfDenmark1911 extends CensusOfDenmark implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnFullName($this, '', ''),
-			new CensusColumnAge($this, '', ''),
-			new CensusColumnCondition($this, '', ''),
-			new CensusColumnRelationToHead($this, '', ''),
-			new CensusColumnOccupation($this, '', ''),
-			new CensusColumnBirthPlace($this, '', ''),
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnSexMF($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+			new CensusColumnBirthPlace($this, 'TBC', 'To be confirmed'),
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // religion
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // employment
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // handicaps
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1916.php b/app/Census/CensusOfDenmark1916.php
index 702b02805f..089af5c730 100644
--- a/app/Census/CensusOfDenmark1916.php
+++ b/app/Census/CensusOfDenmark1916.php
@@ -37,12 +37,17 @@ class CensusOfDenmark1916 extends CensusOfDenmark implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnFullName($this, '', ''),
-			new CensusColumnAge($this, '', ''),
-			new CensusColumnCondition($this, '', ''),
-			new CensusColumnRelationToHead($this, '', ''),
-			new CensusColumnOccupation($this, '', ''),
-			new CensusColumnBirthPlace($this, '', ''),
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnSexMF($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+			new CensusColumnBirthPlace($this, 'TBC', 'To be confirmed'),
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // religion
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // employment
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // handicaps
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // savings
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1921.php b/app/Census/CensusOfDenmark1921.php
index de5a058a48..3a1e428ee5 100644
--- a/app/Census/CensusOfDenmark1921.php
+++ b/app/Census/CensusOfDenmark1921.php
@@ -37,12 +37,17 @@ class CensusOfDenmark1921 extends CensusOfDenmark implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnFullName($this, '', ''),
-			new CensusColumnAge($this, '', ''),
-			new CensusColumnCondition($this, '', ''),
-			new CensusColumnRelationToHead($this, '', ''),
-			new CensusColumnOccupation($this, '', ''),
-			new CensusColumnBirthPlace($this, '', ''),
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnSexMF($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+			new CensusColumnBirthPlace($this, 'TBC', 'To be confirmed'),
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // religion
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // employment
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // handicaps
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // savings
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1925.php b/app/Census/CensusOfDenmark1925.php
index bf0f8ec3ff..cf3c2e98b8 100644
--- a/app/Census/CensusOfDenmark1925.php
+++ b/app/Census/CensusOfDenmark1925.php
@@ -37,12 +37,15 @@ class CensusOfDenmark1925 extends CensusOfDenmark implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnFullName($this, '', ''),
-			new CensusColumnAge($this, '', ''),
-			new CensusColumnCondition($this, '', ''),
-			new CensusColumnRelationToHead($this, '', ''),
-			new CensusColumnOccupation($this, '', ''),
-			new CensusColumnBirthPlace($this, '', ''),
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnSexMF($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+			new CensusColumnBirthPlace($this, 'TBC', 'To be confirmed'),
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // religion
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // citizenship
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1930.php b/app/Census/CensusOfDenmark1930.php
index 95dce161e5..2215a4dc9e 100644
--- a/app/Census/CensusOfDenmark1930.php
+++ b/app/Census/CensusOfDenmark1930.php
@@ -27,7 +27,7 @@ class CensusOfDenmark1930 extends CensusOfDenmark implements CensusInterface {
 	 * @return string
 	 */
 	public function censusDate() {
-		return '05 NOV 1930';
+		return '01 NOV 1930';
 	}
 
 	/**
@@ -37,12 +37,17 @@ class CensusOfDenmark1930 extends CensusOfDenmark implements CensusInterface {
 	 */
 	public function columns() {
 		return array(
-			new CensusColumnFullName($this, '', ''),
-			new CensusColumnAge($this, '', ''),
-			new CensusColumnCondition($this, '', ''),
-			new CensusColumnRelationToHead($this, '', ''),
-			new CensusColumnOccupation($this, '', ''),
-			new CensusColumnBirthPlace($this, '', ''),
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnSexMF($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+			new CensusColumnBirthPlace($this, 'TBC', 'To be confirmed'),
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // religion
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // employment
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // handicaps
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // citizenship
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1940.php b/app/Census/CensusOfDenmark1940.php
new file mode 100644
index 0000000000..738dfbf727
--- /dev/null
+++ b/app/Census/CensusOfDenmark1940.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 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;
+
+use Fisharebest\Webtrees\Date;
+
+/**
+ * Definitions for a census
+ */
+class CensusOfDenmark1940 extends CensusOfDenmark implements CensusInterface {
+	/**
+	 * When did this census occur.
+	 *
+	 * @return string
+	 */
+	public function censusDate() {
+		return '01 NOV 1940';
+	}
+
+	/**
+	 * The columns of the census.
+	 *
+	 * @return CensusColumnInterface[]
+	 */
+	public function columns() {
+		return array(
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnSexMF($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+			new CensusColumnBirthPlace($this, 'TBC', 'To be confirmed'),
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // religion
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // employment
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // handicaps
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // citizenship
+		);
+	}
+}
diff --git a/app/Census/CensusOfDenmark1950.php b/app/Census/CensusOfDenmark1950.php
new file mode 100644
index 0000000000..4c74ccea06
--- /dev/null
+++ b/app/Census/CensusOfDenmark1950.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 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;
+
+use Fisharebest\Webtrees\Date;
+
+/**
+ * Definitions for a census
+ */
+class CensusOfDenmark1950 extends CensusOfDenmark implements CensusInterface {
+	/**
+	 * When did this census occur.
+	 *
+	 * @return string
+	 */
+	public function censusDate() {
+		return '01 NOV 1950';
+	}
+
+	/**
+	 * The columns of the census.
+	 *
+	 * @return CensusColumnInterface[]
+	 */
+	public function columns() {
+		return array(
+			new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
+			new CensusColumnAge($this, 'TBC', 'To be confirmed'),
+			new CensusColumnSexMF($this, 'TBC', 'To be confirmed'),
+			new CensusColumnCondition($this, 'TBC', 'To be confirmed'),
+			new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
+			new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+			new CensusColumnBirthPlace($this, 'TBC', 'To be confirmed'),
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // religion
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // employment
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // handicaps
+			new CensusColumnNull($this, 'TBC', 'To be confirmed'), // citizenship
+		);
+	}
+}