fix(component): fix component validation triggering

IMA-WorldHealth · Aug 10, 2017 · 56055f8 · 56055f8
1 parent 096ca26
commit 56055f8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,3 +39,4 @@ nbproject/
 
 # ignore istanbul generated folders
 .nyc_output/
+
diff --git a/client/src/js/components/bhDepotSelect.js b/client/src/js/components/bhDepotSelect.js
@@ -6,7 +6,8 @@ angular.module('bhima.components')
     bindings    : {
       depotUuid        : '<',
       onSelectCallback : '&',
-      required         : '<?',      
+      required         : '<?',
+      validateTrigger  : '<?',      
     },
   });
 

diff --git a/client/src/js/components/bhInventorySelect.js b/client/src/js/components/bhInventorySelect.js
@@ -6,7 +6,8 @@ angular.module('bhima.components')
     bindings    : {
       inventoryUuid    : '<',
       onSelectCallback : '&',
-      required         : '<?',      
+      required         : '<?',
+      validateTrigger  : '<?',      
     },
   });
 

diff --git a/client/src/modules/templates/bhDepotSelect.tmpl.html b/client/src/modules/templates/bhDepotSelect.tmpl.html
@@ -1,7 +1,7 @@
 <div ng-form="DepotForm" bh-depot-select ng-model-options="{ updateOn: 'default' }">
   <div
     class="form-group"
-    ng-class="{ 'has-error' : DepotForm.$$parent.$submitted && DepotForm.depot_uuid.$invalid }">
+    ng-class="{ 'has-error' : $ctrl.validateTrigger && DepotForm.depot_uuid.$invalid }">
 
     <label class="control-label" translate>
       STOCK.DEPOT
@@ -19,9 +19,9 @@
       <ui-select-choices ui-select-focus-patch repeat="depot.uuid as depot in $ctrl.depots | filter: { 'text': $select.search }">
         <span ng-bind-html="depot.text | highlight:$select.search"></span>
       </ui-select-choices>
-    </ui-select>
+    </ui-select>    
 
-    <div class="help-block" ng-messages="DepotForm.depot_uuid.$error" ng-show="DepotForm.$$parent.$submitted">
+    <div class="help-block" ng-messages="DepotForm.depot_uuid.$error" ng-show="$ctrl.validateTrigger">
       <div ng-messages-include="modules/templates/messages.tmpl.html"></div>
     </div>
   </div>

diff --git a/client/src/modules/templates/bhInventorySelect.tmpl.html b/client/src/modules/templates/bhInventorySelect.tmpl.html
@@ -1,7 +1,7 @@
 <div ng-form="InventoryForm" bh-inventory-select ng-model-options="{ updateOn: 'default' }">
   <div
     class="form-group"
-    ng-class="{ 'has-error' : InventoryForm.$$parent.$submitted && InventoryForm.inventory_uuid.$invalid }">
+    ng-class="{ 'has-error' : $ctrl.validateTrigger && InventoryForm.inventory_uuid.$invalid }">
 
     <label class="control-label" translate>
       FORM.LABELS.INVENTORY
@@ -11,7 +11,8 @@
     <ui-select 
       name="inventory_uuid" 
       ng-model="$ctrl.inventoryUuid"
-      on-select="$ctrl.onSelect($item, $model)">
+      on-select="$ctrl.onSelect($item, $model)"
+      ng-required="$ctrl.required">
       <ui-select-match placeholder="{{ 'FORM.SELECT.INVENTORY' | translate }}">
         <span>{{$select.selected.label}}</span>
       </ui-select-match>
@@ -20,7 +21,7 @@
       </ui-select-choices>
     </ui-select>
 
-    <div class="help-block" ng-messages="InventoryForm.inventory_uuid.$error" ng-show="InventoryForm.$$parent.$submitted">
+    <div class="help-block" ng-messages="InventoryForm.inventory_uuid.$error" ng-show="$ctrl.validateTrigger">
       <div ng-messages-include="modules/templates/messages.tmpl.html"></div>
     </div>
   </div>