|
@@ -54,7 +54,7 @@ discard block |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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], Factory::individual()->make($path[$n - 1], $tree), Factory::individual()->make($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], Factory::individual()->make($path[$n - 1], $tree), Factory::individual()->make($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], Factory::individual()->make($path[$n - 1], $tree), Factory::individual()->make($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 |
|
|
block discarded – undo |
|
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], Factory::individual()->make($path[$n - 1], $tree), Factory::individual()->make($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], Factory::individual()->make($path[$n - 1], $tree), Factory::individual()->make($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 |
|
|
block discarded – undo |
|
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', |