Merge pull request #794 from Bahmni/BAH-3049_Reports

BAH-3049 | Fix. getTime error when format is changed.
Bahmni · Dec 5, 2023 · adf3759 · adf3759
2 parents 8cb47d7 + b7f0d14
commit adf3759
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/ui/app/reports/controllers/reportsController.js b/ui/app/reports/controllers/reportsController.js
@@ -34,7 +34,7 @@ angular.module('bahmni.reports')
         $scope.enableReportQueue = appService.getAppDescriptor().getConfigValue("enableReportQueue");
         $scope.setDefault = function (item, header) {
             var setToChange = header === 'reportsRequiringDateRange' ? $rootScope.reportsRequiringDateRange : $rootScope.reportsNotRequiringDateRange;
-            var isPreviousMonth = $rootScope.default[header][item] && $rootScope.default[header][item].getTime() === dateRange[2].getTime();
+            var isPreviousMonth = $rootScope.default[header][item] && $rootScope.default[header][item] === dateRange[2];
             setToChange.forEach(function (report) {
                 if (item == 'dateRangeType') {
                     $rootScope.default.reportsRequiringDateRange.startDate = $rootScope.default[header][item];

diff --git a/ui/test/unit/reports/controllers/reportsController.spec.js b/ui/test/unit/reports/controllers/reportsController.spec.js
@@ -238,20 +238,21 @@ describe("ReportsController", function () {
                     return mockedDate;
                 }
             });
+            var previousMonthStartDate = new originalDate(expectedStartDate);
             reportServiceMock.getAvailableDateRange.and.returnValue({
                 "Today": mockedDate,
                 "This Month": new originalDate('1-Jan-2023'),
-                "Previous Month": new originalDate(expectedStartDate)
+                "Previous Month": previousMonthStartDate
             });
             setupController();
 
             rootScope.default.reportsRequiringDateRange = {
-                dateRangeType: new originalDate(expectedStartDate),
+                dateRangeType: previousMonthStartDate,
             };
             scope.setDefault('dateRangeType', 'reportsRequiringDateRange');
 
-            expect(rootScope.reportsRequiringDateRange[0].startDate.getTime()).toBe(new originalDate(expectedStartDate).getTime());
-            expect(rootScope.reportsRequiringDateRange[0].stopDate.getTime()).toBe(new originalDate(expectedStopDate).getTime());
+            expect(rootScope.reportsRequiringDateRange[0].startDate).toEqual(new originalDate(expectedStartDate));
+            expect(rootScope.reportsRequiringDateRange[0].stopDate).toEqual(new originalDate(expectedStopDate));
         });
     });