From 0215f139c382fc473e5f08f5db1dcf06f4639285 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Ho=C3=9F?= Date: Tue, 13 Aug 2013 15:55:14 +0200 Subject: [PATCH] Implementation for getFiscalDayOfYear() and getFiscalWeekOfYear() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Both implementations use the number of days/weeks between the start of the fiscal year and the current calendar date. Signed-off-by: Sebastian Hoß --- .../com/github/sebhoss/time/FiscalDateImplementation.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/github/sebhoss/time/FiscalDateImplementation.java b/src/main/java/com/github/sebhoss/time/FiscalDateImplementation.java index 0074901..99a66d6 100644 --- a/src/main/java/com/github/sebhoss/time/FiscalDateImplementation.java +++ b/src/main/java/com/github/sebhoss/time/FiscalDateImplementation.java @@ -9,8 +9,10 @@ package com.github.sebhoss.time; import java.util.Comparator; +import org.joda.time.Days; import org.joda.time.LocalDate; import org.joda.time.Months; +import org.joda.time.Weeks; import com.github.sebhoss.common.annotation.CompilerWarnings; @@ -68,14 +70,18 @@ final class FiscalDateImplementation implements FiscalDate { @Override public int getFiscalDayOfYear() { - // TODO Auto-generated method stub - return 0; + final LocalDate fiscalYearStartDate = new LocalDate(getFiscalYear(), fiscalYearStartMonth.getMonths(), 1); + final Days daysBetween = Days.daysBetween(fiscalYearStartDate, currentCalendarDate); + + return daysBetween.getDays(); } @Override public int getFiscalWeekOfYear() { - // TODO Auto-generated method stub - return 0; + final LocalDate fiscalYearStartDate = new LocalDate(getFiscalYear(), fiscalYearStartMonth.getMonths(), 1); + final Weeks weeksBetween = Weeks.weeksBetween(fiscalYearStartDate, currentCalendarDate); + + return weeksBetween.getWeeks(); } @Override -- 2.11.4.GIT