fixed bug

Anchit Jindal
1 parent d20181a2e0
Showing 3 changed files with 88 additions and 4 deletions Show diff stats
app/partials/viewCompany/viewCompany.controller.js
app/partials/viewCompany/viewCompany.html
app/partials/viewCompany/viewCompany.service.js
@@ -995,9 +995,6 @@ angular.module(&#39;acufuel&#39;)
  
         }
  
-
-
-
         /*delete company*/
         var deletecompanyId = "";
         $scope.deleteComp = function(companyDataid) {
@@ -1005,7 +1002,38 @@ angular.module(&#39;acufuel&#39;)
             //console.log("asda",companyDataid)
             deletecompanyId = companyDataid;
         }
+        $scope.aircraftIdx = '';
+        $scope.checkTail = function(tail, idx){
+        	var data = "tail=" + tail + "&id=" + companyId;
+        	$scope.aircraftIdx = idx;
+        	ViewCompanyService.checkTail(data).then(function(result) {
+                if(result.error) {
+                	$scope.aircraftMessage = result.error;
+                	$scope.openAddAirCraftError();
+                } else if(result.warning) {
+                	$scope.aircraftMessage = result.warning;
+                	$scope.openAddAirCraftWarning();
+                }
+            })
+        }
  
+        $scope.openAddAirCraftError = function() {
+        	$('#addAirCraftError').css('display', 'block');
+        }
+        
+        $scope.openAddAirCraftWarning = function() {
+       	 	$('#addAirCraftWarning').css('display', 'block');
+        }
+        $scope.acceptAirCraftError = function() {
+        	$('#addAirCraftWarning').css('display', 'none');
+        }
+        
+        $scope.cancelAirCraftError = function() {
+        	$scope.aircraftDetails[$scope.aircraftIdx].tail = '';
+        	$('#addAirCraftWarning').css('display', 'none');
+        	$('#addAirCraftError').css('display', 'none');
+        }
+        
         $scope.deleteCompanyData = function() {
             ViewCompanyService.deleteCompany(deletecompanyId).then(function(result) {
  
@@ -789,7 +789,7 @@
                                                    <input type="tel" class="form-control" ng-model="aircraftData.tail" ng-blur="checkJetWithTail(aircraftData.tail, $index)" required/>
                                                 </td> -->
                                                 <td style="width: 15%">
-                                                   <input type="tel" class="form-control" ng-model="aircraftData.tail" required/>
+                                                   <input type="tel" class="form-control" ng-model="aircraftData.tail" ng-blur="checkTail(aircraftData.tail, $index);" required/>
                                                 </td>
                                                 <td style="width: 17%">
                                                    <select class="form-control" ng-model="aircraftData.make" ng-change="getModal(aircraftData.make, $index) ">
@@ -1087,6 +1087,43 @@
       </div>
    </div>
 </div>
+
+
+<div class="customConfirmPopBackdrop" id="addAirCraftError">
+   <div class="customModalInner" style="max-width: 400px;">
+      <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
+         <table>
+            <tr>
+               <td>
+                  <p style="padding: 5px 10px; margin-bottom: 0;">{{aircraftMessage}}</p>
+               </td>
+            </tr>
+         </table>
+      </div>
+      <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
+         <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelAirCraftError()">Cancel</button>
+      </div>
+   </div>
+</div>
+
+<div class="customConfirmPopBackdrop" id="addAirCraftWarning">
+   <div class="customModalInner" style="max-width: 400px;">
+      <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
+         <table>
+            <tr>
+               <td>
+                  <p style="padding: 5px 10px; margin-bottom: 0;">{{aircraftMessage}}</p>
+               </td>
+            </tr>
+         </table>
+      </div>
+      <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
+         <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="acceptAirCraftError()">Yes</button>
+         <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelAirCraftError()">No</button>
+      </div>
+   </div>
+</div>
+
 <div class="myLoader" ng-show="showLoader">
    <img src="../img/hourglass.gif" width="50px;">
 </div>
@@ -329,6 +329,25 @@
           })
           return deferred.promise;
         } 
+          
+          this.checkTail = function(data) {
+          var deferred = $q.defer();
+          $http({
+              method : 'POST',
+              url : BASE_URL.url +'/company/aircraft/tail',
+              data : data,
+              headers : {'Content-Type': 'application/json'},
+          })
+          .then(function (result){
+              deferred.resolve(result.data);
+          },function (result){
+              deferred.resolve(result.data);
+          })
+          return deferred.promise;
+        }
+          
+          
+          
  
          /*this.omitDeleteCompanyFuel = function(id) {
...	...	@@ -995,9 +995,6 @@ angular.module('acufuel')
995	995
996	996	}
997	997
998		-
999		-
1000		-
1001	998	/delete company/
1002	999	var deletecompanyId = "";
1003	1000	$scope.deleteComp = function(companyDataid) {
...	...	@@ -1005,7 +1002,38 @@ angular.module('acufuel')
1005	1002	//console.log("asda",companyDataid)
1006	1003	deletecompanyId = companyDataid;
1007	1004	}
	1005	+ $scope.aircraftIdx = '';
	1006	+ $scope.checkTail = function(tail, idx){
	1007	+ var data = "tail=" + tail + "&id=" + companyId;
	1008	+ $scope.aircraftIdx = idx;
	1009	+ ViewCompanyService.checkTail(data).then(function(result) {
	1010	+ if(result.error) {
	1011	+ $scope.aircraftMessage = result.error;
	1012	+ $scope.openAddAirCraftError();
	1013	+ } else if(result.warning) {
	1014	+ $scope.aircraftMessage = result.warning;
	1015	+ $scope.openAddAirCraftWarning();
	1016	+ }
	1017	+ })
	1018	+ }
1008	1019
	1020	+ $scope.openAddAirCraftError = function() {
	1021	+ $('#addAirCraftError').css('display', 'block');
	1022	+ }
	1023	+
	1024	+ $scope.openAddAirCraftWarning = function() {
	1025	+ $('#addAirCraftWarning').css('display', 'block');
	1026	+ }
	1027	+ $scope.acceptAirCraftError = function() {
	1028	+ $('#addAirCraftWarning').css('display', 'none');
	1029	+ }
	1030	+
	1031	+ $scope.cancelAirCraftError = function() {
	1032	+ $scope.aircraftDetails[$scope.aircraftIdx].tail = '';
	1033	+ $('#addAirCraftWarning').css('display', 'none');
	1034	+ $('#addAirCraftError').css('display', 'none');
	1035	+ }
	1036	+
1009	1037	$scope.deleteCompanyData = function() {
1010	1038	ViewCompanyService.deleteCompany(deletecompanyId).then(function(result) {
1011	1039
...	...
...	...	@@ -789,7 +789,7 @@
789	789	<input type="tel" class="form-control" ng-model="aircraftData.tail" ng-blur="checkJetWithTail(aircraftData.tail, $index)" required/>
790	790	</td> -->
791	791	<td style="width: 15%">
792		- <input type="tel" class="form-control" ng-model="aircraftData.tail" required/>
	792	+ <input type="tel" class="form-control" ng-model="aircraftData.tail" ng-blur="checkTail(aircraftData.tail, $index);" required/>
793	793	</td>
794	794	<td style="width: 17%">
795	795	<select class="form-control" ng-model="aircraftData.make" ng-change="getModal(aircraftData.make, $index) ">
...	...	@@ -1087,6 +1087,43 @@
1087	1087	</div>
1088	1088	</div>
1089	1089	</div>
	1090	+
	1091	+
	1092	+<div class="customConfirmPopBackdrop" id="addAirCraftError">
	1093	+ <div class="customModalInner" style="max-width: 400px;">
	1094	+ <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
	1095	+ <table>
	1096	+ <tr>
	1097	+ <td>
	1098	+ <p style="padding: 5px 10px; margin-bottom: 0;">{{aircraftMessage}}</p>
	1099	+ </td>
	1100	+ </tr>
	1101	+ </table>
	1102	+ </div>
	1103	+ <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
	1104	+ <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelAirCraftError()">Cancel</button>
	1105	+ </div>
	1106	+ </div>
	1107	+</div>
	1108	+
	1109	+<div class="customConfirmPopBackdrop" id="addAirCraftWarning">
	1110	+ <div class="customModalInner" style="max-width: 400px;">
	1111	+ <div class="customModelBody" style="border-radius: 5px 5px 0 0;">
	1112	+ <table>
	1113	+ <tr>
	1114	+ <td>
	1115	+ <p style="padding: 5px 10px; margin-bottom: 0;">{{aircraftMessage}}</p>
	1116	+ </td>
	1117	+ </tr>
	1118	+ </table>
	1119	+ </div>
	1120	+ <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
	1121	+ <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="acceptAirCraftError()">Yes</button>
	1122	+ <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelAirCraftError()">No</button>
	1123	+ </div>
	1124	+ </div>
	1125	+</div>
	1126	+
1090	1127	<div class="myLoader" ng-show="showLoader">
1091	1128	<img src="../img/hourglass.gif" width="50px;">
1092	1129	</div>
...	...
...	...	@@ -329,6 +329,25 @@
329	329	})
330	330	return deferred.promise;
331	331	}
	332	+
	333	+ this.checkTail = function(data) {
	334	+ var deferred = $q.defer();
	335	+ $http({
	336	+ method : 'POST',
	337	+ url : BASE_URL.url +'/company/aircraft/tail',
	338	+ data : data,
	339	+ headers : {'Content-Type': 'application/json'},
	340	+ })
	341	+ .then(function (result){
	342	+ deferred.resolve(result.data);
	343	+ },function (result){
	344	+ deferred.resolve(result.data);
	345	+ })
	346	+ return deferred.promise;
	347	+ }
	348	+
	349	+
	350	+
332	351
333	352	/*this.omitDeleteCompanyFuel = function(id) {
334	353
...	...