step 06 fix minor bugs

codeclou · Aug 28, 2018 · bea7852 · bea7852
1 parent b24481d
commit bea7852
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/...itchen-duty-plugin/src/main/resources/js/kitchen-duty-plugin--overview-page-controller.js b/...itchen-duty-plugin/src/main/resources/js/kitchen-duty-plugin--overview-page-controller.js
@@ -14,9 +14,9 @@ AJS.toInit(function(){
         height: 500,
         fixedWeekCount: false,
         events: function(start, end, timezone, callback) {
-            var year = moment(start).format('YYYY');
             // Full Calender always starts month with days of previous month.
             // We add 10 days to get month we want.
+            var year = moment(start).add('days', 10).format('YYYY');
             var month = moment(start).add('days', 10).format('M');
             AJS.$.ajax({
                 url: window.KDPrestUrl + '/overview_page/year/' + year + '/month/' + month,

diff --git a/...kitchen-duty-plugin/src/test/java/ut/com/comsysto/kitchen/duty/rest/BaseResourceTest.java b/...kitchen-duty-plugin/src/test/java/ut/com/comsysto/kitchen/duty/rest/BaseResourceTest.java
@@ -14,11 +14,11 @@ public class BaseResourceTest {
     public void testGetIsoWeeksOfMonth() {
         List<Long> isoWeeks = BaseResource.getIsoWeeksOfMonth(2018L, 8L);
 
-        assertEquals(Long.valueOf(31), isoWeeks.get(0));
-        assertEquals(Long.valueOf(32), isoWeeks.get(1));
-        assertEquals(Long.valueOf(33), isoWeeks.get(2));
-        assertEquals(Long.valueOf(34), isoWeeks.get(3));
-        assertEquals(Long.valueOf(35), isoWeeks.get(4));
+        assertEquals(Long.valueOf(32), isoWeeks.get(0));
+        assertEquals(Long.valueOf(33), isoWeeks.get(1));
+        assertEquals(Long.valueOf(34), isoWeeks.get(2));
+        assertEquals(Long.valueOf(35), isoWeeks.get(3));
+        assertEquals(Long.valueOf(36), isoWeeks.get(4));
 
         List<Long> isoWeeks2 = BaseResource.getIsoWeeksOfMonth(2018L, 2L);
 
@@ -30,11 +30,11 @@ public void testGetIsoWeeksOfMonth() {
 
         List<Long> isoWeeks3 = BaseResource.getIsoWeeksOfMonth(2018L, 5L);
 
-        assertEquals(Long.valueOf(18), isoWeeks3.get(0));
-        assertEquals(Long.valueOf(19), isoWeeks3.get(1));
-        assertEquals(Long.valueOf(20), isoWeeks3.get(2));
-        assertEquals(Long.valueOf(21), isoWeeks3.get(3));
-        assertEquals(Long.valueOf(22), isoWeeks3.get(4));
+        assertEquals(Long.valueOf(19), isoWeeks3.get(0));
+        assertEquals(Long.valueOf(20), isoWeeks3.get(1));
+        assertEquals(Long.valueOf(21), isoWeeks3.get(2));
+        assertEquals(Long.valueOf(22), isoWeeks3.get(3));
+        assertEquals(Long.valueOf(23), isoWeeks3.get(4));
     }