fix(reports): client-side validation Balance Sheet

This commit adds validation checks to the Balance Sheet report. It also fixes some incorrect CSS styling and classes.
IMA-WorldHealth · Aug 4, 2017 · f2e09a2 · f2e09a2
1 parent eedebc3
commit f2e09a2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/client/src/modules/reports/generate/balance_sheet_report/balance_sheet_report.config.js b/client/src/modules/reports/generate/balance_sheet_report/balance_sheet_report.config.js
@@ -14,6 +14,7 @@ function BalanceSheetReportConfigController($sce, Notify, SavedReports, AppCache
 
   vm.previewGenerated = false;
 
+  // FIXME(@jniles) - why is this needed?
   $timeout(function run() {
     vm.reportDetails = { date : new Date() };
   }, 0);
@@ -41,6 +42,8 @@ function BalanceSheetReportConfigController($sce, Notify, SavedReports, AppCache
   };
 
   vm.preview = function preview(form) {
+    if (form.$invalid) { return; }
+
     // update cached configuration
     cache.reportDetails = angular.copy(vm.reportDetails);
 

diff --git a/client/src/modules/reports/generate/balance_sheet_report/balance_sheet_report.html b/client/src/modules/reports/generate/balance_sheet_report/balance_sheet_report.html
@@ -22,16 +22,16 @@ <h3 class="text-capitalize" translate>REPORT.BALANCE_SHEET.TITLE</h3>
 
         <div class="panel-body">
           <form name="ConfigForm" bh-submit="ReportConfigCtrl.preview(ConfigForm)" novalidate>
-            
+
             <!-- choose date until  -->
             <bh-date-editor
               date-value="ReportConfigCtrl.reportDetails.date">
             </bh-date-editor>
 
             <!--display also revenue and expense-->
-            <div class="form-group">
+            <div class="checkbox">
               <label>
-                <input type="checkbox" 
+                <input type="checkbox"
                   ng-model="ReportConfigCtrl.reportDetails.showExploitation"
                   ng-true-value="1" ng-false-value="0">
                 <span translate>REPORT.BALANCE_SHEET.SHOW_EXPLOITATION</span>