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

6613: Add Occupation/Profession to Relationship Graph

Browse Source
This commit is contained in:
Fabrice 2015-09-15 11:57:05 -07:00 committed by Paul Franklin
parent 4288649573
commit 5a5e7a21c4
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gramps/plugins/graph/gvrelgraph.py
View File

@ -13,6 +13,7 @@
# Copyright (C) 2010 Jakim Friant # Copyright (C) 2010 Jakim Friant
# Copyright (C) 2013 Fedir Zinchuk <fedikw@gmail.com> # Copyright (C) 2013 Fedir Zinchuk <fedikw@gmail.com>
# Copyright (C) 2013-2015 Paul Franklin # Copyright (C) 2013-2015 Paul Franklin
# Copyright (C) 2015 Fabrice <fobrice@laposte.net>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -115,6 +116,7 @@ class RelGraphReport(Report):
name_format - Preferred format to display names name_format - Preferred format to display names
incl_private - Whether to include private data incl_private - Whether to include private data
event_choice - Whether to include dates and/or places event_choice - Whether to include dates and/or places
occupation - Whether to include occupations
""" """
Report.__init__(self, database, options, user) Report.__init__(self, database, options, user)
@ -133,6 +135,7 @@ class RelGraphReport(Report):
self.show_families = get_value('showfamily') self.show_families = get_value('showfamily')
self.use_subgraphs = get_value('usesubgraphs') self.use_subgraphs = get_value('usesubgraphs')
self.event_choice = get_value('event_choice') self.event_choice = get_value('event_choice')
self.occupation = get_value('occupation')
self.colorize = get_value('color') self.colorize = get_value('color')
color_males = get_value('colormales') color_males = get_value('colormales')
@ -493,6 +496,19 @@ class RelGraphReport(Report):
if relationship: if relationship:
label += "%s(%s)" % (lineDelimiter, relationship) label += "%s(%s)" % (lineDelimiter, relationship)
if self.occupation:
event_refs = person.get_primary_event_ref_list()
events = [event for event in
[self.database.get_event_from_handle(ref.ref)
for ref in event_refs]
if event.get_type() ==
EventType(EventType.OCCUPATION)]
if len(events) > 0:
events.sort(key=lambda x: x.get_date_object())
occupation = events[-1].get_description()
if occupation:
label += "%s(%s)" % (lineDelimiter, occupation)
# see if we have a table that needs to be terminated # see if we have a table that needs to be terminated
if self.bUseHtmlOutput: if self.bUseHtmlOutput:
label += '</TD></TR></TABLE>' label += '</TD></TR></TABLE>'
@ -654,6 +670,10 @@ class RelGraphOptions(MenuReportOptions):
"relative to the name")) "relative to the name"))
add_option("imageOnTheSide", self.__image_on_side) add_option("imageOnTheSide", self.__image_on_side)
occupation = BooleanOption(_("Include occupation"), False)
occupation.set_help(_("Whether to include the last occupation"))
add_option("occupation", occupation)
if __debug__: if __debug__:
self.__show_GaGb = BooleanOption(_("Include relationship " self.__show_GaGb = BooleanOption(_("Include relationship "
"debugging numbers also"), "debugging numbers also"),