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

fixed surname; added bold holidays; sorted events pers day, holidays last; removed duplicate entry in US 2011; added Mardi Gras in US

Browse Source 
svn: r16295
This commit is contained in:
Doug Blank
2010-12-17 17:26:02 +00:00
parent 7720507cc7
commit 801f3218b4
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,7 +113,9 @@ class Calendar(Report):
name = gen.lib.Name(married_name)
else:
name = gen.lib.Name(primary_name)
name.set_surname(maiden_name)
surname = gen.lib.Surname()
surname.set_surname(maiden_name)
name.set_surname_list([surname])
else:
name = gen.lib.Name(primary_name)
name.set_display_as(self.name_format)
@@ -128,11 +130,11 @@ class Calendar(Report):
### The rest of these all have to deal with calendar specific things
def add_day_item(self, text, month, day):
def add_day_item(self, text, month, day, format="CAL-Text"):
""" Add an item to a day. """
month_dict = self.calendar.get(month, {})
day_list = month_dict.get(day, [])
day_list.append(text)
day_list.append((format, text))
month_dict[day] = day_list
self.calendar[month] = month_dict
@@ -145,7 +147,7 @@ class Calendar(Report):
for day in range(1, 32):
holiday_names = holiday_table.get_holidays(month, day)
for holiday_name in holiday_names:
self.add_day_item(holiday_name, month, day)
self.add_day_item(holiday_name, month, day, "CAL-Holiday")
def write_report(self):
""" The short method that runs through each month and creates a page. """
@@ -222,8 +224,9 @@ class Calendar(Report):
day_col * cell_width + cell_width/2,
header + week_row * cell_height)
list = self.calendar.get(month, {}).get(thisday.day, [])
list.sort() # to get CAL-Holiday on bottom
position = 0.0
for p in list:
for (format, p) in list:
lines = p.count("\n") + 1 # lines in the text
position += (lines * spacing)
current = 0
@@ -234,7 +237,7 @@ class Calendar(Report):
continue
font = ptext.get_font()
line = string_trim(font, line, cm2pt(cell_width + 0.2))
self.doc.draw_text("CAL-Text", line,
self.doc.draw_text(format, line,
day_col * cell_width + 0.1,
header + (week_row + 1) * cell_height - position + (current * spacing) - 0.1)
current += 1
@@ -528,6 +531,9 @@ class CalendarOptions(MenuReportOptions):
bold=1)
self.make_my_style(default_style, "CAL-Text",
_('Daily text display'), 9)
self.make_my_style(default_style, "CAL-Holiday",
_('Holiday text display'), 9,
bold=1, italic=1)
self.make_my_style(default_style, "CAL-Daynames",
_('Days of the week text'), 12,
italic=1, bold=1,

2
src/plugins/lib/holidays.xml.in
View File

@@ -16,6 +16,7 @@
<date name="Earth Day" value="*/4/22" type="secular" />
<date name="Easter" type="religious" value="> easter(y)" />
<date name="Ash Wednesday" type="religious" value="> easter(y)" offset="-46" />
<date name="Mardi Gras" type="religious" value="> easter(y)" offset="-47" />
<date name="Daylight Saving begins" value="> dst(y)[0]" type="informational" />
<date name="Income Taxes due" value="*/4/15" type="national"
if="date.weekday().__cmp__(4)-1" />
@@ -32,7 +33,6 @@
<date name="Passover" value="2009/4/09" type="religious" />
<date name="Passover" value="2010/3/30" type="religious" />
<date name="Passover" value="2011/4/19" type="religious" />
<date name="Passover" value="2011/4/19" type="religious" />
<date name="Passover" value="2012/4/7" type="religious" />
<date name="Passover" value="2013/3/26" type="religious" />
<date name="Passover" value="2014/4/15" type="religious" />