* src/plugins/DetDescendantReport.py: 0000558: Print only primary events
* src/plugins/DetAncestralReport.py: 0000558: Print only primary events * src/plugins/GraphViz.py: 0000558: Print only primary events * src/plugins/FamilyGroup.py: 0000558: Print only primary events * src/plugins/IndivComplete.py: 0000558: Print only primary events * src/plugins/NarrativeWeb.py: 0000558: Print only primary events svn: r7666
This commit is contained in:
parent
e98aea8b18
commit
e113412801
@ -1,3 +1,11 @@
|
|||||||
|
2006-11-21 Brian Matherly <brian@gramps-project.org>
|
||||||
|
* src/plugins/DetDescendantReport.py: 0000558: Print only primary events
|
||||||
|
* src/plugins/DetAncestralReport.py: 0000558: Print only primary events
|
||||||
|
* src/plugins/GraphViz.py: 0000558: Print only primary events
|
||||||
|
* src/plugins/FamilyGroup.py: 0000558: Print only primary events
|
||||||
|
* src/plugins/IndivComplete.py: 0000558: Print only primary events
|
||||||
|
* src/plugins/NarrativeWeb.py: 0000558: Print only primary events
|
||||||
|
|
||||||
2006-11-21 Don Allingham <don@gramps-project.org>
|
2006-11-21 Don Allingham <don@gramps-project.org>
|
||||||
* src/GrampsDb/_ReadGedcom.py: handle illegal fullname gedcoms produced by FTM
|
* src/GrampsDb/_ReadGedcom.py: handle illegal fullname gedcoms produced by FTM
|
||||||
* src/GrampsDb/_GedTokens.py: handle illegal fullname gedcoms produced by FTM
|
* src/GrampsDb/_GedTokens.py: handle illegal fullname gedcoms produced by FTM
|
||||||
|
@ -297,7 +297,7 @@ class DetAncestorReport(Report):
|
|||||||
if self.includeEvents:
|
if self.includeEvents:
|
||||||
birth_ref = person.get_birth_ref()
|
birth_ref = person.get_birth_ref()
|
||||||
death_ref = person.get_death_ref()
|
death_ref = person.get_death_ref()
|
||||||
for event_ref in person.get_event_ref_list():
|
for event_ref in person.get_primary_event_ref_list():
|
||||||
if event_ref == birth_ref or event_ref == death_ref:
|
if event_ref == birth_ref or event_ref == death_ref:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
@ -502,7 +502,7 @@ class DetAncestorReport(Report):
|
|||||||
person_mark = ReportUtils.get_person_mark(self.database,ind)
|
person_mark = ReportUtils.get_person_mark(self.database,ind)
|
||||||
firstName = ReportUtils.common_name(ind,self.usecall)
|
firstName = ReportUtils.common_name(ind,self.usecall)
|
||||||
|
|
||||||
for event_ref in ind.get_event_ref_list():
|
for event_ref in ind.get_primary_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:
|
if event:
|
||||||
etype = event.get_type()
|
etype = event.get_type()
|
||||||
|
@ -325,7 +325,7 @@ class DetDescendantReport(Report):
|
|||||||
if self.includeEvents:
|
if self.includeEvents:
|
||||||
birth_ref = person.get_birth_ref()
|
birth_ref = person.get_birth_ref()
|
||||||
death_ref = person.get_death_ref()
|
death_ref = person.get_death_ref()
|
||||||
for event_ref in person.get_event_ref_list():
|
for event_ref in person.get_primary_event_ref_list():
|
||||||
if event_ref == birth_ref or event_ref == death_ref:
|
if event_ref == birth_ref or event_ref == death_ref:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
@ -535,7 +535,7 @@ class DetDescendantReport(Report):
|
|||||||
person_mark = ReportUtils.get_person_mark(self.database,ind)
|
person_mark = ReportUtils.get_person_mark(self.database,ind)
|
||||||
firstName = ReportUtils.common_name(ind,self.usecall)
|
firstName = ReportUtils.common_name(ind,self.usecall)
|
||||||
|
|
||||||
for event_ref in ind.get_event_ref_list():
|
for event_ref in ind.get_primary_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:
|
if event:
|
||||||
etype = event.get_type()
|
etype = event.get_type()
|
||||||
|
@ -328,7 +328,7 @@ class FamilyGroup(Report):
|
|||||||
self.dump_parent_parents(person)
|
self.dump_parent_parents(person)
|
||||||
|
|
||||||
if self.incParEvents:
|
if self.incParEvents:
|
||||||
for event_ref in person.get_event_ref_list():
|
for event_ref in person.get_primary_event_ref_list():
|
||||||
if event_ref != birth_ref and event_ref != death_ref:
|
if event_ref != birth_ref and event_ref != death_ref:
|
||||||
event = self.database.get_event_from_handle(event_ref.ref)
|
event = self.database.get_event_from_handle(event_ref.ref)
|
||||||
evtType = event.get_type()
|
evtType = event.get_type()
|
||||||
|
@ -522,7 +522,7 @@ just use iconv:
|
|||||||
if birth and death:
|
if birth and death:
|
||||||
return (birth, death)
|
return (birth, death)
|
||||||
# missing info, use (first) christening/burial instead
|
# missing info, use (first) christening/burial instead
|
||||||
for event_ref in person.get_event_ref_list():
|
for event_ref in person.get_primary_event_ref_list():
|
||||||
event = self.database.get_event_from_handle(event_ref.ref)
|
event = self.database.get_event_from_handle(event_ref.ref)
|
||||||
if int(event.get_type()) == RelLib.EventType.CHRISTEN:
|
if int(event.get_type()) == RelLib.EventType.CHRISTEN:
|
||||||
if not birth:
|
if not birth:
|
||||||
|
@ -378,7 +378,7 @@ class IndivCompleteReport(Report):
|
|||||||
self.doc.end_cell()
|
self.doc.end_cell()
|
||||||
self.doc.end_row()
|
self.doc.end_row()
|
||||||
|
|
||||||
event_ref_list = self.start_person.get_event_ref_list()
|
event_ref_list = self.start_person.get_primary_event_ref_list()
|
||||||
for event_ref in event_ref_list:
|
for event_ref in event_ref_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)
|
||||||
|
@ -1383,7 +1383,7 @@ class IndividualPage(BasePage):
|
|||||||
media_list += ReportUtils.sanitize_media_ref_list( db,
|
media_list += ReportUtils.sanitize_media_ref_list( db,
|
||||||
event.get_media_list(),
|
event.get_media_list(),
|
||||||
self.exclude_private )
|
self.exclude_private )
|
||||||
for evt_ref in self.person.get_event_ref_list():
|
for evt_ref in self.person.get_primary_event_ref_list():
|
||||||
event = self.db.get_event_from_handle(evt_ref.ref)
|
event = self.db.get_event_from_handle(evt_ref.ref)
|
||||||
if event:
|
if event:
|
||||||
media_list += ReportUtils.sanitize_media_ref_list( db,
|
media_list += ReportUtils.sanitize_media_ref_list( db,
|
||||||
@ -1652,7 +1652,7 @@ class IndividualPage(BasePage):
|
|||||||
def display_ind_events(self,of):
|
def display_ind_events(self,of):
|
||||||
birth_ref = self.person.get_birth_ref()
|
birth_ref = self.person.get_birth_ref()
|
||||||
death_ref = self.person.get_death_ref()
|
death_ref = self.person.get_death_ref()
|
||||||
evt_ref_list = self.person.get_event_ref_list()
|
evt_ref_list = self.person.get_primary_event_ref_list()
|
||||||
|
|
||||||
if not birth_ref and not death_ref and not evt_ref_list:
|
if not birth_ref and not death_ref and not evt_ref_list:
|
||||||
return
|
return
|
||||||
|
Loading…
Reference in New Issue
Block a user