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

Handle date differences when one is a newyear other than Jan1

Browse Source 
svn: r11646
This commit is contained in:
Doug Blank 2009-01-17 17:11:34 +00:00
parent 0652722cae
commit 0887ab1ac9
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -507,6 +507,15 @@ class Span:
def _diff(self, date1, date2): def _diff(self, date1, date2):
# We should make sure that Date2 + tuple -> Date1 and # We should make sure that Date2 + tuple -> Date1 and
# Date1 - tuple -> Date2 # Date1 - tuple -> Date2
if date1.get_new_year() or date2.get_new_year():
days = date1.sortval - date2.sortval
years = days/365
months = (days - years * 365) / 30
days = (days - years * 365) - months * 30
if self.negative:
return (-years, -months, -days)
else:
return (years, months, days)
d1 = [i or 1 for i in date1.get_ymd()] d1 = [i or 1 for i in date1.get_ymd()]
d2 = [i or 1 for i in date2.get_ymd()] d2 = [i or 1 for i in date2.get_ymd()]
# d1 - d2 (1998, 12, 32) - (1982, 12, 15) # d1 - d2 (1998, 12, 32) - (1982, 12, 15)