Fix #810 US census

1 files changed, 39 insertions, 10 deletions

diff --git a/app/Census/CensusOfUnitedStates1840.php b/app/Census/CensusOfUnitedStates1840.php
index cfa30a25b4..1e6baacd1b 100644
--- a/app/Census/CensusOfUnitedStates1840.php
+++ b/app/Census/CensusOfUnitedStates1840.php
@@ -36,16 +36,45 @@ class CensusOfUnitedStates1840 extends CensusOfUnitedStates implements CensusInt
 	public function columns() {
 		return array(
 
-			new CensusColumnFullName($this, 'Name', 'Name'),
-			new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'),
-			new CensusColumnAge($this, 'Age', 'Age'),
-			new CensusColumnSexMF($this, 'Sex', 'Sex'),
-			new CensusColumnNull($this, 'Slaves', 'Slaves'),
-			new CensusColumnNull($this, 'Free colored', 'Free colored persons'),
-			new CensusColumnNull($this, 'Infirm', 'Whether deaf and dumb or blind'),
-			new CensusColumnNull($this, 'FNR', 'Foreigners not naturalized'),
-			new CensusColumnNull($this, 'Other Infirm', 'Slaves & colored deaf and dumb or blind'),
-
+			new CensusColumnFullName($this, 'Name', 'Name of head of family'),
+			new CensusColumnNull($this, 'M0', 'Free white males 0-5 years'),
+			new CensusColumnNull($this, 'M5', 'Free white males 5-10 years'),
+			new CensusColumnNull($this, 'M10', 'Free white males 10-15 years'),
+			new CensusColumnNull($this, 'M15', 'Free white males 15-20 years'),
+			new CensusColumnNull($this, 'M20', 'Free white males 20-30 years'),
+			new CensusColumnNull($this, 'M30', 'Free white males 30-40 years'),
+			new CensusColumnNull($this, 'M40', 'Free white males 40-50 years'),
+			new CensusColumnNull($this, 'M50', 'Free white males 50-60 years'),
+			new CensusColumnNull($this, 'M60', 'Free white males 60-70 years'),
+			new CensusColumnNull($this, 'M70', 'Free white males 70-80 years'),
+			new CensusColumnNull($this, 'M80', 'Free white males 80-90 years'),
+			new CensusColumnNull($this, 'M90', 'Free white males 90-100 years'),
+			new CensusColumnNull($this, 'M100', 'Free white males 100+ years'),
+			new CensusColumnNull($this, 'F0', 'Free white females 0-5 years'),
+			new CensusColumnNull($this, 'F5', 'Free white females 5-10 years'),
+			new CensusColumnNull($this, 'F10', 'Free white females 10-15 years'),
+			new CensusColumnNull($this, 'F15', 'Free white females 15-20 years'),
+			new CensusColumnNull($this, 'F20', 'Free white females 20-30 years'),
+			new CensusColumnNull($this, 'F30', 'Free white females 30-40 years'),
+			new CensusColumnNull($this, 'F40', 'Free white females 40-50 years'),
+			new CensusColumnNull($this, 'F50', 'Free white females 50-60 years'),
+			new CensusColumnNull($this, 'F60', 'Free white females 60-70 years'),
+			new CensusColumnNull($this, 'F70', 'Free white females 70-80 years'),
+			new CensusColumnNull($this, 'F80', 'Free white females 80-90 years'),
+			new CensusColumnNull($this, 'F90', 'Free white females 90-100 years'),
+			new CensusColumnNull($this, 'F100', 'Free white females 100+ years'),
+			new CensusColumnNull($this, 'M0', 'Free colored males 0-10 years'),
+			new CensusColumnNull($this, 'M10', 'Free colored males 10-24 years'),
+			new CensusColumnNull($this, 'M24', 'Free colored males 24-36 years'),
+			new CensusColumnNull($this, 'M36', 'Free colored males 36-55 years'),
+			new CensusColumnNull($this, 'M55', 'Free colored males 55-100 years'),
+			new CensusColumnNull($this, 'M100', 'Free colored males 100+ years'),
+			new CensusColumnNull($this, 'F0', 'Free colored females 0-10 years'),
+			new CensusColumnNull($this, 'F10', 'Free colored females 10-24 years'),
+			new CensusColumnNull($this, 'F24', 'Free colored females 24-36 years'),
+			new CensusColumnNull($this, 'F36', 'Free colored females 36-55 years'),
+			new CensusColumnNull($this, 'F55', 'Free colored females 55-100 years'),
+			new CensusColumnNull($this, 'F100', 'Free colored females 100+ years'),
 		);
 	}
 }