diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js index 9f789ab442677d14bce2d89a79bdfe0c8b2ee919..fdcfd0f07a8cd8788f1b79e8fc69ea13a65a8117 100644 --- a/src/js/slaveSummaryWidgets.js +++ b/src/js/slaveSummaryWidgets.js @@ -3861,54 +3861,47 @@ window.SlaveSummaryUncached = (function(){ if (areSisters(V.PC, slave)) { r += `Your sister `; } - if (V.showDistantRelatives) { - if (isAunt(V.PC, slave)) { - if ( slave.genes === "XX") { - r += `Your aunt;`; + let aunts = V.slaves.filter(function(s) { return (s.ID !== slave.ID) && isAunt(slave, s) && (s.genes === "XX"); }); + if (aunts.length === 1) { + let _ssj = V.slaves.findIndex(function(s) { + return isAunt(slave, s); + }); + if (_ssj !== -1) { + if (slave.genes === "XX") { + r += `${SlaveFullName(V.slaves[_ssj])}'s niece`; + } else if (slave.genes === "XY") { + r += `${SlaveFullName(V.slaves[_ssj])}'s nephew`; + } + if (slave.relationshipTarget === V.slaves[_ssj].ID) { + var friendShipShort = relationshipTermShort(slave); + r += `& ${friendShipShort}`; + handled = 1; + } + } + r += " "; + } else if (aunts.length > 1) { + r += `multiple aunts `; + } + let nieces = V.slaves.filter(function(s) { return (s.ID !== slave.ID) && isAunt(s, slave) && (s.genes === "XX"); }); + if (nieces.length === 1) { + let _ssj = V.slaves.findIndex(function(s) { + return isAunt(s, slave); + }); + if (_ssj !== -1) { + if (slave.genes === "XX") { + r += `${SlaveFullName(V.slaves[_ssj])}'s aunt`; + } else if (slave.genes === "XY") { + r += `${SlaveFullName(V.slaves[_ssj])}'s uncle`; + } + if (slave.relationshipTarget === V.slaves[_ssj].ID) { + var friendShipShort = relationshipTermShort(slave); + r += `& ${friendShipShort}`; + handled = 1; } } - let aunts = V.slaves.filter(function(s) { return (s.ID !== slave.ID) && isAunt(slave, s) && (s.genes === "XX"); }); - if (aunts.length === 1) { - let _ssj = V.slaves.findIndex(function(s) { - return isAunt(slave, s); - }); - if (_ssj !== -1) { - if (slave.genes === "XX") { - r += `${SlaveFullName(V.slaves[_ssj])}'s niece`; - } else if (slave.genes === "XY") { - r += `${SlaveFullName(V.slaves[_ssj])}'s nephew`; - } - if (slave.relationshipTarget === V.slaves[_ssj].ID) { - var friendShipShort = relationshipTermShort(slave); - r += `& ${friendShipShort}`; - handled = 1; - } - } - r += " "; - } else if (aunts.length > 1) { - r += `multiple aunts `; - } - let nieces = V.slaves.filter(function(s) { return (s.ID !== slave.ID) && isAunt(s, slave) && (s.genes === "XX"); }); - if (nieces.length === 1) { - let _ssj = V.slaves.findIndex(function(s) { - return isAunt(s, slave); - }); - if (_ssj !== -1) { - if (slave.genes === "XX") { - r += `${SlaveFullName(V.slaves[_ssj])}'s aunt`; - } else if (slave.genes === "XY") { - r += `${SlaveFullName(V.slaves[_ssj])}'s uncle`; - } - if (slave.relationshipTarget === V.slaves[_ssj].ID) { - var friendShipShort = relationshipTermShort(slave); - r += `& ${friendShipShort}`; - handled = 1; - } - } - r += " "; - } else if (nieces.length > 1) { - r += `multiple nieces `; - } + r += " "; + } else if (nieces.length > 1) { + r += `multiple nieces `; } if (slave.sisters === 1) { let _ssj = V.slaves.findIndex(function(s) { @@ -3926,27 +3919,25 @@ window.SlaveSummaryUncached = (function(){ } else if (slave.sisters > 1) { r += `multiple sisters `; } - if (V.showDistantRelatives) { - var cousins = V.slaves.filter(function(s) { return (s.ID !== slave.ID) && areCousins(s, slave); }); - if (cousins.length === 1) { - let _ssj = V.slaves.findIndex(function(s) { - return areCousins(s, slave); - }); - if (_ssj !== -1) { - r += `${SlaveFullName(V.slaves[_ssj])}'s cousin`; - if (slave.relationshipTarget === V.slaves[_ssj].ID) { - var friendShipShort = relationshipTermShort(slave); - r += `& ${friendShipShort}`; - handled = 1; - } - } - r += " "; - } else if (cousins.length > 1) { - r += `multiple cousins `; - } - if (areCousins(V.PC, slave)) { - r += `Your cousin;`; - } + var cousins = V.slaves.filter(function(s) { return (s.ID !== slave.ID) && areCousins(s, slave); }); + if (cousins.length === 1) { + let _ssj = V.slaves.findIndex(function(s) { + return areCousins(s, slave); + }); + if (_ssj !== -1) { + r += `${SlaveFullName(V.slaves[_ssj])}'s cousin`; + if (slave.relationshipTarget === V.slaves[_ssj].ID) { + var friendShipShort = relationshipTermShort(slave); + r += `& ${friendShipShort}`; + handled = 1; + } + } + r += " "; + } else if (cousins.length > 1) { + r += `multiple cousins `; + } + if (areCousins(V.PC, slave)) { + r += `Your cousin;`; } if (slave.relationship > 0 && handled !== 1) { let _ssj = V.slaves.findIndex(function(s) { @@ -4060,6 +4051,9 @@ window.SlaveSummaryUncached = (function(){ if (areSisters(V.PC, slave)) { r += `Your <span class="lightgreen">sister.</span> `; } + if (isAunt(V.PC, slave) && slave.genes === "XX") { + r += `Your <span class="lightgreen">aunt.</span> `; + } if (slave.father > 0 && slave.father !== slave.mother) { let _ssj = V.slaves.findIndex(function(s) { return s.ID === slave.father; @@ -4121,60 +4115,55 @@ window.SlaveSummaryUncached = (function(){ r += `Has <span class="lightgreen">several daughters.</span> `; } } - if (V.showDistantRelatives) { - if (isAunt(V.PC, slave) && slave.genes === "XX") { - r += `Your <span class="lightgreen">aunt.</span> `; - } - let aunts = V.slaves.filter(function(s) { return (s.ID !== slave.ID) && isAunt(slave, s) && (slave.genes === "XX"); }); - if (aunts.length === 1) { - let _ssj = V.slaves.findIndex(function(s) { - return isAunt(slave, s); - }); - if (_ssj !== -1) { - if (slave.genes === "XX") { - r += `${SlaveFullName(V.slaves[_ssj])}'s <span class="lightgreen">niece`; - } - if (slave.relationshipTarget === V.slaves[_ssj].ID) { - var friendShipShort = relationshipTerm(slave); - r += ` and ${friendShipShort}`; - handled = 1; - } - r += `.</span> `; - } - } else if (aunts.length > 1) { - if (aunts.length > 10) { - r += `Has <span class="lightgreen">tons of aunts.</span> `; - } else if (aunts.length > 5) { - r += `Has <span class="lightgreen">many aunts.</span> `; - } else { - r += `Has <span class="lightgreen">several aunts.</span> `; - } - } - let nieces = V.slaves.filter(function(s) { return (s.ID !== slave.ID) && isAunt(s, slave) && (s.genes === "XX"); }); - if (nieces.length === 1) { - let _ssj = V.slaves.findIndex(function(s) { - return isAunt(s, slave); - }); - if (_ssj !== -1) { - if (slave.genes === "XX") { - r += `${SlaveFullName(V.slaves[_ssj])}'s <span class="lightgreen">aunt`; - } - if (slave.relationshipTarget === V.slaves[_ssj].ID) { - var friendShipShort = relationshipTerm(slave); - r += ` and ${friendShipShort}`; - handled = 1; - } - r += `.</span> `; - } - } else if (nieces.length > 1) { - if (nieces.length > 10) { - r += `Has <span class="lightgreen">tons of nieces.</span> `; - } else if (nieces.length > 5) { - r += `Has <span class="lightgreen">many nieces.</span> `; - } else { - r += `Has <span class="lightgreen">several nieces.</span> `; - } - } + let aunts = V.slaves.filter(function(s) { return (s.ID !== slave.ID) && isAunt(slave, s) && (slave.genes === "XX"); }); + if (aunts.length === 1) { + let _ssj = V.slaves.findIndex(function(s) { + return isAunt(slave, s); + }); + if (_ssj !== -1) { + if (slave.genes === "XX") { + r += `${SlaveFullName(V.slaves[_ssj])}'s <span class="lightgreen">niece`; + } + if (slave.relationshipTarget === V.slaves[_ssj].ID) { + var friendShipShort = relationshipTerm(slave); + r += ` and ${friendShipShort}`; + handled = 1; + } + r += `.</span> `; + } + } else if (aunts.length > 1) { + if (aunts.length > 10) { + r += `Has <span class="lightgreen">tons of aunts.</span> `; + } else if (aunts.length > 5) { + r += `Has <span class="lightgreen">many aunts.</span> `; + } else { + r += `Has <span class="lightgreen">several aunts.</span> `; + } + } + let nieces = V.slaves.filter(function(s) { return (s.ID !== slave.ID) && isAunt(s, slave) && (s.genes === "XX"); }); + if (nieces.length === 1) { + let _ssj = V.slaves.findIndex(function(s) { + return isAunt(s, slave); + }); + if (_ssj !== -1) { + if (slave.genes === "XX") { + r += `${SlaveFullName(V.slaves[_ssj])}'s <span class="lightgreen">aunt`; + } + if (slave.relationshipTarget === V.slaves[_ssj].ID) { + var friendShipShort = relationshipTerm(slave); + r += ` and ${friendShipShort}`; + handled = 1; + } + r += `.</span> `; + } + } else if (nieces.length > 1) { + if (nieces.length > 10) { + r += `Has <span class="lightgreen">tons of nieces.</span> `; + } else if (nieces.length > 5) { + r += `Has <span class="lightgreen">many nieces.</span> `; + } else { + r += `Has <span class="lightgreen">several nieces.</span> `; + } } if (slave.sisters === 1) { let _ssj = V.slaves.findIndex(function(s) { @@ -4198,33 +4187,31 @@ window.SlaveSummaryUncached = (function(){ r += `Has <span class="lightgreen">several sisters.</span> `; } } - if (V.showDistantRelatives) { - let cousins = V.slaves.filter(function(s) { return (s.ID != slave.ID) && areCousins(s, slave); }); - if (cousins.length === 1) { - let _ssj = V.slaves.findIndex(function(s) { - return areCousins(s, slave); - }); - if (_ssj !== -1) { - r += `${SlaveFullName(V.slaves[_ssj])}'s <span class="lightgreen">cousin`; - if (slave.relationshipTarget === V.slaves[_ssj].ID) { - var friendShipShort = relationshipTerm(slave); - r += ` and ${friendShipShort}`; - handled = 1; - } - r += `.</span> `; - } - } else if (cousins.length > 1) { - if (cousins.length > 10) { - r += `One of <span class="lightgreen">many cousins.</span> `; - } else if (cousins.length > 5) { - r += `Has <span class="lightgreen">many cousins.</span> `; - } else { - r += `Has <span class="lightgreen">several cousins.</span> `; - } - } - if (areCousins(V.PC, slave)) { - r += `Your <span class="lightgreen">cousin.</span> `; - } + let cousins = V.slaves.filter(function(s) { return (s.ID != slave.ID) && areCousins(s, slave); }); + if (cousins.length === 1) { + let _ssj = V.slaves.findIndex(function(s) { + return areCousins(s, slave); + }); + if (_ssj !== -1) { + r += `${SlaveFullName(V.slaves[_ssj])}'s <span class="lightgreen">cousin`; + if (slave.relationshipTarget === V.slaves[_ssj].ID) { + var friendShipShort = relationshipTerm(slave); + r += ` and ${friendShipShort}`; + handled = 1; + } + r += `.</span> `; + } + } else if (cousins.length > 1) { + if (cousins.length > 10) { + r += `One of <span class="lightgreen">many cousins.</span> `; + } else if (cousins.length > 5) { + r += `Has <span class="lightgreen">many cousins.</span> `; + } else { + r += `Has <span class="lightgreen">several cousins.</span> `; + } + } + if (areCousins(V.PC, slave)) { + r += `Your <span class="lightgreen">cousin.</span> `; } if (slave.relationship > 0 && handled !== 1) { let _ssj = V.slaves.findIndex(function(s) {