new changes

Anchit Jindal
1 parent a9aef0b1c2
Showing 3 changed files with 11 additions and 7 deletions Show diff stats
app/partials/customers/customers.controller.js
app/partials/customers/customers.html
app/partials/customers/customers.service.js
@@ -135,6 +135,10 @@
 		$scope.removeValidation = function(){
 			$scope.showCompanyError = false;
 	    	$('.companyNameInput').removeClass('customErrorInput');
+	    	if($scope.data.companyName == 'undefined' || $scope.data.companyName == '') {
+	    		$('.companyNameInput').addClass('customErrorInput');
+	    		$scope.showCompanyError = true;
+	    	}
 		}
  
 		$scope.removeMarginValidation = function(){
@@ -270,10 +274,9 @@
     	        $scope.showLoader = false;
 	    	 })
 	    }
-	    
-	    $scope.getCompanyName = function(parm){
-      		$scope.showLoader = true;
-	        CustomersService.getCompanyName(parm).then(function(result) {
+	    getCompanyName();
+	    function getCompanyName(){
+	        CustomersService.getCompanyName().then(function(result) {
 	        	$scope.compNameList = result;
 	        })
       	}
@@ -179,7 +179,8 @@
                                        <label class="new-input-label"><b>Company Name *</b></label>
                                     </div>
                                     <div class="pull-left" style="margin-left: 15px;">
-                                       <input type="text" ng-model="data.companyName" class="form-control companyNameInput" ng-keyup="removeValidation()" placeholder="" required>
+                                       <input type="text" ng-keyup="removeValidation()" ng-model="data.companyName" uib-typeahead="company.companyName for company in compNameList | filter:$viewValue | limitTo:8" class="form-control companyNameInput">
+                                       
                                        <label class="customErrorMessage" ng-show="showCompanyError">This field is required.</label>
                                     </div>
                                     <div class="clearfix"></div>
@@ -164,11 +164,11 @@
             return deferred.promise;
          }
  
-        this.getCompanyName = function(parm) {
+        this.getCompanyName = function() {
             var deferred = $q.defer();
             $http({
                 method : 'GET',
-                url : BASE_URL.url +'/company/searchName?query='+parm,
+                url : BASE_URL.url +'/company/searchName',
                 headers : {'Content-Type': 'application/json'},
             })
             .then(function (result){
...	...	@@ -135,6 +135,10 @@
135	135	$scope.removeValidation = function(){
136	136	$scope.showCompanyError = false;
137	137	$('.companyNameInput').removeClass('customErrorInput');
	138	+ if($scope.data.companyName == 'undefined' \|\| $scope.data.companyName == '') {
	139	+ $('.companyNameInput').addClass('customErrorInput');
	140	+ $scope.showCompanyError = true;
	141	+ }
138	142	}
139	143
140	144	$scope.removeMarginValidation = function(){
...	...	@@ -270,10 +274,9 @@
270	274	$scope.showLoader = false;
271	275	})
272	276	}
273		-
274		- $scope.getCompanyName = function(parm){
275		- $scope.showLoader = true;
276		- CustomersService.getCompanyName(parm).then(function(result) {
	277	+ getCompanyName();
	278	+ function getCompanyName(){
	279	+ CustomersService.getCompanyName().then(function(result) {
277	280	$scope.compNameList = result;
278	281	})
279	282	}
...	...
...	...	@@ -179,7 +179,8 @@
179	179	<label class="new-input-label"><b>Company Name *</b></label>
180	180	</div>
181	181	<div class="pull-left" style="margin-left: 15px;">
182		- <input type="text" ng-model="data.companyName" class="form-control companyNameInput" ng-keyup="removeValidation()" placeholder="" required>
	182	+ <input type="text" ng-keyup="removeValidation()" ng-model="data.companyName" uib-typeahead="company.companyName for company in compNameList \| filter:$viewValue \| limitTo:8" class="form-control companyNameInput">
	183	+
183	184	<label class="customErrorMessage" ng-show="showCompanyError">This field is required.</label>
184	185	</div>
185	186	<div class="clearfix"></div>
...	...
...	...	@@ -164,11 +164,11 @@
164	164	return deferred.promise;
165	165	}
166	166
167		- this.getCompanyName = function(parm) {
	167	+ this.getCompanyName = function() {
168	168	var deferred = $q.defer();
169	169	$http({
170	170	method : 'GET',
171		- url : BASE_URL.url +'/company/searchName?query='+parm,
	171	+ url : BASE_URL.url +'/company/searchName',
172	172	headers : {'Content-Type': 'application/json'},
173	173	})
174	174	.then(function (result){
...	...