@@ -34,48 +34,48 @@ |
||
34 | 34 | */ |
35 | 35 | class AncestorsList implements RequestHandlerInterface |
36 | 36 | { |
37 | - use ViewResponseTrait; |
|
37 | + use ViewResponseTrait; |
|
38 | 38 | |
39 | - private ?SosaModule $module; |
|
39 | + private ?SosaModule $module; |
|
40 | 40 | |
41 | - /** |
|
42 | - * Constructor for AncestorsList Request Handler |
|
43 | - * |
|
44 | - * @param ModuleService $module_service |
|
45 | - */ |
|
46 | - public function __construct(ModuleService $module_service) |
|
47 | - { |
|
48 | - $this->module = $module_service->findByInterface(SosaModule::class)->first(); |
|
49 | - } |
|
41 | + /** |
|
42 | + * Constructor for AncestorsList Request Handler |
|
43 | + * |
|
44 | + * @param ModuleService $module_service |
|
45 | + */ |
|
46 | + public function __construct(ModuleService $module_service) |
|
47 | + { |
|
48 | + $this->module = $module_service->findByInterface(SosaModule::class)->first(); |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * {@inheritDoc} |
|
53 | - * @see \Psr\Http\Server\RequestHandlerInterface::handle() |
|
54 | - */ |
|
55 | - public function handle(ServerRequestInterface $request): ResponseInterface |
|
56 | - { |
|
57 | - if ($this->module === null) { |
|
58 | - throw new HttpNotFoundException(I18N::translate('The attached module could not be found.')); |
|
59 | - } |
|
51 | + /** |
|
52 | + * {@inheritDoc} |
|
53 | + * @see \Psr\Http\Server\RequestHandlerInterface::handle() |
|
54 | + */ |
|
55 | + public function handle(ServerRequestInterface $request): ResponseInterface |
|
56 | + { |
|
57 | + if ($this->module === null) { |
|
58 | + throw new HttpNotFoundException(I18N::translate('The attached module could not be found.')); |
|
59 | + } |
|
60 | 60 | |
61 | - $tree = Validator::attributes($request)->tree(); |
|
62 | - $user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser(); |
|
61 | + $tree = Validator::attributes($request)->tree(); |
|
62 | + $user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser(); |
|
63 | 63 | |
64 | - /** @var SosaStatisticsService $sosa_stats_service */ |
|
65 | - $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]); |
|
64 | + /** @var SosaStatisticsService $sosa_stats_service */ |
|
65 | + $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]); |
|
66 | 66 | |
67 | - $current_gen = Validator::queryParams($request)->integer( |
|
68 | - 'gen', |
|
69 | - Validator::attributes($request)->integer('gen', 0) |
|
70 | - ); |
|
67 | + $current_gen = Validator::queryParams($request)->integer( |
|
68 | + 'gen', |
|
69 | + Validator::attributes($request)->integer('gen', 0) |
|
70 | + ); |
|
71 | 71 | |
72 | - return $this->viewResponse($this->module->name() . '::list-ancestors-page', [ |
|
73 | - 'module_name' => $this->module->name(), |
|
74 | - 'title' => I18N::translate('Sosa Ancestors'), |
|
75 | - 'tree' => $tree, |
|
76 | - 'root_indi' => $sosa_stats_service->rootIndividual(), |
|
77 | - 'max_gen' => $sosa_stats_service->maxGeneration(), |
|
78 | - 'current_gen' => $current_gen |
|
79 | - ]); |
|
80 | - } |
|
72 | + return $this->viewResponse($this->module->name() . '::list-ancestors-page', [ |
|
73 | + 'module_name' => $this->module->name(), |
|
74 | + 'title' => I18N::translate('Sosa Ancestors'), |
|
75 | + 'tree' => $tree, |
|
76 | + 'root_indi' => $sosa_stats_service->rootIndividual(), |
|
77 | + 'max_gen' => $sosa_stats_service->maxGeneration(), |
|
78 | + 'current_gen' => $current_gen |
|
79 | + ]); |
|
80 | + } |
|
81 | 81 | } |
@@ -37,89 +37,89 @@ |
||
37 | 37 | */ |
38 | 38 | class MissingAncestorsList implements RequestHandlerInterface |
39 | 39 | { |
40 | - use ViewResponseTrait; |
|
41 | - |
|
42 | - /** |
|
43 | - * @var SosaModule|null $module |
|
44 | - */ |
|
45 | - private $module; |
|
46 | - |
|
47 | - /** |
|
48 | - * @var SosaRecordsService $sosa_record_service |
|
49 | - */ |
|
50 | - private $sosa_record_service; |
|
51 | - |
|
52 | - /** |
|
53 | - * Constructor for MissingAncestorsList Request Handler |
|
54 | - * |
|
55 | - * @param ModuleService $module_service |
|
56 | - * @param SosaRecordsService $sosa_record_service |
|
57 | - */ |
|
58 | - public function __construct( |
|
59 | - ModuleService $module_service, |
|
60 | - SosaRecordsService $sosa_record_service |
|
61 | - ) { |
|
62 | - $this->module = $module_service->findByInterface(SosaModule::class)->first(); |
|
63 | - $this->sosa_record_service = $sosa_record_service; |
|
64 | - } |
|
65 | - |
|
66 | - /** |
|
67 | - * {@inheritDoc} |
|
68 | - * @see \Psr\Http\Server\RequestHandlerInterface::handle() |
|
69 | - */ |
|
70 | - public function handle(ServerRequestInterface $request): ResponseInterface |
|
71 | - { |
|
72 | - if ($this->module === null) { |
|
73 | - throw new HttpNotFoundException(I18N::translate('The attached module could not be found.')); |
|
74 | - } |
|
75 | - |
|
76 | - $tree = Validator::attributes($request)->tree(); |
|
77 | - $user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser(); |
|
78 | - |
|
79 | - /** @var SosaStatisticsService $sosa_stats_service */ |
|
80 | - $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]); |
|
81 | - |
|
82 | - $current_gen = Validator::queryParams($request)->integer( |
|
83 | - 'gen', |
|
84 | - Validator::attributes($request)->integer('gen', 0) |
|
85 | - ); |
|
86 | - |
|
87 | - $list_missing = $this->sosa_record_service->listMissingAncestorsAtGeneration($tree, $user, $current_gen); |
|
88 | - $nb_missing_diff = $list_missing->sum(function (stdClass $value): int { |
|
89 | - return ($value->majs_fat_id === null ? 1 : 0) + ($value->majs_mot_id === null ? 1 : 0); |
|
90 | - }); |
|
91 | - |
|
92 | - $list_missing = $list_missing->map(function (stdClass $value) use ($tree): ?MissingAncestor { |
|
93 | - $indi = Registry::individualFactory()->make($value->majs_i_id, $tree); |
|
94 | - if ($indi !== null && $indi->canShowName()) { |
|
95 | - return new MissingAncestor( |
|
96 | - $indi, |
|
97 | - (int) $value->majs_sosa, |
|
98 | - $value->majs_fat_id === null, |
|
99 | - $value->majs_mot_id === null |
|
100 | - ); |
|
101 | - } |
|
102 | - return null; |
|
103 | - })->filter(); |
|
104 | - |
|
105 | - $nb_missing_shown = $list_missing->sum(function (MissingAncestor $value): int { |
|
106 | - return ($value->isFatherMissing() ? 1 : 0) + ($value->isMotherMissing() ? 1 : 0); |
|
107 | - }); |
|
108 | - |
|
109 | - return $this->viewResponse($this->module->name() . '::list-missing-page', [ |
|
110 | - 'module_name' => $this->module->name(), |
|
111 | - 'title' => I18N::translate('Missing Ancestors'), |
|
112 | - 'tree' => $tree, |
|
113 | - 'root_indi' => $sosa_stats_service->rootIndividual(), |
|
114 | - 'max_gen' => $sosa_stats_service->maxGeneration(), |
|
115 | - 'current_gen' => $current_gen, |
|
116 | - 'list_missing' => $list_missing, |
|
117 | - 'nb_missing_diff' => $nb_missing_diff, |
|
118 | - 'nb_missing_shown' => $nb_missing_shown, |
|
119 | - 'gen_completeness' => |
|
120 | - $sosa_stats_service->totalAncestorsAtGeneration($current_gen) / pow(2, $current_gen - 1), |
|
121 | - 'gen_potential' => |
|
122 | - $sosa_stats_service->totalAncestorsAtGeneration($current_gen - 1) / pow(2, $current_gen - 2) |
|
123 | - ]); |
|
124 | - } |
|
40 | + use ViewResponseTrait; |
|
41 | + |
|
42 | + /** |
|
43 | + * @var SosaModule|null $module |
|
44 | + */ |
|
45 | + private $module; |
|
46 | + |
|
47 | + /** |
|
48 | + * @var SosaRecordsService $sosa_record_service |
|
49 | + */ |
|
50 | + private $sosa_record_service; |
|
51 | + |
|
52 | + /** |
|
53 | + * Constructor for MissingAncestorsList Request Handler |
|
54 | + * |
|
55 | + * @param ModuleService $module_service |
|
56 | + * @param SosaRecordsService $sosa_record_service |
|
57 | + */ |
|
58 | + public function __construct( |
|
59 | + ModuleService $module_service, |
|
60 | + SosaRecordsService $sosa_record_service |
|
61 | + ) { |
|
62 | + $this->module = $module_service->findByInterface(SosaModule::class)->first(); |
|
63 | + $this->sosa_record_service = $sosa_record_service; |
|
64 | + } |
|
65 | + |
|
66 | + /** |
|
67 | + * {@inheritDoc} |
|
68 | + * @see \Psr\Http\Server\RequestHandlerInterface::handle() |
|
69 | + */ |
|
70 | + public function handle(ServerRequestInterface $request): ResponseInterface |
|
71 | + { |
|
72 | + if ($this->module === null) { |
|
73 | + throw new HttpNotFoundException(I18N::translate('The attached module could not be found.')); |
|
74 | + } |
|
75 | + |
|
76 | + $tree = Validator::attributes($request)->tree(); |
|
77 | + $user = Auth::check() ? Validator::attributes($request)->user() : new DefaultUser(); |
|
78 | + |
|
79 | + /** @var SosaStatisticsService $sosa_stats_service */ |
|
80 | + $sosa_stats_service = app()->makeWith(SosaStatisticsService::class, ['tree' => $tree, 'user' => $user]); |
|
81 | + |
|
82 | + $current_gen = Validator::queryParams($request)->integer( |
|
83 | + 'gen', |
|
84 | + Validator::attributes($request)->integer('gen', 0) |
|
85 | + ); |
|
86 | + |
|
87 | + $list_missing = $this->sosa_record_service->listMissingAncestorsAtGeneration($tree, $user, $current_gen); |
|
88 | + $nb_missing_diff = $list_missing->sum(function (stdClass $value): int { |
|
89 | + return ($value->majs_fat_id === null ? 1 : 0) + ($value->majs_mot_id === null ? 1 : 0); |
|
90 | + }); |
|
91 | + |
|
92 | + $list_missing = $list_missing->map(function (stdClass $value) use ($tree): ?MissingAncestor { |
|
93 | + $indi = Registry::individualFactory()->make($value->majs_i_id, $tree); |
|
94 | + if ($indi !== null && $indi->canShowName()) { |
|
95 | + return new MissingAncestor( |
|
96 | + $indi, |
|
97 | + (int) $value->majs_sosa, |
|
98 | + $value->majs_fat_id === null, |
|
99 | + $value->majs_mot_id === null |
|
100 | + ); |
|
101 | + } |
|
102 | + return null; |
|
103 | + })->filter(); |
|
104 | + |
|
105 | + $nb_missing_shown = $list_missing->sum(function (MissingAncestor $value): int { |
|
106 | + return ($value->isFatherMissing() ? 1 : 0) + ($value->isMotherMissing() ? 1 : 0); |
|
107 | + }); |
|
108 | + |
|
109 | + return $this->viewResponse($this->module->name() . '::list-missing-page', [ |
|
110 | + 'module_name' => $this->module->name(), |
|
111 | + 'title' => I18N::translate('Missing Ancestors'), |
|
112 | + 'tree' => $tree, |
|
113 | + 'root_indi' => $sosa_stats_service->rootIndividual(), |
|
114 | + 'max_gen' => $sosa_stats_service->maxGeneration(), |
|
115 | + 'current_gen' => $current_gen, |
|
116 | + 'list_missing' => $list_missing, |
|
117 | + 'nb_missing_diff' => $nb_missing_diff, |
|
118 | + 'nb_missing_shown' => $nb_missing_shown, |
|
119 | + 'gen_completeness' => |
|
120 | + $sosa_stats_service->totalAncestorsAtGeneration($current_gen) / pow(2, $current_gen - 1), |
|
121 | + 'gen_potential' => |
|
122 | + $sosa_stats_service->totalAncestorsAtGeneration($current_gen - 1) / pow(2, $current_gen - 2) |
|
123 | + ]); |
|
124 | + } |
|
125 | 125 | } |
@@ -25,45 +25,45 @@ |
||
25 | 25 | * @extends AbstractHookCollector<SosaMissingDatatablesExtenderInterface> |
26 | 26 | */ |
27 | 27 | class SosaMissingDatatablesExtenderCollector extends AbstractHookCollector implements |
28 | - SosaMissingDatatablesExtenderInterface |
|
28 | + SosaMissingDatatablesExtenderInterface |
|
29 | 29 | { |
30 | - /** |
|
31 | - * {@inheritDoc} |
|
32 | - * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::title() |
|
33 | - */ |
|
34 | - public function title(): string |
|
35 | - { |
|
36 | - return I18N::translate('Columns extender for tables of missing ancestors'); |
|
37 | - } |
|
30 | + /** |
|
31 | + * {@inheritDoc} |
|
32 | + * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::title() |
|
33 | + */ |
|
34 | + public function title(): string |
|
35 | + { |
|
36 | + return I18N::translate('Columns extender for tables of missing ancestors'); |
|
37 | + } |
|
38 | 38 | |
39 | - /** |
|
40 | - * {@inheritDoc} |
|
41 | - * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::description() |
|
42 | - */ |
|
43 | - public function description(): string |
|
44 | - { |
|
45 | - return I18N::translate('Add additional columns to tables of missing ancestors'); |
|
46 | - } |
|
39 | + /** |
|
40 | + * {@inheritDoc} |
|
41 | + * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::description() |
|
42 | + */ |
|
43 | + public function description(): string |
|
44 | + { |
|
45 | + return I18N::translate('Add additional columns to tables of missing ancestors'); |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * {@inheritDoc} |
|
50 | - * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::hookInterface() |
|
51 | - */ |
|
52 | - public function hookInterface(): string |
|
53 | - { |
|
54 | - return SosaMissingDatatablesExtenderInterface::class; |
|
55 | - } |
|
48 | + /** |
|
49 | + * {@inheritDoc} |
|
50 | + * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::hookInterface() |
|
51 | + */ |
|
52 | + public function hookInterface(): string |
|
53 | + { |
|
54 | + return SosaMissingDatatablesExtenderInterface::class; |
|
55 | + } |
|
56 | 56 | |
57 | - /** |
|
58 | - * {@inheritDoc} |
|
59 | - * @see \MyArtJaub\Webtrees\Contracts\Hooks\SosaMissingDatatablesExtenderInterface::sosaMissingColumns() |
|
60 | - */ |
|
61 | - public function sosaMissingColumns(iterable $records): array |
|
62 | - { |
|
63 | - $result = []; |
|
64 | - foreach ($this->hooks() as $hook) { |
|
65 | - $result += $hook->sosaMissingColumns($records); |
|
66 | - } |
|
67 | - return $result; |
|
68 | - } |
|
57 | + /** |
|
58 | + * {@inheritDoc} |
|
59 | + * @see \MyArtJaub\Webtrees\Contracts\Hooks\SosaMissingDatatablesExtenderInterface::sosaMissingColumns() |
|
60 | + */ |
|
61 | + public function sosaMissingColumns(iterable $records): array |
|
62 | + { |
|
63 | + $result = []; |
|
64 | + foreach ($this->hooks() as $hook) { |
|
65 | + $result += $hook->sosaMissingColumns($records); |
|
66 | + } |
|
67 | + return $result; |
|
68 | + } |
|
69 | 69 | } |
@@ -25,45 +25,45 @@ |
||
25 | 25 | * @extends AbstractHookCollector<SosaFamilyDatatablesExtenderInterface> |
26 | 26 | */ |
27 | 27 | class SosaFamilyDatatablesExtenderCollector extends AbstractHookCollector implements |
28 | - SosaFamilyDatatablesExtenderInterface |
|
28 | + SosaFamilyDatatablesExtenderInterface |
|
29 | 29 | { |
30 | - /** |
|
31 | - * {@inheritDoc} |
|
32 | - * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::title() |
|
33 | - */ |
|
34 | - public function title(): string |
|
35 | - { |
|
36 | - return I18N::translate('Columns extender for tables of ancestors’ families'); |
|
37 | - } |
|
30 | + /** |
|
31 | + * {@inheritDoc} |
|
32 | + * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::title() |
|
33 | + */ |
|
34 | + public function title(): string |
|
35 | + { |
|
36 | + return I18N::translate('Columns extender for tables of ancestors’ families'); |
|
37 | + } |
|
38 | 38 | |
39 | - /** |
|
40 | - * {@inheritDoc} |
|
41 | - * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::description() |
|
42 | - */ |
|
43 | - public function description(): string |
|
44 | - { |
|
45 | - return I18N::translate('Add additional columns to tables of ancestors’ families'); |
|
46 | - } |
|
39 | + /** |
|
40 | + * {@inheritDoc} |
|
41 | + * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::description() |
|
42 | + */ |
|
43 | + public function description(): string |
|
44 | + { |
|
45 | + return I18N::translate('Add additional columns to tables of ancestors’ families'); |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * {@inheritDoc} |
|
50 | - * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::hookInterface() |
|
51 | - */ |
|
52 | - public function hookInterface(): string |
|
53 | - { |
|
54 | - return SosaFamilyDatatablesExtenderInterface::class; |
|
55 | - } |
|
48 | + /** |
|
49 | + * {@inheritDoc} |
|
50 | + * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::hookInterface() |
|
51 | + */ |
|
52 | + public function hookInterface(): string |
|
53 | + { |
|
54 | + return SosaFamilyDatatablesExtenderInterface::class; |
|
55 | + } |
|
56 | 56 | |
57 | - /** |
|
58 | - * {@inheritDoc} |
|
59 | - * @see \MyArtJaub\Webtrees\Contracts\Hooks\SosaFamilyDatatablesExtenderInterface::sosaFamilyColumns() |
|
60 | - */ |
|
61 | - public function sosaFamilyColumns(iterable $records): array |
|
62 | - { |
|
63 | - $result = []; |
|
64 | - foreach ($this->hooks() as $hook) { |
|
65 | - $result += $hook->sosaFamilyColumns($records); |
|
66 | - } |
|
67 | - return $result; |
|
68 | - } |
|
57 | + /** |
|
58 | + * {@inheritDoc} |
|
59 | + * @see \MyArtJaub\Webtrees\Contracts\Hooks\SosaFamilyDatatablesExtenderInterface::sosaFamilyColumns() |
|
60 | + */ |
|
61 | + public function sosaFamilyColumns(iterable $records): array |
|
62 | + { |
|
63 | + $result = []; |
|
64 | + foreach ($this->hooks() as $hook) { |
|
65 | + $result += $hook->sosaFamilyColumns($records); |
|
66 | + } |
|
67 | + return $result; |
|
68 | + } |
|
69 | 69 | } |
@@ -25,45 +25,45 @@ |
||
25 | 25 | * @extends AbstractHookCollector<SosaIndividualDatatablesExtenderInterface> |
26 | 26 | */ |
27 | 27 | class SosaIndividualDatatablesExtenderCollector extends AbstractHookCollector implements |
28 | - SosaIndividualDatatablesExtenderInterface |
|
28 | + SosaIndividualDatatablesExtenderInterface |
|
29 | 29 | { |
30 | - /** |
|
31 | - * {@inheritDoc} |
|
32 | - * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::title() |
|
33 | - */ |
|
34 | - public function title(): string |
|
35 | - { |
|
36 | - return I18N::translate('Columns extender for tables of ancestors'); |
|
37 | - } |
|
30 | + /** |
|
31 | + * {@inheritDoc} |
|
32 | + * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::title() |
|
33 | + */ |
|
34 | + public function title(): string |
|
35 | + { |
|
36 | + return I18N::translate('Columns extender for tables of ancestors'); |
|
37 | + } |
|
38 | 38 | |
39 | - /** |
|
40 | - * {@inheritDoc} |
|
41 | - * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::description() |
|
42 | - */ |
|
43 | - public function description(): string |
|
44 | - { |
|
45 | - return I18N::translate('Add additional columns to tables of ancestors'); |
|
46 | - } |
|
39 | + /** |
|
40 | + * {@inheritDoc} |
|
41 | + * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::description() |
|
42 | + */ |
|
43 | + public function description(): string |
|
44 | + { |
|
45 | + return I18N::translate('Add additional columns to tables of ancestors'); |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * {@inheritDoc} |
|
50 | - * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::hookInterface() |
|
51 | - */ |
|
52 | - public function hookInterface(): string |
|
53 | - { |
|
54 | - return SosaIndividualDatatablesExtenderInterface::class; |
|
55 | - } |
|
48 | + /** |
|
49 | + * {@inheritDoc} |
|
50 | + * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::hookInterface() |
|
51 | + */ |
|
52 | + public function hookInterface(): string |
|
53 | + { |
|
54 | + return SosaIndividualDatatablesExtenderInterface::class; |
|
55 | + } |
|
56 | 56 | |
57 | - /** |
|
58 | - * {@inheritDoc} |
|
59 | - * @see \MyArtJaub\Webtrees\Contracts\Hooks\SosaIndividualDatatablesExtenderInterface::sosaIndividualColumns() |
|
60 | - */ |
|
61 | - public function sosaIndividualColumns(iterable $records): array |
|
62 | - { |
|
63 | - $result = []; |
|
64 | - foreach ($this->hooks() as $hook) { |
|
65 | - $result += $hook->sosaIndividualColumns($records); |
|
66 | - } |
|
67 | - return $result; |
|
68 | - } |
|
57 | + /** |
|
58 | + * {@inheritDoc} |
|
59 | + * @see \MyArtJaub\Webtrees\Contracts\Hooks\SosaIndividualDatatablesExtenderInterface::sosaIndividualColumns() |
|
60 | + */ |
|
61 | + public function sosaIndividualColumns(iterable $records): array |
|
62 | + { |
|
63 | + $result = []; |
|
64 | + foreach ($this->hooks() as $hook) { |
|
65 | + $result += $hook->sosaIndividualColumns($records); |
|
66 | + } |
|
67 | + return $result; |
|
68 | + } |
|
69 | 69 | } |
@@ -27,56 +27,56 @@ |
||
27 | 27 | */ |
28 | 28 | class FactSourceTextExtenderCollector extends AbstractHookCollector implements FactSourceTextExtenderInterface |
29 | 29 | { |
30 | - /** |
|
31 | - * {@inheritDoc} |
|
32 | - * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::title() |
|
33 | - */ |
|
34 | - public function title(): string |
|
35 | - { |
|
36 | - return I18N::translate('Text extender for source citations’ title'); |
|
37 | - } |
|
30 | + /** |
|
31 | + * {@inheritDoc} |
|
32 | + * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::title() |
|
33 | + */ |
|
34 | + public function title(): string |
|
35 | + { |
|
36 | + return I18N::translate('Text extender for source citations’ title'); |
|
37 | + } |
|
38 | 38 | |
39 | - /** |
|
40 | - * {@inheritDoc} |
|
41 | - * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::description() |
|
42 | - */ |
|
43 | - public function description(): string |
|
44 | - { |
|
45 | - return I18N::translate('Extends the title of source citations with additional text or icons.'); |
|
46 | - } |
|
39 | + /** |
|
40 | + * {@inheritDoc} |
|
41 | + * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::description() |
|
42 | + */ |
|
43 | + public function description(): string |
|
44 | + { |
|
45 | + return I18N::translate('Extends the title of source citations with additional text or icons.'); |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * {@inheritDoc} |
|
50 | - * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::hookInterface() |
|
51 | - */ |
|
52 | - public function hookInterface(): string |
|
53 | - { |
|
54 | - return FactSourceTextExtenderInterface::class; |
|
55 | - } |
|
48 | + /** |
|
49 | + * {@inheritDoc} |
|
50 | + * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::hookInterface() |
|
51 | + */ |
|
52 | + public function hookInterface(): string |
|
53 | + { |
|
54 | + return FactSourceTextExtenderInterface::class; |
|
55 | + } |
|
56 | 56 | |
57 | - /** |
|
58 | - * {@inheritDoc} |
|
59 | - * @see \MyArtJaub\Webtrees\Contracts\Hooks\FactSourceTextExtenderInterface::factSourcePrepend() |
|
60 | - */ |
|
61 | - public function factSourcePrepend(Tree $tree, $fact): string |
|
62 | - { |
|
63 | - return $this->hooks() |
|
64 | - ->map( |
|
65 | - fn(FactSourceTextExtenderInterface $hook) => |
|
66 | - $hook->factSourcePrepend($tree, $fact) |
|
67 | - )->implode(''); |
|
68 | - } |
|
57 | + /** |
|
58 | + * {@inheritDoc} |
|
59 | + * @see \MyArtJaub\Webtrees\Contracts\Hooks\FactSourceTextExtenderInterface::factSourcePrepend() |
|
60 | + */ |
|
61 | + public function factSourcePrepend(Tree $tree, $fact): string |
|
62 | + { |
|
63 | + return $this->hooks() |
|
64 | + ->map( |
|
65 | + fn(FactSourceTextExtenderInterface $hook) => |
|
66 | + $hook->factSourcePrepend($tree, $fact) |
|
67 | + )->implode(''); |
|
68 | + } |
|
69 | 69 | |
70 | - /** |
|
71 | - * {@inheritDoc} |
|
72 | - * @see \MyArtJaub\Webtrees\Contracts\Hooks\FactSourceTextExtenderInterface::factSourceAppend() |
|
73 | - */ |
|
74 | - public function factSourceAppend(Tree $tree, $fact): string |
|
75 | - { |
|
76 | - return $this->hooks() |
|
77 | - ->map( |
|
78 | - fn(FactSourceTextExtenderInterface $hook) => |
|
79 | - $hook->factSourcePrepend($tree, $fact) |
|
80 | - )->implode(''); |
|
81 | - } |
|
70 | + /** |
|
71 | + * {@inheritDoc} |
|
72 | + * @see \MyArtJaub\Webtrees\Contracts\Hooks\FactSourceTextExtenderInterface::factSourceAppend() |
|
73 | + */ |
|
74 | + public function factSourceAppend(Tree $tree, $fact): string |
|
75 | + { |
|
76 | + return $this->hooks() |
|
77 | + ->map( |
|
78 | + fn(FactSourceTextExtenderInterface $hook) => |
|
79 | + $hook->factSourcePrepend($tree, $fact) |
|
80 | + )->implode(''); |
|
81 | + } |
|
82 | 82 | } |
@@ -25,45 +25,45 @@ |
||
25 | 25 | * @extends AbstractHookCollector<FamilyDatatablesExtenderInterface> |
26 | 26 | */ |
27 | 27 | class FamilyDatatablesExtenderCollector extends AbstractHookCollector implements |
28 | - FamilyDatatablesExtenderInterface |
|
28 | + FamilyDatatablesExtenderInterface |
|
29 | 29 | { |
30 | - /** |
|
31 | - * {@inheritDoc} |
|
32 | - * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::title() |
|
33 | - */ |
|
34 | - public function title(): string |
|
35 | - { |
|
36 | - return I18N::translate('Columns extender for tables of families'); |
|
37 | - } |
|
30 | + /** |
|
31 | + * {@inheritDoc} |
|
32 | + * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::title() |
|
33 | + */ |
|
34 | + public function title(): string |
|
35 | + { |
|
36 | + return I18N::translate('Columns extender for tables of families'); |
|
37 | + } |
|
38 | 38 | |
39 | - /** |
|
40 | - * {@inheritDoc} |
|
41 | - * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::description() |
|
42 | - */ |
|
43 | - public function description(): string |
|
44 | - { |
|
45 | - return I18N::translate('Add additional columns to tables of families'); |
|
46 | - } |
|
39 | + /** |
|
40 | + * {@inheritDoc} |
|
41 | + * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::description() |
|
42 | + */ |
|
43 | + public function description(): string |
|
44 | + { |
|
45 | + return I18N::translate('Add additional columns to tables of families'); |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * {@inheritDoc} |
|
50 | - * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::hookInterface() |
|
51 | - */ |
|
52 | - public function hookInterface(): string |
|
53 | - { |
|
54 | - return FamilyDatatablesExtenderInterface::class; |
|
55 | - } |
|
48 | + /** |
|
49 | + * {@inheritDoc} |
|
50 | + * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::hookInterface() |
|
51 | + */ |
|
52 | + public function hookInterface(): string |
|
53 | + { |
|
54 | + return FamilyDatatablesExtenderInterface::class; |
|
55 | + } |
|
56 | 56 | |
57 | - /** |
|
58 | - * {@inheritDoc} |
|
59 | - * @see \MyArtJaub\Webtrees\Contracts\Hooks\FamilyDatatablesExtenderInterface::familyColumns() |
|
60 | - */ |
|
61 | - public function familyColumns(iterable $records): array |
|
62 | - { |
|
63 | - $result = []; |
|
64 | - foreach ($this->hooks() as $hook) { |
|
65 | - $result += $hook->familyColumns($records); |
|
66 | - } |
|
67 | - return $result; |
|
68 | - } |
|
57 | + /** |
|
58 | + * {@inheritDoc} |
|
59 | + * @see \MyArtJaub\Webtrees\Contracts\Hooks\FamilyDatatablesExtenderInterface::familyColumns() |
|
60 | + */ |
|
61 | + public function familyColumns(iterable $records): array |
|
62 | + { |
|
63 | + $result = []; |
|
64 | + foreach ($this->hooks() as $hook) { |
|
65 | + $result += $hook->familyColumns($records); |
|
66 | + } |
|
67 | + return $result; |
|
68 | + } |
|
69 | 69 | } |
@@ -25,45 +25,45 @@ |
||
25 | 25 | * @extends AbstractHookCollector<IndividualDatatablesExtenderInterface> |
26 | 26 | */ |
27 | 27 | class IndividualDatatablesExtenderCollector extends AbstractHookCollector implements |
28 | - IndividualDatatablesExtenderInterface |
|
28 | + IndividualDatatablesExtenderInterface |
|
29 | 29 | { |
30 | - /** |
|
31 | - * {@inheritDoc} |
|
32 | - * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::title() |
|
33 | - */ |
|
34 | - public function title(): string |
|
35 | - { |
|
36 | - return I18N::translate('Columns extender for tables of individuals'); |
|
37 | - } |
|
30 | + /** |
|
31 | + * {@inheritDoc} |
|
32 | + * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::title() |
|
33 | + */ |
|
34 | + public function title(): string |
|
35 | + { |
|
36 | + return I18N::translate('Columns extender for tables of individuals'); |
|
37 | + } |
|
38 | 38 | |
39 | - /** |
|
40 | - * {@inheritDoc} |
|
41 | - * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::description() |
|
42 | - */ |
|
43 | - public function description(): string |
|
44 | - { |
|
45 | - return I18N::translate('Add additional columns to tables of individuals'); |
|
46 | - } |
|
39 | + /** |
|
40 | + * {@inheritDoc} |
|
41 | + * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::description() |
|
42 | + */ |
|
43 | + public function description(): string |
|
44 | + { |
|
45 | + return I18N::translate('Add additional columns to tables of individuals'); |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * {@inheritDoc} |
|
50 | - * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::hookInterface() |
|
51 | - */ |
|
52 | - public function hookInterface(): string |
|
53 | - { |
|
54 | - return IndividualDatatablesExtenderInterface::class; |
|
55 | - } |
|
48 | + /** |
|
49 | + * {@inheritDoc} |
|
50 | + * @see \MyArtJaub\Webtrees\Common\Hooks\AbstractHookCollector::hookInterface() |
|
51 | + */ |
|
52 | + public function hookInterface(): string |
|
53 | + { |
|
54 | + return IndividualDatatablesExtenderInterface::class; |
|
55 | + } |
|
56 | 56 | |
57 | - /** |
|
58 | - * {@inheritDoc} |
|
59 | - * @see \MyArtJaub\Webtrees\Contracts\Hooks\IndividualDatatablesExtenderInterface::individualColumns() |
|
60 | - */ |
|
61 | - public function individualColumns(iterable $records): array |
|
62 | - { |
|
63 | - $result = []; |
|
64 | - foreach ($this->hooks() as $hook) { |
|
65 | - $result += $hook->individualColumns($records); |
|
66 | - } |
|
67 | - return $result; |
|
68 | - } |
|
57 | + /** |
|
58 | + * {@inheritDoc} |
|
59 | + * @see \MyArtJaub\Webtrees\Contracts\Hooks\IndividualDatatablesExtenderInterface::individualColumns() |
|
60 | + */ |
|
61 | + public function individualColumns(iterable $records): array |
|
62 | + { |
|
63 | + $result = []; |
|
64 | + foreach ($this->hooks() as $hook) { |
|
65 | + $result += $hook->individualColumns($records); |
|
66 | + } |
|
67 | + return $result; |
|
68 | + } |
|
69 | 69 | } |
@@ -42,106 +42,106 @@ |
||
42 | 42 | * Provide entry points to extend core webtrees code. |
43 | 43 | */ |
44 | 44 | class HooksModule extends AbstractModule implements |
45 | - ModuleMyArtJaubInterface, |
|
46 | - ModuleConfigInterface, |
|
47 | - ModuleHookSubscriberInterface |
|
45 | + ModuleMyArtJaubInterface, |
|
46 | + ModuleConfigInterface, |
|
47 | + ModuleHookSubscriberInterface |
|
48 | 48 | { |
49 | - use ModuleMyArtJaubTrait { |
|
50 | - boot as traitBoot; |
|
51 | - } |
|
52 | - use ModuleConfigTrait; |
|
53 | - |
|
54 | - // How to update the database schema for this module |
|
55 | - private const SCHEMA_TARGET_VERSION = 2; |
|
56 | - private const SCHEMA_SETTING_NAME = 'MAJ_HOOKS_SCHEMA_VERSION'; |
|
57 | - private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema'; |
|
58 | - |
|
59 | - /** |
|
60 | - * {@inheritDoc} |
|
61 | - * @see \Fisharebest\Webtrees\Module\AbstractModule::title() |
|
62 | - */ |
|
63 | - public function title(): string |
|
64 | - { |
|
65 | - return /* I18N: Name of the “Hooks” module */ I18N::translate('Hooks'); |
|
66 | - } |
|
67 | - |
|
68 | - /** |
|
69 | - * {@inheritDoc} |
|
70 | - * @see \Fisharebest\Webtrees\Module\AbstractModule::description() |
|
71 | - */ |
|
72 | - public function description(): string |
|
73 | - { |
|
74 | - return /* I18N: Description of the “Hooks” module */ I18N::translate('Implements hooks management.'); |
|
75 | - } |
|
76 | - |
|
77 | - /** |
|
78 | - * {@inheritDoc} |
|
79 | - * @see \Fisharebest\Webtrees\Module\AbstractModule::boot() |
|
80 | - */ |
|
81 | - public function boot(): void |
|
82 | - { |
|
83 | - $this->traitBoot(); |
|
84 | - app()->bind(HookServiceInterface::class, HookService::class); |
|
85 | - app(MigrationService::class)->updateSchema( |
|
86 | - self::SCHEMA_MIGRATION_PREFIX, |
|
87 | - self::SCHEMA_SETTING_NAME, |
|
88 | - self::SCHEMA_TARGET_VERSION |
|
89 | - ); |
|
90 | - } |
|
91 | - |
|
92 | - /** |
|
93 | - * {@inheritDoc} |
|
94 | - * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes() |
|
95 | - */ |
|
96 | - public function loadRoutes(Map $router): void |
|
97 | - { |
|
98 | - $router->attach('', '', static function (Map $router): void { |
|
99 | - |
|
100 | - $router->attach('', '/module-maj/hooks', static function (Map $router): void { |
|
101 | - |
|
102 | - $router->attach('', '/config/admin', static function (Map $router): void { |
|
103 | - |
|
104 | - $router->get(AdminConfigPage::class, '', AdminConfigPage::class); |
|
105 | - $router->get(ModulesHooksPage::class, '/{hook_name}', ModulesHooksPage::class); |
|
106 | - $router->post(ModulesHooksAction::class, '/{hook_name}', ModulesHooksAction::class); |
|
107 | - }); |
|
108 | - }); |
|
109 | - }); |
|
110 | - } |
|
111 | - |
|
112 | - /** |
|
113 | - * {@inheritDoc} |
|
114 | - * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion() |
|
115 | - */ |
|
116 | - public function customModuleVersion(): string |
|
117 | - { |
|
118 | - return '2.1.1-v.1'; |
|
119 | - } |
|
120 | - |
|
121 | - /** |
|
122 | - * {@inheritDoc} |
|
123 | - * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink() |
|
124 | - */ |
|
125 | - public function getConfigLink(): string |
|
126 | - { |
|
127 | - return route(AdminConfigPage::class); |
|
128 | - } |
|
129 | - |
|
130 | - /** |
|
131 | - * {@inheritDoc} |
|
132 | - * @see \MyArtJaub\Webtrees\Contracts\Hooks\ModuleHookSubscriberInterface::listSubscribedHooks() |
|
133 | - */ |
|
134 | - public function listSubscribedHooks(): array |
|
135 | - { |
|
136 | - return [ |
|
137 | - app()->makeWith(FactSourceTextExtenderCollector::class, ['module' => $this]), |
|
138 | - app()->makeWith(FamilyDatatablesExtenderCollector::class, ['module' => $this]), |
|
139 | - app()->makeWith(IndividualDatatablesExtenderCollector::class, ['module' => $this]), |
|
140 | - app()->makeWith(NameAccordionExtenderCollector::class, ['module' => $this]), |
|
141 | - app()->makeWith(RecordNameTextExtenderCollector::class, ['module' => $this]), |
|
142 | - app()->makeWith(SosaFamilyDatatablesExtenderCollector::class, ['module' => $this]), |
|
143 | - app()->makeWith(SosaIndividualDatatablesExtenderCollector::class, ['module' => $this]), |
|
144 | - app()->makeWith(SosaMissingDatatablesExtenderCollector::class, ['module' => $this]) |
|
145 | - ]; |
|
146 | - } |
|
49 | + use ModuleMyArtJaubTrait { |
|
50 | + boot as traitBoot; |
|
51 | + } |
|
52 | + use ModuleConfigTrait; |
|
53 | + |
|
54 | + // How to update the database schema for this module |
|
55 | + private const SCHEMA_TARGET_VERSION = 2; |
|
56 | + private const SCHEMA_SETTING_NAME = 'MAJ_HOOKS_SCHEMA_VERSION'; |
|
57 | + private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema'; |
|
58 | + |
|
59 | + /** |
|
60 | + * {@inheritDoc} |
|
61 | + * @see \Fisharebest\Webtrees\Module\AbstractModule::title() |
|
62 | + */ |
|
63 | + public function title(): string |
|
64 | + { |
|
65 | + return /* I18N: Name of the “Hooks” module */ I18N::translate('Hooks'); |
|
66 | + } |
|
67 | + |
|
68 | + /** |
|
69 | + * {@inheritDoc} |
|
70 | + * @see \Fisharebest\Webtrees\Module\AbstractModule::description() |
|
71 | + */ |
|
72 | + public function description(): string |
|
73 | + { |
|
74 | + return /* I18N: Description of the “Hooks” module */ I18N::translate('Implements hooks management.'); |
|
75 | + } |
|
76 | + |
|
77 | + /** |
|
78 | + * {@inheritDoc} |
|
79 | + * @see \Fisharebest\Webtrees\Module\AbstractModule::boot() |
|
80 | + */ |
|
81 | + public function boot(): void |
|
82 | + { |
|
83 | + $this->traitBoot(); |
|
84 | + app()->bind(HookServiceInterface::class, HookService::class); |
|
85 | + app(MigrationService::class)->updateSchema( |
|
86 | + self::SCHEMA_MIGRATION_PREFIX, |
|
87 | + self::SCHEMA_SETTING_NAME, |
|
88 | + self::SCHEMA_TARGET_VERSION |
|
89 | + ); |
|
90 | + } |
|
91 | + |
|
92 | + /** |
|
93 | + * {@inheritDoc} |
|
94 | + * @see \MyArtJaub\Webtrees\Module\ModuleMyArtJaubInterface::loadRoutes() |
|
95 | + */ |
|
96 | + public function loadRoutes(Map $router): void |
|
97 | + { |
|
98 | + $router->attach('', '', static function (Map $router): void { |
|
99 | + |
|
100 | + $router->attach('', '/module-maj/hooks', static function (Map $router): void { |
|
101 | + |
|
102 | + $router->attach('', '/config/admin', static function (Map $router): void { |
|
103 | + |
|
104 | + $router->get(AdminConfigPage::class, '', AdminConfigPage::class); |
|
105 | + $router->get(ModulesHooksPage::class, '/{hook_name}', ModulesHooksPage::class); |
|
106 | + $router->post(ModulesHooksAction::class, '/{hook_name}', ModulesHooksAction::class); |
|
107 | + }); |
|
108 | + }); |
|
109 | + }); |
|
110 | + } |
|
111 | + |
|
112 | + /** |
|
113 | + * {@inheritDoc} |
|
114 | + * @see \Fisharebest\Webtrees\Module\ModuleCustomInterface::customModuleVersion() |
|
115 | + */ |
|
116 | + public function customModuleVersion(): string |
|
117 | + { |
|
118 | + return '2.1.1-v.1'; |
|
119 | + } |
|
120 | + |
|
121 | + /** |
|
122 | + * {@inheritDoc} |
|
123 | + * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink() |
|
124 | + */ |
|
125 | + public function getConfigLink(): string |
|
126 | + { |
|
127 | + return route(AdminConfigPage::class); |
|
128 | + } |
|
129 | + |
|
130 | + /** |
|
131 | + * {@inheritDoc} |
|
132 | + * @see \MyArtJaub\Webtrees\Contracts\Hooks\ModuleHookSubscriberInterface::listSubscribedHooks() |
|
133 | + */ |
|
134 | + public function listSubscribedHooks(): array |
|
135 | + { |
|
136 | + return [ |
|
137 | + app()->makeWith(FactSourceTextExtenderCollector::class, ['module' => $this]), |
|
138 | + app()->makeWith(FamilyDatatablesExtenderCollector::class, ['module' => $this]), |
|
139 | + app()->makeWith(IndividualDatatablesExtenderCollector::class, ['module' => $this]), |
|
140 | + app()->makeWith(NameAccordionExtenderCollector::class, ['module' => $this]), |
|
141 | + app()->makeWith(RecordNameTextExtenderCollector::class, ['module' => $this]), |
|
142 | + app()->makeWith(SosaFamilyDatatablesExtenderCollector::class, ['module' => $this]), |
|
143 | + app()->makeWith(SosaIndividualDatatablesExtenderCollector::class, ['module' => $this]), |
|
144 | + app()->makeWith(SosaMissingDatatablesExtenderCollector::class, ['module' => $this]) |
|
145 | + ]; |
|
146 | + } |
|
147 | 147 | } |