Add FiscalWeek and fiscal_week attribute to FiscalDate and FiscalDateTime

README.rst

@@ -169,6 +169,8 @@ The start and end of each of the above objects are stored as instances of the ``
    FiscalQuarter(2017, 4)
    >>> e.fiscal_month
    7
+   >>> e.fiscal_week
+   28
    >>> e.fiscal_day
    190
 

docs/basic_usage.rst

@@ -139,6 +139,8 @@ The start and end of each of the above objects are stored as instances of the ``
    FiscalQuarter(2017, 4)
    >>> e.fiscal_month
    7
+   >>> e.fiscal_week
+   28
    >>> e.fiscal_day
    190
 

fiscalyear.py

@@ -1275,18 +1275,25 @@ def fiscal_month(self):
         """
         return (self.month - FiscalYear(self.year).start.month) % 12 + 1
 
+    @property
+    def fiscal_week(self):
+        """returns: The fiscal week
+        :rtype: int
+        """
+        return -(-self.fiscal_day // 7)
+
     @property
     def fiscal_day(self):
         """:returns: The fiscal day
         :rtype: int
         """
-        day_of_calendar_year = self.timetuple().tm_yday
         fiscal_year = FiscalYear(self.fiscal_year)
-        beginning_of_fiscal_year = fiscal_year.start.timetuple().tm_yday
-        days_elapsed = day_of_calendar_year - beginning_of_fiscal_year + 1
-        if days_elapsed < 1:
-            days_elapsed += 365 if fiscal_year.isleap else 366
-        return days_elapsed
+        year_start = fiscal_year.start
+
+        if isinstance(self, FiscalDate):
+            year_start = year_start.date()
+
+        return (self - year_start).days + 1
 
     @property
     def prev_fiscal_year(self):

test_fiscalyear.py

@@ -918,6 +918,9 @@ def test_leap_year(self):
         assert fiscalyear.FiscalDate(2016, 1, 1).fiscal_day == 93
         assert fiscalyear.FiscalDate(2016, 2, 29).fiscal_day == 152
         assert fiscalyear.FiscalDate(2017, 3, 1).fiscal_day == 152
+        assert fiscalyear.FiscalDate(2016, 9, 30).fiscal_day == 366
+        assert fiscalyear.FiscalDate(2017, 9, 30).fiscal_day == 365
+        assert fiscalyear.FiscalDate(2018, 9, 30).fiscal_day == 365
 
     def test_contains(self, a, b, c, f):
         assert b in c
@@ -1024,6 +1027,18 @@ def test_next_fiscal_quarter(self, a, c):
     def test_prev_fiscal_month(self, a):
         assert a.prev_fiscal_month == fiscalyear.FiscalMonth(2017, 3)
 
+    def test_fiscal_week(self):
+        a = fiscalyear.FiscalDay(2017, 1).start
+        b = fiscalyear.FiscalDay(2017, 7).start
+        assert a.fiscal_week == 1
+        assert b.fiscal_week == 1
+
+        c = fiscalyear.FiscalDay(2017, 8).start
+        assert c.fiscal_week == 2
+
+        d = fiscalyear.FiscalDay(2016, 366).start
+        assert d.fiscal_week == 53
+
     def test_next_fiscal_month(self, a):
         assert a.next_fiscal_month == fiscalyear.FiscalMonth(2017, 5)