@@ -75,10 +75,10 @@ |
||
75 | 75 | } |
76 | 76 | |
77 | 77 | /** |
78 | - * The default position for this footer. It can be changed in the control panel. |
|
79 | - * |
|
80 | - * @return int |
|
81 | - */ |
|
78 | + * The default position for this footer. It can be changed in the control panel. |
|
79 | + * |
|
80 | + * @return int |
|
81 | + */ |
|
82 | 82 | public function defaultFooterOrder(): int |
83 | 83 | { |
84 | 84 | return 2; |
@@ -49,7 +49,7 @@ |
||
49 | 49 | $color_from = $color_from ?? $chart_color1; |
50 | 50 | $color_to = $color_to ?? $chart_color2; |
51 | 51 | |
52 | - $sizes = explode('x', $size); |
|
52 | + $sizes = explode('x', $size); |
|
53 | 53 | |
54 | 54 | if ($tot_indi === 0) { |
55 | 55 | return ''; |
@@ -153,10 +153,10 @@ |
||
153 | 153 | } |
154 | 154 | |
155 | 155 | $chart_url = 'https://chart.googleapis.com/chart?cht=bvg&chs=' . $sizes[0] . 'x' . $sizes[1] |
156 | - . '&chm=D,FF0000,2,0,3,1|N*f1*,000000,0,-1,11,1|N*f1*,000000,1,-1,11,1&chf=bg,s,ffffff00|c,s,ffffff00&chtt=' |
|
157 | - . rawurlencode($chtt) . '&chd=' . $chd . '&chco=0000FF,FFA0CB,FF0000&chbh=20,3&chxt=x,x,y,y&chxl=' |
|
158 | - . rawurlencode($chxl) . '&chdl=' |
|
159 | - . rawurlencode(I18N::translate('Males') . '|' . I18N::translate('Females') . '|' . I18N::translate('Average age at death')); |
|
156 | + . '&chm=D,FF0000,2,0,3,1|N*f1*,000000,0,-1,11,1|N*f1*,000000,1,-1,11,1&chf=bg,s,ffffff00|c,s,ffffff00&chtt=' |
|
157 | + . rawurlencode($chtt) . '&chd=' . $chd . '&chco=0000FF,FFA0CB,FF0000&chbh=20,3&chxt=x,x,y,y&chxl=' |
|
158 | + . rawurlencode($chxl) . '&chdl=' |
|
159 | + . rawurlencode(I18N::translate('Males') . '|' . I18N::translate('Females') . '|' . I18N::translate('Average age at death')); |
|
160 | 160 | |
161 | 161 | return view( |
162 | 162 | 'statistics/other/chart-google', |
@@ -135,7 +135,7 @@ |
||
135 | 135 | $decades .= '|' . I18N::number($i); |
136 | 136 | } |
137 | 137 | |
138 | - $chxl .= '1:||' . I18N::translate('century') . '|2:' . $decades . '|3:||' . I18N::translate('Age') . '|'; |
|
138 | + $chxl .= '1:||' . I18N::translate('century') . '|2:' . $decades . '|3:||' . I18N::translate('Age') . '|'; |
|
139 | 139 | $title = I18N::translate('Average age related to death century'); |
140 | 140 | |
141 | 141 | if (\count($rows) > 6 || mb_strlen($title) < 30) { |
@@ -479,7 +479,7 @@ |
||
479 | 479 | 'age' => $age, |
480 | 480 | ]; |
481 | 481 | |
482 | - $dist[] = $fam->family; |
|
482 | + $dist[] = $fam->family; |
|
483 | 483 | } |
484 | 484 | } elseif (!$one && $child1->canShow() && $child2->canShow()) { |
485 | 485 | $top10[] = [ |
@@ -29,7 +29,7 @@ |
||
29 | 29 | /** |
30 | 30 | * Where are our CSS, JS and other assets? |
31 | 31 | */ |
32 | - public const ASSET_DIR = 'themes/fab/css-2.0.0/'; |
|
32 | + public const ASSET_DIR = 'themes/fab/css-2.0.0/'; |
|
33 | 33 | |
34 | 34 | protected const PERSON_BOX_CLASSES = [ |
35 | 35 | 'M' => 'person_box', |
@@ -322,14 +322,14 @@ discard block |
||
322 | 322 | case 'sis': |
323 | 323 | case 'sib': |
324 | 324 | $table[$x + 1][$y] = '<div style="background:url(' . app()->make(ModuleThemeInterface::class)->parameter('image-hline') . ') 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-end') . '</div></div>'; |
325 | - $x += 2; |
|
325 | + $x += 2; |
|
326 | 326 | break; |
327 | 327 | case 'son': |
328 | 328 | case 'dau': |
329 | 329 | case 'chi': |
330 | 330 | if ($n > 2 && preg_match('/fat|mot|par/', $relationships[$n - 2])) { |
331 | 331 | $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>'; |
332 | - $x += 2; |
|
332 | + $x += 2; |
|
333 | 333 | } else { |
334 | 334 | $table[$x][$y - 1] = '<div style="background:url(' . app()->make(ModuleThemeInterface::class) |
335 | 335 | ->parameter('image-vline') . ') 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>'; |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | case 'par': |
342 | 342 | if ($n > 2 && preg_match('/son|dau|chi/', $relationships[$n - 2])) { |
343 | 343 | $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>'; |
344 | - $x += 2; |
|
344 | + $x += 2; |
|
345 | 345 | } else { |
346 | 346 | $table[$x][$y + 1] = '<div style="background:url(' . app()->make(ModuleThemeInterface::class) |
347 | 347 | ->parameter('image-vline') . ') 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>'; |
@@ -482,17 +482,17 @@ discard block |
||
482 | 482 | */ |
483 | 483 | private function oldStyleRelationshipPath(Tree $tree, array $path): array |
484 | 484 | { |
485 | - $spouse_codes = [ |
|
485 | + $spouse_codes = [ |
|
486 | 486 | 'M' => 'hus', |
487 | 487 | 'F' => 'wif', |
488 | 488 | 'U' => 'spo', |
489 | 489 | ]; |
490 | - $parent_codes = [ |
|
490 | + $parent_codes = [ |
|
491 | 491 | 'M' => 'fat', |
492 | 492 | 'F' => 'mot', |
493 | 493 | 'U' => 'par', |
494 | 494 | ]; |
495 | - $child_codes = [ |
|
495 | + $child_codes = [ |
|
496 | 496 | 'M' => 'son', |
497 | 497 | 'F' => 'dau', |
498 | 498 | 'U' => 'chi', |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | */ |
70 | 70 | public function reportList(Tree $tree, User $user): Response |
71 | 71 | { |
72 | - $title = I18N::translate('Choose a report to run'); |
|
72 | + $title = I18N::translate('Choose a report to run'); |
|
73 | 73 | |
74 | 74 | return $this->viewResponse('report-select-page', [ |
75 | 75 | 'reports' => $this->module_service->findByComponent('report', $tree, $user), |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | } |
255 | 255 | } |
256 | 256 | |
257 | - $report_xml =WT_ROOT . 'resources/xml/reports/' . $module->name() . '.xml'; |
|
257 | + $report_xml = WT_ROOT . 'resources/xml/reports/' . $module->name() . '.xml'; |
|
258 | 258 | |
259 | 259 | |
260 | 260 | switch ($output) { |
@@ -482,7 +482,7 @@ discard block |
||
482 | 482 | public function findByName(string $module_name): ?ModuleInterface |
483 | 483 | { |
484 | 484 | return self::all() |
485 | - ->filter(function (ModuleInterface $module) use ($module_name): bool { |
|
485 | + ->filter(function (ModuleInterface $module) use ($module_name) : bool { |
|
486 | 486 | return $module->isEnabled() && $module->name() === $module_name; |
487 | 487 | }) |
488 | 488 | ->first(); |
@@ -498,7 +498,7 @@ discard block |
||
498 | 498 | public function findByClass(string $class_name): ?ModuleInterface |
499 | 499 | { |
500 | 500 | return self::all() |
501 | - ->filter(function (ModuleInterface $module) use ($class_name): bool { |
|
501 | + ->filter(function (ModuleInterface $module) use ($class_name) : bool { |
|
502 | 502 | return $module->isEnabled() && $module instanceof $class_name; |
503 | 503 | }) |
504 | 504 | ->first(); |
@@ -2580,7 +2580,7 @@ |
||
2580 | 2580 | { |
2581 | 2581 | /** @var ModuleBlockInterface $module */ |
2582 | 2582 | $module = app(ModuleService::class)->findByComponent('block', $this->tree, Auth::user()) |
2583 | - ->filter(function (ModuleInterface $module) use ($block): bool { |
|
2583 | + ->filter(function (ModuleInterface $module) use ($block) : bool { |
|
2584 | 2584 | return $module->name() === $block && $module->name() !== 'html'; |
2585 | 2585 | }) |
2586 | 2586 | ->first(); |