From b7f0d14af5caf31aefdda93b93bb0119a213a486 Mon Sep 17 00:00:00 2001 From: deeptirawat1510 Date: Tue, 5 Dec 2023 12:09:22 +0530 Subject: [PATCH] BAH-3049 | Deepti,Sweety | Fix. getTime error when format is changed. --- ui/app/reports/controllers/reportsController.js | 2 +- .../unit/reports/controllers/reportsController.spec.js | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ui/app/reports/controllers/reportsController.js b/ui/app/reports/controllers/reportsController.js index a8416da2c8..d9d0af9582 100644 --- 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 index 3873f75f48..04c8416fa6 100644 --- 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)); }); });