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

0001754: Capitalization in Statistics chart

Browse Source 
0001755: Selection of contents in statistics chart does not work

svn: r10019
This commit is contained in:
Brian Matherly 2008-02-12 04:49:43 +00:00
parent ddd23a5164
commit 60b7f5e04d
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-02-11 Brian Matherly <brian@gramps-project.org>
* src/plugins/StatisticsChart.py:
0001754: Capitalization in Statistics chart
0001755: Selection of contents in statistics chart does not work
2008-02-11 Brian Matherly <brian@gramps-project.org> 2008-02-11 Brian Matherly <brian@gramps-project.org>
* src/Editors/_EditNote.py: Fix saving notes without marker being set. * src/Editors/_EditNote.py: Fix saving notes without marker being set.

15
src/plugins/StatisticsChart.py
View File

@ -143,7 +143,7 @@ class Extract:
# TODO: return all forenames, not just primary ones... # TODO: return all forenames, not just primary ones...
firstnames = person.get_primary_name().get_first_name().strip() firstnames = person.get_primary_name().get_first_name().strip()
if firstnames: if firstnames:
return [name.capitalize() for name in firstnames.split()] return firstnames.split()
else: else:
return [_("(Preferred) forename missing")] return [_("(Preferred) forename missing")]
@ -152,7 +152,7 @@ class Extract:
# TODO: return all surnames, not just primary ones... # TODO: return all surnames, not just primary ones...
surnames = person.get_primary_name().get_surname().strip() surnames = person.get_primary_name().get_surname().strip()
if surnames: if surnames:
return [name.capitalize() for name in surnames.split()] return surnames.split()
else: else:
return [_("(Preferred) surname missing")] return [_("(Preferred) surname missing")]
@ -410,8 +410,9 @@ class Extract:
data = [] data = []
ext = self.extractors ext = self.extractors
# which methods to use # which methods to use
for name in menu.get_all_option_names(): for name in self.extractors.keys():
if name in self.extractors: option = menu.get_option_by_name(name)
if option.get_value() == True:
# localized data title, value dict, type and data method # localized data title, value dict, type and data method
data.append((ext[name][1], {}, ext[name][2], ext[name][3])) data.append((ext[name][1], {}, ext[name][2], ext[name][3]))
@ -470,11 +471,11 @@ class StatisticsChart(Report):
To see what the options are, check the options help in the options class. To see what the options are, check the options help in the options class.
""" """
Report.__init__(self, database, person, options_class) Report.__init__(self, database, person, options_class)
menu = options_class.menu
self.filter_option = options_class.menu.get_option_by_name('filter') self.filter_option = menu.get_option_by_name('filter')
self.filter = self.filter_option.get_filter() self.filter = self.filter_option.get_filter()
menu = options_class.menu
self.bar_items = menu.get_option_by_name('bar_items').get_value() self.bar_items = menu.get_option_by_name('bar_items').get_value()
year_from = menu.get_option_by_name('year_from').get_value() year_from = menu.get_option_by_name('year_from').get_value()
year_to = menu.get_option_by_name('year_to').get_value() year_to = menu.get_option_by_name('year_to').get_value()
@ -737,7 +738,7 @@ class StatisticsChartOptions(MenuReportOptions):
category_name = _("Charts 2") category_name = _("Charts 2")
opt = BooleanOption(_Extract.extractors[key][1], False) opt = BooleanOption(_Extract.extractors[key][1], False)
opt.set_help(_("Include charts with indicated date")) opt.set_help(_("Include charts with indicated data"))
menu.add_option(category_name,key, opt) menu.add_option(category_name,key, opt)
idx += 1 idx += 1