@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfDenmark1906 extends CensusOfDenmark implements CensusInterface { |
|
21 | +class CensusOfDenmark1906 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 1906'; |
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 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)'), |
39 | 42 | new CensusColumnSexMK($this, 'Køn', 'Kjønnet. Mandkøn (M) eller Kvindekøn (K).'), |
@@ -21,7 +21,8 @@ discard block |
||
21 | 21 | /** |
22 | 22 | * At what age did the individual marry. |
23 | 23 | */ |
24 | -class CensusColumnAgeMarried extends AbstractCensusColumn implements CensusColumnInterface { |
|
24 | +class CensusColumnAgeMarried 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->getBirthDate()->isOK()) { |
35 | 37 | foreach ($individual->getSpouseFamilies() as $family) { |
36 | 38 | foreach ($family->getFacts('MARR', true) as $fact) { |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfDenmark1930 extends CensusOfDenmark implements CensusInterface { |
|
21 | +class CensusOfDenmark1930 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 '05 NOV 1930'; |
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 CensusColumnSurnameGivenNames($this, 'Navn', ''), |
39 | 42 | new CensusColumnNull($this, 'Bopæl', ''), |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfScotland1891 extends CensusOfScotland implements CensusInterface { |
|
21 | +class CensusOfScotland1891 extends CensusOfScotland 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 '05 APR 1891'; |
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'), |
@@ -20,7 +20,8 @@ discard block |
||
20 | 20 | /** |
21 | 21 | * The individual's religion. |
22 | 22 | */ |
23 | -class CensusColumnReligion extends AbstractCensusColumn implements CensusColumnInterface { |
|
23 | +class CensusColumnReligion extends AbstractCensusColumn implements CensusColumnInterface |
|
24 | +{ |
|
24 | 25 | /** |
25 | 26 | * Generate the likely value of this census column, based on available information. |
26 | 27 | * |
@@ -31,7 +32,8 @@ discard block |
||
31 | 32 | * |
32 | 33 | * @return string |
33 | 34 | */ |
34 | - public function generate(Individual $individual, Individual $head = null) { |
|
35 | + public function generate(Individual $individual, Individual $head = null) |
|
36 | + { |
|
35 | 37 | return ''; |
36 | 38 | } |
37 | 39 | } |
@@ -20,7 +20,8 @@ discard block |
||
20 | 20 | /** |
21 | 21 | * Did the individual marry within the last year. |
22 | 22 | */ |
23 | -class CensusColumnMarriedWithinYear extends AbstractCensusColumn implements CensusColumnInterface { |
|
23 | +class CensusColumnMarriedWithinYear extends AbstractCensusColumn implements CensusColumnInterface |
|
24 | +{ |
|
24 | 25 | /** |
25 | 26 | * Generate the likely value of this census column, based on available information. |
26 | 27 | * |
@@ -29,7 +30,8 @@ discard block |
||
29 | 30 | * |
30 | 31 | * @return string |
31 | 32 | */ |
32 | - public function generate(Individual $individual, Individual $head = null) { |
|
33 | + public function generate(Individual $individual, Individual $head = null) |
|
34 | + { |
|
33 | 35 | foreach ($individual->getSpouseFamilies() as $family) { |
34 | 36 | foreach ($family->getFacts('MARR') as $fact) { |
35 | 37 | $marriage_jd = $fact->getDate()->julianDay(); |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfFrance1946 extends CensusOfFrance implements CensusInterface { |
|
21 | +class CensusOfFrance1946 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 '17 JAN 1946'; |
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, 'Nom', 'Nom de famille'), |
39 | 42 | new CensusColumnGivenNames($this, 'Prénom', 'Prénom usuel'), |
@@ -18,13 +18,15 @@ discard block |
||
18 | 18 | /** |
19 | 19 | * Definitions for a census |
20 | 20 | */ |
21 | -class CensusOfFrance1866 extends CensusOfFrance implements CensusInterface { |
|
21 | +class CensusOfFrance1866 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 '18 JAN 1866'; |
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', ''), |
@@ -21,7 +21,8 @@ discard block |
||
21 | 21 | /** |
22 | 22 | * The nationality of the individual. |
23 | 23 | */ |
24 | -class CensusColumnNationality extends AbstractCensusColumn implements CensusColumnInterface { |
|
24 | +class CensusColumnNationality extends AbstractCensusColumn implements CensusColumnInterface |
|
25 | +{ |
|
25 | 26 | /** @var array Convert a country name to a nationality */ |
26 | 27 | private $nationalities = array( |
27 | 28 | 'England' => 'British', |
@@ -38,7 +39,8 @@ discard block |
||
38 | 39 | * |
39 | 40 | * @return string |
40 | 41 | */ |
41 | - public function generate(Individual $individual, Individual $head = null) { |
|
42 | + public function generate(Individual $individual, Individual $head = null) |
|
43 | + { |
|
42 | 44 | $place = $individual->getBirthPlace(); |
43 | 45 | |
44 | 46 | // No birthplace? Assume born in the same country. |