diff options
Diffstat (limited to 'resources/views/lists/individuals-table.phtml')
| -rw-r--r-- | resources/views/lists/individuals-table.phtml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/resources/views/lists/individuals-table.phtml b/resources/views/lists/individuals-table.phtml index ea0205aa4a..2ae2c0fd0e 100644 --- a/resources/views/lists/individuals-table.phtml +++ b/resources/views/lists/individuals-table.phtml @@ -251,7 +251,7 @@ for ($year = 1550; $year < 2030; $year += 10) { <tbody> <?php foreach ($individuals as $key => $individual) : ?> <tr class="<?= $individual->isPendingDeletion() ? 'old' : ($individual->isPendingAddition() ? 'new' : '') ?>"> - <td colspan="2" data-sort="<?= e(str_replace([',', '@P.N.', '@N.N.'], 'AAAA', implode(',', array_reverse(explode(',', $individual->getSortName()))))) ?>"> + <td colspan="2" data-sort="<?= e(str_replace([',', '@P.N.', '@N.N.'], 'AAAA', implode(',', array_reverse(explode(',', $individual->sortName()))))) ?>"> <?php foreach ($individual->getAllNames() as $num => $name) : ?> <a title="<?= $name['type'] === 'NAME' ? '' : GedcomTag::getLabel($name['type'], $individual) ?>" href="<?= e($individual->url()) ?>" class="<?= $num === $individual->getPrimaryName() ? 'name2' : '' ?>"> <?= $name['full'] ?> @@ -264,7 +264,7 @@ for ($year = 1550; $year < 2030; $year += 10) { <?= $individual->getPrimaryParentsNames('parents details1', 'none') ?> </td> - <td hidden data-sort="<?= e(str_replace([',', '@P.N.', '@N.N.'], 'AAAA', $individual->getSortName())) ?>"></td> + <td hidden data-sort="<?= e(str_replace([',', '@P.N.', '@N.N.'], 'AAAA', $individual->sortName())) ?>"></td> <td class="text-center" data-sort="<?= $key ?>"> <?php if ($sosa) : ?> @@ -291,7 +291,7 @@ for ($year = 1550; $year < 2030; $year += 10) { <!-- Birth anniversary --> <td class="text-center" data-sort="<?= -$individual->getEstimatedBirthDate()->julianDay() ?>"> <?php if (isset($birth_dates[0]) && $birth_dates[0]->gregorianYear() >= 1550 && $birth_dates[0]->gregorianYear() < 2030 && !isset($unique_indis[$individual->xref()])) : ?> - <?php $birt_by_decade[(int) ($birth_dates[0]->gregorianYear() / 10) * 10] .= $individual->getSex() ?> + <?php $birt_by_decade[(int) ($birth_dates[0]->gregorianYear() / 10) * 10] .= $individual->sex() ?> <?= Date::getAge($birth_dates[0], null) ?> <?php endif ?> </td> @@ -305,8 +305,8 @@ for ($year = 1550; $year < 2030; $year += 10) { </td> <!-- Number of children --> - <td class="text-center" data-sort="<?= $individual->getNumberOfChildren() ?>"> - <?= I18N::number($individual->getNumberOfChildren()) ?> + <td class="text-center" data-sort="<?= $individual->numberOfChildren() ?>"> + <?= I18N::number($individual->numberOfChildren()) ?> </td> <!-- Death date --> @@ -321,7 +321,7 @@ for ($year = 1550; $year < 2030; $year += 10) { <!-- Death anniversary --> <td class="text-center" data-sort="<?= -$individual->getEstimatedDeathDate()->julianDay() ?>"> <?php if (isset($death_dates[0]) && $death_dates[0]->gregorianYear() >= 1550 && $death_dates[0]->gregorianYear() < 2030 && !isset($unique_indis[$individual->xref()])) : ?> - <?php $deat_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $individual->getSex() ?> + <?php $deat_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $individual->sex() ?> <?= Date::getAge($death_dates[0], null) ?> <?php endif ?> </td> @@ -331,7 +331,7 @@ for ($year = 1550; $year < 2030; $year += 10) { <?php $age_at_death = I18N::number((int) Date::getAgeYears($birth_dates[0], $death_dates[0])); ?> <?php $age_at_death_sort = Date::getAge($birth_dates[0], $death_dates[0]); ?> <?php if (!isset($unique_indis[$individual->xref()]) && $age_at_death >= 0 && $age_at_death <= $max_age) : ?> - <?php $deat_by_age[$age_at_death] .= $individual->getSex(); ?> + <?php $deat_by_age[$age_at_death] .= $individual->sex(); ?> <?php endif ?> <?php else : ?> <?php $age_at_death = ''; ?> @@ -356,7 +356,7 @@ for ($year = 1550; $year < 2030; $year += 10) { <!-- Filter by sex --> <td hidden> - <?= $individual->getSex() ?> + <?= $individual->sex() ?> </td> <!-- Filter by birth date --> @@ -381,9 +381,9 @@ for ($year = 1550; $year < 2030; $year += 10) { <!-- Filter by roots/leaves --> <td hidden> - <?php if (!$individual->getChildFamilies()) : ?> + <?php if (!$individual->childFamilies()) : ?> R - <?php elseif (!$individual->isDead() && $individual->getNumberOfChildren() < 1) : ?> + <?php elseif (!$individual->isDead() && $individual->numberOfChildren() < 1) : ?> L <?php endif ?> </td> |