From 8f7dbe97c18e4c9337c65471520874a44d99f3c4 Mon Sep 17 00:00:00 2001
From: swarn <swarn.singh@viithiisys.com>
Date: Thu, 8 Jun 2017 17:11:36 +0530
Subject: [PATCH] fuel order complete, fixed bugs on ramp fee manager

---
 app/css/custom.css                                 |  16 +++
 app/index.html                                     |   6 ++
 app/js/app.constant.js                             |   2 +-
 app/js/app.js                                      |   8 +-
 app/partials/ContactView/ContactView.html          |   2 +
 app/partials/FuelVendors/FuelVendors.html          |   2 +-
 app/partials/customers/customers.html              |   2 +
 .../enterFuelOrder/enterFuelOrder.controller.js    |  70 ++++++++++++
 app/partials/enterFuelOrder/enterFuelOrder.html    | 117 +++++++++++++++++++++
 .../enterFuelOrder/enterFuelOrder.service.js       |  86 +++++++++++++++
 app/partials/fuelManager/fuelManager.controller.js |  20 +++-
 app/partials/fuelManager/fuelManager.html          |  20 ++--
 app/partials/login/login.service.js                |   4 +-
 app/partials/main/main.html                        |   3 +
 app/partials/viewcontact/viewcontact.controller.js |   5 +-
 app/partials/viewcontact/viewcontact.html          |   8 +-
 bower.json                                         |   3 +-
 17 files changed, 351 insertions(+), 23 deletions(-)
 create mode 100644 app/partials/enterFuelOrder/enterFuelOrder.controller.js
 create mode 100644 app/partials/enterFuelOrder/enterFuelOrder.html
 create mode 100644 app/partials/enterFuelOrder/enterFuelOrder.service.js

diff --git a/app/css/custom.css b/app/css/custom.css
index 2b9cc5b..4ec2b1c 100644
--- a/app/css/custom.css
+++ b/app/css/custom.css
@@ -705,4 +705,20 @@ font-size: 10px !important;
 }
 .recordCountSelect{
 	background-color: #fff;
+}
+.exportBtn{
+	margin-top: 20px;
+}
+.select2-container .select2-choice{
+	height: 34px !important;
+	padding: 6px 12px !important;
+	border: 1px solid #ccc !important;
+	background-image: none !important;
+}
+.select2-container .select2-choice .select2-arrow{
+	border-left: none !important;
+	background: transparent !important;
+}
+.select2-container .select2-choice{
+	padding: 2px 12px !important;
 }
\ No newline at end of file
diff --git a/app/index.html b/app/index.html
index ef93cfa..e7a8b1b 100644
--- a/app/index.html
+++ b/app/index.html
@@ -42,6 +42,8 @@
       <link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/themes/smoothness/jquery-ui.min.css" rel="stylesheet" type="text/css" />
 
       <link rel="stylesheet" type="text/css" href="css/ngTable.css">
+      <link rel="stylesheet" href="bower_components/select2/select2.css">
+
       <!-- <link rel="stylesheet"; href="https://unpkg.com/ng-table@2.0.2/bundles/ng-table.min.css"> -->
 
    </head>
@@ -78,6 +80,8 @@
       <script src="bower_components/jqGrid/js/jquery.jqGrid.min.js"></script>
       <script src="bower_components/angular-xeditable/dist/js/xeditable.js"></script>
       <script src="bower_components/angular-bootstrap-toggle/dist/angular-bootstrap-toggle.min.js"></script>
+      <script src="bower_components/select2/select2.js"></script>
+      <script src="bower_components/angular-ui-select2/src/select2.js"></script>
       
       <!-- <script src="https://unpkg.com/ng-table@2.0.2/bundles/ng-table.min.js"></script> -->
 
@@ -139,6 +143,7 @@
       <script src="partials/viewFuelVendor/viewFuelVendor.controller.js"></script>
       <script src="partials/accountSetting/accountSetting.Controller.js"></script>
       <script src="partials/viewVendorContact/viewVendorContact.Controller.js"></script>
+      <script src="partials/enterFuelOrder/enterFuelOrder.controller.js"></script>
 
       <script src="partials/main/main.controller.js"></script>
       <div ui-view></div>
@@ -175,6 +180,7 @@
       <script src="partials/viewFuelVendor/viewFuelVendor.service.js"></script>
       <script src="partials/accountSetting/accountSetting.Service.js"></script>
       <script src="partials/viewVendorContact/viewVendorContact.Service.js"></script>
+      <script src="partials/enterFuelOrder/enterFuelOrder.service.js"></script>
 
       <script src="partials/main/main.service.js"></script>
 
diff --git a/app/js/app.constant.js b/app/js/app.constant.js
index cdda7f3..8521ccf 100644
--- a/app/js/app.constant.js
+++ b/app/js/app.constant.js
@@ -5,7 +5,7 @@
 	
 	.constant('BASE_URL', {
 		url: 'http://54.149.169.33:8080/ws'
-        //url: 'http://192.168.1.175:8080/ws'
+        //url: 'http://192.168.2.178:8080/ws'
         //url: 'http://192.168.1.8:8080/ws'
 
 	})
diff --git a/app/js/app.js b/app/js/app.js
index 4174df4..684208e 100644
--- a/app/js/app.js
+++ b/app/js/app.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-  angular.module('acufuel', ['ngCookies', 'ngResource', 'ui.router', 'ngAnimate', 'ui.bootstrap', 'xeditable', 'ui.toggle', 'ngTable'])
+  angular.module('acufuel', ['ngCookies', 'ngResource', 'ui.router', 'ngAnimate', 'ui.bootstrap', 'xeditable', 'ui.toggle', 'ngTable', 'ui.select2'])
 
     .config(['$httpProvider', function($httpProvider) {
       $httpProvider.defaults.withCredentials = true;
@@ -240,6 +240,12 @@
               controller: "viewVendorContactController"
             })
             
+            .state("app.enterFuelOrder", {
+              url: "/enterFuelOrder",
+              templateUrl: "partials/enterFuelOrder/enterFuelOrder.html",
+              controller: "enterFuelOrderController"
+            })
+
         }
   ])
 
diff --git a/app/partials/ContactView/ContactView.html b/app/partials/ContactView/ContactView.html
index 4620c5f..111b0d4 100644
--- a/app/partials/ContactView/ContactView.html
+++ b/app/partials/ContactView/ContactView.html
@@ -61,6 +61,8 @@
 	                             </td>
 	                           </tr>
 	                         </table>
+
+                            <button type="button" class="btn btn-warning exportBtn">Export Customers</button>
                         
                            <!-- <table class="table table-striped">
                               <thead>
diff --git a/app/partials/FuelVendors/FuelVendors.html b/app/partials/FuelVendors/FuelVendors.html
index 6c94c95..d668d9f 100644
--- a/app/partials/FuelVendors/FuelVendors.html
+++ b/app/partials/FuelVendors/FuelVendors.html
@@ -128,7 +128,7 @@
 	                           </tr>
 	                         </table>
                         
-                        
+                          <button type="button" class="btn btn-warning exportBtn">Export Customers</button>
                         
                            <!-- <table class="table table-striped">
                               <thead>
diff --git a/app/partials/customers/customers.html b/app/partials/customers/customers.html
index 3cef3b1..eb9fe9a 100644
--- a/app/partials/customers/customers.html
+++ b/app/partials/customers/customers.html
@@ -133,6 +133,8 @@
                            </tr>
                          </table>
 
+                         <button type="button" class="btn btn-warning exportBtn">Export Customers</button>
+
                         <!-- 
                            <table class="table table-striped">
                               <thead>
diff --git a/app/partials/enterFuelOrder/enterFuelOrder.controller.js b/app/partials/enterFuelOrder/enterFuelOrder.controller.js
new file mode 100644
index 0000000..59468de
--- /dev/null
+++ b/app/partials/enterFuelOrder/enterFuelOrder.controller.js
@@ -0,0 +1,70 @@
+'use strict';
+
+angular.module('acufuel')
+
+.controller('enterFuelOrderController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'enterFuelOrderService', enterFuelOrderController]);
+
+function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http, enterFuelOrderService) {
+	$scope.showLoader = true;
+
+	$scope.companyList = {};
+
+	enterFuelOrderService.getAllCompanies().then(function(result) {
+		$scope.showLoader = false;
+		$scope.companyList = result;
+	})
+
+	$scope.order = {};
+	$scope.order.upliftDate = '';
+	$scope.order.departingDate = '';
+	$scope.selectedCompanyName = '';
+	$scope.selectedCompanyId = '';
+	$scope.marginId = '';
+
+	enterFuelOrderService.getFuelPricingNew().then(function(margins) {
+		$scope.marginList = margins;
+		//console.log('$scope.marginList', $scope.marginList);
+	})
+
+	$scope.getAircraft = function(company){
+		$scope.selectedCompanyName = company;
+		$scope.showLoader = true;
+		for (var i = 0; i < $scope.companyList.length; i++) {
+			if ($scope.companyList[i].companyName == company) {
+				$scope.selectedCompanyId = $scope.companyList[i].id;
+				$scope.marginId = $scope.companyList[i].margin.id;
+				if ($scope.selectedCompanyId != '') {
+					enterFuelOrderService.getAircraft($scope.selectedCompanyId).then(function(aircraft) {
+						$scope.aircraftList = aircraft;
+					})
+				}
+				if ($scope.marginId != '') {
+					enterFuelOrderService.getJetTiers($scope.marginId).then(function(tiers) {
+		                $scope.tierList = tiers;
+		                $scope.showLoader = false;
+		            })
+				}else{
+					$scope.showLoader = false;
+				}
+			}
+		}
+
+	}
+
+	$scope.dispatchFuel = function(){
+		console.log('$scope.order', $scope.order);
+		$scope.order.companyId = $scope.selectedCompanyId;
+		if ($scope.order.upliftDate != '') {
+			$scope.order.upliftDate = new Date($scope.order.upliftDate);
+			$scope.order.upliftDate = $scope.order.upliftDate.getTime();
+		}
+		if ($scope.order.departingDate != '') {
+			$scope.order.departingDate = new Date($scope.order.departingDate);
+			$scope.order.departingDate = $scope.order.departingDate.getTime();
+		}
+		enterFuelOrderService.dispathFuelOrder($scope.order).then(function(result) {
+			console.log('result', result);
+		})
+	}
+
+}
\ No newline at end of file
diff --git a/app/partials/enterFuelOrder/enterFuelOrder.html b/app/partials/enterFuelOrder/enterFuelOrder.html
new file mode 100644
index 0000000..213aa0a
--- /dev/null
+++ b/app/partials/enterFuelOrder/enterFuelOrder.html
@@ -0,0 +1,117 @@
+<style type="text/css">
+	.subnavbar .mainnav > li:nth-child(2) > a{
+		color: #ff9900;
+	}
+	.customInputWrap{
+		margin-top: 15px;
+	}
+	.customInputWrap label{
+		font-weight: normal;
+		margin-bottom: 0;
+	}
+</style>
+<div class="myLoader" ng-show="showLoader">
+   <img src="../img/hourglass.gif" width="50px;">
+</div>
+
+<div class="container">
+	<div class="row">
+		<div class="col-md-5">
+			<div class="widget stacked">
+				<div class="widget-header">
+					<i class="fa fa-search" aria-hidden="true"></i>
+					<h3>Search and Dispatch Fuel</h3>
+				</div>
+				<div class="widget-content new-widget-content">
+					<form>
+
+						<div class="customInputWrap">
+							<div class="col-md-3 text-right">
+								<label>Company</label>
+							</div>
+							<div class="col-md-9">
+								<select ui-select2 ng-model="order.companyName" ng-change="getAircraft(order.companyName)" style="width: 100%;">
+									<option value="" selected disabled>Select Company</option>
+									<option ng-repeat="list in companyList">{{list.companyName}}</option>
+								</select>
+							</div>
+							<div class="clearfix"></div>
+						</div>
+
+						<div class="customInputWrap">
+							<div class="col-md-3 text-right">
+								<label>Aircraft</label>
+							</div>
+							<div class="col-md-3">
+								<select class="form-control" ng-model="order.aircraftName">
+									<option selected disabled value="">Select Aircraft</option>
+									<option ng-repeat="list in aircraftList" value="{{list.tail}}">{{list.tail}}</option>
+								</select>
+							</div>
+							<div class="col-md-3 text-right">
+								<label>Requested Volume</label>
+							</div>
+							<div class="col-md-3">
+								<input type="text" ng-model="order.volume" class="form-control">
+							</div>
+							<div class="clearfix"></div>
+						</div>
+
+						<div class="customInputWrap">
+							<div class="col-md-3 text-right">
+								<label>Price Quote</label>
+							</div>
+							<div class="col-md-8 col-md-offset-1">
+								<select class="form-control" ng-model="order.priceQuote">
+									<option value="" selected disabled>Select Price Quote</option>
+									<option ng-repeat="margin in marginList" value="{{margin.fuelPricing.papTotal}}">${{margin.fuelPricing.papTotal}} {{margin.name}}</option>
+								</select>
+							</div>
+							<div class="clearfix"></div>
+						</div>
+
+						<div class="customInputWrap">
+							<div class="col-md-3 text-right">
+								<label>Tier Break</label>
+							</div>
+							<div class="col-md-8 col-md-offset-1">
+								<select class="form-control" ng-model="order.tierBreak">
+									<option value="" selected disabled>Select Price Quote</option>
+									<option ng-repeat="list in tierList" value="{{list.minTierBreak}}-{{list.maxTierBreak}}">
+										{{list.minTierBreak | number: 2}}-{{list.maxTierBreak | number: 2}} = ${{list.marginTotal | number: 2}} {{list.marginTemplate.marginName}}
+									</option>
+								</select>
+							</div>
+							<div class="clearfix"></div>
+						</div>
+
+						<div class="customInputWrap">
+							<div class="col-md-3 text-right">
+								<label>Uplift Date</label>
+							</div>
+							<div class="col-md-3">
+								<input type="text" ng-model="order.upliftDate" datepicker class="form-control">
+							</div>
+							<div class="col-md-3 text-right">
+								<label>Departing FBO</label>
+							</div>
+							<div class="col-md-3">
+								<input type="text" ng-model="order.departingDate" datepicker class="form-control">
+							</div>
+							<div class="clearfix"></div>
+						</div>
+
+						<div class="customInputWrap text-right">
+							<div class="col-xs-12">
+								<input type="cancel" value="Cancel" class="btn btn-default" style="margin-right: 15px; width: 100px;">
+								<input type="submit" value="Dispatch" ng-click="dispatchFuel()" class="btn btn-primary">
+							</div>
+							<div class="clearfix"></div>
+						</div>
+
+					</form>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/app/partials/enterFuelOrder/enterFuelOrder.service.js b/app/partials/enterFuelOrder/enterFuelOrder.service.js
new file mode 100644
index 0000000..c2ab7a8
--- /dev/null
+++ b/app/partials/enterFuelOrder/enterFuelOrder.service.js
@@ -0,0 +1,86 @@
+(function(){
+  'use strict';    
+  angular.module('acufuel')
+  .service('enterFuelOrderService', ['$q', '$http', 'BASE_URL', enterFuelOrderService]);
+
+  function enterFuelOrderService($q, $http, BASE_URL) {        
+
+    this.getAllCompanies = function() {
+      var deferred = $q.defer();
+      $http({
+        method : 'GET',
+        url : BASE_URL.url +'/user/allCompanies',
+        headers : {'Content-Type': 'application/json'},
+      })
+      .then(function (result){
+        deferred.resolve(result.data);
+      },function (result){
+        deferred.resolve(result.data);
+      })
+      return deferred.promise;
+    }
+
+    this.getAircraft = function(id) {
+      var deferred = $q.defer();
+      $http({
+          method : 'GET',
+          url : BASE_URL.url +'/company/aircrafts/'+id,
+          headers : {'Content-Type': 'application/json'},
+      })
+      .then(function (result){
+          deferred.resolve(result.data);
+      },function (result){
+          deferred.resolve(result.data);
+      })
+      return deferred.promise;
+    }
+
+    this.getJetTiers = function(id) {
+      var deferred = $q.defer();
+      $http({
+          method : 'GET',
+          url : BASE_URL.url +'/margin/getCustomMargins/'+id,
+          headers : {'Content-Type': 'application/json'},
+      })
+      .then(function (result){
+          deferred.resolve(result.data);
+      },function (result){
+          deferred.resolve(result.data);
+      })
+      return deferred.promise;
+    }
+
+    this.getFuelPricingNew = function() {
+      var deferred = $q.defer();
+      $http({
+          method : 'GET',
+          url : BASE_URL.url +'/user/products',
+          headers : {'Content-Type': 'application/json'},
+      })
+      .then(function (result){
+          deferred.resolve(result.data);
+      },function (result){
+          deferred.resolve(result.data);
+      })
+      return deferred.promise;
+    }
+
+    this.dispathFuelOrder = function(data) {
+      var deferred = $q.defer();
+      $http({
+          method : 'POST',
+          url : BASE_URL.url +'/fuelOrder',
+          headers : {'Content-Type': 'application/json'},
+          data: data
+      })
+      .then(function (result){
+          deferred.resolve(result.data);
+      },function (result){
+          deferred.resolve(result.data);
+      })
+      return deferred.promise;
+    }
+
+  }
+
+})();
\ No newline at end of file
diff --git a/app/partials/fuelManager/fuelManager.controller.js b/app/partials/fuelManager/fuelManager.controller.js
index 711aaa6..4c0562f 100644
--- a/app/partials/fuelManager/fuelManager.controller.js
+++ b/app/partials/fuelManager/fuelManager.controller.js
@@ -9,6 +9,22 @@
 
   function fuelManagerController($scope, $rootScope, $uibModal, $filter, $http, fuelManagerService) {
 
+      var todayDate = new Date();
+      var ddn = todayDate.getDate();
+      var mmn = todayDate.getMonth()+1; //January is 0!
+      var yyyyn = todayDate.getFullYear();
+
+      if(ddn<10) {
+          ddn ='0'+ddn
+      } 
+
+      if(mmn<10) {
+          mmn ='0'+mmn
+      }
+
+      $scope.todayDateNew = mmn+'/'+ddn+'/'+yyyyn;
+      $scope.currentUserName = JSON.parse(window.localStorage.getItem("currentUserName"));
+
       $scope.currentUserData = JSON.parse(localStorage.getItem('userProfileId'));
       $scope.showLoader = true;
 
@@ -54,9 +70,9 @@
                       'avoidance' : $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.avoidance,
                       'applicable' : $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.applicable,
                       'expirationDate' : $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate,
-                      'notes' : $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.notes
+                      'notes' : $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.notes,
+                      'reportedBy': $scope.currentUserName
                     });
-
                 }
               }
           }
diff --git a/app/partials/fuelManager/fuelManager.html b/app/partials/fuelManager/fuelManager.html
index 0354b38..30362c1 100644
--- a/app/partials/fuelManager/fuelManager.html
+++ b/app/partials/fuelManager/fuelManager.html
@@ -43,10 +43,7 @@
                            </div>
                            <div class="new-tab-body" id="parentTogglebody{{$index}}" style="display: none;">
                               <div class="new-tab-body-th">
-                                 <div class="col-md-4" ng-if="list.type != 'CUSTOM'">
-                                    Aircraft Size
-                                 </div>
-                                 <div class="col-md-3" ng-if="list.type == 'CUSTOM'">
+                                 <div class="col-md-4">
                                     Aircraft Size
                                  </div>
                                  <div class="col-md-2">
@@ -55,7 +52,7 @@
                                  <div class="col-md-2">
                                     Avoidance
                                  </div>
-                                 <div class="col-md-2">
+                                 <div class="col-md-2" ng-if="list.type != 'CUSTOM'">
                                     Expiration Date
                                  </div>
                                  <div class="col-md-2">
@@ -68,11 +65,7 @@
                               </div>
                               <div class="new-tab-body-td" ng-repeat="jets in list.aircraftsSize">
                                  <div>
-                                    <div class="col-md-4" ng-if="list.type != 'CUSTOM'">
-                                       <i class="fa fa-plus-circle {{jets.id}}" ng-click="toggleChild(jets.id)" aria-hidden="true"></i>
-                                       <span style="margin-left: 5px;">{{jets.size}}</span>
-                                    </div>
-                                    <div class="col-md-3" ng-if="list.type == 'CUSTOM'">
+                                    <div class="col-md-4">
                                        <i class="fa fa-plus-circle {{jets.id}}" ng-click="toggleChild(jets.id)" aria-hidden="true"></i>
                                        <span style="margin-left: 5px;">{{jets.size}}</span>
                                     </div>
@@ -82,11 +75,11 @@
                                     <div class="col-md-2">
                                        <input type="text" ng-disabled="jets.rampFeesAndAvoidance.applicable == false || jets.rampFeesAndAvoidance.applicable == null" ng-model="jets.rampFeesAndAvoidance.avoidance" style="padding: 5px 5px;">
                                     </div>
-                                    <div class="col-md-2">
+                                    <div class="col-md-2" ng-if="list.type != 'CUSTOM'">
                                        <!-- <input type="date" ng-disabled="jets.rampFeesAndAvoidance.applicable == false || jets.rampFeesAndAvoidance.applicable == null" name="" ng-model="jets.rampFeesAndAvoidance.expirationDate"> -->
 
                                        
-                                       <input type="text" datepicker ng-disabled="jets.rampFeesAndAvoidance.applicable == false || jets.rampFeesAndAvoidance.applicable == null" ng-model="jets.rampFeesAndAvoidance.expirationDate" style="width: 90px; padding: 5px 5px;" />
+                                       <input type="text" ng-if="list.type != 'CUSTOM'" datepicker ng-disabled="jets.rampFeesAndAvoidance.applicable == false || jets.rampFeesAndAvoidance.applicable == null" ng-model="jets.rampFeesAndAvoidance.expirationDate" style="width: 90px; padding: 5px 5px;" />
                                        
                                     </div>
                                     <div class="col-md-2">
@@ -135,7 +128,8 @@
                                                             Reported On:
                                                          </td>
                                                          <td width="50%">
-                                                            {{jets.rampFeesAndAvoidance.reportedOn}}
+                                                            <!-- {{jets.rampFeesAndAvoidance.reportedOn}} -->
+                                                            {{todayDateNew}}
                                                          </td>
                                                       </tr>
                                                       <tr>
diff --git a/app/partials/login/login.service.js b/app/partials/login/login.service.js
index 56aaddd..eb3801d 100644
--- a/app/partials/login/login.service.js
+++ b/app/partials/login/login.service.js
@@ -89,10 +89,12 @@
         authService.getUser = function () {
           return JSON.parse(window.localStorage.getItem("currentUser"));
         }
-      
+        
         authService.setUser = function (authData) {
+            console.log('authdata', authData);
             window.localStorage.setItem("currentUser", JSON.stringify(authData.userProfile.userType));
             window.localStorage.setItem("userProfileId", JSON.stringify(authData.userProfile.id));
+            window.localStorage.setItem('currentUserName', JSON.stringify(authData.userProfile.firstName +' '+ authData.userProfile.lastName));
             if(authData.userProfile.userType.type == 'ADMIN' || authData.userProfile.userType.type == 'FBO'){
                 role = USER_ROLES.admin;
                 $rootScope.isAuthenticated = true;
diff --git a/app/partials/main/main.html b/app/partials/main/main.html
index a52d72b..972e8e9 100644
--- a/app/partials/main/main.html
+++ b/app/partials/main/main.html
@@ -55,6 +55,9 @@
                   </a>  
                   <ul class="dropdown-menu">
                      <li><a ui-sref="app.updateFuelManager" href="#/updateFuelManager">Update Fuel Manager</a></li>
+                     <li>
+                        <a ui-sref="app.enterFuelOrder">Enter Fuel Order</a>
+                     </li>
                      <li><a ui-sref="app.fuelManager" href="#/fuelManager">Ramp Free Manager</a></li>
                      <li class="dropdown-submenu">
                         <a tabindex="-1" href="#">Tax Manager</a>
diff --git a/app/partials/viewcontact/viewcontact.controller.js b/app/partials/viewcontact/viewcontact.controller.js
index 9bb60a6..76caf0c 100644
--- a/app/partials/viewcontact/viewcontact.controller.js
+++ b/app/partials/viewcontact/viewcontact.controller.js
@@ -63,7 +63,8 @@
         $scope.cancelToogle = function(){
           $('#toogleMail').css('display', 'none');
         }
-
+        $scope.disableNext = true;
+        $scope.disablePrev = true;
         setInterval(function(){
         	var checkMaxLength = $scope.contactIdList.length - one;
         	if (index === checkMaxLength) {
@@ -76,7 +77,7 @@
         	}else{
         		$scope.disablePrev = false;
         	}
-        }, 3);
+        }, 1);
 
         $scope.editName = true;
         $scope.editCompany = true;
diff --git a/app/partials/viewcontact/viewcontact.html b/app/partials/viewcontact/viewcontact.html
index 18a7096..711bbaf 100644
--- a/app/partials/viewcontact/viewcontact.html
+++ b/app/partials/viewcontact/viewcontact.html
@@ -1,3 +1,9 @@
+<style type="text/css">
+  .toggle.btn{
+    width: 140px !important;
+  }
+</style>
+
 <div class="myLoader" ng-show="showLoader">
   <img src="../img/hourglass.gif" width="50px;">
 </div>
@@ -30,7 +36,7 @@
                            <h3 style="margin-right: 0px;">Contact Detail</h3>
                            <i class="fa fa-trash-o deleteTierIcon" ng-click="deleteContact(contactDetail.id)" style="color: white;" aria-hidden="true"></i>
                             <div class="pull-right" style="margin-top: 5px; margin-right: 10px;">
-                              <toggle ng-model="contactDetail.priceEmail" ng-change="changePriceEmail(contactDetail.id)" size="customToogle" on="PRICE EMAIL ON" off="PRICE EMAIL OFF"></toggle>
+                              <toggle ng-model="contactDetail.priceEmail" style="width: 140px;" ng-change="changePriceEmail(contactDetail.id)" size="customToogle" on="PRICE EMAIL ON" off="PRICE EMAIL OFF"></toggle>
                             </div>
 
                         </div>
diff --git a/bower.json b/bower.json
index 702a37d..1e3b175 100644
--- a/bower.json
+++ b/bower.json
@@ -33,6 +33,7 @@
     "angular-cookies": "~1.6.4",
     "angular-resource": "~1.6.4",
     "angular-xeditable": "~0.7.1",
-    "angular-bootstrap-toggle": "~0.1.2"
+    "angular-bootstrap-toggle": "~0.1.2",
+    "angular-ui-select2": "^0.0.5"
   }
 }
-- 
2.0.0