From 1c749689b13f274a0e91cc4fa08948ddebcb82c2 Mon Sep 17 00:00:00 2001
From: Rishav <rsingla.rishu@gmail.com>
Date: Mon, 17 Apr 2017 14:45:29 +0530
Subject: [PATCH] search issue solved

---
 app/views/fbo-Clients/fboClient.controller.js | 74 ++++++++++++-------------
 app/views/fbo-Clients/fboClients.html         |  9 +--
 app/views/flightDept/flightDept.html          |  8 +--
 app/views/flightDept/flightDeptController.js  | 79 ++++++++++++++-------------
 4 files changed, 86 insertions(+), 84 deletions(-)

diff --git a/app/views/fbo-Clients/fboClient.controller.js b/app/views/fbo-Clients/fboClient.controller.js
index f08eec1..f60fe20 100644
--- a/app/views/fbo-Clients/fboClient.controller.js
+++ b/app/views/fbo-Clients/fboClient.controller.js
@@ -19,45 +19,45 @@
           })
         }
 
-        $scope.searchData = function(){
-          var userType = $('#tabClient > li.active > a').attr('id');
-          searchClient($scope.searchQuery, userType);
-        }
+        // $scope.searchData = function(){
+        //   var userType = $('#tabClient > li.active > a').attr('id');
+        //   searchClient($scope.searchQuery, userType);
+        // }
         
-        function searchClient(searchData, userType){
-          console.log(userType)
-          if(searchData == null || searchData == undefined || searchData == "" && userType == 'fbo'){
-            getAllFbo();
-          }else if(searchData == null || searchData == undefined || searchData == "" && userType == 'flightDetp'){
-            $scope.fboDept();
-          }else{
-            var data = {
-              "query" : searchData,
-              "userType" : userType
-            }
-            FBOClient.getSearchClient(data).then(function(result) {
-              for(var i=0; i<result.length; i++){
-                result[i].user = [];
-                result[i].user.companyName = result[i].companyName;
-                result[i].user.firstName = result[i].firstName;
-                result[i].user.lastName = result[i].lastName;
-                result[i].user.id = result[i].id;
-                result[i].user.account = [];
-                result[i].user.account.user = [];
-                result[i].user.account.user.status = result[i].account.user.status;
-              }
-              if(userType == 'fbo'){
-                $scope.fboClient = result;
-                console.log(result)
-                $scope.clientLength = result.length;
-              }else{
-                $scope.fboDeptList = result;
-                $scope.clientLength = result.length;
-              }
-            })
-          }
+        // function searchClient(searchData, userType){
+        //   console.log(userType)
+        //   if(searchData == null || searchData == undefined || searchData == "" && userType == 'fbo'){
+        //     getAllFbo();
+        //   }else if(searchData == null || searchData == undefined || searchData == "" && userType == 'flightDetp'){
+        //     $scope.fboDept();
+        //   }else{
+        //     var data = {
+        //       "query" : searchData,
+        //       "userType" : userType
+        //     }
+        //     FBOClient.getSearchClient(data).then(function(result) {
+        //       for(var i=0; i<result.length; i++){
+        //         result[i].user = [];
+        //         result[i].user.companyName = result[i].companyName;
+        //         result[i].user.firstName = result[i].firstName;
+        //         result[i].user.lastName = result[i].lastName;
+        //         result[i].user.id = result[i].id;
+        //         result[i].user.account = [];
+        //         result[i].user.account.user = [];
+        //         result[i].user.account.user.status = result[i].account.user.status;
+        //       }
+        //       if(userType == 'fbo'){
+        //         $scope.fboClient = result;
+        //         console.log(result)
+        //         $scope.clientLength = result.length;
+        //       }else{
+        //         $scope.fboDeptList = result;
+        //         $scope.clientLength = result.length;
+        //       }
+        //     })
+        //   }
           
-        }
+        // }
 
       	$scope.fboAdmin = function(){
           getAllFbo();
diff --git a/app/views/fbo-Clients/fboClients.html b/app/views/fbo-Clients/fboClients.html
index 9d3f1a6..05b97a7 100644
--- a/app/views/fbo-Clients/fboClients.html
+++ b/app/views/fbo-Clients/fboClients.html
@@ -34,9 +34,10 @@
                </p> -->
                <div class="input-group" style="width: 70%;">
 
-                  <input type="text" placeholder="Search client " class="input form-control" ng-keyup="$event.keyCode == 13 && searchData()" ng-model="searchQuery">
+                  <!-- <input type="text" placeholder="Search client " class="input form-control" ng-keyup="$event.keyCode == 13 && searchData()" ng-model="searchQuery"> -->
+                  <input type="text" placeholder="Search client " class="input form-control" ng-model="searchQuery">
                   <span class="input-group-btn">
-                  <button type="button" class="btn btn btn-primary" ng-click="searchData()"> <i class="fa fa-search"></i> Search</button>
+                  <button type="button" class="btn btn btn-primary"> <i class="fa fa-search"></i> Search</button>
                   </span>
                </div>
                <div class="clients-list">
@@ -51,7 +52,7 @@
                            <div class="table-responsive">
                               <table class="table table-striped table-hover">
                                  <tbody>
-                                    <tr ng-repeat="client in fboClient" ui-sref="index.updateFBO({id: client.user.id})" style="cursor: pointer;">
+                                    <tr ng-repeat="client in fboClient | filter : searchQuery" ui-sref="index.updateFBO({id: client.user.id})" style="cursor: pointer;">
                                        <td class="client-link">{{client.user.companyName}}</td>
                                        <td> {{client.user.firstName}}</td>
                                        <td><i class="fa fa-flag"></i> {{client.user.lastName}}</td>
@@ -68,7 +69,7 @@
                            <div class="table-responsive">
                               <table class="table table-striped table-hover">
                                  <tbody>
-                                    <tr ng-repeat="dept in fboDeptList" ui-sref="index.updateFBODept({id: dept.user.id})" style="cursor: pointer;">
+                                    <tr ng-repeat="dept in fboDeptList | filter : searchQuery" ui-sref="index.updateFBODept({id: dept.user.id})" style="cursor: pointer;">
                                        <td><a data-toggle="tab" href="#company-1" class="client-link">{{dept.user.companyName}}</a></td>
                                        <td>{{dept.user.firstName}}</td>
                                        <td><i class="fa fa-flag"></i> {{dept.user.lastName}}</td>
diff --git a/app/views/flightDept/flightDept.html b/app/views/flightDept/flightDept.html
index 5049f5e..ac723e3 100644
--- a/app/views/flightDept/flightDept.html
+++ b/app/views/flightDept/flightDept.html
@@ -34,9 +34,9 @@
                </p> -->
                <div class="input-group" style="width: 70%;">
 
-                  <input type="text" placeholder="Search client " class="input form-control" ng-keyup="$event.keyCode == 13 && searchData()" ng-model="searchQuery">
+                  <input type="text" placeholder="Search client " class="input form-control" ng-model="searchQuery">
                   <span class="input-group-btn">
-                  <button type="button" class="btn btn btn-primary" ng-click="searchData()"> <i class="fa fa-search"></i> Search</button>
+                  <button type="button" class="btn btn btn-primary"> <i class="fa fa-search"></i> Search</button>
                   </span>
                </div>
                <div class="clients-list">
@@ -51,7 +51,7 @@
                            <div class="table-responsive">
                               <table class="table table-striped table-hover">
                                  <tbody>
-                                    <tr ng-repeat="client in fboClient" ui-sref="index.updateFBO({id: client.user.id})" style="cursor: pointer;">
+                                    <tr ng-repeat="client in fboClient | filter : searchQuery" ui-sref="index.updateFBO({id: client.user.id})" style="cursor: pointer;">
                                        <td class="client-link">{{client.user.companyName}}</td>
                                        <td> {{client.user.firstName}}</td>
                                        <td><i class="fa fa-flag"></i> {{client.user.lastName}}</td>
@@ -68,7 +68,7 @@
                            <div class="table-responsive">
                               <table class="table table-striped table-hover">
                                  <tbody>
-                                    <tr ng-repeat="dept in fboDeptList" ui-sref="index.updateFBODept({id: dept.user.id})" style="cursor: pointer;">
+                                    <tr ng-repeat="dept in fboDeptList | filter : searchQuery" ui-sref="index.updateFBODept({id: dept.user.id})" style="cursor: pointer;">
                                        <td><a data-toggle="tab" href="#company-1" class="client-link">{{dept.user.companyName}}</a></td>
                                        <td>{{dept.user.firstName}}</td>
                                        <td><i class="fa fa-flag"></i> {{dept.user.lastName}}</td>
diff --git a/app/views/flightDept/flightDeptController.js b/app/views/flightDept/flightDeptController.js
index 6f50f10..d6eb0b6 100644
--- a/app/views/flightDept/flightDeptController.js
+++ b/app/views/flightDept/flightDeptController.js
@@ -24,46 +24,47 @@
           })
         }
 
-        $scope.searchData = function(){
-          var userType = $('#tabClient > li.active > a').attr('id');
-          searchClient($scope.searchQuery, userType);
-        }
+        // $scope.searchData = function(){
+        //   console.log($scope.searchQuery)
+        //   var userType = $('#tabClient > li.active > a').attr('id');
+        //   searchClient($scope.searchQuery, userType);
+        // }
         
-        function searchClient(searchData, userType){
-          console.log(searchData)
-          console.log(userType)
-          if(searchData == null || searchData == undefined || searchData == "" && userType == 'fbo'){
-            $scope.fboAdmin();
-          }else if(searchData == null || searchData == undefined || searchData == "" && userType == 'flightDetp'){
-            getAllFbo();
-          }else{
-            var data = {
-              "query" : searchData,
-              "userType" : userType
-            }
-            FBOClient.getSearchClient(data).then(function(result) {
-              for(var i=0; i<result.length; i++){
-                result[i].user = [];
-                result[i].user.companyName = result[i].companyName;
-                result[i].user.firstName = result[i].firstName;
-                result[i].user.lastName = result[i].lastName;
-                result[i].user.id = result[i].id;
-                result[i].user.account = [];
-                result[i].user.account.user = [];
-                result[i].user.account.user.status = result[i].account.user.status;
-              }
-              if(userType == 'fbo'){
-                $scope.fboClient = result;
-                console.log(result)
-                $scope.clientLength = result.length;
-              }else{
-                console.log("nai aaya")
-                $scope.fboDeptList = result;
-                $scope.clientLength = result.length;
-              }
-            })
-          }
-        }
+        // function searchClient(searchData, userType){
+        //   console.log(searchData)
+        //   console.log(userType)
+        //   if(searchData == null || searchData == undefined || searchData == "" && userType == 'fbo'){
+        //     $scope.fboAdmin();
+        //   }else if(searchData == null || searchData == undefined || searchData == "" && userType == 'flightDetp'){
+        //     getAllFbo();
+        //   }else{
+        //     var data = {
+        //       "query" : searchData,
+        //       "userType" : userType
+        //     }
+        //     FBOClient.getSearchClient(data).then(function(result) {
+        //       for(var i=0; i<result.length; i++){
+        //         result[i].user = [];
+        //         result[i].user.companyName = result[i].companyName;
+        //         result[i].user.firstName = result[i].firstName;
+        //         result[i].user.lastName = result[i].lastName;
+        //         result[i].user.id = result[i].id;
+        //         result[i].user.account = [];
+        //         result[i].user.account.user = [];
+        //         result[i].user.account.user.status = result[i].account.user.status;
+        //       }
+        //       if(userType == 'fbo'){
+        //         $scope.fboClient = result;
+        //         console.log(result)
+        //         $scope.clientLength = result.length;
+        //       }else{
+        //         console.log("nai aaya")
+        //         $scope.fboDeptList = result;
+        //         $scope.clientLength = result.length;
+        //       }
+        //     })
+        //   }
+        // }
 
       	$scope.fboAdmin = function(){
           FBOClient.getALlFBOList().then(function(result) {
-- 
2.0.0