summaryrefslogtreecommitdiff
path: root/app/Census
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@gmail.com>2015-12-30 18:25:55 +0000
committerGreg Roach <fisharebest@gmail.com>2015-12-30 22:13:28 +0000
commit4c219c47822475f66a15a7a74d8bcf644e030cfe (patch)
tree457365fd94a525d1381e608ab40c2378fe10dfbd /app/Census
parentab12429990b847d176a5fcc6bbccb7686a461d71 (diff)
downloadwebtrees-4c219c47822475f66a15a7a74d8bcf644e030cfe.tar.gz
webtrees-4c219c47822475f66a15a7a74d8bcf644e030cfe.tar.bz2
webtrees-4c219c47822475f66a15a7a74d8bcf644e030cfe.zip
Danish census
Diffstat (limited to 'app/Census')
-rw-r--r--app/Census/CensusColumnBirthDaySlashMonth.php41
-rw-r--r--app/Census/CensusColumnBirthDaySlashMonthYear.php41
-rw-r--r--app/Census/CensusColumnReligion.php37
-rw-r--r--app/Census/CensusColumnSexMF.php11
-rw-r--r--app/Census/CensusColumnSexMK.php42
-rw-r--r--app/Census/CensusOfDenmark1787.php10
-rw-r--r--app/Census/CensusOfDenmark1801.php10
-rw-r--r--app/Census/CensusOfDenmark1803.php10
-rw-r--r--app/Census/CensusOfDenmark1834.php9
-rw-r--r--app/Census/CensusOfDenmark1835.php9
-rw-r--r--app/Census/CensusOfDenmark1840.php9
-rw-r--r--app/Census/CensusOfDenmark1845.php14
-rw-r--r--app/Census/CensusOfDenmark1850.php17
-rw-r--r--app/Census/CensusOfDenmark1855.php18
-rw-r--r--app/Census/CensusOfDenmark1860.php20
-rw-r--r--app/Census/CensusOfDenmark1870.php22
-rw-r--r--app/Census/CensusOfDenmark1880.php22
-rw-r--r--app/Census/CensusOfDenmark1885.php22
-rw-r--r--app/Census/CensusOfDenmark1890.php24
-rw-r--r--app/Census/CensusOfDenmark1895.php24
-rw-r--r--app/Census/CensusOfDenmark1901.php27
-rw-r--r--app/Census/CensusOfDenmark1906.php25
-rw-r--r--app/Census/CensusOfDenmark1911.php20
-rw-r--r--app/Census/CensusOfDenmark1916.php22
-rw-r--r--app/Census/CensusOfDenmark1921.php22
-rw-r--r--app/Census/CensusOfDenmark1925.php18
-rw-r--r--app/Census/CensusOfDenmark1930.php22
-rw-r--r--app/Census/CensusOfDenmark1940.php22
-rw-r--r--app/Census/CensusOfDenmark1950.php22
29 files changed, 408 insertions, 204 deletions
diff --git a/app/Census/CensusColumnBirthDaySlashMonth.php b/app/Census/CensusColumnBirthDaySlashMonth.php
new file mode 100644
index 0000000000..8c403ffc0e
--- /dev/null
+++ b/app/Census/CensusColumnBirthDaySlashMonth.php
@@ -0,0 +1,41 @@
+<?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;
+
+/**
+ * The individual's date of birth.
+ */
+class CensusColumnBirthDaySlashMonth extends AbstractCensusColumn implements CensusColumnInterface {
+ /**
+ * Generate the likely value of this census column, based on available information.
+ *
+ * @param Individual $individual
+ * @param Individual|null $head
+ *
+ * @return string
+ */
+ public function generate(Individual $individual, Individual $head = null) {
+ $birth_date = $individual->getBirthDate();
+
+ if ($birth_date->minimumJulianDay() === $birth_date->maximumJulianDay()) {
+ return $birth_date->minimumDate()->format('%j/%n');
+ } else {
+ return '';
+ }
+ }
+}
diff --git a/app/Census/CensusColumnBirthDaySlashMonthYear.php b/app/Census/CensusColumnBirthDaySlashMonthYear.php
new file mode 100644
index 0000000000..cacfe05a7c
--- /dev/null
+++ b/app/Census/CensusColumnBirthDaySlashMonthYear.php
@@ -0,0 +1,41 @@
+<?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;
+
+/**
+ * The individual's date of birth.
+ */
+class CensusColumnBirthDaySlashMonthYear extends AbstractCensusColumn implements CensusColumnInterface {
+ /**
+ * Generate the likely value of this census column, based on available information.
+ *
+ * @param Individual $individual
+ * @param Individual|null $head
+ *
+ * @return string
+ */
+ public function generate(Individual $individual, Individual $head = null) {
+ $birth_date = $individual->getBirthDate();
+
+ if ($birth_date->minimumJulianDay() === $birth_date->maximumJulianDay()) {
+ return $birth_date->minimumDate()->format('%j/%n %Y');
+ } else {
+ return '';
+ }
+ }
+}
diff --git a/app/Census/CensusColumnReligion.php b/app/Census/CensusColumnReligion.php
new file mode 100644
index 0000000000..c578be1651
--- /dev/null
+++ b/app/Census/CensusColumnReligion.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;
+
+/**
+ * The individual's religion.
+ */
+class CensusColumnReligion extends AbstractCensusColumn implements CensusColumnInterface {
+ /**
+ * Generate the likely value of this census column, based on available information.
+ *
+ * @todo Look for RELI tags (or subtags?)
+ *
+ * @param Individual $individual
+ * @param Individual|null $head
+ *
+ * @return string
+ */
+ public function generate(Individual $individual, Individual $head = null) {
+ return '';
+ }
+}
diff --git a/app/Census/CensusColumnSexMF.php b/app/Census/CensusColumnSexMF.php
index 31df9ed010..47841a22ab 100644
--- a/app/Census/CensusColumnSexMF.php
+++ b/app/Census/CensusColumnSexMF.php
@@ -30,11 +30,12 @@ class CensusColumnSexMF extends AbstractCensusColumn implements CensusColumnInte
* @return string
*/
public function generate(Individual $individual, Individual $head = null) {
- $sex = $individual->getSex();
-
- if ($sex === 'M' || $sex === 'F') {
- return $sex;
- } else {
+ switch ($individual->getSex()) {
+ case 'M':
+ return 'M';
+ case 'F':
+ return 'F';
+ default:
return '';
}
}
diff --git a/app/Census/CensusColumnSexMK.php b/app/Census/CensusColumnSexMK.php
new file mode 100644
index 0000000000..12506df0c3
--- /dev/null
+++ b/app/Census/CensusColumnSexMK.php
@@ -0,0 +1,42 @@
+<?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;
+
+/**
+ * The individual's sex.
+ */
+class CensusColumnSexMK extends AbstractCensusColumn implements CensusColumnInterface {
+ /**
+ * Generate the likely value of this census column, based on available information.
+ *
+ * @param Individual $individual
+ * @param Individual|null $head
+ *
+ * @return string
+ */
+ public function generate(Individual $individual, Individual $head = null) {
+ switch ($individual->getSex()) {
+ case 'M':
+ return 'M';
+ case 'F':
+ return 'K';
+ default:
+ return '';
+ }
+ }
+}
diff --git a/app/Census/CensusOfDenmark1787.php b/app/Census/CensusOfDenmark1787.php
index 30a9181b43..4f51508bfb 100644
--- a/app/Census/CensusOfDenmark1787.php
+++ b/app/Census/CensusOfDenmark1787.php
@@ -35,11 +35,11 @@ class CensusOfDenmark1787 extends CensusOfDenmark implements CensusInterface {
*/
public function columns() {
return array(
- 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'),
+ new CensusColumnFullName($this, 'Navn', ''),
+ new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
+ new CensusColumnAge($this, 'Alder', ''),
+ new CensusColumnConditionDanish($this, 'Civilstand', ''),
+ new CensusColumnOccupation($this, 'Erhverv', ''),
);
}
}
diff --git a/app/Census/CensusOfDenmark1801.php b/app/Census/CensusOfDenmark1801.php
index d856d3e2fb..94676671cf 100644
--- a/app/Census/CensusOfDenmark1801.php
+++ b/app/Census/CensusOfDenmark1801.php
@@ -35,11 +35,11 @@ class CensusOfDenmark1801 extends CensusOfDenmark implements CensusInterface {
*/
public function columns() {
return array(
- new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
- new CensusColumnAge($this, 'TBC', 'To be confirmed'),
- new CensusColumnConditionEnglish($this, 'TBC', 'To be confirmed'),
- new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
- new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+ new CensusColumnFullName($this, 'Navn', ''),
+ new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
+ new CensusColumnAge($this, 'Alder', ''),
+ new CensusColumnConditionDanish($this, 'Civilstand', ''),
+ new CensusColumnOccupation($this, 'Erhverv', ''),
);
}
}
diff --git a/app/Census/CensusOfDenmark1803.php b/app/Census/CensusOfDenmark1803.php
index 6da108af71..50d38fa537 100644
--- a/app/Census/CensusOfDenmark1803.php
+++ b/app/Census/CensusOfDenmark1803.php
@@ -44,11 +44,11 @@ class CensusOfDenmark1803 extends CensusOfDenmark implements CensusInterface {
*/
public function columns() {
return array(
- new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
- new CensusColumnAge($this, 'TBC', 'To be confirmed'),
- new CensusColumnConditionEnglish($this, 'TBC', 'To be confirmed'),
- new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
- new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+ new CensusColumnFullName($this, 'Navn', ''),
+ new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
+ new CensusColumnAge($this, 'Alder', ''),
+ new CensusColumnConditionDanish($this, 'Civilstand', ''),
+ new CensusColumnOccupation($this, 'Erhverv', ''),
);
}
}
diff --git a/app/Census/CensusOfDenmark1834.php b/app/Census/CensusOfDenmark1834.php
index 4362b40289..7a09605f30 100644
--- a/app/Census/CensusOfDenmark1834.php
+++ b/app/Census/CensusOfDenmark1834.php
@@ -35,11 +35,10 @@ class CensusOfDenmark1834 extends CensusOfDenmark implements CensusInterface {
*/
public function columns() {
return array(
- new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
- new CensusColumnAge($this, 'TBC', 'To be confirmed'),
- new CensusColumnConditionEnglish($this, 'TBC', 'To be confirmed'),
- new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
- new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+ new CensusColumnFullName($this, 'Navn', ''),
+ new CensusColumnAge($this, 'Alder', ''),
+ new CensusColumnConditionDanish($this, 'Civilstand', ''),
+ new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
);
}
}
diff --git a/app/Census/CensusOfDenmark1835.php b/app/Census/CensusOfDenmark1835.php
index e5a2a54eeb..e99bdf5096 100644
--- a/app/Census/CensusOfDenmark1835.php
+++ b/app/Census/CensusOfDenmark1835.php
@@ -44,11 +44,10 @@ class CensusOfDenmark1835 extends CensusOfDenmark implements CensusInterface {
*/
public function columns() {
return array(
- new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
- new CensusColumnAge($this, 'TBC', 'To be confirmed'),
- new CensusColumnConditionEnglish($this, 'TBC', 'To be confirmed'),
- new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
- new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+ new CensusColumnFullName($this, 'Navn', ''),
+ new CensusColumnAge($this, 'Alder', ''),
+ new CensusColumnConditionDanish($this, 'Civilstand', ''),
+ new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
);
}
}
diff --git a/app/Census/CensusOfDenmark1840.php b/app/Census/CensusOfDenmark1840.php
index ea374a372a..a3b8541f46 100644
--- a/app/Census/CensusOfDenmark1840.php
+++ b/app/Census/CensusOfDenmark1840.php
@@ -35,11 +35,10 @@ class CensusOfDenmark1840 extends CensusOfDenmark implements CensusInterface {
*/
public function columns() {
return array(
- new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
- new CensusColumnAge($this, 'TBC', 'To be confirmed'),
- new CensusColumnConditionEnglish($this, 'TBC', 'To be confirmed'),
- new CensusColumnRelationToHead($this, 'TBC', 'To be confirmed'),
- new CensusColumnOccupation($this, 'TBC', 'To be confirmed'),
+ new CensusColumnFullName($this, 'Navn', ''),
+ new CensusColumnAge($this, 'Alder', ''),
+ new CensusColumnConditionDanish($this, 'Civilstand', ''),
+ new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
);
}
}
diff --git a/app/Census/CensusOfDenmark1845.php b/app/Census/CensusOfDenmark1845.php
index ec6ad75a84..f25f1535c5 100644
--- a/app/Census/CensusOfDenmark1845.php
+++ b/app/Census/CensusOfDenmark1845.php
@@ -35,13 +35,13 @@ class CensusOfDenmark1845 extends CensusOfDenmark implements CensusInterface {
*/
public function columns() {
return array(
- new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
- new CensusColumnAge($this, 'TBC', 'To be confirmed'),
- new CensusColumnConditionEnglish($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
+ new CensusColumnFullName($this, 'Navn', ''),
+ new CensusColumnAge($this, 'Alder', ''),
+ new CensusColumnConditionDanish($this, 'Civilstand', ''),
+ new CensusColumnOccupation($this, 'Erhverv', ''),
+ new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
);
}
}
diff --git a/app/Census/CensusOfDenmark1850.php b/app/Census/CensusOfDenmark1850.php
index 0eed3fe77b..a184061251 100644
--- a/app/Census/CensusOfDenmark1850.php
+++ b/app/Census/CensusOfDenmark1850.php
@@ -35,13 +35,16 @@ class CensusOfDenmark1850 extends CensusOfDenmark implements CensusInterface {
*/
public function columns() {
return array(
- new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
- new CensusColumnAge($this, 'TBC', 'To be confirmed'),
- new CensusColumnConditionEnglish($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
+ new CensusColumnFullName($this, 'Navn', ''),
+ new CensusColumnAge($this, 'Alder', ''),
+ new CensusColumnConditionDanish($this, 'Civilstand', ''),
+ new CensusColumnOccupation($this, 'Erhverv', ''),
+ new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
);
}
}
diff --git a/app/Census/CensusOfDenmark1855.php b/app/Census/CensusOfDenmark1855.php
index 87a144e0bc..50e31562b2 100644
--- a/app/Census/CensusOfDenmark1855.php
+++ b/app/Census/CensusOfDenmark1855.php
@@ -35,14 +35,16 @@ class CensusOfDenmark1855 extends CensusOfDenmark implements CensusInterface {
*/
public function columns() {
return array(
- new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
- new CensusColumnAge($this, 'TBC', 'To be confirmed'),
- new CensusColumnConditionEnglish($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
+ new CensusColumnFullName($this, 'Navn', ''),
+ new CensusColumnAge($this, 'Alder', ''),
+ new CensusColumnConditionDanish($this, 'Civilstand', ''),
+ new CensusColumnOccupation($this, 'Erhverv', ''),
+ new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
+ new CensusColumnNull($this, '', ''), // Religion?
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
);
}
}
diff --git a/app/Census/CensusOfDenmark1860.php b/app/Census/CensusOfDenmark1860.php
index 8e01ac2a04..de5a448613 100644
--- a/app/Census/CensusOfDenmark1860.php
+++ b/app/Census/CensusOfDenmark1860.php
@@ -35,14 +35,18 @@ class CensusOfDenmark1860 extends CensusOfDenmark implements CensusInterface {
*/
public function columns() {
return array(
- new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
- new CensusColumnAge($this, 'TBC', 'To be confirmed'),
- new CensusColumnConditionEnglish($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
+ new CensusColumnFullName($this, 'Navn', ''),
+ new CensusColumnAge($this, 'Alder', ''),
+ new CensusColumnConditionDanish($this, 'Civilstand', ''),
+ new CensusColumnOccupation($this, 'Erhverv', ''),
+ new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
+ new CensusColumnNull($this, '', ''), // Religion?
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
);
}
}
diff --git a/app/Census/CensusOfDenmark1870.php b/app/Census/CensusOfDenmark1870.php
index 56df2df3db..18ee291c99 100644
--- a/app/Census/CensusOfDenmark1870.php
+++ b/app/Census/CensusOfDenmark1870.php
@@ -35,14 +35,20 @@ class CensusOfDenmark1870 extends CensusOfDenmark implements CensusInterface {
*/
public function columns() {
return array(
- new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
- new CensusColumnAge($this, 'TBC', 'To be confirmed'),
- new CensusColumnConditionEnglish($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
+ new CensusColumnFullName($this, 'Navn', ''),
+ new CensusColumnSexMK($this, 'Køn', ''),
+ new CensusColumnAge($this, 'Alder', ''),
+ new CensusColumnConditionDanish($this, 'Civilstand', ''),
+ new CensusColumnReligion($this, 'Religion', ''),
+ new CensusColumnOccupation($this, 'Erhverv', ''),
+ new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
);
}
}
diff --git a/app/Census/CensusOfDenmark1880.php b/app/Census/CensusOfDenmark1880.php
index feb6f3eee9..043e74154f 100644
--- a/app/Census/CensusOfDenmark1880.php
+++ b/app/Census/CensusOfDenmark1880.php
@@ -35,15 +35,19 @@ class CensusOfDenmark1880 extends CensusOfDenmark implements CensusInterface {
*/
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 CensusColumnConditionEnglish($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
+ new CensusColumnFullName($this, 'Navn', ''),
+ new CensusColumnSexMK($this, 'Køn', ''),
+ new CensusColumnAge($this, 'Alder', ''),
+ new CensusColumnConditionDanish($this, 'Civilstand', ''),
+ new CensusColumnReligion($this, 'Religion', ''),
+ new CensusColumnOccupation($this, 'Erhverv', ''),
+ new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
);
}
}
diff --git a/app/Census/CensusOfDenmark1885.php b/app/Census/CensusOfDenmark1885.php
index 95a7c55021..e0cdf4496e 100644
--- a/app/Census/CensusOfDenmark1885.php
+++ b/app/Census/CensusOfDenmark1885.php
@@ -44,15 +44,19 @@ class CensusOfDenmark1885 extends CensusOfDenmark implements CensusInterface {
*/
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 CensusColumnConditionEnglish($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
+ new CensusColumnFullName($this, 'Navn', ''),
+ new CensusColumnSexMK($this, 'Køn', ''),
+ new CensusColumnAge($this, 'Alder', ''),
+ new CensusColumnConditionDanish($this, 'Civilstand', ''),
+ new CensusColumnReligion($this, 'Religion', ''),
+ new CensusColumnOccupation($this, 'Erhverv', ''),
+ new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
);
}
}
diff --git a/app/Census/CensusOfDenmark1890.php b/app/Census/CensusOfDenmark1890.php
index f6b0dbf62d..9e21f32f3d 100644
--- a/app/Census/CensusOfDenmark1890.php
+++ b/app/Census/CensusOfDenmark1890.php
@@ -35,15 +35,21 @@ class CensusOfDenmark1890 extends CensusOfDenmark implements CensusInterface {
*/
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 CensusColumnConditionEnglish($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
+ new CensusColumnFullName($this, 'Navn', 'Samtlige Personers fulde Navn.'),
+ new CensusColumnSexMK($this, 'Køn', 'Kjønnet. Mandkøn (M.) eller Kvindekøn (Kv.).'),
+ new CensusColumnAge($this, 'Alder', 'Alder. Alderen anføres med det fyldte Aar, men for Børn, der ikke have fyldt 1 Aar, anføres „Under 1 Aar“ of Fødselsdagen.'),
+ new CensusColumnConditionDanish($this, 'Civilstand', 'Ægteskabelig Stillinge. Ugift (U.), Gift (G.), Enkemand eller Enke (E.), Separeret (S.), Fraskilt (F.).'),
+ new CensusColumnReligion($this, 'Trossamfund', 'Trossamfund („Folkekirken“ eller andetSamfund, saasom „det frilutheranske“, „det romersk katholske“, det „mosaiske“ o.s.v.).'),
+ new CensusColumnBirthPlace($this, 'Fødested', 'Fødested, nemlig Sognets og Amtets eller Kjøbstadens (eller Handelpladsens) Navn, og for de i Bilandene Fødte samt for Udlændinge Landet, hvori de ere fødte.'),
+ new CensusColumnRelationToHead($this, 'Stilling i familien', 'Stilling i Familien (Husfader, Husmoder, Barn, Tjenestetyende, Logerende o.s.v.).'),
+ new CensusColumnOccupation($this, 'Erhverv', 'Erhverv (Embede, Forretning, Næringsvej og Titel, samt Vedkommendes Stilling som Hovedperson eller Medhjælper, Forvalter, Svend eller Dreng o.s.v.). - Arten af Erhvervet (Gaardejer, Husmand, Grovsmed, Vognfabrikant, Høker o.s.v.). - Under Fattigforsørgelse.'),
+ new CensusColumnNull($this, 'Erhvervsstedet', 'Erhvervsstedet (Beboelseskommunen eller hvilken anden Kommune).'),
+ new CensusColumnNull($this, 'Døvstumme', 'Døvstumme.'),
+ new CensusColumnNull($this, 'Døve', 'Døve (Hørelson aldeles berøvet).'),
+ new CensusColumnNull($this, 'Blinde', 'Blinde (Synet aldeles borsvet).'),
+ new CensusColumnNull($this, 'Idioter', 'Uden Forstandsovner (Idioter).'),
+ new CensusColumnNull($this, 'Sindssyge', 'Sindssyge.'),
+ new CensusColumnNull($this, 'Anmærkninger', 'Anmærkninger.'),
);
}
}
diff --git a/app/Census/CensusOfDenmark1895.php b/app/Census/CensusOfDenmark1895.php
index f1063a8805..899226dd41 100644
--- a/app/Census/CensusOfDenmark1895.php
+++ b/app/Census/CensusOfDenmark1895.php
@@ -44,15 +44,21 @@ class CensusOfDenmark1895 extends CensusOfDenmark implements CensusInterface {
*/
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 CensusColumnConditionEnglish($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
+ new CensusColumnFullName($this, 'Navn', 'Samtlige Personers fulde Navn.'),
+ new CensusColumnSexMK($this, 'Køn', 'Kjønnet. Mandkøn (M.) eller Kvindekøn (Kv.).'),
+ new CensusColumnAge($this, 'Alder', 'Alder. Alderen anføres med det fyldte Aar, men for Børn, der ikke have fyldt 1 Aar, anføres „Under 1 Aar“ of Fødselsdagen.'),
+ new CensusColumnConditionDanish($this, 'Civilstand', 'Ægteskabelig Stillinge. Ugift (U.), Gift (G.), Enkemand eller Enke (E.), Separeret (S.), Fraskilt (F.).'),
+ new CensusColumnReligion($this, 'Trossamfund', 'Trossamfund („Folkekirken“ eller andetSamfund, saasom „det frilutheranske“, „det romersk katholske“, det „mosaiske“ o.s.v.).'),
+ new CensusColumnBirthPlace($this, 'Fødested', 'Fødested, nemlig Sognets og Amtets eller Kjøbstadens (eller Handelpladsens) Navn, og for de i Bilandene Fødte samt for Udlændinge Landet, hvori de ere fødte.'),
+ new CensusColumnRelationToHead($this, 'Stilling i familien', 'Stilling i Familien (Husfader, Husmoder, Barn, Tjenestetyende, Logerende o.s.v.).'),
+ new CensusColumnOccupation($this, 'Erhverv', 'Erhverv (Embede, Forretning, Næringsvej og Titel, samt Vedkommendes Stilling som Hovedperson eller Medhjælper, Forvalter, Svend eller Dreng o.s.v.). - Arten af Erhvervet (Gaardejer, Husmand, Grovsmed, Vognfabrikant, Høker o.s.v.). - Under Fattigforsørgelse.'),
+ new CensusColumnNull($this, 'Erhvervsstedet', 'Erhvervsstedet (Beboelseskommunen eller hvilken anden Kommune).'),
+ new CensusColumnNull($this, 'Døvstumme', 'Døvstumme.'),
+ new CensusColumnNull($this, 'Døve', 'Døve (Hørelson aldeles berøvet).'),
+ new CensusColumnNull($this, 'Blinde', 'Blinde (Synet aldeles borsvet).'),
+ new CensusColumnNull($this, 'Idioter', 'Uden Forstandsovner (Idioter).'),
+ new CensusColumnNull($this, 'Sindssyge', 'Sindssyge.'),
+ new CensusColumnNull($this, 'Anmærkninger', 'Anmærkninger.'),
);
}
}
diff --git a/app/Census/CensusOfDenmark1901.php b/app/Census/CensusOfDenmark1901.php
index e96369d29b..4c73a68e90 100644
--- a/app/Census/CensusOfDenmark1901.php
+++ b/app/Census/CensusOfDenmark1901.php
@@ -35,16 +35,23 @@ class CensusOfDenmark1901 extends CensusOfDenmark implements CensusInterface {
*/
public function columns() {
return array(
- new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
- new CensusColumnBirthDate($this, 'TBC', 'To be confirmed'),
- new CensusColumnSexMF($this, 'TBC', 'To be confirmed'),
- new CensusColumnConditionEnglish($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 CensusColumnFullName($this, 'Navn', 'Samtlige Personers Navn (ogsaa Fornavn). Ved Børn, endnu uden Navn, sættes „Dreng“ eller „Pige“.'),
+ new CensusColumnSexMK($this, 'Køn', 'Kjønnet. Mandkøn (M.) eller Kvindekøn (Kv.).'),
+ new CensusColumnBirthDaySlashMonthYear($this, 'Fødselsdag', 'Føderlsaar og Føderladag.'),
+ new CensusColumnConditionDanish($this, 'Civilstand', 'Ægteskabelig Stillinge. Ugift (U.), Gift (G.), Enkemand eller Enke (E.), Separeret (S.), Fraskilt (F.).'),
+ new CensusColumnReligion($this, 'Trossamfund', 'Trossamfund (Folkekirken eller Navnet paa det Trossamfund, man tilhører, eller „uden for Trossamfund“).'),
+ new CensusColumnBirthPlace($this, 'Fødested', 'Fødested 1) Indenlandsk Fødested: Kebstadens, Handelspladsens eller Sogneta og Amtets Navn (kan Amtet ikke angives, sættes vedkommende Landsdel, f. Eks. Fyn, Jlland osv.), 2) Fedt i Bilandene eller Udlandet: Landets Navn.'),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnRelationToHead($this, 'Stilling i familien', 'Stilling i Familien (Husfader, Husmoder, Barn, Slangtning o.l., Tjenestetyende (naar vedkommende har Skudsmaalsbog), Pensioner, logerende.'),
+ new CensusColumnOccupation($this, 'Erhverv', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, 'Anmærkninger', 'Anmærkninger.'),
);
}
}
diff --git a/app/Census/CensusOfDenmark1906.php b/app/Census/CensusOfDenmark1906.php
index 186c87b5ce..ccb1bd6e79 100644
--- a/app/Census/CensusOfDenmark1906.php
+++ b/app/Census/CensusOfDenmark1906.php
@@ -35,17 +35,20 @@ class CensusOfDenmark1906 extends CensusOfDenmark implements CensusInterface {
*/
public function columns() {
return array(
- new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
- new CensusColumnBirthDate($this, 'TBC', 'To be confirmed'),
- new CensusColumnSexMF($this, 'TBC', 'To be confirmed'),
- new CensusColumnConditionEnglish($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
+ new CensusColumnFullName($this, 'Navn', 'Samtlige Personers Navn (ogsaa Fornavn). Ved Børn, endnu uden Navn, sættes „Dreng“ eller „Pige“. Midlertidig fraværerade Personer anføres ikke her, men paa Skemaeta Bagside)'),
+ new CensusColumnSexMK($this, 'Køn', 'Kjønnet. Mandkøn (M) eller Kvindekøn (K).'),
+ new CensusColumnBirthDaySlashMonthYear($this, 'Fødselsdag', 'Føderlsaar og Føderladag.'),
+ new CensusColumnConditionDanish($this, 'Civilstand', 'Ægteskabelig Stillinge. Ugift (U), Gift (G), Enkemand eller Enke (E), Separeret (S), Fraskilt (F).'),
+ new CensusColumnReligion($this, 'Trossamfund', 'Trossamfund (Folkekirken eller Navnet paa det Trossamfund, man tilhører, eller „udenfor Trossamfund“).'),
+ new CensusColumnBirthPlace($this, 'Fødested', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnRelationToHead($this, 'Stilling i familien', 'Stilling i Familien: Husfader, Husmoder, Barn, Slangtning o.l., Tjenestetyende, Logerende, Pensioner'),
+ new CensusColumnOccupation($this, 'Erhverv', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, '', ''),
+ new CensusColumnNull($this, 'Anmærkninger', 'Anmærkninger.'),
);
}
}
diff --git a/app/Census/CensusOfDenmark1911.php b/app/Census/CensusOfDenmark1911.php
index af9ac853f2..076bd9329b 100644
--- a/app/Census/CensusOfDenmark1911.php
+++ b/app/Census/CensusOfDenmark1911.php
@@ -35,16 +35,16 @@ class CensusOfDenmark1911 extends CensusOfDenmark implements CensusInterface {
*/
public function columns() {
return array(
- new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
- new CensusColumnBirthDate($this, 'TBC', 'To be confirmed'),
- new CensusColumnSexMF($this, 'TBC', 'To be confirmed'),
- new CensusColumnConditionEnglish($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 CensusColumnFullName($this, '', ''),
+ new CensusColumnBirthDate($this, '', ''),
+ new CensusColumnSexMF($this, '', ''),
+ new CensusColumnConditionEnglish($this, '', ''),
+ new CensusColumnRelationToHead($this, '', ''),
+ new CensusColumnOccupation($this, '', ''),
+ new CensusColumnBirthPlace($this, '', ''),
+ new CensusColumnNull($this, '', ''), // religion
+ new CensusColumnNull($this, '', ''), // employment
+ new CensusColumnNull($this, '', ''), // handicaps
);
}
}
diff --git a/app/Census/CensusOfDenmark1916.php b/app/Census/CensusOfDenmark1916.php
index 317814e12c..7739092634 100644
--- a/app/Census/CensusOfDenmark1916.php
+++ b/app/Census/CensusOfDenmark1916.php
@@ -35,17 +35,17 @@ class CensusOfDenmark1916 extends CensusOfDenmark implements CensusInterface {
*/
public function columns() {
return array(
- new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
- new CensusColumnBirthDate($this, 'TBC', 'To be confirmed'),
- new CensusColumnSexMF($this, 'TBC', 'To be confirmed'),
- new CensusColumnConditionEnglish($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
+ new CensusColumnFullName($this, '', ''),
+ new CensusColumnBirthDate($this, '', ''),
+ new CensusColumnSexMF($this, '', ''),
+ new CensusColumnConditionEnglish($this, '', ''),
+ new CensusColumnRelationToHead($this, '', ''),
+ new CensusColumnOccupation($this, '', ''),
+ new CensusColumnBirthPlace($this, '', ''),
+ new CensusColumnNull($this, '', ''), // religion
+ new CensusColumnNull($this, '', ''), // employment
+ new CensusColumnNull($this, '', ''), // handicaps
+ new CensusColumnNull($this, '', ''), // savings
);
}
}
diff --git a/app/Census/CensusOfDenmark1921.php b/app/Census/CensusOfDenmark1921.php
index 58d9273486..c64d916b47 100644
--- a/app/Census/CensusOfDenmark1921.php
+++ b/app/Census/CensusOfDenmark1921.php
@@ -35,17 +35,17 @@ class CensusOfDenmark1921 extends CensusOfDenmark implements CensusInterface {
*/
public function columns() {
return array(
- new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
- new CensusColumnBirthDate($this, 'TBC', 'To be confirmed'),
- new CensusColumnSexMF($this, 'TBC', 'To be confirmed'),
- new CensusColumnConditionEnglish($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
+ new CensusColumnFullName($this, '', ''),
+ new CensusColumnBirthDate($this, '', ''),
+ new CensusColumnSexMF($this, '', ''),
+ new CensusColumnConditionEnglish($this, '', ''),
+ new CensusColumnRelationToHead($this, '', ''),
+ new CensusColumnOccupation($this, '', ''),
+ new CensusColumnBirthPlace($this, '', ''),
+ new CensusColumnNull($this, '', ''), // religion
+ new CensusColumnNull($this, '', ''), // employment
+ new CensusColumnNull($this, '', ''), // handicaps
+ new CensusColumnNull($this, '', ''), // savings
);
}
}
diff --git a/app/Census/CensusOfDenmark1925.php b/app/Census/CensusOfDenmark1925.php
index ed78492fcc..e99cb2f4ff 100644
--- a/app/Census/CensusOfDenmark1925.php
+++ b/app/Census/CensusOfDenmark1925.php
@@ -35,15 +35,15 @@ class CensusOfDenmark1925 extends CensusOfDenmark implements CensusInterface {
*/
public function columns() {
return array(
- new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
- new CensusColumnBirthDate($this, 'TBC', 'To be confirmed'),
- new CensusColumnSexMF($this, 'TBC', 'To be confirmed'),
- new CensusColumnConditionEnglish($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
+ new CensusColumnFullName($this, '', ''),
+ new CensusColumnBirthDate($this, '', ''),
+ new CensusColumnSexMF($this, '', ''),
+ new CensusColumnConditionEnglish($this, '', ''),
+ new CensusColumnRelationToHead($this, '', ''),
+ new CensusColumnOccupation($this, '', ''),
+ new CensusColumnBirthPlace($this, '', ''),
+ new CensusColumnNull($this, '', ''), // religion
+ new CensusColumnNull($this, '', ''), // citizenship
);
}
}
diff --git a/app/Census/CensusOfDenmark1930.php b/app/Census/CensusOfDenmark1930.php
index f8f33dcddc..c96b1745ca 100644
--- a/app/Census/CensusOfDenmark1930.php
+++ b/app/Census/CensusOfDenmark1930.php
@@ -35,17 +35,17 @@ class CensusOfDenmark1930 extends CensusOfDenmark implements CensusInterface {
*/
public function columns() {
return array(
- new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
- new CensusColumnBirthDate($this, 'TBC', 'To be confirmed'),
- new CensusColumnSexMF($this, 'TBC', 'To be confirmed'),
- new CensusColumnConditionEnglish($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
+ new CensusColumnFullName($this, '', ''),
+ new CensusColumnBirthDate($this, '', ''),
+ new CensusColumnSexMF($this, '', ''),
+ new CensusColumnConditionEnglish($this, '', ''),
+ new CensusColumnRelationToHead($this, '', ''),
+ new CensusColumnOccupation($this, '', ''),
+ new CensusColumnBirthPlace($this, '', ''),
+ new CensusColumnNull($this, '', ''), // religion
+ new CensusColumnNull($this, '', ''), // employment
+ new CensusColumnNull($this, '', ''), // handicaps
+ new CensusColumnNull($this, '', ''), // citizenship
);
}
}
diff --git a/app/Census/CensusOfDenmark1940.php b/app/Census/CensusOfDenmark1940.php
index da822b9306..e2b0cc6c16 100644
--- a/app/Census/CensusOfDenmark1940.php
+++ b/app/Census/CensusOfDenmark1940.php
@@ -35,17 +35,17 @@ class CensusOfDenmark1940 extends CensusOfDenmark implements CensusInterface {
*/
public function columns() {
return array(
- new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
- new CensusColumnBirthDate($this, 'TBC', 'To be confirmed'),
- new CensusColumnSexMF($this, 'TBC', 'To be confirmed'),
- new CensusColumnConditionEnglish($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
+ new CensusColumnFullName($this, '', ''),
+ new CensusColumnBirthDate($this, '', ''),
+ new CensusColumnSexMF($this, '', ''),
+ new CensusColumnConditionEnglish($this, '', ''),
+ new CensusColumnRelationToHead($this, '', ''),
+ new CensusColumnOccupation($this, '', ''),
+ new CensusColumnBirthPlace($this, '', ''),
+ new CensusColumnNull($this, '', ''), // religion
+ new CensusColumnNull($this, '', ''), // employment
+ new CensusColumnNull($this, '', ''), // handicaps
+ new CensusColumnNull($this, '', ''), // citizenship
);
}
}
diff --git a/app/Census/CensusOfDenmark1950.php b/app/Census/CensusOfDenmark1950.php
index eb666bf9f3..4844ac724f 100644
--- a/app/Census/CensusOfDenmark1950.php
+++ b/app/Census/CensusOfDenmark1950.php
@@ -35,17 +35,17 @@ class CensusOfDenmark1950 extends CensusOfDenmark implements CensusInterface {
*/
public function columns() {
return array(
- new CensusColumnFullName($this, 'TBC', 'To be confirmed'),
- new CensusColumnBirthDate($this, 'TBC', 'To be confirmed'),
- new CensusColumnSexMF($this, 'TBC', 'To be confirmed'),
- new CensusColumnConditionEnglish($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
+ new CensusColumnFullName($this, '', ''),
+ new CensusColumnBirthDate($this, '', ''),
+ new CensusColumnSexMF($this, '', ''),
+ new CensusColumnConditionEnglish($this, '', ''),
+ new CensusColumnRelationToHead($this, '', ''),
+ new CensusColumnOccupation($this, '', ''),
+ new CensusColumnBirthPlace($this, '', ''),
+ new CensusColumnNull($this, '', ''), // religion
+ new CensusColumnNull($this, '', ''), // employment
+ new CensusColumnNull($this, '', ''), // handicaps
+ new CensusColumnNull($this, '', ''), // citizenship
);
}
}