@@ -49,7 +49,7 @@ |
||
| 49 | 49 | { |
| 50 | 50 | use ModuleChartTrait; |
| 51 | 51 | |
| 52 | - protected const ROUTE_URL = '/tree/{tree}/fan-chart-{style}-{generations}-{width}/{xref}'; |
|
| 52 | + protected const ROUTE_URL = '/tree/{tree}/fan-chart-{style}-{generations}-{width}/{xref}'; |
|
| 53 | 53 | |
| 54 | 54 | // Chart styles |
| 55 | 55 | private const STYLE_HALF_CIRCLE = '2'; |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | use ModuleChartTrait; |
| 55 | 55 | use ModuleConfigTrait; |
| 56 | 56 | |
| 57 | - protected const ROUTE_URL = '/tree/{tree}/relationships-{ancestors}-{recursion}/{xref}{/xref2}'; |
|
| 57 | + protected const ROUTE_URL = '/tree/{tree}/relationships-{ancestors}-{recursion}/{xref}{/xref2}'; |
|
| 58 | 58 | |
| 59 | 59 | /** It would be more correct to use PHP_INT_MAX, but this isn't friendly in URLs */ |
| 60 | 60 | public const UNLIMITED_RECURSION = 99; |
@@ -332,14 +332,14 @@ discard block |
||
| 332 | 332 | case 'sis': |
| 333 | 333 | case 'sib': |
| 334 | 334 | $table[$x + 1][$y] = '<div style="background:url(' . e(asset('css/images/hline.png')) . ') repeat-x center; width: 94px; text-align: center"><div class="hline-text" style="height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px;">' . view('icons/arrow-right') . '</div></div>'; |
| 335 | - $x += 2; |
|
| 335 | + $x += 2; |
|
| 336 | 336 | break; |
| 337 | 337 | case 'son': |
| 338 | 338 | case 'dau': |
| 339 | 339 | case 'chi': |
| 340 | 340 | if ($n > 2 && preg_match('/fat|mot|par/', $relationships[$n - 2])) { |
| 341 | 341 | $table[$x + 1][$y - 1] = '<div style="background:url(' . $diagonal2 . '); width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: end;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: start;">' . view('icons/arrow-down') . '</div></div>'; |
| 342 | - $x += 2; |
|
| 342 | + $x += 2; |
|
| 343 | 343 | } else { |
| 344 | 344 | $table[$x][$y - 1] = '<div style="background:url(' . e('"' . asset('css/images/vline.png') . '"') . ') repeat-y center; height: 64px; text-align: center;"><div class="vline-text" style="display: inline-block; width:50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width:50%; line-height: 64px;">' . view('icons/arrow-down') . '</div></div>'; |
| 345 | 345 | } |
@@ -350,7 +350,7 @@ discard block |
||
| 350 | 350 | case 'par': |
| 351 | 351 | if ($n > 2 && preg_match('/son|dau|chi/', $relationships[$n - 2])) { |
| 352 | 352 | $table[$x + 1][$y + 1] = '<div style="background:url(' . $diagonal1 . '); background-position: top right; width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: start;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: end;">' . view('icons/arrow-down') . '</div></div>'; |
| 353 | - $x += 2; |
|
| 353 | + $x += 2; |
|
| 354 | 354 | } else { |
| 355 | 355 | $table[$x][$y + 1] = '<div style="background:url(' . e('"' . asset('css/images/vline.png') . '"') . ') repeat-y center; height: 64px; text-align:center; "><div class="vline-text" style="display: inline-block; width: 50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width: 50%; line-height: 32px">' . view('icons/arrow-up') . '</div></div>'; |
| 356 | 356 | } |
@@ -648,17 +648,17 @@ discard block |
||
| 648 | 648 | */ |
| 649 | 649 | private function oldStyleRelationshipPath(Tree $tree, array $path): array |
| 650 | 650 | { |
| 651 | - $spouse_codes = [ |
|
| 651 | + $spouse_codes = [ |
|
| 652 | 652 | 'M' => 'hus', |
| 653 | 653 | 'F' => 'wif', |
| 654 | 654 | 'U' => 'spo', |
| 655 | 655 | ]; |
| 656 | - $parent_codes = [ |
|
| 656 | + $parent_codes = [ |
|
| 657 | 657 | 'M' => 'fat', |
| 658 | 658 | 'F' => 'mot', |
| 659 | 659 | 'U' => 'par', |
| 660 | 660 | ]; |
| 661 | - $child_codes = [ |
|
| 661 | + $child_codes = [ |
|
| 662 | 662 | 'M' => 'son', |
| 663 | 663 | 'F' => 'dau', |
| 664 | 664 | 'U' => 'chi', |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | { |
| 48 | 48 | use ModuleChartTrait; |
| 49 | 49 | |
| 50 | - protected const ROUTE_URL = '/tree/{tree}/pedigree-{style}-{generations}/{xref}'; |
|
| 50 | + protected const ROUTE_URL = '/tree/{tree}/pedigree-{style}-{generations}/{xref}'; |
|
| 51 | 51 | |
| 52 | 52 | // Chart styles |
| 53 | 53 | public const STYLE_LEFT = 'left'; |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | |
| 226 | 226 | // Father’s ancestors link to the father’s pedigree |
| 227 | 227 | // Mother’s ancestors link to the mother’s pedigree.. |
| 228 | - $links = $ancestors->map(function (?Individual $individual, $sosa) use ($ancestors, $style, $generations): string { |
|
| 228 | + $links = $ancestors->map(function (?Individual $individual, $sosa) use ($ancestors, $style, $generations) : string { |
|
| 229 | 229 | if ($individual instanceof Individual && $sosa >= 2 ** $generations / 2 && $individual->childFamilies()->isNotEmpty()) { |
| 230 | 230 | // The last row/column, and there are more generations. |
| 231 | 231 | if ($sosa >= 2 ** $generations * 3 / 4) { |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | { |
| 46 | 46 | use ModuleChartTrait; |
| 47 | 47 | |
| 48 | - protected const ROUTE_URL = '/tree/{tree}/timeline-{scale}'; |
|
| 48 | + protected const ROUTE_URL = '/tree/{tree}/timeline-{scale}'; |
|
| 49 | 49 | |
| 50 | 50 | // Defaults |
| 51 | 51 | protected const DEFAULT_SCALE = 10; |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | '_TODO', |
| 67 | 67 | 'CHAN', |
| 68 | 68 | ]; |
| 69 | - protected const BHEIGHT = 30; |
|
| 69 | + protected const BHEIGHT = 30; |
|
| 70 | 70 | |
| 71 | 71 | // Box height |
| 72 | 72 | |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | |
| 152 | 152 | $params = (array) $request->getParsedBody(); |
| 153 | 153 | |
| 154 | - $add = $params['add'] ?? ''; |
|
| 154 | + $add = $params['add'] ?? ''; |
|
| 155 | 155 | |
| 156 | 156 | Auth::checkComponentAccess($this, 'chart', $tree, $user); |
| 157 | 157 | |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | { |
| 53 | 53 | use ModuleChartTrait; |
| 54 | 54 | |
| 55 | - protected const ROUTE_URL = '/tree/{tree}/pedigree-map-{generations}/{xref}'; |
|
| 55 | + protected const ROUTE_URL = '/tree/{tree}/pedigree-map-{generations}/{xref}'; |
|
| 56 | 56 | |
| 57 | 57 | // Defaults |
| 58 | 58 | public const DEFAULT_GENERATIONS = '4'; |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | { |
| 45 | 45 | use ModuleChartTrait; |
| 46 | 46 | |
| 47 | - protected const ROUTE_URL = '/tree/{tree}/family-book-{book_size}-{generations}-{spouses}/{xref}'; |
|
| 47 | + protected const ROUTE_URL = '/tree/{tree}/family-book-{book_size}-{generations}-{spouses}/{xref}'; |
|
| 48 | 48 | |
| 49 | 49 | // Defaults |
| 50 | 50 | public const DEFAULT_GENERATIONS = '2'; |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | { |
| 44 | 44 | use ModuleChartTrait; |
| 45 | 45 | |
| 46 | - protected const ROUTE_URL = '/tree/{tree}/compact/{xref}'; |
|
| 46 | + protected const ROUTE_URL = '/tree/{tree}/compact/{xref}'; |
|
| 47 | 47 | |
| 48 | 48 | /** @var ChartService */ |
| 49 | 49 | private $chart_service; |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | { |
| 46 | 46 | use ModuleChartTrait; |
| 47 | 47 | |
| 48 | - protected const ROUTE_URL = '/tree/{tree}/hourglass-{generations}-{spouses}/{xref}'; |
|
| 48 | + protected const ROUTE_URL = '/tree/{tree}/hourglass-{generations}-{spouses}/{xref}'; |
|
| 49 | 49 | |
| 50 | 50 | // Defaults |
| 51 | 51 | private const DEFAULT_GENERATIONS = '3'; |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | { |
| 46 | 46 | use ModuleChartTrait; |
| 47 | 47 | |
| 48 | - protected const ROUTE_URL = '/tree/{tree}/ancestors-{style}-{generations}/{xref}'; |
|
| 48 | + protected const ROUTE_URL = '/tree/{tree}/ancestors-{style}-{generations}/{xref}'; |
|
| 49 | 49 | |
| 50 | 50 | // Chart styles |
| 51 | 51 | public const CHART_STYLE_TREE = 'tree'; |