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

Fixed three errors in date conversions: set_slash didn't work; set_slash2 was missing; and convert_to calendar needed to clear NEWYEAR and SLASHES

Browse Source 
svn: r13395
This commit is contained in:
Doug Blank
2009-10-23 00:06:14 +00:00
parent 4ffac19071
commit 40b9c7a7ca
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/gen/lib/date.py
View File

@@ -1513,7 +1513,7 @@ class Date(object):
""" """
Convert the date from the current calendar to the specified calendar. Convert the date from the current calendar to the specified calendar.
""" """
if calendar == self.calendar and self.newyear == 0: if calendar == self.calendar and self.newyear == Date.NEWYEAR_JAN1:
return return
(year, month, day) = Date._calendar_change[calendar](self.sortval) (year, month, day) = Date._calendar_change[calendar](self.sortval)
if self.is_compound(): if self.is_compound():
@@ -1522,11 +1522,12 @@ class Date(object):
rday = max(self.dateval[Date._POS_RDAY], 1) rday = max(self.dateval[Date._POS_RDAY], 1)
sdn = Date._calendar_convert[self.calendar](ryear, rmonth, rday) sdn = Date._calendar_convert[self.calendar](ryear, rmonth, rday)
(nyear, nmonth, nday) = Date._calendar_change[calendar](sdn) (nyear, nmonth, nday) = Date._calendar_change[calendar](sdn)
self.dateval = (day, month, year, self.dateval[Date._POS_SL], self.dateval = (day, month, year, False,
nday, nmonth, nyear, self.dateval[Date._POS_RSL]) nday, nmonth, nyear, False)
else: else:
self.dateval = (day, month, year, self.dateval[Date._POS_SL]) self.dateval = (day, month, year, False)
self.calendar = calendar self.calendar = calendar
self.newyear = Date.NEWYEAR_JAN1
def set_as_text(self, text): def set_as_text(self, text):
""" """
@@ -1657,7 +1658,23 @@ class Date(object):
""" """
Set to 1 if the date is a slash-date (dual dated). Set to 1 if the date is a slash-date (dual dated).
""" """
self.dateval[Date._POS_SL] = value temp = list(self.dateval)
temp[Date._POS_SL] = value
self.dateval = tuple(temp)
def get_slash2(self):
"""
Return true if the ending date is a slash-date (dual dated).
"""
return self._get_low_item_valid(Date._POS_RSL)
def set_slash2(self, value):
"""
Set to 1 if the ending date is a slash-date (dual dated).
"""
temp = list(self.dateval)
temp[Date._POS_RSL] = value
self.dateval = tuple(temp)
def Today(): def Today():
""" """