Fix account balance report

IMA-WorldHealth · May 25, 2022 · 322b6dd · 322b6dd
1 parent 850323d
commit 322b6dd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/client/src/modules/reports/generate/balance_report/balance_report.config.js b/client/src/modules/reports/generate/balance_report/balance_report.config.js
@@ -21,10 +21,11 @@ function BalanceReportConfigController($sce, Notify, SavedReports, AppCache, rep
 
   vm.onSelectFiscalYear = (fiscalYear) => {
     vm.reportDetails.fiscal_id = fiscalYear.id;
+    delete vm.reportDetails.period_id;
   };
 
   vm.onSelectPeriod = (period) => {
-    vm.reportDetails.period_id = period.id;
+    vm.reportDetails.period_id = period?.id;
   };
 
   vm.clearPreview = function clearPreview() {
@@ -45,6 +46,10 @@ function BalanceReportConfigController($sce, Notify, SavedReports, AppCache, rep
   };
 
   vm.onChangeClosingBalances = bool => {
+    // If true, the period is the whole FY, so delete the period
+    if (bool) {
+      delete vm.reportDetails.period_id;
+    }
     vm.reportDetails.includeClosingBalances = bool;
   };
 
@@ -99,5 +104,9 @@ function BalanceReportConfigController($sce, Notify, SavedReports, AppCache, rep
     if (!angular.isDefined(vm.reportDetails.shouldHideTitleAccounts)) {
       vm.reportDetails.shouldHideTitleAccounts = 0;
     }
+    if (angular.isDefined(vm.reportDetails.fiscal_id)
+        && angular.isDefined(vm.reportDetails.includeClosingBalances)) {
+      delete vm.reportDetails.period_id;
+    }
   }
 }
diff --git a/client/src/modules/reports/generate/balance_report/balance_report.html b/client/src/modules/reports/generate/balance_report/balance_report.html
@@ -41,8 +41,9 @@ <h3 class="text-capitalize" translate>REPORT.BALANCE_REPORT.TITLE</h3>
               fiscal-year-id="ReportConfigCtrl.reportDetails.fiscal_id"
               period-id="ReportConfigCtrl.reportDetails.period_id"
               on-select-callback="ReportConfigCtrl.onSelectPeriod(period)"
-              disable="!ReportConfigCtrl.reportDetails.includeClosingBalances"
-              required="true">
+              disable="ReportConfigCtrl.reportDetails.includeClosingBalances"
+              required="!ReportConfigCtrl.reportDetails.includeClosingBalances"
+              ng-show="!ReportConfigCtrl.reportDetails.includeClosingBalances">
             </bh-period-selection>
 
             <bh-yes-no-radios