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

#2124: Baptism as alternate birth event on Det (Ancestral,Descendant) reports and Ancestral report

Browse Source 
svn: r10911
This commit is contained in:
Jérôme Rapinat 2008-07-22 10:00:59 +00:00
parent e320af2295
commit 4b3780f1a1
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ReportBase/_ReportUtils.py
View File

@ -801,6 +801,7 @@ baptised_no_date_no_place = {
_("This person was baptised."), _("This person was baptised."),
], ],
'succinct' : _("Baptised."), 'succinct' : _("Baptised."),
}
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #
@ -2564,12 +2565,12 @@ def baptised_str(database, person, person_name=None, verbose=True, empty_date=""
""" """
name_index = 0 name_index = 0
if person_name is None: if person_name == None:
person_name = _nd.display(person) person_name = _nd.display(person)
elif person_name == 0: elif person_name == 0:
name_index = 1 name_index = 1
gender = gen.lib.Person.get_gender() gender = person.get_gender()
text = "" text = ""
@ -2579,13 +2580,12 @@ def baptised_str(database, person, person_name=None, verbose=True, empty_date=""
bdate_mod = False bdate_mod = False
baptism = None baptism = None
for event_ref in gen.lib.Person.get_event_ref_list(): for event_ref in person.get_event_ref_list():
event = database.get_event_from_handle(event_ref.ref) event = database.get_event_from_handle(event_ref.ref)
if event and event.type.value == EventType.BAPTISM \ if event and event.get_type() == gen.lib.EventType.BAPTISM \
and event_ref.role.value == EventRoleType.PRIMARY: and event_ref.get_role() == gen.lib.EventRoleType.PRIMARY:
baptism = event burial = event
break break
if baptism: if baptism:
bdate = DateHandler.get_date(baptism) bdate = DateHandler.get_date(baptism)
bplace_handle = baptism.get_place_handle() bplace_handle = baptism.get_place_handle()
@ -2593,7 +2593,8 @@ def baptised_str(database, person, person_name=None, verbose=True, empty_date=""
bplace = database.get_place_from_handle(bplace_handle).get_title() bplace = database.get_place_from_handle(bplace_handle).get_title()
bdate_obj = baptism.get_date_object() bdate_obj = baptism.get_date_object()
bdate_full = bdate_obj and bdate_obj.get_day_valid() bdate_full = bdate_obj and bdate_obj.get_day_valid()
bdate_mod = bdate_obj and bdate_obj.get_modifier() != Date.MOD_NONE bdate_mod = bdate_obj and \
bdate_obj.get_modifier() != gen.lib.Date.MOD_NONE
else: else:
return text return text