BAH-3049 | Samridhi | Added fix for start-stop date

Bahmni · Oct 1, 2023 · a3a77b0 · a3a77b0
1 parent c6231fa
commit a3a77b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ui/app/reports/controllers/reportsController.js b/ui/app/reports/controllers/reportsController.js
@@ -38,6 +38,7 @@ angular.module('bahmni.reports')
                     report['stopDate'] = dateRange[0];
                 }
                 else if ($rootScope.default[header][item] === undefined) {
+                    $rootScope.default.reportsRequiringDateRange.startDate = dateRange[0];
                     $rootScope.reportsRequiringDateRange.forEach(function (report) {
                         report.startDate = dateRange[0];
                         report.stopDate = dateRange[0];
@@ -76,8 +77,8 @@ angular.module('bahmni.reports')
                 if (!report.stopDate) {
                     msg.push("end date");
                 }
-                if (report.startDate > report.stopDate) {
-                    msg.push("start date can not be greeater than stop date");
+                if ((report.startDate > report.stopDate)) {
+                    msg.push("start date can not be greater than stop date");
                 }
                 messagingService.showMessage("error", "Please select the " + msg.join(" and "));
                 return false;

diff --git a/ui/app/reports/views/reports.html b/ui/app/reports/views/reports.html
@@ -25,7 +25,7 @@ <h2 class="section-title">{{::'REPORTS_TITLE_KEY' | translate}}</h2>
                 <th class="reports-stop-date">{{::'REPORTS_END_DATE_HEADER_KEY' |translate}}
                     <span class="asterick">*</span>
                     <input ng-model="default.reportsRequiringDateRange.stopDate" date-converter
-                           class="form-field start-date" type="date" min="{{default.reportsRequiringDateRange.startDate | date:'yyyy-MM-dd'}}"
+                           class="form-field stop-date" type="date" min="{{default.reportsRequiringDateRange.startDate | date:'yyyy-MM-dd'}}"
                            ng-change="setDefault('stopDate', 'reportsRequiringDateRange')">
                 </th>
                 <th class="reports-format">