Merge pull request #481 from compucorp/staging

Sync master with staging
compucorp · Jun 6, 2018 · 5f1f3c3 · 5f1f3c3
2 parents ca78566 + 09baeda
commit 5f1f3c3
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/civihr_employee_portal/js/reports.js b/civihr_employee_portal/js/reports.js
@@ -414,8 +414,8 @@
    * @return {String}
    */
   HRReport.prototype.getDefaultFilterQueryForLeaveReport = function () {
-    var fromDate = moment().dayOfYear(1).format('YYYY-MM-DD');
-    var toDate = moment().dayOfYear(1).add(1, 'year').subtract(1, 'day').format('YYYY-MM-DD');
+    var fromDate = moment().startOf('month').format('YYYY-MM-DD');
+    var toDate = moment().endOf('month').format('YYYY-MM-DD');
     var defaultFilterValues = [
       { name: 'absence_date_filter[min]', value: fromDate },
       { name: 'absence_date_filter[max]', value: toDate }
@@ -894,8 +894,8 @@
               }
 
               if (REPORT_NAME === 'leave_and_absence') {
-                formFiltersStore.values.fromDate = moment().dayOfYear(1).toDate();
-                formFiltersStore.values.toDate = moment().dayOfYear(1).add(1, 'year').subtract(1, 'day').toDate();
+                formFiltersStore.values.fromDate = moment().startOf('month').toDate();
+                formFiltersStore.values.toDate = moment().endOf('month').toDate();
                 resolve();
               } else {
                 formFiltersStore.values.date = new Date();