Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Possible biological, half, and step siblings into NarrativeWeb.

Browse Source 
svn: r18877
This commit is contained in:
Rob G. Healey 2012-02-14 02:33:08 +00:00
parent c8048fed81
commit e8567ae608
1 changed files with 197 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

363
src/plugins/webreport/NarrativeWeb.py
View File

@ -5302,11 +5302,11 @@ class ContactPage(BasePage):
# and close the file # and close the file
self.XHTMLWriter(contactpage, of) self.XHTMLWriter(contactpage, of)
################################################# """
# #
# creates the Individual Pages from the IndividualListPage # creates the Individual Pages from the IndividualListPage
# #
################################################# """
class IndividualPage(BasePage): class IndividualPage(BasePage):
gender_map = { gender_map = {
gen.lib.Person.MALE : _('male'), gen.lib.Person.MALE : _('male'),
@ -5334,6 +5334,9 @@ class IndividualPage(BasePage):
# decide if we will sort the birth order of siblings... # decide if we will sort the birth order of siblings...
self.birthorder = self.report.options['birthorder'] self.birthorder = self.report.options['birthorder']
# get the Relationship Calculator so that we can determine
# bio, half, step- siblings for use in display_ind_parents() ...
self.rel_class = rel_class self.rel_class = rel_class
of = self.report.create_file(person.get_handle(), "ppl") of = self.report.create_file(person.get_handle(), "ppl")
@ -5362,7 +5365,7 @@ class IndividualPage(BasePage):
individualdetail += sect2 individualdetail += sect2
# display parents # display parents
sect3 = self.display_ind_parents(self.ind_list) sect3 = self.display_ind_parents()
if sect3 is not None: if sect3 is not None:
individualdetail += sect3 individualdetail += sect3
@ -6183,7 +6186,7 @@ class IndividualPage(BasePage):
# return table columns to its caller # return table columns to its caller
return tcell1, tcell2 return tcell1, tcell2
def display_ind_parents(self, ppl_handle_list): def display_ind_parents(self):
""" """
Display a person's parents Display a person's parents
""" """
@ -6192,8 +6195,6 @@ class IndividualPage(BasePage):
if not parent_list: if not parent_list:
return None return None
birthorder = self.report.options['birthorder']
# begin parents division # begin parents division
with Html("div", class_ = "subsection", id = "parents") as section: with Html("div", class_ = "subsection", id = "parents") as section:
section += Html("h4", _("Parents"), inline = True) section += Html("h4", _("Parents"), inline = True)
@ -6210,7 +6211,7 @@ class IndividualPage(BasePage):
# Get the mother and father relationships # Get the mother and father relationships
frel = None frel = None
mrel = None mrel = None
sibling = [] all_children = []
child_handle = self.person.get_handle() child_handle = self.person.get_handle()
child_ref_list = family.get_child_ref_list() child_ref_list = family.get_child_ref_list()
@ -6252,13 +6253,136 @@ class IndividualPage(BasePage):
if len(child_ref_list) > 1: if len(child_ref_list) > 1:
# remove sibling if it is yourself? # remove sibling if it is yourself?
childlist = [child_ref.ref for child_ref in child_ref_list child_list = [child_ref.ref for child_ref in child_ref_list
if child_ref.ref != self.person.handle] if child_ref.ref != self.person.get_handle()]
sibling.extend(childlist) all_children.extend(child_list)
# now that we have all siblings in families of the person, ## TO FIX: the code only works if the user has his
# display them... ## half/step siblings in a specific way in the database,
## however this way is not the official way
## The official way is:
## 1. step or half siblings _must_ be present
## somewhere in the same family. So the search
## here over other families is wrong
## 2. to determine the relationship, only the child
## relationship must be looked at, nothing else!
showallsiblings = self.report.options['showhalfsiblings']
# if we have a known father...
if father_handle and showallsiblings:
# 1) get all of the families in which this father is involved
# 2) get all of the children from those families
# 3) if the children are not already listed as siblings...
# 4) then remember those children since we're going to list them
father = self.dbase_.get_person_from_handle(father_handle)
for family_handle in father.get_family_handle_list():
family = self.dbase_.get_family_from_handle(family_handle)
for child_ref in family.get_child_ref_list():
child_handle = child_ref.ref
if child_handle not in all_children:
if child_handle != self.person.get_handle():
all_children.append(child_handle)
# do the same thing with the mother (see "father" just above):
if mother_handle and showallsiblings:
mother = self.dbase_.get_person_from_handle(mother_handle)
for family_handle in mother.get_family_handle_list():
family = self.dbase_.get_family_from_handle(family_handle)
for child_ref in family.get_child_ref_list():
child_handle = child_ref.ref
if child_handle not in all_children:
if child_handle != self.person.get_handle():
all_children.append(child_handle)
if showallsiblings:
# to find the step-siblings, we need to identify
# all of the families that can be linked back to
# the current person, and then extract the children
# from those families
all_family_handles = set()
all_parent_handles = set()
tmp_parent_handles = set()
# first we queue up the parents we know about
if mother_handle:
tmp_parent_handles.add(mother_handle)
if father_handle:
tmp_parent_handles.add(father_handle)
while len(tmp_parent_handles):
# pop the next parent from the set
parent_handle = tmp_parent_handles.pop()
# add this parent to our official list
all_parent_handles.add(parent_handle)
# get all families with this parent
parent = self.dbase_.get_person_from_handle(parent_handle)
for family_handle in parent.get_family_handle_list():
all_family_handles.add(family_handle)
# we already have 1 parent from this family
# (see "parent" above) so now see if we need
# to queue up the other parent
family = self.dbase_.get_family_from_handle(family_handle)
tmp_mother_handle = family.get_mother_handle()
if tmp_mother_handle and \
tmp_mother_handle != parent and \
tmp_mother_handle not in tmp_parent_handles and \
tmp_mother_handle not in all_parent_handles:
tmp_parent_handles.add(tmp_mother_handle)
tmp_father_handle = family.get_father_handle()
if tmp_father_handle and \
tmp_father_handle != parent and \
tmp_father_handle not in tmp_parent_handles and \
tmp_father_handle not in all_parent_handles:
tmp_parent_handles.add(tmp_father_handle)
# once we get here, we have all of the families
# that could result in step-siblings; note that
# we can only have step-siblings if the number
# of families involved is > 1
if len(all_family_handles) > 1:
while len(all_family_handles):
# pop the next family from the set
family_handle = all_family_handles.pop()
# look in this family for children we haven't yet seen
family = self.dbase_.get_family_from_handle(family_handle)
for child_ref in family.get_child_ref_list():
child_handle = child_ref.ref
if child_handle not in all_children and \
child_handle != self.person.get_handle():
all_children.append(child_handle)
child_list = [child_handle for child_handle in all_children]
# separate all children into biological, half, and step- siblings...
siblings, half_siblings, step_siblings = [], [], []
if len(child_list):
for sibling_handle in child_list:
sibling = self.dbase_.get_person_from_handle(sibling_handle)
if sibling: if sibling:
sibling_type = self.rel_class.get_sibling_type(
self.dbase_, self.person, sibling)
# biological/ natural sibling
if sibling_type == 0:
siblings.append(sibling_handle)
# half siblings
elif (sibling_type == 1 or sibling_type == 2):
half_siblings.append(sibling_handle)
# step siblings
elif (sibling_type == 3 or sibling_type == 4):
step_siblings.append(sibling_handle)
# now that we have all siblings, display them...
if len(siblings):
trow = Html("tr") + ( trow = Html("tr") + (
Html("td", _("Siblings"), class_ = "ColumnAttribute", inline = True) Html("td", _("Siblings"), class_ = "ColumnAttribute", inline = True)
) )
@ -6270,168 +6394,59 @@ class IndividualPage(BasePage):
ordered = Html("ol") ordered = Html("ol")
tcell += ordered tcell += ordered
sibling = add_birthdate(self.dbase_, sibling) siblings = add_birthdate(self.dbase_, siblings)
if birthorder: if self.birthorder:
sibling = sorted(sibling) siblings = sorted(siblings)
ordered.extend( ordered.extend(
self.display_child_link(chandle, ppl_handle_list) self.display_child_link(child_handle, self.ind_list)
for birth_date, chandle in sibling for birth_date, child_handle in siblings
) )
# Also try to identify half-siblings # now that we have all half- siblings, display them...
half_siblings = [] if len(half_siblings):
trow = Html("tr") + (
Html("td", _("Half Siblings"), class_ = "ColumnAttribute", inline = True)
)
table += trow
tcell = Html("td", class_ = "ColumnValue")
trow += tcell
ordered = Html("ol")
tcell += ordered
half_siblings = add_birthdate(self.dbase_, half_siblings)
if self.birthorder:
half_siblings = sorted(half_siblings)
ordered.extend(
self.display_child_link(child_handle, self.ind_list)
for birth_date, child_handle in half_siblings
)
# now that we have all step- siblings, display them...
if len(step_siblings):
trow = Html("tr") + (
Html("td", _("Step Siblings"), class_ = "ColumnAttribute", inline = True)
)
table += trow
tcell = Html("td", class_ = "ColumnValue")
trow += tcell
ordered = Html("ol")
tcell += ordered
step_siblings = add_birthdate(self.dbase_, step_siblings)
if self.birthorder:
step_siblings = sorted(step_siblings)
ordered.extend(
self.display_child_link(child_handle, self.ind_list)
for birth_date, child_handle in step_siblings
)
## FOLLOWING CODE IS WRONG, AS showallsiblings = False
## THIS CODE WILL NOT RUN
## TO FIX: the code only works if the user has his
## half/step siblings in a specific way in the database,
## however this way is not the official way
## The official way is:
## 1. step or half siblings _must_ be present
## somewhere in the same family. So the search
## here over other families is wrong
## 2. to determine the relationship, only the child
## relationship must be looked at, nothing else!
showallsiblings = False #self.report.options['showhalfsiblings']
## # if we have a known father...
## if father_handle and showallsiblings:
## # 1) get all of the families in which this father is involved
## # 2) get all of the children from those families
## # 3) if the children are not already listed as siblings...
## # 4) then remember those children since we're going to list them
## father = self.dbase_.get_person_from_handle(father_handle)
## for family_handle in father.get_family_handle_list():
## family = self.dbase_.get_family_from_handle(family_handle)
## for half_child_ref in family.get_child_ref_list():
## half_child_handle = half_child_ref.ref
## if half_child_handle not in sibling:
## if half_child_handle != self.person.handle:
## # we have a new step/half sibling
## half_siblings.append(half_child_handle)
##
## # do the same thing with the mother (see "father" just above):
## if mother_handle and showallsiblings:
## mother = self.dbase_.get_person_from_handle(mother_handle)
## for family_handle in mother.get_family_handle_list():
## family = self.dbase_.get_family_from_handle(family_handle)
## for half_child_ref in family.get_child_ref_list():
## half_child_handle = half_child_ref.ref
## if half_child_handle not in sibling:
## if half_child_handle != self.person.handle:
## # we have a new half sibling
## half_siblings.append(half_child_handle)
##
## # now that we have all half- siblings, display them...
## if half_siblings:
## trow = Html("tr") + (
## Html("td", _("Half Siblings"), class_ = "ColumnAttribute", inline = True)
## )
## table += trow
##
## tcell = Html("td", class_ = "ColumnValue")
## trow += tcell
##
## ordered = Html("ol")
## tcell += ordered
##
## half_siblings = add_birthdate(self.dbase_, half_siblings)
## if birthorder:
## half_siblings = sorted(half_siblings)
##
## ordered.extend(
## self.display_child_link(chandle, ind_list)
## for birth_date, chandle in half_siblings
## )
##
## # get step-siblings
## if showallsiblings:
## step_siblings = []
##
## # to find the step-siblings, we need to identify
## # all of the families that can be linked back to
## # the current person, and then extract the children
## # from those families
## all_family_handles = set()
## all_parent_handles = set()
## tmp_parent_handles = set()
##
## # first we queue up the parents we know about
## if mother_handle:
## tmp_parent_handles.add(mother_handle)
## if father_handle:
## tmp_parent_handles.add(father_handle)
##
## while len(tmp_parent_handles):
## # pop the next parent from the set
## parent_handle = tmp_parent_handles.pop()
##
## # add this parent to our official list
## all_parent_handles.add(parent_handle)
##
## # get all families with this parent
## parent = self.dbase_.get_person_from_handle(parent_handle)
## for family_handle in parent.get_family_handle_list():
##
## all_family_handles.add(family_handle)
##
## # we already have 1 parent from this family
## # (see "parent" above) so now see if we need
## # to queue up the other parent
## family = self.dbase_.get_family_from_handle(family_handle)
## tmp_mother_handle = family.get_mother_handle()
## if tmp_mother_handle and \
## tmp_mother_handle != parent and \
## tmp_mother_handle not in tmp_parent_handles and \
## tmp_mother_handle not in all_parent_handles:
## tmp_parent_handles.add(tmp_mother_handle)
## tmp_father_handle = family.get_father_handle()
## if tmp_father_handle and \
## tmp_father_handle != parent and \
## tmp_father_handle not in tmp_parent_handles and \
## tmp_father_handle not in all_parent_handles:
## tmp_parent_handles.add(tmp_father_handle)
##
## # once we get here, we have all of the families
## # that could result in step-siblings; note that
## # we can only have step-siblings if the number
## # of families involved is > 1
##
## if len(all_family_handles) > 1:
## while len(all_family_handles):
## # pop the next family from the set
## family_handle = all_family_handles.pop()
## # look in this family for children we haven't yet seen
## family = self.dbase_.get_family_from_handle(family_handle)
## for step_child_ref in family.get_child_ref_list():
## step_child_handle = step_child_ref.ref
## if step_child_handle not in sibling and \
## step_child_handle not in half_siblings and \
## step_child_handle != self.person.handle:
## # we have a new step sibling
## step_siblings.append(step_child_handle)
##
## # now that we have all step- siblings, display them...
## if len(step_siblings):
## trow = Html("tr") + (
## Html("td", _("Step Siblings"), class_ = "ColumnAttribute", inline = True)
## )
## table += trow
##
## tcell = Html("td", class_ = "ColumnValue")
## trow += tcell
##
## ordered = Html("ol")
## tcell += ordered
##
## step_siblings = add_birthdate(self.dbase_, step_siblings)
## if birthorder:
## step_siblings = sorted(step_siblings)
##
## ordered.extend(
## self.display_child_link(chandle, ind_list)
## for birth_date, chandle in step_siblings
## )
# return parents division to its caller # return parents division to its caller
return section return section
@ -7962,11 +7977,11 @@ class NavWebOptions(MenuReportOptions):
showparents.set_help(_('Whether to include a parents column')) showparents.set_help(_('Whether to include a parents column'))
addopt( "showparents", showparents ) addopt( "showparents", showparents )
## showallsiblings = BooleanOption(_("Include half and/ or " showallsiblings = BooleanOption(_("Include half and/ or "
## "step-siblings on the individual pages"), False) "step-siblings on the individual pages"), False)
## showallsiblings.set_help(_( "Whether to include half and/ or " showallsiblings.set_help(_( "Whether to include half and/ or "
## "step-siblings with the parents and siblings")) "step-siblings with the parents and siblings"))
## addopt('showhalfsiblings', showallsiblings) addopt('showhalfsiblings', showallsiblings)
birthorder = BooleanOption(_('Sort all children in birth order'), False) birthorder = BooleanOption(_('Sort all children in birth order'), False)
birthorder.set_help(_('Whether to display children in birth order or in entry order?')) birthorder.set_help(_('Whether to display children in birth order or in entry order?'))