From db8e1f992cf3bc0f84f64c859751aa2dfc283f99 Mon Sep 17 00:00:00 2001
From: Rishav <rsingla.rishu@gmail.com>
Date: Fri, 14 Apr 2017 13:05:07 +0530
Subject: [PATCH] pending user api, update company name with editable field,
 size according to make modal, and some other ui changes

---
 app/scripts/controllers.js                         |  3 +
 app/scripts/directives.js                          |  4 +-
 app/views/common/topnavbar.html                    |  2 +-
 app/views/fbo-Clients/fboClient.controller.js      | 55 ++++++++--------
 app/views/fbo-admin/dashboard.controller.js        | 23 +++++--
 app/views/fbo-admin/dashboard.html                 |  3 +-
 app/views/fbo-flight/flight.html                   | 11 ++--
 app/views/fbo-flight/flightDept.controller.js      | 56 ++++++++++++-----
 app/views/fbo-flight/flightDeptService.js          |  6 +-
 app/views/flightDept/flightDeptController.js       | 54 +++++++++-------
 app/views/login/login.service.js                   | 14 +++++
 app/views/updateAllFBO/updateAllFBO.controller.js  | 16 ++++-
 app/views/updateAllFBO/updateAllFBO.html           |  7 ++-
 .../updateFBODept/updateFBODept.controller.js      | 73 +++++++++++++++++-----
 app/views/updateFBODept/updateFBODept.html         | 11 ++--
 app/views/updateFBODept/updateFBODept.service.js   |  2 +
 16 files changed, 236 insertions(+), 104 deletions(-)

diff --git a/app/scripts/controllers.js b/app/scripts/controllers.js
index 1354200..2dcd8c5 100755
--- a/app/scripts/controllers.js
+++ b/app/scripts/controllers.js
@@ -12,6 +12,9 @@ function MainCtrl($scope, $location, $state, $rootScope, LoginService) {
     $scope.helloText = 'Welcome in SeedProject';
     $scope.descriptionText = 'It is an application skeleton for a typical AngularJS web app. You can use it to quickly bootstrap your angular webapp projects and dev environment for these projects.';
     
+    LoginService.getActiveUser().then(function(result) {
+        $scope.pendingUser = result;
+    })
     $scope.logout = function(){
     	console.log("Called")
     	LoginService.logout();
diff --git a/app/scripts/directives.js b/app/scripts/directives.js
index 22002c2..d0dd772 100755
--- a/app/scripts/directives.js
+++ b/app/scripts/directives.js
@@ -12,9 +12,9 @@ function pageTitle($rootScope, $timeout) {
         link: function(scope, element) {
             var listener = function(event, toState, toParams, fromState, fromParams) {
                 // Default title - load on Dashboard 1
-                var title = 'Acuefuel';
+                var title = 'Acufuel';
                 // Create your own title pattern
-                if (toState.data && toState.data.pageTitle) title = 'INSPINIA | ' + toState.data.pageTitle;
+                if (toState.data && toState.data.pageTitle) title = 'ACUFUEL | ' + toState.data.pageTitle;
                 $timeout(function() {
                     element.text(title);
                 });
diff --git a/app/views/common/topnavbar.html b/app/views/common/topnavbar.html
index a9a4342..70e402e 100755
--- a/app/views/common/topnavbar.html
+++ b/app/views/common/topnavbar.html
@@ -81,7 +81,7 @@
             </li>
             <li class="dropdown">
                 <a class="dropdown-toggle count-info" data-toggle="dropdown" href="#">
-                    <i class="fa fa-bell"></i>  <span class="label label-primary">8</span>
+                    <i class="fa fa-bell"></i>  <span class="label label-primary">{{pendingUser}}</span>
                 </a>
                 <ul class="dropdown-menu dropdown-alerts">
                     <li>
diff --git a/app/views/fbo-Clients/fboClient.controller.js b/app/views/fbo-Clients/fboClient.controller.js
index 27a76a4..f08eec1 100644
--- a/app/views/fbo-Clients/fboClient.controller.js
+++ b/app/views/fbo-Clients/fboClient.controller.js
@@ -25,33 +25,38 @@
         }
         
         function searchClient(searchData, userType){
-          console.log(searchData)
           console.log(userType)
-          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;
+          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(){
diff --git a/app/views/fbo-admin/dashboard.controller.js b/app/views/fbo-admin/dashboard.controller.js
index c0dd435..8bd3df2 100644
--- a/app/views/fbo-admin/dashboard.controller.js
+++ b/app/views/fbo-admin/dashboard.controller.js
@@ -3,14 +3,14 @@
  //Load controller
   angular.module('acuefuel')
 
-	.controller('DashboardController', function($scope, FBOAdmin) {
+	.controller('DashboardController', function($scope, $state, FBOAdmin) {
 	    $(document).ready(function(){
           $('.i-checks').iCheck({
               checkboxClass: 'icheckbox_square-green',
               radioClass: 'iradio_square-green',
           });
       });
-    
+      $scope.showCompany = true;
     	$scope.userName = 'Dylan Goodwin';
       $scope.essAccountId = true;
       $("#esAccId").css({ opacity: 0.5 });
@@ -25,8 +25,15 @@
       $scope.feature.posAccountingIntegration = false;
       $scope.feature.posVeederRootIntegration = false;
       $scope.userData = function(){
-          console.log("daadada", $scope.feature)
-
+        if($scope.user.email == undefined || $scope.user.email == null){
+          toastr.error('Please enter your email first', {
+            closeButton: true
+          })
+        }else if($scope.user.firstName == undefined || $scope.user.firstName == null){
+          toastr.error('Please enter your First Name', {
+            closeButton: true
+          })
+        }else{
           if($scope.status == true){
             $scope.user.status = 'active';
           }else{
@@ -50,11 +57,14 @@
               console.log(response)
                 
             })
+            $state.go('index.fboAdmin');
           }, function (err) {
               toastr.error('Error in registering', {
                 closeButton: true
               })
           });
+        }
+          
       }
 
       $scope.enableEssId = function(){
@@ -68,4 +78,9 @@
           }
       }
 
+      $scope.editName = function(){
+        $scope.showCompany = false;
+
+      }
+
     });
\ No newline at end of file
diff --git a/app/views/fbo-admin/dashboard.html b/app/views/fbo-admin/dashboard.html
index e0aaa9f..9ed8223 100644
--- a/app/views/fbo-admin/dashboard.html
+++ b/app/views/fbo-admin/dashboard.html
@@ -1,7 +1,8 @@
 </div>
     <div class="row wrapper border-bottom white-bg page-heading">
         <div class="col-lg-8">
-            <h2>Tellus Institute</h2>
+            <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">Tellus Institute</h2>
+            <div style="margin-top: 20px;" ng-hide="showCompany"><input type="text" style="width:50%;" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
         </div>
         <div class="col-lg-4" style="margin-top: 20px; text-align: right;">
             <button type="button" class="btn btn-default btn-sm" ui-sref="index.fboAdmin">Cancel</button>
diff --git a/app/views/fbo-flight/flight.html b/app/views/fbo-flight/flight.html
index f5c6ec9..e3e63af 100644
--- a/app/views/fbo-flight/flight.html
+++ b/app/views/fbo-flight/flight.html
@@ -1,7 +1,8 @@
 </div>
     <div class="row wrapper border-bottom white-bg page-heading">
         <div class="col-lg-8">
-            <h2>Tellus Institute</h2>
+            <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">Tellus Institute</h2>
+            <div style="margin-top: 20px;" ng-hide="showCompany"><input type="text" style="width:50%;" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
         </div>
         <div class="col-lg-4" style="margin-top: 20px; text-align: right;">
             <button type="button" class="btn btn-default btn-sm" ui-sref="index.flightDept">Cancel</button>
@@ -113,13 +114,13 @@
                                         </select>
                                       </td>
                                       <td style="width: 30%">
-                                        <select class="form-control">
-                                           <option ng-repeat="model in aircraftModalList" ng-model="aircraft.model">{{model}}</option>
+                                        <select class="form-control" ng-model="aircraft.model" ng-change="getSize()">
+                                           <option ng-repeat="model in aircraftModalList">{{model}}</option>
                                         </select>
                                       </td>
                                       <td style="width: 30%">
-                                        <select class="form-control">
-                                           <option ng-repeat="size in aircraftSizeList" ng-model="aircraft.size">{{size}}</option>
+                                        <select class="form-control" ng-model="aircraft.size">
+                                           <option ng-repeat="size in aircraftSizeList">{{size}}</option>
                                         </select>
                                       </td>
                                     </tr>
diff --git a/app/views/fbo-flight/flightDept.controller.js b/app/views/fbo-flight/flightDept.controller.js
index 4d38872..7775786 100644
--- a/app/views/fbo-flight/flightDept.controller.js
+++ b/app/views/fbo-flight/flightDept.controller.js
@@ -4,10 +4,24 @@
   angular.module('acuefuel')
 
 	.controller('FlightDeptController', function ($scope, $uibModal, FBOFlight) {
+      $scope.showCompany = true;
+      $scope.editName = function(){
+        $scope.showCompany = false;
+
+      }
       $scope.data = {};
       $scope.user = {};
       $scope.aircraft = {};
       $scope.userData = function(){
+        if($scope.user.email == undefined || $scope.user.email == null){
+          toastr.error('Please enter your email first', {
+            closeButton: true
+          })
+        }else if($scope.user.firstName == undefined || $scope.user.firstName == null){
+          toastr.error('Please enter your First Name', {
+            closeButton: true
+          })
+        }else{
           if($scope.status == true){
             $scope.user.status = 'active';
           }else{
@@ -24,11 +38,13 @@
             toastr.success('Created Successfully', {
               closeButton: true
             })
+            $state.go('index.flightDept');
           }, function (err) {
               toastr.error('Error in registering', {
                 closeButton: true
               })
           });
+        }
       }
 
       $scope.data.cardType = 'creditCard';
@@ -60,25 +76,32 @@
           FBOFlight.getModal($scope.aircraft.make).then(function(result) {
             $scope.aircraftModalList = result;
             $scope.aircraft.model = $scope.aircraftModalList[0];
-              
+              FBOFlight.getAircraftSize($scope.aircraft.make, $scope.aircraft.model).then(function(result) {
+                $scope.aircraftSizeList = result;
+                $scope.aircraft.size = $scope.aircraftSizeList[0];
+              })
           })
             
         })
-
-        FBOFlight.getAircraftSize().then(function(result) {
-          $scope.aircraftSizeList = result;
-          $scope.aircraft.size = $scope.aircraftSizeList[0];
-            
-        })
       }
       
 
       $scope.getModal = function(){
-        var modelId = $scope.aircraft.make
-        FBOFlight.getModal(modelId).then(function(result) {
+        var makeId = $scope.aircraft.make;
+        FBOFlight.getModal(makeId).then(function(result) {
           $scope.aircraftModalList = result;
           $scope.aircraft.model = $scope.aircraftModalList[0];
-            
+            FBOFlight.getAircraftSize(makeId, $scope.aircraft.model).then(function(result) {
+              $scope.aircraftSizeList = result;
+              $scope.aircraft.size = $scope.aircraftSizeList[0];
+            })
+        })
+      }
+
+      $scope.getSize = function(){
+        FBOFlight.getAircraftSize($scope.aircraft.make, $scope.aircraft.model).then(function(result) {
+          $scope.aircraftSizeList = result;
+          $scope.aircraft.size = $scope.aircraftSizeList[0];
         })
       }
 
@@ -87,7 +110,7 @@
           toastr.error('Please Add Contact Information', {
             closeButton: true
           })
-          $('#myModal4').modal('hide');
+          $('#myModal4').modal('show');
         }else{
           $('#myModal4').modal('show');
         }
@@ -97,12 +120,9 @@
       $scope.aircraftData.aircraftList = [];
       $scope.getCraftList = [];
       $scope.addAircraft = function(){
-        console.log($scope.aircraft.accountId)
         $scope.aircraftData.aircraftList.push($scope.aircraft);
-        console.log($scope.aircraftData.aircraftList)
         if ($scope.getCraftList.indexOf($scope.aircraft) == -1) {
             $scope.getCraftList.push($scope.aircraft);
-            
         }
         
         FBOFlight.addAircraft($scope.aircraftData).then(function(result) {
@@ -111,7 +131,13 @@
           toastr.success('Created Successfully', {
             closeButton: true
           })
-        })
+        }, function (err) {
+            toastr.error('Error in Adding Aircraft', {
+              closeButton: true
+            })
+            $('#myModal4').modal('hide');
+            $scope.getCraftList.splice($scope.aircraft);
+        });
         
       }
 
diff --git a/app/views/fbo-flight/flightDeptService.js b/app/views/fbo-flight/flightDeptService.js
index 41227cd..8e3fee5 100644
--- a/app/views/fbo-flight/flightDeptService.js
+++ b/app/views/fbo-flight/flightDeptService.js
@@ -51,11 +51,11 @@
           return deferred.promise;
         }
 
-        this.getAircraftSize = function(){
+        this.getAircraftSize = function(makeId, modelId){
           var deferred = $q.defer();
           $http({
               method : 'GET',
-              url : BE.url +'/fuelerlinx/acufuel/getAircraftSize',
+              url : BE.url +'/fuelerlinx/acufuel/getAircraftSize/' +makeId + '/' +modelId,
               headers : {'Content-Type': 'application/json'},
           })
           .success(function(result) {
@@ -87,6 +87,8 @@
           })
           .success(function(result) {
               deferred.resolve(result);
+          }).error(function(error) {
+              deferred.reject(error);
           })
           return deferred.promise;
         }
diff --git a/app/views/flightDept/flightDeptController.js b/app/views/flightDept/flightDeptController.js
index 316d9a8..6f50f10 100644
--- a/app/views/flightDept/flightDeptController.js
+++ b/app/views/flightDept/flightDeptController.js
@@ -32,31 +32,37 @@
         function searchClient(searchData, userType){
           console.log(searchData)
           console.log(userType)
-          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;
+          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(){
diff --git a/app/views/login/login.service.js b/app/views/login/login.service.js
index 67db088..33c4028 100644
--- a/app/views/login/login.service.js
+++ b/app/views/login/login.service.js
@@ -62,6 +62,20 @@
           })
           return deferred.promise;
         }
+
+        this.getActiveUser = function() {
+
+          var deferred = $q.defer();
+          $http({
+              method : 'GET',
+              url : BE.url +'/user/waitingForAuth/',
+              headers : {'Content-Type': 'application/json'}
+          })
+          .success(function(result) {
+              deferred.resolve(result);
+          })
+          return deferred.promise;
+        }
    }
 
 })();
\ No newline at end of file
diff --git a/app/views/updateAllFBO/updateAllFBO.controller.js b/app/views/updateAllFBO/updateAllFBO.controller.js
index 5fe825c..55640d7 100644
--- a/app/views/updateAllFBO/updateAllFBO.controller.js
+++ b/app/views/updateAllFBO/updateAllFBO.controller.js
@@ -11,6 +11,11 @@
           });
 
       });
+      $scope.showCompany = true;
+      $scope.editName = function(){
+        $scope.showCompany = false;
+
+      }
       $scope.feature = {};
       var userProfileID = $stateParams.id;
       UpdateAllFBO.getALlFBOData(userProfileID).then(function(result) {
@@ -59,7 +64,15 @@
 
       $scope.userData = function(){
         console.log($scope.user.userTypeId)
-
+        if($scope.user.email == undefined || $scope.user.email == null){
+          toastr.error('Please enter your email first', {
+            closeButton: true
+          })
+        }else if($scope.user.firstName == undefined || $scope.user.firstName == null){
+          toastr.error('Please enter your First Name', {
+            closeButton: true
+          })
+        }else{
           if($scope.status == true){
             $scope.user.status = 'active';
           }else{
@@ -85,6 +98,7 @@
               console.log(response)
             })
           })
+        }
       }
 
   });
\ No newline at end of file
diff --git a/app/views/updateAllFBO/updateAllFBO.html b/app/views/updateAllFBO/updateAllFBO.html
index 74fd6e8..7fb621e 100644
--- a/app/views/updateAllFBO/updateAllFBO.html
+++ b/app/views/updateAllFBO/updateAllFBO.html
@@ -1,9 +1,10 @@
 </div>
     <div class="row wrapper border-bottom white-bg page-heading">
-        <div class="col-lg-2">
-            <h2>{{user.companyName}}</h2>
+        <div class="col-lg-3">
+            <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">{{user.companyName}}</h2>
+            <div style="margin-top: 20px;" ng-hide="showCompany"><input type="text" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
         </div>
-        <div class="col-lg-4" style="margin-top: 20px;">
+        <div class="col-lg-3" style="margin-top: 20px;">
             <button type="button" class="btn btn-w-m btn-danger" ng-click="deleteData()">Delete Account</button>
         </div>
         <div class="col-lg-6" style="margin-top: 20px; text-align: right;">
diff --git a/app/views/updateFBODept/updateFBODept.controller.js b/app/views/updateFBODept/updateFBODept.controller.js
index b0079d1..bf8fa2b 100644
--- a/app/views/updateFBODept/updateFBODept.controller.js
+++ b/app/views/updateFBODept/updateFBODept.controller.js
@@ -4,6 +4,11 @@
   angular.module('acuefuel')
 
 	.controller('updateFBODeptController', function($scope, $stateParams, UpdateAllFBODept, UpdateAllFBO, FBOFlight) {
+      $scope.showCompany = true;
+      $scope.editName = function(){
+        $scope.showCompany = false;
+
+      }
       $scope.showPayments = true;
       $scope.aircraft = {};
       $scope.updateData = {};
@@ -71,7 +76,15 @@
 
       $scope.userData = function(){
         console.log($scope.user.userTypeId)
-
+        if($scope.user.email == undefined || $scope.user.email == null){
+          toastr.error('Please enter your email first', {
+            closeButton: true
+          })
+        }else if($scope.user.firstName == undefined || $scope.user.firstName == null){
+          toastr.error('Please enter your First Name', {
+            closeButton: true
+          })
+        }else{
           if($scope.status == true){
             $scope.user.status = 'active';
           }else{
@@ -89,6 +102,7 @@
                 closeButton: true
             })
           })
+        }
       }
 
       getData();
@@ -99,26 +113,37 @@
           FBOFlight.getModal($scope.aircraft.make).then(function(result) {
             $scope.aircraftModalList = result;
             $scope.aircraft.model = $scope.aircraftModalList[0];
-              
-          })
-            
-        })
 
-        FBOFlight.getAircraftSize().then(function(result) {
-          $scope.aircraftSizeList = result;
-          $scope.aircraft.size = $scope.aircraftSizeList[0];
+            FBOFlight.getAircraftSize($scope.aircraft.make, $scope.aircraft.model).then(function(result) {
+              $scope.aircraftSizeList = result;
+              $scope.aircraft.size = $scope.aircraftSizeList[0];
+                
+            })
+          })
             
         })
       }
-      
 
       $scope.getModal = function(){
-        var modelId = $scope.aircraft.make
-        FBOFlight.getModal(modelId).then(function(result) {
+        var makeId = $scope.aircraft.make
+        FBOFlight.getModal(makeId).then(function(result) {
           $scope.aircraftModalList = result;
           $scope.aircraft.model = $scope.aircraftModalList[0];
+
+          FBOFlight.getAircraftSize(makeId, $scope.aircraft.model).then(function(result) {
+            $scope.aircraftSizeList = result;
+            $scope.aircraft.size = $scope.aircraftSizeList[0];
+          })
         })
       }
+
+      $scope.getSize = function(){
+        FBOFlight.getAircraftSize($scope.aircraft.make, $scope.aircraft.model).then(function(result) {
+          $scope.aircraftSizeList = result;
+          $scope.aircraft.size = $scope.aircraftSizeList[0];
+        })
+      }
+
       $scope.aircraftData = {};
       $scope.aircraftData.aircraftList = [];
       $scope.addAircraft = function(){
@@ -131,7 +156,13 @@
           toastr.success('Created Successfully', {
             closeButton: true
           })
-        })
+        }, function (err) {
+            toastr.error('Error in Adding Aircraft', {
+              closeButton: true
+            })
+            $('#myModal4').modal('hide');
+            $scope.getCraftList.splice($scope.aircraft);
+        });
       }
 
       $scope.closeModal = function(){
@@ -140,13 +171,17 @@
       }
 
       $scope.update = function(airdata){
-        console.log(airdata)
+        $("#myModal5").modal('show');
         $scope.aircraft = airdata;
+        console.log($scope.aircraft)
         $scope.aircraft.accountId = $scope.user.account.id;
-        $("#myModal5").modal('show');
+        
         FBOFlight.getModal($scope.aircraft.make).then(function(result) {
           $scope.aircraftModalList = result;
-            
+          FBOFlight.getAircraftSize($scope.aircraft.make, $scope.aircraft.model).then(function(result) {
+            $scope.aircraftSizeList = result;
+              
+          })
         })
       }
 
@@ -172,7 +207,13 @@
           toastr.success('Updated Successfully', {
             closeButton: true
           })
-        })
+        }, function (err) {
+            toastr.error('Error in Updating Aircraft', {
+              closeButton: true
+            })
+            $('#myModal5').modal('hide');
+            $scope.getCraftList.splice($scope.aircraft);
+        });
       }
 
       $scope.remove = function(data){
diff --git a/app/views/updateFBODept/updateFBODept.html b/app/views/updateFBODept/updateFBODept.html
index c79d9a7..d5e9f0b 100644
--- a/app/views/updateFBODept/updateFBODept.html
+++ b/app/views/updateFBODept/updateFBODept.html
@@ -1,9 +1,10 @@
 
 <div class="row wrapper border-bottom white-bg page-heading">
-     <div class="col-lg-2">
-        <h2>{{user.companyName}}</h2>
+     <div class="col-lg-3">
+        <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">{{user.companyName}}</h2>
+        <div style="margin-top: 20px;" ng-hide="showCompany"><input type="text" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
     </div>
-    <div class="col-lg-4" style="margin-top: 20px;">
+    <div class="col-lg-3" style="margin-top: 20px;">
         <button type="button" class="btn btn-w-m btn-danger" ng-click="deleteData()">Delete Account</button>
     </div>
     <div class="col-lg-6" style="margin-top: 20px; text-align: right;">
@@ -117,7 +118,7 @@
                                         </select>
                                       </td>
                                       <td style="width: 30%">
-                                        <select class="form-control" ng-model="aircraft.model">
+                                        <select class="form-control" ng-model="aircraft.model" ng-change="getSize()">
                                            <option ng-repeat="model in aircraftModalList">{{model}}</option>
                                         </select>
                                       </td>
@@ -212,7 +213,7 @@
                                         </select>
                                       </td>
                                       <td style="width: 30%">
-                                        <select class="form-control" ng-model="aircraft.model">
+                                        <select class="form-control" ng-model="aircraft.model" ng-change="getSize()">
                                            <option ng-repeat="model in aircraftModalList">{{model}}</option>
                                         </select>
                                       </td>
diff --git a/app/views/updateFBODept/updateFBODept.service.js b/app/views/updateFBODept/updateFBODept.service.js
index 69fc895..61d2435 100644
--- a/app/views/updateFBODept/updateFBODept.service.js
+++ b/app/views/updateFBODept/updateFBODept.service.js
@@ -88,6 +88,8 @@
           })
           .success(function(result) {
               deferred.resolve(result);
+          }).error(function(error) {
+              deferred.reject(error);
           })
           return deferred.promise;
         }
-- 
2.0.0