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

3282: Gramps should only display marriage event with role = family (or primary)

Browse Source 
svn: r13411
This commit is contained in:
Benny Malengier
2009-10-25 16:52:45 +00:00
parent 14dcf94739
commit cad5461b2d
9 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/drawreport/Calendar.py
View File

@@ -326,11 +326,15 @@ class Calendar(Report):
for event_ref in fam.get_event_ref_list():
event = self.database.get_event_from_handle(event_ref.ref)
if event.type in [gen.lib.EventType.MARRIAGE,
gen.lib.EventType.MARR_ALT]:
gen.lib.EventType.MARR_ALT] and \
(event_ref.get_role() == gen.lib.EventRoleType.FAMILY or
event_ref.get_role() == gen.lib.EventRoleType.PRIMARY ):
are_married = event
elif event.type in [gen.lib.EventType.DIVORCE,
gen.lib.EventType.ANNULMENT,
gen.lib.EventType.DIV_FILING]:
gen.lib.EventType.ANNULMENT,
gen.lib.EventType.DIV_FILING] and \
(event_ref.get_role() == gen.lib.EventRoleType.FAMILY or
event_ref.get_role() == gen.lib.EventRoleType.PRIMARY ):
are_married = None
if are_married is not None:
for event_ref in fam.get_event_ref_list():

6
src/plugins/drawreport/StatisticsChart.py
View File

@@ -41,7 +41,7 @@ from TransUtils import sgettext as _
#------------------------------------------------------------------------
# Person and relation types
from gen.lib import Person, FamilyRelType, EventType
from gen.lib import Person, FamilyRelType, EventType, EventRoleType
# gender and report type names
from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle,
FONT_SANS_SERIF, FONT_SERIF,
@@ -339,7 +339,9 @@ class Extract(object):
if int(family.get_relationship()) == FamilyRelType.MARRIED:
for event_ref in family.get_event_ref_list():
event = self.db.get_event_from_handle(event_ref.ref)
if event.type == EventType.MARRIAGE:
if event.get_type() == EventType.MARRIAGE and \
(event_ref.get_role() == EventRoleType.FAMILY or
event_ref.get_role() == EventRoleType.PRIMARY ):
marriages.append(event_ref.ref)
if marriages:
return (person, marriages)