diff options
| -rw-r--r-- | app/Module/PedigreeMapModule.php | 55 | ||||
| -rw-r--r-- | resources/views/modules/pedigree-map/events.phtml | 23 |
2 files changed, 25 insertions, 53 deletions
diff --git a/app/Module/PedigreeMapModule.php b/app/Module/PedigreeMapModule.php index d6167a063e..cd508895bf 100644 --- a/app/Module/PedigreeMapModule.php +++ b/app/Module/PedigreeMapModule.php @@ -75,6 +75,7 @@ class PedigreeMapModule extends AbstractModule implements ModuleChartInterface, 'Magenta', 'Brown', ]; + private const MINZOOM = 2; /** @var ChartService */ private $chart_service; @@ -247,8 +248,8 @@ class PedigreeMapModule extends AbstractModule implements ModuleChartInterface, 'polyline' => $polyline, 'iconcolor' => $color, 'tooltip' => strip_tags($fact->place()->fullName()), - 'summary' => view('modules/pedigree-map/events', $this->summaryData($individual, $fact, $id)), - 'zoom' => $location->zoom() ?: 2, + 'summary' => view('modules/pedigree-map/events', $this->summaryData($fact, $id)), + 'zoom' => $location->zoom() ?: self::MINZOOM, ], ]; } @@ -336,47 +337,29 @@ class PedigreeMapModule extends AbstractModule implements ModuleChartInterface, } /** - * @param Individual $individual - * @param Fact $fact - * @param int $sosa + * @param Fact $fact + * @param int $sosa * * @return array */ - private function summaryData(Individual $individual, Fact $fact, int $sosa): array + private function summaryData(Fact $fact, int $sosa): array { - $record = $fact->record(); - $name = ''; - $url = ''; - $tag = $fact->label(); - $addbirthtag = false; - - if ($record instanceof Family) { - // Marriage - $spouse = $record->spouse($individual); - if ($spouse) { - $url = $spouse->url(); - $name = $spouse->fullName(); - } - } elseif ($record !== $individual) { - // Birth of a child - $url = $record->url(); - $name = $record->fullName(); - $tag = GedcomTag::getLabel('_BIRT_CHIL', $record); - } - - if ($sosa > 1) { - $addbirthtag = true; - $tag = ucfirst($this->getSosaName($sosa)); + if ($sosa === 1) { + $url = ''; + $name = ''; + } else { + $record = $fact->record(); + $url = $record->url(); + $name = $record->fullName(); } return [ - 'tag' => $tag, - 'url' => $url, - 'name' => $name, - 'value' => $fact->value(), - 'date' => $fact->date()->display(true), - 'place' => $fact->place(), - 'addtag' => $addbirthtag, + 'tag' => ucfirst($this->getSosaName($sosa)), + 'url' => $url, + 'name' => $name, + 'date' => $fact->date()->display(true), + 'place' => $fact->place(), + 'etag' => $fact->getTag() ]; } diff --git a/resources/views/modules/pedigree-map/events.phtml b/resources/views/modules/pedigree-map/events.phtml index 8d961d902d..edd7ccaff0 100644 --- a/resources/views/modules/pedigree-map/events.phtml +++ b/resources/views/modules/pedigree-map/events.phtml @@ -13,23 +13,12 @@ use Fisharebest\Webtrees\GedcomTag; </a> <?php endif ?> -<?php if ($value) : ?> - <span> - <?= $value ?> - </span> -<?php endif ?> - <div> - <?php if ($addtag) : ?> - <?= GedcomTag::getLabel('BIRT') ?>: - <?php endif ?> - <?= $date ?> + <?= GedcomTag::getLabel($etag) ?>: <?= $date ?> </div> -<?php if ($place->gedcomName() !== '') : ?> - <div> - <a href="<?= e($place->url()) ?>"> - <?= $place->fullName() ?> - </a> - </div> -<?php endif ?> +<div> + <a href="<?= e($place->url()) ?>"> + <?= $place->fullName() ?> + </a> +</div> |