%s\n' % (cs, url, nav_text))
def calendar_build(self, of, cal, month):
"""
@@ -553,8 +494,8 @@ class WebCalReport(Report):
of.write(' | [])):
+ list_ = self.calendar.get(month, {}).get(thisday.day, [])
+ if list_ > []:
specclass = "highlight " + dayclass
of.write('class="%s">\n' % specclass)
if cal == "yg": # Year at a Glance
@@ -565,13 +506,13 @@ class WebCalReport(Report):
of.write(' %d'
' \n' % day)
self.indiv_date(month, day, list_)
- else: # WebCal
+ else:
+ # WebCal
of.write(' %d'
' \n' % day)
of.write(' \n')
for p in list_:
- lines = p.count("\n") + 1 # lines in the text
- for line in p.split("\n"):
+ for line in p.splitlines():
of.write(' - ')
of.write(line)
of.write('
\n')
@@ -588,9 +529,7 @@ class WebCalReport(Report):
of.write(' \n')
# Complete six weeks for proper styling
- of = self.six_weeks(of, nweeks)
-
- return of
+ self.six_weeks(of, nweeks)
def write_header(self, of, title, cal, mystyle):
"""
@@ -777,8 +716,7 @@ class WebCalReport(Report):
else:
ip.write(' \n')
for p in list_:
- lines = p.count("\n") + 1 # lines in the text
- for line in p.split("\n"):
+ for line in p.splitlines():
ip.write(' - ')
ip.write(line)
ip.write('
\n')
@@ -804,7 +742,6 @@ class WebCalReport(Report):
of.write(' \n')
of.write(' | \n')
of.write(' \n')
- return of
def blank_year(self):
"""
@@ -874,7 +811,7 @@ class WebCalReport(Report):
self.progress.step()
# build the calendar
- by = self.calendar_build(by, "by", month)
+ self.calendar_build(by, "by", month)
# close table body
by.write(' \n')
@@ -978,7 +915,7 @@ class WebCalReport(Report):
self.progress.step()
# build the calendar
- yg = self.calendar_build(yg, "yg", month)
+ self.calendar_build(yg, "yg", month)
# close table body before writing note
@@ -1115,7 +1052,7 @@ class WebCalReport(Report):
# European calendar starts on Monday, default
# build the calendar
- of = self.calendar_build(of, "wc", month)
+ self.calendar_build(of, "wc", month)
# close table body before note section
of.write(' \n')
@@ -1152,6 +1089,7 @@ class WebCalReport(Report):
birth_event = self.database.get_event_from_handle(birth_ref.ref)
birth_date = birth_event.get_date_object()
living = probably_alive(person, self.database, make_date(self.year, 1, 1), 0)
+
if self.birthday and birth_date != None and ((self.alive and living) or not self.alive):
year = birth_date.get_year()
month = birth_date.get_month()
@@ -1172,7 +1110,7 @@ class WebCalReport(Report):
father = self.database.get_person_from_handle(father_handle)
if father != None:
father_lastname = father.get_primary_name().get_surname()
- short_name = self.get_short_name(person, father_lastname)
+ short_name = _get_short_name(person, father_lastname)
if age == 0: # person is 0 years old, display nothing
text = ""
elif age == 1: # person is 1, and therefore display it correctly
@@ -1181,6 +1119,7 @@ class WebCalReport(Report):
else:
text = '%s, %d years old' % (short_name, age)
self.add_day_item(text, year, month, day)
+
if self.anniv and ((self.alive and living) or not self.alive):
family_list = person.get_family_handle_list()
for fhandle in family_list:
@@ -1194,8 +1133,8 @@ class WebCalReport(Report):
if spouse_handle:
spouse = self.database.get_person_from_handle(spouse_handle)
if spouse:
- spouse_name = self.get_short_name(spouse)
- short_name = self.get_short_name(person)
+ spouse_name = _get_short_name(spouse)
+ short_name = _get_short_name(person)
if self.alive:
if not probably_alive(spouse, self.database, make_date(self.year, 1, 1), 0):
continue
@@ -1705,6 +1644,62 @@ def _get_countries():
# doesn't take so long to start up.
_COUNTRIES = _get_countries()
+# code snippets for Easter and Daylight saving start/ stop
+# are borrowed from Calendar.py
+def _easter(year):
+ """
+ Computes the year/month/day of easter. Based on work by
+ J.-M. Oudin (1940) and is reprinted in the "Explanatory Supplement
+ to the Astronomical Almanac", ed. P. K. Seidelmann (1992). Note:
+ Ash Wednesday is 46 days before Easter Sunday.
+ """
+ c = year / 100
+ n = year - 19 * (year / 19)
+ k = (c - 17) / 25
+ i = c - c / 4 - (c - k) / 3 + 19 * n + 15
+ i = i - 30 * (i / 30)
+ i = i - (i / 28) * (1 - (i / 28) * (29 / (i + 1)) * ((21 - n) / 11))
+ j = year + year / 4 + i + 2 - c + c / 4
+ j = j - 7 * (j / 7)
+ l = i - j
+ month = 3 + (l + 40) / 44
+ day = l + 28 - 31 * (month / 4)
+ return year, month, day
+
+# FIXME. Missing name prefix, suffix etc.
+def _get_short_name(person, maiden_name = None):
+ """ Return person's name, unless maiden_name given, unless married_name listed. """
+ # Get all of a person's names:
+ primary_name = person.get_primary_name()
+
+ married_name = None
+ names = [primary_name] + person.get_alternate_names()
+ for n in names:
+ if int(n.get_type()) == gen.lib.NameType.MARRIED:
+ married_name = n
+
+ # Now, decide which to use:
+ if maiden_name is not None:
+ if married_name is not None:
+ first_name, family_name = married_name.get_first_name(), married_name.get_surname()
+ call_name = married_name.get_call_name()
+ else:
+ first_name, family_name = primary_name.get_first_name(), maiden_name
+ call_name = primary_name.get_call_name()
+ else:
+ first_name, family_name = primary_name.get_first_name(), primary_name.get_surname()
+ call_name = primary_name.get_call_name()
+
+ # If they have a nickname use it
+ if call_name is not None and call_name.strip() != "":
+ first_name = call_name.strip()
+ else: # else just get the first name:
+ first_name = first_name.strip()
+ if " " in first_name:
+ first_name, rest = first_name.split(" ", 1) # just one split max
+
+ return ("%s %s" % (first_name, family_name)).strip()
+
#-------------------------------------------------------------------------
#
#
|