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

4
src/DataViews/PedigreeView.py
View File

@@ -370,7 +370,9 @@ class FormattingHelper(object):
text = "" text = ""
for event_ref in family.get_event_ref_list(): for event_ref in family.get_event_ref_list():
event = self.dbstate.db.get_event_from_handle(event_ref.ref) event = self.dbstate.db.get_event_from_handle(event_ref.ref)
if event and event.get_type() == gen.lib.EventType.MARRIAGE: if event and event.get_type() == gen.lib.EventType.MARRIAGE and \
(event_ref.get_role() == gen.lib.EventRoleType.FAMILY or
event_ref.get_role() == gen.lib.EventRoleType.PRIMARY ):
if line_count < 3: if line_count < 3:
return DateHandler.get_date(event) return DateHandler.get_date(event)
name = str(event.get_type()) name = str(event.get_type())

4
src/DataViews/RelationView.py
View File

@@ -1220,7 +1220,9 @@ class RelationshipView(NavigationView):
for event_ref in family.get_event_ref_list(): for event_ref in family.get_event_ref_list():
handle = event_ref.ref handle = event_ref.ref
event = self.dbstate.db.get_event_from_handle(handle) event = self.dbstate.db.get_event_from_handle(handle)
if event.get_type() == gen.lib.EventType.MARRIAGE: if event and event.get_type() == gen.lib.EventType.MARRIAGE and \
(event_ref.get_role() == gen.lib.EventRoleType.FAMILY or
event_ref.get_role() == gen.lib.EventRoleType.PRIMARY ):
self.write_event_ref(vbox, _('Marriage'), event) self.write_event_ref(vbox, _('Marriage'), event)
value = True value = True
return value return value

3
src/DisplayModels/_FamilyModel.py
View File

@@ -46,6 +46,7 @@ import GrampsLocale
import DateHandler import DateHandler
from BasicUtils import name_displayer from BasicUtils import name_displayer
import gen.lib import gen.lib
from gen.lib import EventRoleType
import gen.utils import gen.utils
from gui.views.treemodels.flatbasemodel import FlatBaseModel from gui.views.treemodels.flatbasemodel import FlatBaseModel
@@ -130,6 +131,8 @@ class FamilyModel(FlatBaseModel):
def column_marriage(self, data): def column_marriage(self, data):
erlist = [ gen.lib.EventRef().unserialize(d) for d in data[6] ] erlist = [ gen.lib.EventRef().unserialize(d) for d in data[6] ]
erlist = [x for x in erlist if x.get_role()==EventRoleType.FAMILY or
x.get_role()==EventRoleType.PRIMARY]
event = gen.utils.marriage_from_eventref_list(self.db, erlist) event = gen.utils.marriage_from_eventref_list(self.db, erlist)
if event: if event:
return DateHandler.displayer.display(event.date) return DateHandler.displayer.display(event.date)

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

@@ -326,11 +326,15 @@ class Calendar(Report):
for event_ref in fam.get_event_ref_list(): for event_ref in fam.get_event_ref_list():
event = self.database.get_event_from_handle(event_ref.ref) event = self.database.get_event_from_handle(event_ref.ref)
if event.type in [gen.lib.EventType.MARRIAGE, 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 are_married = event
elif event.type in [gen.lib.EventType.DIVORCE, elif event.type in [gen.lib.EventType.DIVORCE,
gen.lib.EventType.ANNULMENT, gen.lib.EventType.ANNULMENT,
gen.lib.EventType.DIV_FILING]: 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 are_married = None
if are_married is not None: if are_married is not None:
for event_ref in fam.get_event_ref_list(): 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 # Person and relation types
from gen.lib import Person, FamilyRelType, EventType from gen.lib import Person, FamilyRelType, EventType, EventRoleType
# gender and report type names # gender and report type names
from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle, from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle,
FONT_SANS_SERIF, FONT_SERIF, FONT_SANS_SERIF, FONT_SERIF,
@@ -339,7 +339,9 @@ class Extract(object):
if int(family.get_relationship()) == FamilyRelType.MARRIED: if int(family.get_relationship()) == FamilyRelType.MARRIED:
for event_ref in family.get_event_ref_list(): for event_ref in family.get_event_ref_list():
event = self.db.get_event_from_handle(event_ref.ref) 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) marriages.append(event_ref.ref)
if marriages: if marriages:
return (person, marriages) return (person, marriages)

4
src/plugins/graph/GVFamilyLines.py
View File

@@ -934,7 +934,9 @@ class FamilyLinesReport(Report):
if self._incdates or self._incplaces: if self._incdates or self._incplaces:
for event_ref in family.get_event_ref_list(): for event_ref in family.get_event_ref_list():
event = self._db.get_event_from_handle(event_ref.ref) event = self._db.get_event_from_handle(event_ref.ref)
if event.get_type() == gen.lib.EventType.MARRIAGE: if event.get_type() == gen.lib.EventType.MARRIAGE and \
(event_ref.get_role() == gen.lib.EventRoleType.FAMILY or
event_ref.get_role() == gen.lib.EventRoleType.PRIMARY ):
# get the wedding date # get the wedding date
if (event.private and self._incprivate) or not event.private: if (event.private and self._incprivate) or not event.private:
if self._incdates: if self._incdates:

4
src/plugins/graph/GVRelGraph.py
View File

@@ -264,7 +264,9 @@ class RelGraphReport(Report):
label = "" label = ""
for event_ref in fam.get_event_ref_list(): for event_ref in fam.get_event_ref_list():
event = self.database.get_event_from_handle(event_ref.ref) event = self.database.get_event_from_handle(event_ref.ref)
if event.type == gen.lib.EventType.MARRIAGE: if event.type == gen.lib.EventType.MARRIAGE and \
(event_ref.get_role() == gen.lib.EventRoleType.FAMILY or
event_ref.get_role() == gen.lib.EventRoleType.PRIMARY ):
label = self.get_event_string(event) label = self.get_event_string(event)
break break
if self.includeid: if self.includeid:

4
src/plugins/textreport/FamilyGroup.py
View File

@@ -338,7 +338,9 @@ class FamilyGroup(Report):
for event_ref in family_list: for event_ref in family_list:
if event_ref: if event_ref:
event = self.database.get_event_from_handle(event_ref.ref) event = self.database.get_event_from_handle(event_ref.ref)
if event.get_type() == gen.lib.EventType.MARRIAGE: if event.get_type() == gen.lib.EventType.MARRIAGE and \
(event_ref.get_role() == gen.lib.EventRoleType.FAMILY or
event_ref.get_role() == gen.lib.EventRoleType.PRIMARY ):
m = event m = event
break break

4
src/plugins/tool/Verify.py
View File

@@ -209,7 +209,9 @@ def get_marriage_date(db,family):
return 0 return 0
for event_ref in family.get_event_ref_list(): for event_ref in family.get_event_ref_list():
event = find_event(db,event_ref.ref) event = find_event(db,event_ref.ref)
if event.get_type() == gen.lib.EventType.MARRIAGE: if event.get_type() == gen.lib.EventType.MARRIAGE and \
(event_ref.get_role() == gen.lib.EventRoleType.FAMILY or
event_ref.get_role() == gen.lib.EventRoleType.PRIMARY ):
date_obj = event.get_date_object() date_obj = event.get_date_object()
return date_obj.get_sort_value() return date_obj.get_sort_value()
return 0 return 0