@@ -102,9 +102,9 @@ |
||
| 102 | 102 | ->groupBy(['century', 'sex']); |
| 103 | 103 | |
| 104 | 104 | return $male->unionAll($female) |
| 105 | - ->orderBy('century') |
|
| 106 | - ->get() |
|
| 107 | - ->all(); |
|
| 105 | + ->orderBy('century') |
|
| 106 | + ->get() |
|
| 107 | + ->all(); |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | /** |
@@ -3,7 +3,8 @@ |
||
| 3 | 3 | use Fisharebest\Webtrees\Module\ModuleCustomInterface; |
| 4 | 4 | use Fisharebest\Webtrees\Module\ModuleCustomTrait; |
| 5 | 5 | |
| 6 | -return new class extends AbstractModule implements ModuleCustomInterface { |
|
| 6 | +return new class extends AbstractModule implements ModuleCustomInterface |
|
| 7 | +{ |
|
| 7 | 8 | use ModuleCustomTrait; |
| 8 | 9 | |
| 9 | 10 | /** |
@@ -13,7 +13,8 @@ |
||
| 13 | 13 | use Fisharebest\Webtrees\Module\ModuleCustomTrait; |
| 14 | 14 | use Fisharebest\Webtrees\View; |
| 15 | 15 | |
| 16 | -return new class extends MinimalTheme implements ModuleCustomInterface { |
|
| 16 | +return new class extends MinimalTheme implements ModuleCustomInterface |
|
| 17 | +{ |
|
| 17 | 18 | use ModuleCustomTrait; |
| 18 | 19 | |
| 19 | 20 | /** |
@@ -37,12 +37,12 @@ |
||
| 37 | 37 | class EditIndividualController extends AbstractEditController |
| 38 | 38 | { |
| 39 | 39 | /** |
| 40 | - * Add a child to an existing individual (creating a one-parent family). |
|
| 41 | - * |
|
| 42 | - * @param ServerRequestInterface $request |
|
| 43 | - * |
|
| 44 | - * @return ResponseInterface |
|
| 45 | - */ |
|
| 40 | + * Add a child to an existing individual (creating a one-parent family). |
|
| 41 | + * |
|
| 42 | + * @param ServerRequestInterface $request |
|
| 43 | + * |
|
| 44 | + * @return ResponseInterface |
|
| 45 | + */ |
|
| 46 | 46 | public function addChild(ServerRequestInterface $request): ResponseInterface |
| 47 | 47 | { |
| 48 | 48 | $tree = $request->getAttribute('tree'); |
@@ -246,7 +246,8 @@ discard block |
||
| 246 | 246 | <li class="wt-initials-list-item d-flex"> |
| 247 | 247 | <?php if ($count > 0) : ?> |
| 248 | 248 | <a href="<?= e(route('module', ['module' => $module, 'action' => $action, 'alpha' => $letter, 'tree' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a> |
| 249 | - <?php else : ?> |
|
| 249 | + <?php else { |
|
| 250 | + : ?> |
|
| 250 | 251 | <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span> |
| 251 | 252 | |
| 252 | 253 | <?php endif ?> |
@@ -300,6 +301,7 @@ discard block |
||
| 300 | 301 | |
| 301 | 302 | if ($show === 'indi' || $show === 'surn') { |
| 302 | 303 | $surns = $this->individual_list_service->surnames($surname, $alpha, $show_marnm === 'yes', $families, I18N::locale()); |
| 304 | +} |
|
| 303 | 305 | if ($show === 'surn') { |
| 304 | 306 | // Show the surname list |
| 305 | 307 | switch ($tree->getPreference('SURNAME_LIST_STYLE')) { |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | return array ( |
| 4 | - '%H:%i:%s' => '%g:%i:%s %a', |
|
| 5 | - '%j %F %Y' => '%F %j, %Y', |
|
| 4 | + '%H:%i:%s' => '%g:%i:%s %a', |
|
| 5 | + '%j %F %Y' => '%F %j, %Y', |
|
| 6 | 6 | ); |
@@ -31,25 +31,25 @@ |
||
| 31 | 31 | |
| 32 | 32 | interface GedcomRecordFactoriesInterface { |
| 33 | 33 | |
| 34 | - /** |
|
| 35 | - * Add (or replace) a factory for a specific type, e.g. 'INDI', 'FAM' ... |
|
| 36 | - */ |
|
| 37 | - public function setFactory(string $type, GedcomRecordFactory $factory): void; |
|
| 38 | - |
|
| 39 | - /** |
|
| 40 | - * Get an instance of a GedcomRecord object. For single records, |
|
| 41 | - * we just receive the XREF. For bulk records (such as lists |
|
| 42 | - * and search results) we can receive the GEDCOM data as well. |
|
| 43 | - * |
|
| 44 | - * @param string $xref |
|
| 45 | - * @param Tree $tree |
|
| 46 | - * @param string|null $gedcom |
|
| 47 | - * |
|
| 48 | - * @throws Exception |
|
| 49 | - * @return GedcomRecord|Individual|Family|Source|Repository|Media|Note|null |
|
| 50 | - */ |
|
| 51 | - public function getInstance(string $xref, Tree $tree, string $gedcom = null); |
|
| 52 | - |
|
| 53 | - public function clearCache(): void; |
|
| 34 | + /** |
|
| 35 | + * Add (or replace) a factory for a specific type, e.g. 'INDI', 'FAM' ... |
|
| 36 | + */ |
|
| 37 | + public function setFactory(string $type, GedcomRecordFactory $factory): void; |
|
| 38 | + |
|
| 39 | + /** |
|
| 40 | + * Get an instance of a GedcomRecord object. For single records, |
|
| 41 | + * we just receive the XREF. For bulk records (such as lists |
|
| 42 | + * and search results) we can receive the GEDCOM data as well. |
|
| 43 | + * |
|
| 44 | + * @param string $xref |
|
| 45 | + * @param Tree $tree |
|
| 46 | + * @param string|null $gedcom |
|
| 47 | + * |
|
| 48 | + * @throws Exception |
|
| 49 | + * @return GedcomRecord|Individual|Family|Source|Repository|Media|Note|null |
|
| 50 | + */ |
|
| 51 | + public function getInstance(string $xref, Tree $tree, string $gedcom = null); |
|
| 52 | + |
|
| 53 | + public function clearCache(): void; |
|
| 54 | 54 | |
| 55 | 55 | } |
@@ -29,7 +29,8 @@ |
||
| 29 | 29 | use Fisharebest\Webtrees\Repository; |
| 30 | 30 | use Fisharebest\Webtrees\Source; |
| 31 | 31 | |
| 32 | -interface GedcomRecordFactoriesInterface { |
|
| 32 | +interface GedcomRecordFactoriesInterface |
|
| 33 | +{ |
|
| 33 | 34 | |
| 34 | 35 | /** |
| 35 | 36 | * Add (or replace) a factory for a specific type, e.g. 'INDI', 'FAM' ... |
@@ -24,6 +24,6 @@ |
||
| 24 | 24 | |
| 25 | 25 | interface GedcomRecordFactory { |
| 26 | 26 | |
| 27 | - public function createRecord(string $xref, string $gedcom, ?string $pending, Tree $tree): GedcomRecord; |
|
| 27 | + public function createRecord(string $xref, string $gedcom, ?string $pending, Tree $tree): GedcomRecord; |
|
| 28 | 28 | |
| 29 | 29 | } |
| 30 | 30 | \ No newline at end of file |
@@ -22,7 +22,8 @@ |
||
| 22 | 22 | use Fisharebest\Webtrees\GedcomRecord; |
| 23 | 23 | use Fisharebest\Webtrees\Tree; |
| 24 | 24 | |
| 25 | -interface GedcomRecordFactory { |
|
| 25 | +interface GedcomRecordFactory |
|
| 26 | +{ |
|
| 26 | 27 | |
| 27 | 28 | public function createRecord(string $xref, string $gedcom, ?string $pending, Tree $tree): GedcomRecord; |
| 28 | 29 | |
@@ -190,7 +190,7 @@ |
||
| 190 | 190 | |
| 191 | 191 | public static function retrieveGedcomRecord(string $xref, int $tree_id): ?string |
| 192 | 192 | { |
| 193 | - return self::fetchGedcomRecord($xref, $tree_id); |
|
| 193 | + return self::fetchGedcomRecord($xref, $tree_id); |
|
| 194 | 194 | } |
| 195 | 195 | |
| 196 | 196 | /** |