Merge pull request #9 from CorasWorksSolutions/BackwardsFYTests

Backwards FY function and tests
robgallen · Oct 1, 2015 · 6ff9e66 · 6ff9e66
2 parents 6d070d5 + 6230619
commit 6ff9e66
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 1 deletion.
diff --git a/moment-fquarter.js b/moment-fquarter.js
@@ -18,6 +18,12 @@
 			} else {
 				adjustedDate = this;
 			}
+			if (startMonth < 0) {
+				adjustedDate = this.subtract(12 + startMonth, "month").add(1, "year");
+				nextYear = adjustedDate.clone().add(1, "year");
+			} else {
+				adjustedDate = this;
+			}
 
 			result.quarter = Math.ceil((adjustedDate.month() + 1.0) / 3.0);
 			result.year = adjustedDate.year();

diff --git a/test/fquarterSpec.coffee b/test/fquarterSpec.coffee
@@ -110,4 +110,43 @@ describe "Academic quarters", ->
     expect(moment("2013-11-01").fquarter(9).toString()).toEqual("Q1 2013/14")
   it "Dec is Q2", ->
     expect(moment("2013-12-01").fquarter(9)).toEqual({quarter: 2, year: 2013, nextYear: 2014})
-    expect(moment("2013-12-01").fquarter(9).toString()).toEqual("Q2 2013/14")
+    expect(moment("2013-12-01").fquarter(9).toString()).toEqual("Q2 2013/14")
+
+
+describe "Backwards Fiscal Year quarters", ->
+  it "January is FYQ2 of current calendar year", ->
+    expect(moment('2015-01-01').fquarter(-3)).toEqual({quarter: 2, year: 2015, nextYear: 2016})
+    expect(moment("2015-01-01").fquarter(-3).toString()).toEqual("Q2 2015/16")
+  it "February is FYQ2 of current calendar year", ->
+    expect(moment('2015-02-15').fquarter(-3)).toEqual({quarter: 2, year: 2015, nextYear: 2016})
+    expect(moment("2015-02-15").fquarter(-3).toString()).toEqual("Q2 2015/16")
+  it "March is FYQ2 of current calendar year", ->
+    expect(moment('2015-03-15').fquarter(-3)).toEqual({quarter: 2, year: 2015, nextYear: 2016})
+    expect(moment("2015-03-15").fquarter(-3).toString()).toEqual("Q2 2015/16")
+  it "April is FYQ3 of current calendar year", ->
+    expect(moment('2015-04-15').fquarter(-3)).toEqual({quarter: 3, year: 2015, nextYear: 2016})
+    expect(moment("2015-04-15").fquarter(-3).toString()).toEqual("Q3 2015/16")
+  it "May is FYQ3 of current calendar year", ->
+    expect(moment('2015-05-15').fquarter(-3)).toEqual({quarter: 3, year: 2015, nextYear: 2016})
+    expect(moment("2015-05-15").fquarter(-3).toString()).toEqual("Q3 2015/16")
+  it "June is FYQ3 of current calendar year", ->
+    expect(moment('2015-06-15').fquarter(-3)).toEqual({quarter: 3, year: 2015, nextYear: 2016})
+    expect(moment("2015-06-15").fquarter(-3).toString()).toEqual("Q3 2015/16")
+  it "July is FYQ4 of current calendar year", ->
+    expect(moment('2015-07-15').fquarter(-3)).toEqual({quarter: 4, year: 2015, nextYear: 2016})
+    expect(moment("2015-07-15").fquarter(-3).toString()).toEqual("Q4 2015/16")
+  it "August is FYQ4 of current calendar year", ->
+    expect(moment('2015-08-05').fquarter(-3)).toEqual({quarter: 4, year: 2015, nextYear: 2016})
+    expect(moment("2015-08-05").fquarter(-3).toString()).toEqual("Q4 2015/16")
+  it "September is Q4 of current calendar year", ->
+    expect(moment('2015-09-15').fquarter(-3)).toEqual({quarter: 4, year: 2015, nextYear: 2016})
+    expect(moment("2015-09-15").fquarter(-3).toString()).toEqual("Q4 2015/16")
+  it "October is Q1 of next calendar year", ->
+    expect(moment('2015-10-15').fquarter(-3)).toEqual({quarter: 1, year: 2016, nextYear: 2017})
+    expect(moment("2015-10-15").fquarter(-3).toString()).toEqual("Q1 2016/17")
+  it "November is Q1 of next calendar year", ->
+    expect(moment('2015-10-15').fquarter(-3)).toEqual({quarter: 1, year: 2016, nextYear: 2017})
+    expect(moment("2015-10-15").fquarter(-3).toString()).toEqual("Q1 2016/17")
+  it "December is Q1 of next calendar year", ->
+    expect(moment('2015-10-15').fquarter(-3)).toEqual({quarter: 1, year: 2016, nextYear: 2017})
+    expect(moment("2015-10-15").fquarter(-3).toString()).toEqual("Q1 2016/17")