@@ -22,32 +22,32 @@ |
||
22 | 22 | * The number of children born alive. |
23 | 23 | */ |
24 | 24 | class CensusColumnChildrenBornAlive extends AbstractCensusColumn implements CensusColumnInterface { |
25 | - /** |
|
26 | - * Generate the likely value of this census column, based on available information. |
|
27 | - * |
|
28 | - * @param Individual $individual |
|
29 | - * @param Individual|null $head |
|
30 | - * |
|
31 | - * @return string |
|
32 | - */ |
|
33 | - public function generate(Individual $individual, Individual $head = null) { |
|
34 | - if ($individual->getSex() !== 'F') { |
|
35 | - return ''; |
|
36 | - } |
|
25 | + /** |
|
26 | + * Generate the likely value of this census column, based on available information. |
|
27 | + * |
|
28 | + * @param Individual $individual |
|
29 | + * @param Individual|null $head |
|
30 | + * |
|
31 | + * @return string |
|
32 | + */ |
|
33 | + public function generate(Individual $individual, Individual $head = null) { |
|
34 | + if ($individual->getSex() !== 'F') { |
|
35 | + return ''; |
|
36 | + } |
|
37 | 37 | |
38 | - $count = 0; |
|
39 | - foreach ($individual->getSpouseFamilies() as $family) { |
|
40 | - foreach ($family->getChildren() as $child) { |
|
41 | - if ( |
|
42 | - $child->getBirthDate()->isOK() && |
|
43 | - Date::compare($child->getBirthDate(), $this->date()) < 0 && |
|
44 | - $child->getBirthDate() != $child->getDeathDate() |
|
45 | - ) { |
|
46 | - $count++; |
|
47 | - } |
|
48 | - } |
|
49 | - } |
|
38 | + $count = 0; |
|
39 | + foreach ($individual->getSpouseFamilies() as $family) { |
|
40 | + foreach ($family->getChildren() as $child) { |
|
41 | + if ( |
|
42 | + $child->getBirthDate()->isOK() && |
|
43 | + Date::compare($child->getBirthDate(), $this->date()) < 0 && |
|
44 | + $child->getBirthDate() != $child->getDeathDate() |
|
45 | + ) { |
|
46 | + $count++; |
|
47 | + } |
|
48 | + } |
|
49 | + } |
|
50 | 50 | |
51 | - return (string) $count; |
|
52 | - } |
|
51 | + return (string) $count; |
|
52 | + } |
|
53 | 53 | } |
@@ -21,7 +21,8 @@ discard block |
||
21 | 21 | /** |
22 | 22 | * The number of children born alive. |
23 | 23 | */ |
24 | -class CensusColumnChildrenBornAlive extends AbstractCensusColumn implements CensusColumnInterface { |
|
24 | +class CensusColumnChildrenBornAlive extends AbstractCensusColumn implements CensusColumnInterface |
|
25 | +{ |
|
25 | 26 | /** |
26 | 27 | * Generate the likely value of this census column, based on available information. |
27 | 28 | * |
@@ -30,7 +31,8 @@ discard block |
||
30 | 31 | * |
31 | 32 | * @return string |
32 | 33 | */ |
33 | - public function generate(Individual $individual, Individual $head = null) { |
|
34 | + public function generate(Individual $individual, Individual $head = null) |
|
35 | + { |
|
34 | 36 | if ($individual->getSex() !== 'F') { |
35 | 37 | return ''; |
36 | 38 | } |
@@ -19,44 +19,44 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfDenmark1885 extends CensusOfDenmark implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '01 FEB 1885'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '01 FEB 1885'; |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * Where did this census occur, in GEDCOM format. |
|
33 | - * |
|
34 | - * @return string |
|
35 | - */ |
|
36 | - public function censusPlace() { |
|
37 | - return 'København, Danmark'; |
|
38 | - } |
|
31 | + /** |
|
32 | + * Where did this census occur, in GEDCOM format. |
|
33 | + * |
|
34 | + * @return string |
|
35 | + */ |
|
36 | + public function censusPlace() { |
|
37 | + return 'København, Danmark'; |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * The columns of the census. |
|
42 | - * |
|
43 | - * @return CensusColumnInterface[] |
|
44 | - */ |
|
45 | - public function columns() { |
|
46 | - return array( |
|
47 | - new CensusColumnFullName($this, 'Navn', ''), |
|
48 | - new CensusColumnSexMK($this, 'Køn', ''), |
|
49 | - new CensusColumnAge($this, 'Alder', ''), |
|
50 | - new CensusColumnConditionDanish($this, 'Civilstand', ''), |
|
51 | - new CensusColumnReligion($this, 'Religion', ''), |
|
52 | - new CensusColumnOccupation($this, 'Erhverv', ''), |
|
53 | - new CensusColumnRelationToHead($this, 'Stilling i familien', ''), |
|
54 | - new CensusColumnNull($this, '', ''), |
|
55 | - new CensusColumnNull($this, '', ''), |
|
56 | - new CensusColumnNull($this, '', ''), |
|
57 | - new CensusColumnNull($this, '', ''), |
|
58 | - new CensusColumnNull($this, '', ''), |
|
59 | - new CensusColumnNull($this, '', ''), |
|
60 | - ); |
|
61 | - } |
|
40 | + /** |
|
41 | + * The columns of the census. |
|
42 | + * |
|
43 | + * @return CensusColumnInterface[] |
|
44 | + */ |
|
45 | + public function columns() { |
|
46 | + return array( |
|
47 | + new CensusColumnFullName($this, 'Navn', ''), |
|
48 | + new CensusColumnSexMK($this, 'Køn', ''), |
|
49 | + new CensusColumnAge($this, 'Alder', ''), |
|
50 | + new CensusColumnConditionDanish($this, 'Civilstand', ''), |
|
51 | + new CensusColumnReligion($this, 'Religion', ''), |
|
52 | + new CensusColumnOccupation($this, 'Erhverv', ''), |
|
53 | + new CensusColumnRelationToHead($this, 'Stilling i familien', ''), |
|
54 | + new CensusColumnNull($this, '', ''), |
|
55 | + new CensusColumnNull($this, '', ''), |
|
56 | + new CensusColumnNull($this, '', ''), |
|
57 | + new CensusColumnNull($this, '', ''), |
|
58 | + new CensusColumnNull($this, '', ''), |
|
59 | + new CensusColumnNull($this, '', ''), |
|
60 | + ); |
|
61 | + } |
|
62 | 62 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfDenmark1885 extends CensusOfDenmark implements CensusInterface { |
|
21 | +class CensusOfDenmark1885 extends CensusOfDenmark implements CensusInterface |
|
22 | +{ |
|
22 | 23 | /** |
23 | 24 | * When did this census occur. |
24 | 25 | * |
25 | 26 | * @return string |
26 | 27 | */ |
27 | - public function censusDate() { |
|
28 | + public function censusDate() |
|
29 | + { |
|
28 | 30 | return '01 FEB 1885'; |
29 | 31 | } |
30 | 32 | |
@@ -33,7 +35,8 @@ discard block |
||
33 | 35 | * |
34 | 36 | * @return string |
35 | 37 | */ |
36 | - public function censusPlace() { |
|
38 | + public function censusPlace() |
|
39 | + { |
|
37 | 40 | return 'København, Danmark'; |
38 | 41 | } |
39 | 42 | |
@@ -42,7 +45,8 @@ discard block |
||
42 | 45 | * |
43 | 46 | * @return CensusColumnInterface[] |
44 | 47 | */ |
45 | - public function columns() { |
|
48 | + public function columns() |
|
49 | + { |
|
46 | 50 | return array( |
47 | 51 | new CensusColumnFullName($this, 'Navn', ''), |
48 | 52 | new CensusColumnSexMK($this, 'Køn', ''), |
@@ -22,15 +22,15 @@ |
||
22 | 22 | * The individual's age. |
23 | 23 | */ |
24 | 24 | class CensusColumnAge extends AbstractCensusColumn implements CensusColumnInterface { |
25 | - /** |
|
26 | - * Generate the likely value of this census column, based on available information. |
|
27 | - * |
|
28 | - * @param Individual $individual |
|
29 | - * @param Individual|null $head |
|
30 | - * |
|
31 | - * @return string |
|
32 | - */ |
|
33 | - public function generate(Individual $individual, Individual $head = null) { |
|
34 | - return (string) Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0); |
|
35 | - } |
|
25 | + /** |
|
26 | + * Generate the likely value of this census column, based on available information. |
|
27 | + * |
|
28 | + * @param Individual $individual |
|
29 | + * @param Individual|null $head |
|
30 | + * |
|
31 | + * @return string |
|
32 | + */ |
|
33 | + public function generate(Individual $individual, Individual $head = null) { |
|
34 | + return (string) Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0); |
|
35 | + } |
|
36 | 36 | } |
@@ -21,7 +21,8 @@ discard block |
||
21 | 21 | /** |
22 | 22 | * The individual's age. |
23 | 23 | */ |
24 | -class CensusColumnAge extends AbstractCensusColumn implements CensusColumnInterface { |
|
24 | +class CensusColumnAge extends AbstractCensusColumn implements CensusColumnInterface |
|
25 | +{ |
|
25 | 26 | /** |
26 | 27 | * Generate the likely value of this census column, based on available information. |
27 | 28 | * |
@@ -30,7 +31,8 @@ discard block |
||
30 | 31 | * |
31 | 32 | * @return string |
32 | 33 | */ |
33 | - public function generate(Individual $individual, Individual $head = null) { |
|
34 | + public function generate(Individual $individual, Individual $head = null) |
|
35 | + { |
|
34 | 36 | return (string) Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0); |
35 | 37 | } |
36 | 38 | } |
@@ -19,58 +19,58 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfDeutschland1900 extends CensusOfDeutschland implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '01 DEC 1900'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '01 DEC 1900'; |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * Where did this census occur, in GEDCOM format. |
|
33 | - * |
|
34 | - * @return string |
|
35 | - */ |
|
36 | - public function censusPlace() { |
|
37 | - return 'Mecklenburg-Schwerin, Deutschland'; |
|
38 | - } |
|
31 | + /** |
|
32 | + * Where did this census occur, in GEDCOM format. |
|
33 | + * |
|
34 | + * @return string |
|
35 | + */ |
|
36 | + public function censusPlace() { |
|
37 | + return 'Mecklenburg-Schwerin, Deutschland'; |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * The columns of the census. |
|
42 | - * |
|
43 | - * @return CensusColumnInterface[] |
|
44 | - */ |
|
45 | - public function columns() { |
|
46 | - return array( |
|
47 | - new CensusColumnNull($this, 'Lfd.Nr.', 'Laufende Nummer'), |
|
48 | - new CensusColumnGivenNames($this, 'Vorname', 'Vorname'), |
|
49 | - new CensusColumnSurname($this, 'Familienname', 'Familienname'), |
|
50 | - new CensusColumnRelationToHeadGerman($this, 'Stellung', 'Verwandtschaft oder sonstige Stellung zum Haushaltungsvorstand'), |
|
51 | - new CensusColumnNull($this, 'männlich', 'Geschlecht männlich'), |
|
52 | - new CensusColumnNull($this, 'weiblich', 'Geschlecht weiblich'), |
|
53 | - new CensusColumnNull($this, 'Blind', 'Blind auf beiden Augen'), |
|
54 | - new CensusColumnNull($this, 'Taubstumm', 'Taubstumm'), |
|
55 | - new CensusColumnNull($this, 'Bemerkungen', 'Bemerkungen'), |
|
56 | - new CensusColumnNull($this, '', 'Nachfolgend die detaillierten Zählkartenangaben'), |
|
57 | - new CensusColumnFullName($this, 'ZK 1.Name', '1. Vor- und Familienname:'), |
|
58 | - new CensusColumnNull($this, 'ZK 2.Geschlecht', '2. Geschlecht:'), |
|
59 | - new CensusColumnNull($this, 'ZK 3.Familienstand', '3. Familienstand:'), |
|
60 | - new CensusColumnBirthDayDotMonthYear($this, 'ZK 4.Alter', '4. Alter: geboren den ... im Jahre ...'), |
|
61 | - new CensusColumnBirthPlace($this, 'ZK 5.Geburtsort', '5. Geburtsort: ... im Bezirk (Amt) ...'), |
|
62 | - new CensusColumnNull($this, 'ZK 5.Land/Provinz', 'für außerhalb des Großherzogthums Geborene auch Geburtsland, für in Preußen Geborene auch Provinz: ...'), |
|
63 | - new CensusColumnOccupation($this, 'ZK 6.Beruf/Stand', '6. Beruf, Stand, Erwerb, Gewerbe, Geschäft oder Nahrungszweig:'), |
|
64 | - new CensusColumnNull($this, 'ZK 7a.Gemeinde Wohnort', '7.a. Gemeinde (Ortschaft), in welcher der Wohnort (Wohnung), bei verheiratheten Personen der Familienwohnsitz liegt:'), |
|
65 | - new CensusColumnNull($this, 'ZK 7a.Land/Provinz', 'für außerhalb des Großherzogthums Wohnende auch Staat und für in Preußen Wohnende auch Provinz: ...'), |
|
66 | - new CensusColumnNull($this, 'ZK 7b.Gemeinde Erwerbsort', '7.b. Gemeinde (Ortschaft), in welcher der Beruf (die Erwerbsthätigkeit) zur Zeit ausgeübt wird oder zuletzt ausgeübt wurde:'), |
|
67 | - new CensusColumnNull($this, 'ZK 7b.Land/Provinz', 'für außerhalb des Großherzogthums Arbeitende auch Staat und für in Preußen Arbeitende auch Provinz: ...'), |
|
68 | - new CensusColumnReligion($this, 'ZK 8.Religion', '8. Religionsbekenntnis:'), |
|
69 | - new CensusColumnNull($this, 'ZK 9.Muttersprache', '9. Muttersprache (ob deutsch oder welche andere Sprache?):'), |
|
70 | - new CensusColumnNull($this, 'ZK 10.StA', '10. Staatsangehörigkeit:'), |
|
71 | - new CensusColumnNull($this, 'ZK 11.Dienstgrad', '11. Für Militärpersonen im aktiven Dienste: Dienstgrad:'), |
|
72 | - new CensusColumnNull($this, 'ZK 11.Einheit', 'Truppentheil, Kommando- oder Verwaltungsbehörde:'), |
|
73 | - new CensusColumnNull($this, 'ZK 12.Gebrechen', '12. Etwaige körperliche Mängel und Gebrechen:'), |
|
74 | - ); |
|
75 | - } |
|
40 | + /** |
|
41 | + * The columns of the census. |
|
42 | + * |
|
43 | + * @return CensusColumnInterface[] |
|
44 | + */ |
|
45 | + public function columns() { |
|
46 | + return array( |
|
47 | + new CensusColumnNull($this, 'Lfd.Nr.', 'Laufende Nummer'), |
|
48 | + new CensusColumnGivenNames($this, 'Vorname', 'Vorname'), |
|
49 | + new CensusColumnSurname($this, 'Familienname', 'Familienname'), |
|
50 | + new CensusColumnRelationToHeadGerman($this, 'Stellung', 'Verwandtschaft oder sonstige Stellung zum Haushaltungsvorstand'), |
|
51 | + new CensusColumnNull($this, 'männlich', 'Geschlecht männlich'), |
|
52 | + new CensusColumnNull($this, 'weiblich', 'Geschlecht weiblich'), |
|
53 | + new CensusColumnNull($this, 'Blind', 'Blind auf beiden Augen'), |
|
54 | + new CensusColumnNull($this, 'Taubstumm', 'Taubstumm'), |
|
55 | + new CensusColumnNull($this, 'Bemerkungen', 'Bemerkungen'), |
|
56 | + new CensusColumnNull($this, '', 'Nachfolgend die detaillierten Zählkartenangaben'), |
|
57 | + new CensusColumnFullName($this, 'ZK 1.Name', '1. Vor- und Familienname:'), |
|
58 | + new CensusColumnNull($this, 'ZK 2.Geschlecht', '2. Geschlecht:'), |
|
59 | + new CensusColumnNull($this, 'ZK 3.Familienstand', '3. Familienstand:'), |
|
60 | + new CensusColumnBirthDayDotMonthYear($this, 'ZK 4.Alter', '4. Alter: geboren den ... im Jahre ...'), |
|
61 | + new CensusColumnBirthPlace($this, 'ZK 5.Geburtsort', '5. Geburtsort: ... im Bezirk (Amt) ...'), |
|
62 | + new CensusColumnNull($this, 'ZK 5.Land/Provinz', 'für außerhalb des Großherzogthums Geborene auch Geburtsland, für in Preußen Geborene auch Provinz: ...'), |
|
63 | + new CensusColumnOccupation($this, 'ZK 6.Beruf/Stand', '6. Beruf, Stand, Erwerb, Gewerbe, Geschäft oder Nahrungszweig:'), |
|
64 | + new CensusColumnNull($this, 'ZK 7a.Gemeinde Wohnort', '7.a. Gemeinde (Ortschaft), in welcher der Wohnort (Wohnung), bei verheiratheten Personen der Familienwohnsitz liegt:'), |
|
65 | + new CensusColumnNull($this, 'ZK 7a.Land/Provinz', 'für außerhalb des Großherzogthums Wohnende auch Staat und für in Preußen Wohnende auch Provinz: ...'), |
|
66 | + new CensusColumnNull($this, 'ZK 7b.Gemeinde Erwerbsort', '7.b. Gemeinde (Ortschaft), in welcher der Beruf (die Erwerbsthätigkeit) zur Zeit ausgeübt wird oder zuletzt ausgeübt wurde:'), |
|
67 | + new CensusColumnNull($this, 'ZK 7b.Land/Provinz', 'für außerhalb des Großherzogthums Arbeitende auch Staat und für in Preußen Arbeitende auch Provinz: ...'), |
|
68 | + new CensusColumnReligion($this, 'ZK 8.Religion', '8. Religionsbekenntnis:'), |
|
69 | + new CensusColumnNull($this, 'ZK 9.Muttersprache', '9. Muttersprache (ob deutsch oder welche andere Sprache?):'), |
|
70 | + new CensusColumnNull($this, 'ZK 10.StA', '10. Staatsangehörigkeit:'), |
|
71 | + new CensusColumnNull($this, 'ZK 11.Dienstgrad', '11. Für Militärpersonen im aktiven Dienste: Dienstgrad:'), |
|
72 | + new CensusColumnNull($this, 'ZK 11.Einheit', 'Truppentheil, Kommando- oder Verwaltungsbehörde:'), |
|
73 | + new CensusColumnNull($this, 'ZK 12.Gebrechen', '12. Etwaige körperliche Mängel und Gebrechen:'), |
|
74 | + ); |
|
75 | + } |
|
76 | 76 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfDeutschland1900 extends CensusOfDeutschland implements CensusInterface { |
|
21 | +class CensusOfDeutschland1900 extends CensusOfDeutschland implements CensusInterface |
|
22 | +{ |
|
22 | 23 | /** |
23 | 24 | * When did this census occur. |
24 | 25 | * |
25 | 26 | * @return string |
26 | 27 | */ |
27 | - public function censusDate() { |
|
28 | + public function censusDate() |
|
29 | + { |
|
28 | 30 | return '01 DEC 1900'; |
29 | 31 | } |
30 | 32 | |
@@ -33,7 +35,8 @@ discard block |
||
33 | 35 | * |
34 | 36 | * @return string |
35 | 37 | */ |
36 | - public function censusPlace() { |
|
38 | + public function censusPlace() |
|
39 | + { |
|
37 | 40 | return 'Mecklenburg-Schwerin, Deutschland'; |
38 | 41 | } |
39 | 42 | |
@@ -42,7 +45,8 @@ discard block |
||
42 | 45 | * |
43 | 46 | * @return CensusColumnInterface[] |
44 | 47 | */ |
45 | - public function columns() { |
|
48 | + public function columns() |
|
49 | + { |
|
46 | 50 | return array( |
47 | 51 | new CensusColumnNull($this, 'Lfd.Nr.', 'Laufende Nummer'), |
48 | 52 | new CensusColumnGivenNames($this, 'Vorname', 'Vorname'), |
@@ -19,37 +19,37 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfDenmark1890 extends CensusOfDenmark implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '01 FEB 1890'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '01 FEB 1890'; |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * The columns of the census. |
|
33 | - * |
|
34 | - * @return CensusColumnInterface[] |
|
35 | - */ |
|
36 | - public function columns() { |
|
37 | - return array( |
|
38 | - new CensusColumnFullName($this, 'Navn', 'Samtlige Personers fulde Navn.'), |
|
39 | - new CensusColumnSexMK($this, 'Køn', 'Kjønnet. Mandkøn (M.) eller Kvindekøn (Kv.).'), |
|
40 | - 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.'), |
|
41 | - new CensusColumnConditionDanish($this, 'Civilstand', 'Ægteskabelig Stillinge. Ugift (U.), Gift (G.), Enkemand eller Enke (E.), Separeret (S.), Fraskilt (F.).'), |
|
42 | - new CensusColumnReligion($this, 'Trossamfund', 'Trossamfund („Folkekirken“ eller andetSamfund, saasom „det frilutheranske“, „det romersk katholske“, det „mosaiske“ o.s.v.).'), |
|
43 | - 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.'), |
|
44 | - new CensusColumnRelationToHead($this, 'Stilling i familien', 'Stilling i Familien (Husfader, Husmoder, Barn, Tjenestetyende, Logerende o.s.v.).'), |
|
45 | - 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.'), |
|
46 | - new CensusColumnNull($this, 'Erhvervsstedet', 'Erhvervsstedet (Beboelseskommunen eller hvilken anden Kommune).'), |
|
47 | - new CensusColumnNull($this, 'Døvstumme', 'Døvstumme.'), |
|
48 | - new CensusColumnNull($this, 'Døve', 'Døve (Hørelson aldeles berøvet).'), |
|
49 | - new CensusColumnNull($this, 'Blinde', 'Blinde (Synet aldeles borsvet).'), |
|
50 | - new CensusColumnNull($this, 'Idioter', 'Uden Forstandsovner (Idioter).'), |
|
51 | - new CensusColumnNull($this, 'Sindssyge', 'Sindssyge.'), |
|
52 | - new CensusColumnNull($this, 'Anmærkninger', 'Anmærkninger.'), |
|
53 | - ); |
|
54 | - } |
|
31 | + /** |
|
32 | + * The columns of the census. |
|
33 | + * |
|
34 | + * @return CensusColumnInterface[] |
|
35 | + */ |
|
36 | + public function columns() { |
|
37 | + return array( |
|
38 | + new CensusColumnFullName($this, 'Navn', 'Samtlige Personers fulde Navn.'), |
|
39 | + new CensusColumnSexMK($this, 'Køn', 'Kjønnet. Mandkøn (M.) eller Kvindekøn (Kv.).'), |
|
40 | + 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.'), |
|
41 | + new CensusColumnConditionDanish($this, 'Civilstand', 'Ægteskabelig Stillinge. Ugift (U.), Gift (G.), Enkemand eller Enke (E.), Separeret (S.), Fraskilt (F.).'), |
|
42 | + new CensusColumnReligion($this, 'Trossamfund', 'Trossamfund („Folkekirken“ eller andetSamfund, saasom „det frilutheranske“, „det romersk katholske“, det „mosaiske“ o.s.v.).'), |
|
43 | + 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.'), |
|
44 | + new CensusColumnRelationToHead($this, 'Stilling i familien', 'Stilling i Familien (Husfader, Husmoder, Barn, Tjenestetyende, Logerende o.s.v.).'), |
|
45 | + 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.'), |
|
46 | + new CensusColumnNull($this, 'Erhvervsstedet', 'Erhvervsstedet (Beboelseskommunen eller hvilken anden Kommune).'), |
|
47 | + new CensusColumnNull($this, 'Døvstumme', 'Døvstumme.'), |
|
48 | + new CensusColumnNull($this, 'Døve', 'Døve (Hørelson aldeles berøvet).'), |
|
49 | + new CensusColumnNull($this, 'Blinde', 'Blinde (Synet aldeles borsvet).'), |
|
50 | + new CensusColumnNull($this, 'Idioter', 'Uden Forstandsovner (Idioter).'), |
|
51 | + new CensusColumnNull($this, 'Sindssyge', 'Sindssyge.'), |
|
52 | + new CensusColumnNull($this, 'Anmærkninger', 'Anmærkninger.'), |
|
53 | + ); |
|
54 | + } |
|
55 | 55 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfDenmark1890 extends CensusOfDenmark implements CensusInterface { |
|
21 | +class CensusOfDenmark1890 extends CensusOfDenmark implements CensusInterface |
|
22 | +{ |
|
22 | 23 | /** |
23 | 24 | * When did this census occur. |
24 | 25 | * |
25 | 26 | * @return string |
26 | 27 | */ |
27 | - public function censusDate() { |
|
28 | + public function censusDate() |
|
29 | + { |
|
28 | 30 | return '01 FEB 1890'; |
29 | 31 | } |
30 | 32 | |
@@ -33,7 +35,8 @@ discard block |
||
33 | 35 | * |
34 | 36 | * @return CensusColumnInterface[] |
35 | 37 | */ |
36 | - public function columns() { |
|
38 | + public function columns() |
|
39 | + { |
|
37 | 40 | return array( |
38 | 41 | new CensusColumnFullName($this, 'Navn', 'Samtlige Personers fulde Navn.'), |
39 | 42 | new CensusColumnSexMK($this, 'Køn', 'Kjønnet. Mandkøn (M.) eller Kvindekøn (Kv.).'), |
@@ -19,34 +19,34 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfDenmark1860 extends CensusOfDenmark implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '01 FEB 1860'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '01 FEB 1860'; |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * The columns of the census. |
|
33 | - * |
|
34 | - * @return CensusColumnInterface[] |
|
35 | - */ |
|
36 | - public function columns() { |
|
37 | - return array( |
|
38 | - new CensusColumnFullName($this, 'Navn', ''), |
|
39 | - new CensusColumnAge($this, 'Alder', ''), |
|
40 | - new CensusColumnConditionDanish($this, 'Civilstand', ''), |
|
41 | - new CensusColumnOccupation($this, 'Erhverv', ''), |
|
42 | - new CensusColumnRelationToHead($this, 'Stilling i familien', ''), |
|
43 | - new CensusColumnNull($this, '', ''), // Religion? |
|
44 | - new CensusColumnNull($this, '', ''), |
|
45 | - new CensusColumnNull($this, '', ''), |
|
46 | - new CensusColumnNull($this, '', ''), |
|
47 | - new CensusColumnNull($this, '', ''), |
|
48 | - new CensusColumnNull($this, '', ''), |
|
49 | - new CensusColumnNull($this, '', ''), |
|
50 | - ); |
|
51 | - } |
|
31 | + /** |
|
32 | + * The columns of the census. |
|
33 | + * |
|
34 | + * @return CensusColumnInterface[] |
|
35 | + */ |
|
36 | + public function columns() { |
|
37 | + return array( |
|
38 | + new CensusColumnFullName($this, 'Navn', ''), |
|
39 | + new CensusColumnAge($this, 'Alder', ''), |
|
40 | + new CensusColumnConditionDanish($this, 'Civilstand', ''), |
|
41 | + new CensusColumnOccupation($this, 'Erhverv', ''), |
|
42 | + new CensusColumnRelationToHead($this, 'Stilling i familien', ''), |
|
43 | + new CensusColumnNull($this, '', ''), // Religion? |
|
44 | + new CensusColumnNull($this, '', ''), |
|
45 | + new CensusColumnNull($this, '', ''), |
|
46 | + new CensusColumnNull($this, '', ''), |
|
47 | + new CensusColumnNull($this, '', ''), |
|
48 | + new CensusColumnNull($this, '', ''), |
|
49 | + new CensusColumnNull($this, '', ''), |
|
50 | + ); |
|
51 | + } |
|
52 | 52 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfDenmark1860 extends CensusOfDenmark implements CensusInterface { |
|
21 | +class CensusOfDenmark1860 extends CensusOfDenmark implements CensusInterface |
|
22 | +{ |
|
22 | 23 | /** |
23 | 24 | * When did this census occur. |
24 | 25 | * |
25 | 26 | * @return string |
26 | 27 | */ |
27 | - public function censusDate() { |
|
28 | + public function censusDate() |
|
29 | + { |
|
28 | 30 | return '01 FEB 1860'; |
29 | 31 | } |
30 | 32 | |
@@ -33,7 +35,8 @@ discard block |
||
33 | 35 | * |
34 | 36 | * @return CensusColumnInterface[] |
35 | 37 | */ |
36 | - public function columns() { |
|
38 | + public function columns() |
|
39 | + { |
|
37 | 40 | return array( |
38 | 41 | new CensusColumnFullName($this, 'Navn', ''), |
39 | 42 | new CensusColumnAge($this, 'Alder', ''), |
@@ -19,32 +19,32 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfFrance1836 extends CensusOfFrance implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '21 JAN 1836'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '21 JAN 1836'; |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * The columns of the census. |
|
33 | - * |
|
34 | - * @return CensusColumnInterface[] |
|
35 | - */ |
|
36 | - public function columns() { |
|
37 | - return array( |
|
38 | - new CensusColumnSurname($this, 'Noms', 'Noms de famille'), |
|
39 | - new CensusColumnGivenNames($this, 'Prénoms', ''), |
|
40 | - new CensusColumnOccupation($this, 'Titres', 'Titres, qualifications, état ou profession et fonctions'), |
|
41 | - new CensusColumnConditionFrenchGarcon($this, 'Garçons', ''), |
|
42 | - new CensusColumnConditionFrenchHomme($this, 'Hommes', 'Hommes mariés'), |
|
43 | - new CensusColumnConditionFrenchVeuf($this, 'Veufs', ''), |
|
44 | - new CensusColumnConditionFrenchFille($this, 'Filles', ''), |
|
45 | - new CensusColumnConditionFrenchFemme($this, 'Femmes', 'Femmes mariées'), |
|
46 | - new CensusColumnConditionFrenchVeuve($this, 'Veuves', ''), |
|
47 | - new CensusColumnAge($this, 'Âge', ''), |
|
48 | - ); |
|
49 | - } |
|
31 | + /** |
|
32 | + * The columns of the census. |
|
33 | + * |
|
34 | + * @return CensusColumnInterface[] |
|
35 | + */ |
|
36 | + public function columns() { |
|
37 | + return array( |
|
38 | + new CensusColumnSurname($this, 'Noms', 'Noms de famille'), |
|
39 | + new CensusColumnGivenNames($this, 'Prénoms', ''), |
|
40 | + new CensusColumnOccupation($this, 'Titres', 'Titres, qualifications, état ou profession et fonctions'), |
|
41 | + new CensusColumnConditionFrenchGarcon($this, 'Garçons', ''), |
|
42 | + new CensusColumnConditionFrenchHomme($this, 'Hommes', 'Hommes mariés'), |
|
43 | + new CensusColumnConditionFrenchVeuf($this, 'Veufs', ''), |
|
44 | + new CensusColumnConditionFrenchFille($this, 'Filles', ''), |
|
45 | + new CensusColumnConditionFrenchFemme($this, 'Femmes', 'Femmes mariées'), |
|
46 | + new CensusColumnConditionFrenchVeuve($this, 'Veuves', ''), |
|
47 | + new CensusColumnAge($this, 'Âge', ''), |
|
48 | + ); |
|
49 | + } |
|
50 | 50 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfFrance1836 extends CensusOfFrance implements CensusInterface { |
|
21 | +class CensusOfFrance1836 extends CensusOfFrance implements CensusInterface |
|
22 | +{ |
|
22 | 23 | /** |
23 | 24 | * When did this census occur. |
24 | 25 | * |
25 | 26 | * @return string |
26 | 27 | */ |
27 | - public function censusDate() { |
|
28 | + public function censusDate() |
|
29 | + { |
|
28 | 30 | return '21 JAN 1836'; |
29 | 31 | } |
30 | 32 | |
@@ -33,7 +35,8 @@ discard block |
||
33 | 35 | * |
34 | 36 | * @return CensusColumnInterface[] |
35 | 37 | */ |
36 | - public function columns() { |
|
38 | + public function columns() |
|
39 | + { |
|
37 | 40 | return array( |
38 | 41 | new CensusColumnSurname($this, 'Noms', 'Noms de famille'), |
39 | 42 | new CensusColumnGivenNames($this, 'Prénoms', ''), |
@@ -19,17 +19,17 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | interface CensusInterface extends CensusPlaceInterface { |
22 | - /** |
|
23 | - * When did this census occur, in GEDCOM format. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate(); |
|
22 | + /** |
|
23 | + * When did this census occur, in GEDCOM format. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate(); |
|
28 | 28 | |
29 | - /** |
|
30 | - * The columns of the census. |
|
31 | - * |
|
32 | - * @return CensusColumnInterface[] |
|
33 | - */ |
|
34 | - public function columns(); |
|
29 | + /** |
|
30 | + * The columns of the census. |
|
31 | + * |
|
32 | + * @return CensusColumnInterface[] |
|
33 | + */ |
|
34 | + public function columns(); |
|
35 | 35 | } |
@@ -18,7 +18,8 @@ |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -interface CensusInterface extends CensusPlaceInterface { |
|
21 | +interface CensusInterface extends CensusPlaceInterface |
|
22 | +{ |
|
22 | 23 | /** |
23 | 24 | * When did this census occur, in GEDCOM format. |
24 | 25 | * |
@@ -19,30 +19,30 @@ |
||
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | 21 | class CensusOfEngland1881 extends CensusOfEngland implements CensusInterface { |
22 | - /** |
|
23 | - * When did this census occur. |
|
24 | - * |
|
25 | - * @return string |
|
26 | - */ |
|
27 | - public function censusDate() { |
|
28 | - return '03 APR 1881'; |
|
29 | - } |
|
22 | + /** |
|
23 | + * When did this census occur. |
|
24 | + * |
|
25 | + * @return string |
|
26 | + */ |
|
27 | + public function censusDate() { |
|
28 | + return '03 APR 1881'; |
|
29 | + } |
|
30 | 30 | |
31 | - /** |
|
32 | - * The columns of the census. |
|
33 | - * |
|
34 | - * @return CensusColumnInterface[] |
|
35 | - */ |
|
36 | - public function columns() { |
|
37 | - return array( |
|
38 | - new CensusColumnFullName($this, 'Name', 'Name and surname'), |
|
39 | - new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'), |
|
40 | - new CensusColumnConditionEnglish($this, 'Condition', 'Condition'), |
|
41 | - new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), |
|
42 | - new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), |
|
43 | - new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), |
|
44 | - new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), |
|
45 | - new CensusColumnNull($this, 'Infirm', 'Whether deaf-and-dumb, blind, imbecile, idiot or lunatic'), |
|
46 | - ); |
|
47 | - } |
|
31 | + /** |
|
32 | + * The columns of the census. |
|
33 | + * |
|
34 | + * @return CensusColumnInterface[] |
|
35 | + */ |
|
36 | + public function columns() { |
|
37 | + return array( |
|
38 | + new CensusColumnFullName($this, 'Name', 'Name and surname'), |
|
39 | + new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'), |
|
40 | + new CensusColumnConditionEnglish($this, 'Condition', 'Condition'), |
|
41 | + new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), |
|
42 | + new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), |
|
43 | + new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), |
|
44 | + new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), |
|
45 | + new CensusColumnNull($this, 'Infirm', 'Whether deaf-and-dumb, blind, imbecile, idiot or lunatic'), |
|
46 | + ); |
|
47 | + } |
|
48 | 48 | } |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfEngland1881 extends CensusOfEngland implements CensusInterface { |
|
21 | +class CensusOfEngland1881 extends CensusOfEngland implements CensusInterface |
|
22 | +{ |
|
22 | 23 | /** |
23 | 24 | * When did this census occur. |
24 | 25 | * |
25 | 26 | * @return string |
26 | 27 | */ |
27 | - public function censusDate() { |
|
28 | + public function censusDate() |
|
29 | + { |
|
28 | 30 | return '03 APR 1881'; |
29 | 31 | } |
30 | 32 | |
@@ -33,7 +35,8 @@ discard block |
||
33 | 35 | * |
34 | 36 | * @return CensusColumnInterface[] |
35 | 37 | */ |
36 | - public function columns() { |
|
38 | + public function columns() |
|
39 | + { |
|
37 | 40 | return array( |
38 | 41 | new CensusColumnFullName($this, 'Name', 'Name and surname'), |
39 | 42 | new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'), |