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

Bahmni · Sep 27, 2023 · c6231fa · c6231fa
1 parent a8bb471
commit c6231fa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/ui/app/reports/controllers/reportsController.js b/ui/app/reports/controllers/reportsController.js
@@ -76,6 +76,9 @@ 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");
+                }
                 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
@@ -45,12 +45,10 @@ <h2 class="section-title">{{::'REPORTS_TITLE_KEY' | translate}}</h2>
             <tr ng-repeat="report in ::reportsRequiringDateRange" show-if-privilege="{{:: report.requiredPrivilege}}">
                 <td>{{:: report.name |translate }}</td>
                 <td class="reports-start-date">
-                    <input date-converter class="form-field start-date" type="date" max="{{report.stopDate + 1 | date:'yyyy-MM-dd'}}"
-                           ng-model="report.startDate">
+                    <input date-converter class="form-field start-date" type="date" ng-model="report.startDate">  
                 </td>
                 <td class="reports-stop-date">
-                    <input date-converter class="form-field stop-date" type="date" min="{{report.startDate | date:'yyyy-MM-dd'}}"
-                            ng-model="report.stopDate">
+                    <input date-converter class="form-field stop-date" type="date" min="{{report.startDate | date:'yyyy-MM-dd'}}" ng-model="report.stopDate">
                 </td>
                 <td class="reports-format">
                     <select ng-model="report.responseType" ng-options="type as label for (label , type) in ::formats">