From 84245bb4f2735c0cd0f240c83c7b8c1d8bad1eaf Mon Sep 17 00:00:00 2001
From: Hermann Hartenthaler <hermann@hartenthaler.de>
Date: Thu, 17 Jun 2021 00:54:05 +0200
Subject: [PATCH] bug in children/grandchildren

- using "partners" instead of "spouses"
- showing parents of children and grandchildren again
- using nice name of proband if there are no members in a part of the extended family
---
 latest-version.txt        |  2 +-
 module.php                | 84 +++++++++++++++++++--------------------
 readme.md                 |  4 +-
 resources/views/tab.phtml | 50 +++++++++++++----------
 4 files changed, 74 insertions(+), 66 deletions(-)

diff --git a/latest-version.txt b/latest-version.txt
index 9d1d35d..3ac87e0 100644
--- a/latest-version.txt
+++ b/latest-version.txt
@@ -1 +1 @@
-2.0.16.17
\ No newline at end of file
+2.0.16.18
\ No newline at end of file
diff --git a/module.php b/module.php
index 5689568..dbee623 100644
--- a/module.php
+++ b/module.php
@@ -69,7 +69,7 @@ class ExtendedFamilyTabModule extends AbstractModule implements ModuleTabInterfa
     
     public const CUSTOM_WEBSITE = 'https://github.com/hartenthaler/' . self::CUSTOM_MODULE . '/';
     
-    public const CUSTOM_VERSION = '2.0.16.17';
+    public const CUSTOM_VERSION = '2.0.16.18';
 
     public const CUSTOM_LAST = 'https://github.com/hartenthaler/' . self::CUSTOM_MODULE. '/raw/main/latest-version.txt';
    
@@ -1176,16 +1176,16 @@ protected function germanTranslations(): array
             '%d sister recorded (%d in total).' . I18N::PLURAL . '%d sisters recorded (%d in total).' 
                 => '%d Schwester verzeichnet (insgesamt %d).' . I18N::PLURAL . '%d Schwestern verzeichnet (insgesamt %d).',
                                 
-            'Spouses' => 'Partner',
-            '%s has no spouses recorded.' => 'Für %s sind keine Partner verzeichnet.',
-            '%s has one wife recorded.' => 'Für %s ist eine Partnerin verzeichnet.',
-            '%s has one husband recorded.' => 'Für %s ist ein Partner verzeichnet.',
-            '%s has one spouse recorded.' => 'Für %s ist ein Partner verzeichnet.',
-            '%s has %d wifes recorded.' => 'Für %s sind %d Partnerinnen verzeichnet.',
-            '%s has %d husbands recorded.' => 'Für %s sind %d Partner verzeichnet.',
-            '%2$s has %1$d husband and ' . I18N::PLURAL . '%2$s has %1$d husbands and ' 
+            'Partners' => 'Partner',
+            '%s has no partners recorded.' => 'Für %s sind keine Partner verzeichnet.',
+            '%s has one female partner recorded.' => 'Für %s ist eine Partnerin verzeichnet.',
+            '%s has one male partner recorded.' => 'Für %s ist ein Partner verzeichnet.',
+            '%s has one partner recorded.' => 'Für %s ist ein Partner verzeichnet.',
+            '%s has %d female partners recorded.' => 'Für %s sind %d Partnerinnen verzeichnet.',
+            '%s has %d male partners recorded.' => 'Für %s sind %d Partner verzeichnet.',
+            '%2$s has %1$d male partner and ' . I18N::PLURAL . '%2$s has %1$d male partners and ' 
                 => 'Für %2$s sind %1$d Partner und ' . I18N::PLURAL . 'Für %2$s sind %1$d Partner und ',
-            '%d wife recorded (%d in total).' . I18N::PLURAL . '%d wifes recorded (%d in total).' 
+            '%d female partner recorded (%d in total).' . I18N::PLURAL . '%d female partners recorded (%d in total).' 
                 => '%d Partnerin verzeichnet (insgesamt %d).' . I18N::PLURAL . '%d Partnerinnen verzeichnet (insgesamt %d).',
 
             'Cousins' => 'Cousins und Cousinen',
@@ -1390,18 +1390,6 @@ protected function dutchTranslations(): array
             '%d aunt recorded (%d in total).' . I18N::PLURAL . '%d aunts recorded (%d in total).' 
                 => '%d tante geregistreerd (%d in totaal).' . I18N::PLURAL . '%d tantes geregistreerd (%d in totaal).',
                 
-            'Cousins' => 'Neven en nichten (kinderen van oom of tante)',
-            '%s has no first cousins recorded.' => 'Voor %s zijn geen eerstegraads neven en nichten geregistreerd.',
-            '%s has one female first cousin recorded.' => 'Voor %s is een eerstegraads nicht geregistreerd.',
-            '%s has one male first cousin recorded.' => 'Voor %s is een eerstegraads neef geregistreerd.',
-            '%s has one first cousin recorded.' => 'Voor %s is een eerstegraads neef of nicht geregistreerd.',
-            '%s has %d female first cousins recorded.' => 'Voor %s zijn %d eerstegraads nichten geregistreerd.',
-            '%s has %d male first cousins recorded.' => 'Voor %s zijn %d eerstegraads neven geregistreerd.',
-            '%2$s has %1$d male first cousin and ' . I18N::PLURAL . '%2$s has %1$d male first cousins and ' 
-                => 'Voor %2$s zijn %1$d eerstegraads neef en ' . I18N::PLURAL . 'Voor %2$s zijn %1$d eerstegraads neven en ',
-            '%d female first cousin recorded (%d in total).' . I18N::PLURAL . '%d female first cousins recorded (%d in total).' 
-                => '%d eerstegraads nicht geregistreerd (%d in totaal).' . I18N::PLURAL . '%d eerstegraads nichten geregistreerd (%d in totaal).',
-                
             'Siblings' => 'Broers en zussen',
             '%s has no siblings recorded.' => 'Voor %s zijn geen broers of zussen geregistreerd.',
             '%s has one sister recorded.' => 'Voor %s is een zus geregistreerd.',
@@ -1414,29 +1402,41 @@ protected function dutchTranslations(): array
             '%d sister recorded (%d in total).' . I18N::PLURAL . '%d sisters recorded (%d in total).' 
                 => '%d zus geregistreerd (%d in totaal).' . I18N::PLURAL . '%d zussen geregistreerd (%d in totaal).',
                                 
-            'Spouses' => 'Partners',
-            '%s has no spouses recorded.' => 'Voor %s zijn geen partners geregistreerd.',
-            '%s has one wife recorded.' => 'Voor %s is een partner/echtgenote geregistreerd.',
-            '%s has one husband recorded.' => 'Voor %s is een partner/echtgenoot geregistreerd.',
-            '%s has one spouse recorded.' => 'Voor %s is een partner geregistreerd.',
-            '%s has %d wifes recorded.' => 'Voor %s zijn %d partners/echtgenotes geregistreerd.',
-            '%s has %d husbands recorded.' => 'Voor %s zijn %d partners/echtgenoten geregistreerd.',
-            '%2$s has %1$d husband and ' . I18N::PLURAL . '%2$s has %1$d husbands and ' 
-                => 'Voor %2$s zijn %1$d partner/echtgenoot en ' . I18N::PLURAL . 'Voor %2$s zijn %1$d partners/echtgenoten en ',
-            '%d wife recorded (%d in total).' . I18N::PLURAL . '%d wifes recorded (%d in total).' 
-                => '%d partner/echtgenote geregistreerd (%d in totaal).' . I18N::PLURAL . '%d partners/echtgenotes geregistreerd (%d in totaal).',
+            'Partners' => 'Partners',
+            '%s has no partners recorded.' => 'Voor %s zijn geen partners geregistreerd.',
+            '%s has one female partner recorded.' => 'Voor %s is een partner geregistreerd.',
+            '%s has one male partner recorded.' => 'Voor %s is een partner geregistreerd.',
+            '%s has one partner recorded.' => 'Voor %s is een partner geregistreerd.',
+            '%s has %d female partners recorded.' => 'Voor %s zijn %d partners geregistreerd.',
+            '%s has %d male partners recorded.' => 'Voor %s zijn %d partners geregistreerd.',
+            '%2$s has %1$d male partner and ' . I18N::PLURAL . '%2$s has %1$d male partners and ' 
+                => 'Voor %2$s zijn %1$d partner en ' . I18N::PLURAL . 'Voor %2$s zijn %1$d partners en ',
+            '%d female partner recorded (%d in total).' . I18N::PLURAL . '%d female partners recorded (%d in total).' 
+                => '%d partner geregistreerd (%d in totaal).' . I18N::PLURAL . '%d partners geregistreerd (%d in totaal).',
+            
+            'Cousins' => 'Volle neven en nichten (kinderen van oom of tante)',
+            '%s has no first cousins recorded.' => 'Voor %s zijn geen volle neven en nichten geregistreerd.',
+            '%s has one female first cousin recorded.' => 'Voor %s is een volle nicht geregistreerd.',
+            '%s has one male first cousin recorded.' => 'Voor %s is een volle neef geregistreerd.',
+            '%s has one first cousin recorded.' => 'Voor %s is een volle neef of nicht geregistreerd.',
+            '%s has %d female first cousins recorded.' => 'Voor %s zijn %d volle nichten geregistreerd.',
+            '%s has %d male first cousins recorded.' => 'Voor %s zijn %d volle neven geregistreerd.',
+            '%2$s has %1$d male first cousin and ' . I18N::PLURAL . '%2$s has %1$d male first cousins and ' 
+                => 'Voor %2$s zijn %1$d volle neef en ' . I18N::PLURAL . 'Voor %2$s zijn %1$d volle neven en ',
+            '%d female first cousin recorded (%d in total).' . I18N::PLURAL . '%d female first cousins recorded (%d in total).' 
+                => '%d volle nicht geregistreerd (%d in totaal).' . I18N::PLURAL . '%d volle nichten geregistreerd (%d in totaal).',
                 
-            'Nephews and Nieces' => 'Neven en nichten (kinderen van broer of zus)',
-            '%s has no nephews or nieces recorded.' => 'Voor %s zijn geen neven of nichten geregistreerd.',
-            '%s has one niece recorded.' => 'Voor %s is een nicht geregistreerd.',
-            '%s has one nephew recorded.' => 'Voor %s is een neef geregistreerd.',
-            '%s has one nephew or niece recorded.' => 'Voor %s is een neef of nicht geregistreerd.',
-            '%s has %d nieces recorded.' => 'Voor %s zijn %d nichten geregistreerd.',
-            '%s has %d nephews recorded.' => 'Voor %s zijn %d neven geregistreerd.',
+            'Nephews and Nieces' => 'Neefjes en nichtjes (kinderen van broer of zus)',
+            '%s has no nephews or nieces recorded.' => 'Voor %s zijn geen neefjes of nichtjes (kinderen van broer of zus) geregistreerd.',
+            '%s has one niece recorded.' => 'Voor %s is een nichtje geregistreerd.',
+            '%s has one nephew recorded.' => 'Voor %s is een neefje geregistreerd.',
+            '%s has one nephew or niece recorded.' => 'Voor %s is een neefje of nichtje geregistreerd.',
+            '%s has %d nieces recorded.' => 'Voor %s zijn %d nichtjes geregistreerd.',
+            '%s has %d nephews recorded.' => 'Voor %s zijn %d neefjes geregistreerd.',
             '%2$s has %1$d nephew and ' . I18N::PLURAL . '%2$s has %1$d nephews and ' 
-                => 'Voor %2$s zijn %1$d neef en ' . I18N::PLURAL . 'Voor %2$s zijn %1$d neven en ',
+                => 'Voor %2$s zijn %1$d neefje en ' . I18N::PLURAL . 'Voor %2$s zijn %1$d neefjes en ',
             '%d niece recorded (%d in total).' . I18N::PLURAL . '%d nieces recorded (%d in total).' 
-                => '%d nicht geregistreerd (%d in totaal).' . I18N::PLURAL . '%d nichten geregistreerd (%d in totaal).', 
+                => '%d nichtje geregistreerd (%d in totaal).' . I18N::PLURAL . '%d nichtjes geregistreerd (%d in totaal).', 
                 
             'Children' => 'Kinderen',
             '%s has no children recorded.' => 'Voor %s zijn geen kinderen geregistreerd.',
diff --git a/readme.md b/readme.md
index 5257349..2ed3535 100644
--- a/readme.md
+++ b/readme.md
@@ -40,10 +40,10 @@ The readme contains the following main sections:
 ## Screenshots
 
 Screenshot of module
-<p align="center"><img src="screenshot.png" alt="Screenshot" align="center" width="67%"></p>
+<p align="center"><img src="screenshot.png" alt="Screenshot" align="center" width="80%"></p>
 
 Screenshot of control panel menu
-<p align="center"><img src="screenshot.png" alt="Screenshot" align="center" width="67%"></p>
+<p align="center"><img src="screenshot_control_panel.png" alt="Screenshot control panel" align="center" width="40%"></p>
 
 <a name="Requirements"></a>
 
diff --git a/resources/views/tab.phtml b/resources/views/tab.phtml
index 8d2b68a..7f2c88f 100644
--- a/resources/views/tab.phtml
+++ b/resources/views/tab.phtml
@@ -89,7 +89,7 @@
                         <?php endif ?>
                     </div>
                 <?php else: ?>
-                    <h3><?= I18N::translate('%s has no grandparents recorded.', $extfam_obj->Self->indi->fullName()) ?></h3>
+                    <h3><?= I18N::translate('%s has no grandparents recorded.', $extfam_obj->Self->niceName) ?></h3>
                 <?php endif ?>
             </div>
         <?php endif ?>
@@ -174,7 +174,7 @@
                         <?php endif ?>
                     </div>
                 <?php else: ?>
-                    <h3><?= I18N::translate('%s has no parents recorded.', $extfam_obj->Self->indi->fullName()) ?></h3>
+                    <h3><?= I18N::translate('%s has no parents recorded.', $extfam_obj->Self->niceName) ?></h3>
                 <?php endif ?>
             </div>
         <?php endif ?>
@@ -274,7 +274,7 @@
                         <?php endif ?>
                     </div>
                 <?php else: ?>
-                    <h3><?= I18N::translate('%s has no uncles or aunts recorded.', $extfam_obj->Self->indi->fullName()) ?></h3>
+                    <h3><?= I18N::translate('%s has no uncles or aunts recorded.', $extfam_obj->Self->niceName) ?></h3>
                 <?php endif ?>
             </div>
         <?php endif ?>
@@ -326,7 +326,7 @@
                         <?php endforeach ?>
                     </div>
                 <?php else: ?>
-                    <h3><?= I18N::translate('%s has no siblings recorded.', $extfam_obj->Self->indi->fullName()) ?></h3>
+                    <h3><?= I18N::translate('%s has no siblings recorded.', $extfam_obj->Self->niceName) ?></h3>
                 <?php endif ?>
             </div>
         <?php endif ?>
@@ -334,26 +334,26 @@
         <?php if ( $extfam_obj->showFamilyPart['spouses'] ): ?>
             <div class="hh-extended-family-spouses">
                 <?php if ($extfam_obj->Spouses->allCount): ?>
-                    <h2><?= I18N::translate('Spouses') ?></h2>
+                    <h2><?= I18N::translate('Partners') ?></h2>
                     <?php if ($extfam_obj->Spouses->allCount == 1): ?>
                         <?php if ($extfam_obj->Spouses->femaleCount == 1): ?>
-                            <h3><?= I18N::translate('%s has one wife recorded.', $extfam_obj->Self->niceName) ?></h3>
+                            <h3><?= I18N::translate('%s has one female partner recorded.', $extfam_obj->Self->niceName) ?></h3>
                         <?php else: ?>
                             <?php if ($extfam_obj->Spouses->maleCount == 1): ?>
-                                <h3><?= I18N::translate('%s has one husband recorded.', $extfam_obj->Self->niceName) ?></h3>
+                                <h3><?= I18N::translate('%s has one male partner recorded.', $extfam_obj->Self->niceName) ?></h3>
                             <?php else: ?>
-                                <h3><?= I18N::translate('%s has one spouse recorded.', $extfam_obj->Self->niceName) ?></h3>
+                                <h3><?= I18N::translate('%s has one partner recorded.', $extfam_obj->Self->niceName) ?></h3>
                             <?php endif ?>
                         <?php endif ?>
                     <?php else: ?>
                         <?php if ($extfam_obj->Spouses->maleCount == 0): ?>
-                            <h3><?= I18N::translate('%s has %d wifes recorded.', $extfam_obj->Self->niceName, $extfam_obj->Spouses->femaleCount) ?></h3>
+                            <h3><?= I18N::translate('%s has %d female partners recorded.', $extfam_obj->Self->niceName, $extfam_obj->Spouses->femaleCount) ?></h3>
                         <?php else: ?>
                             <?php if ($extfam_obj->Spouses->femaleCount == 0): ?>
-                                <h3><?= I18N::translate('%s has %d husbands recorded.', $extfam_obj->Self->niceName, $extfam_obj->Spouses->maleCount) ?></h3>
+                                <h3><?= I18N::translate('%s has %d male partners recorded.', $extfam_obj->Self->niceName, $extfam_obj->Spouses->maleCount) ?></h3>
                             <?php else: ?>
-                                <h3><?= I18N::plural('%2$s has %1$d husband and ', '%2$s has %1$d husbands and ', $extfam_obj->Spouses->maleCount, $extfam_obj->Spouses->maleCount, $extfam_obj->Self->niceName) ?>
-                                    <?= I18N::plural('%d wife recorded (%d in total).', '%d wifes recorded (%d in total).', $extfam_obj->Spouses->femaleCount, $extfam_obj->Spouses->femaleCount, $extfam_obj->Spouses->allCount) ?></h3>
+                                <h3><?= I18N::plural('%2$s has %1$d male partner and ', '%2$s has %1$d male partners and ', $extfam_obj->Spouses->maleCount, $extfam_obj->Spouses->maleCount, $extfam_obj->Self->niceName) ?>
+                                    <?= I18N::plural('%d female partner recorded (%d in total).', '%d female partners recorded (%d in total).', $extfam_obj->Spouses->femaleCount, $extfam_obj->Spouses->femaleCount, $extfam_obj->Spouses->allCount) ?></h3>
                             <?php endif ?>
                         <?php endif ?>
                     <?php endif ?>
@@ -377,7 +377,7 @@
                         <?php endforeach ?>
                     </div>
                 <?php else: ?>
-                    <h3><?= I18N::translate('%s has no spouses recorded.', $extfam_obj->Self->indi->fullName()) ?></h3>
+                    <h3><?= I18N::translate('%s has no spouses recorded.', $extfam_obj->Self->niceName) ?></h3>
                 <?php endif ?>
             </div>
         <?php endif ?>
@@ -477,7 +477,7 @@
                         <?php endif ?>
                     </div>
                 <?php else: ?>
-                    <h3><?= I18N::translate('%s has no first cousins recorded.', $extfam_obj->Self->indi->fullName()) ?></h3>
+                    <h3><?= I18N::translate('%s has no first cousins recorded.', $extfam_obj->Self->niceName) ?></h3>
                 <?php endif ?>
             </div>
         <?php endif ?>
@@ -533,7 +533,7 @@
                         <?php endforeach ?>
                     </div>
                 <?php else: ?>
-                    <h3><?= I18N::translate('%s has no nephews or nieces recorded.', $extfam_obj->Self->indi->fullName()) ?></h3>
+                    <h3><?= I18N::translate('%s has no nephews or nieces recorded.', $extfam_obj->Self->niceName) ?></h3>
                 <?php endif ?>
             </div>
         <?php endif ?>
@@ -567,9 +567,13 @@
                     <div id="hh_extended_family_content">
                         <?php foreach ($extfam_obj->Children->families as $famobj): ?>
                             <div id="extended_family_g">
-                                
-                                <?php    $i = 1; ?>
+                                <?php $prev_fam_id = '-1'; ?>
+                                <?php $i = 1; ?>
                                 <?php  foreach ($famobj->members as $indi) : ?>
+                                    <?php if ($indi->childFamilies()->first()->xref() != $prev_fam_id) : ?>
+                                        <?php $prev_fam_id = $indi->childFamilies()->first()->xref(); $i = 1; ?>
+                                        <h5><?= /* I18N: Do not translate. Already in webtrees core */ I18N::translate('Parents') ?><a href="<?= e($indi->childFamilies()->first()->url());?>">&nbsp;<?= $indi->childFamilies()->first()->fullName(); ?></a></h5>
+                                    <?php endif ?>
                                     <div class="wt-chart-box-<?= strtolower($indi->sex()) ?>">
                                         <span class="extended_family_counter"><?= $i ?> </span>
                                         <?php if ($indi->canShow()): ?>
@@ -584,7 +588,7 @@
                         <?php endforeach ?>
                     </div>
                 <?php else: ?>
-                    <h3><?= I18N::translate('%s has no children recorded.', $extfam_obj->Self->indi->fullName()) ?></h3>
+                    <h3><?= I18N::translate('%s has no children recorded.', $extfam_obj->Self->niceName) ?></h3>
                 <?php endif ?>
             </div>
         <?php endif ?>
@@ -618,9 +622,13 @@
                     <div id="hh_extended_family_content">
                         <?php foreach ($extfam_obj->Grandchildren->families as $famobj): ?>
                             <div id="extended_family_g">
-                                
-                                <?php    $i = 1; ?>
+                                <?php $prev_fam_id = '-1'; ?>
+                                <?php $i = 1; ?>
                                 <?php  foreach ($famobj->members as $indi) : ?>
+                                    <?php if ($indi->childFamilies()->first()->xref() != $prev_fam_id) : ?>
+                                        <?php $prev_fam_id = $indi->childFamilies()->first()->xref(); $i = 1; ?>
+                                        <h5><?= /* I18N: Do not translate. Already in webtrees core */ I18N::translate('Parents') ?><a href="<?= e($indi->childFamilies()->first()->url());?>">&nbsp;<?= $indi->childFamilies()->first()->fullName(); ?></a></h5>
+                                    <?php endif ?>
                                     <div class="wt-chart-box-<?= strtolower($indi->sex()) ?>">
                                         <span class="extended_family_counter"><?= $i ?> </span>
                                         <?php if ($indi->canShow()): ?>
@@ -635,7 +643,7 @@
                         <?php endforeach ?>
                     </div>
                 <?php else: ?>
-                    <h3><?= I18N::translate('%s has no grandchildren recorded.', $extfam_obj->Self->indi->fullName()) ?></h3>
+                    <h3><?= I18N::translate('%s has no grandchildren recorded.', $extfam_obj->Self->niceName) ?></h3>
                 <?php endif ?>
             </div>
         <?php endif ?>