validation for required fields

Kuldeep Arora
1 parent a4004862d5
Showing 4 changed files with 46 additions and 29 deletions Show diff stats
app/partials/enterFuelOrder/enterFuelOrder.controller.js
app/partials/enterFuelOrder/enterFuelOrder.html
app/partials/fuelOrders/fuelOrders.controller.js
app/partials/fuelOrders/fuelOrders.html
@@ -98,8 +98,10 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
  
     $scope.addTotal = function(value, valueOf){
       if(valueOf == 'v'){
+      	console.log("total v",value,$scope.order.invoiced)
         $scope.order.total = value * $scope.order.invoiced
       }else if(valueOf == 'i'){
+      	console.log("total i",value,$scope.order.volume)
         $scope.order.total = $scope.order.volume * value 
       }
     }       
@@ -117,7 +119,7 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
 		$scope.order.invoiced = $scope.order.invoiced;
 		$scope.order.volume = $scope.order.volume; 
         $scope.order.source = $scope.order.source; 
-        $scope.order.status = $scope.order.status;
+        
         $scope.order.total = $scope.order.total;
  
         var obj =JSON.parse($scope.order.priceQuote);
@@ -144,7 +146,15 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
 			$scope.order.departingDate = new Date($scope.order.departingDate);
 			$scope.order.departingDate = $scope.order.departingDate.getTime();
 		}
-		 
+
+		if($scope.order.status === null || $scope.order.status === undefined){
+
+			$scope.order.status = "pending"; //default status
+
+		}else {
+			
+			$scope.order.status = $scope.order.status;
+		}
 		//console.log("===order====",$scope.order);
  
 		$scope.dispatchOrder.fuelOrderList.push($scope.order);
@@ -114,7 +114,7 @@
                                        <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
-                                       <input type="text" ng-model="order.invoiced" ng-keyup="addTotal(order.invoiced,'i')" class="form-control"  placeholder="" required>
+                                       <input type="text" ng-model="order.invoiced" ng-keyup="addTotal(order.invoiced,'i')" class="form-control"  placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
@@ -131,11 +131,11 @@
                                     <div class="pull-left" style="width: calc(100% - 110px);">  
                                       <div style="width: 50%; float: left;">
                                         Date
-                                         <input type="text" style="width: 90%;" ng-model="order.departingDate" class="form-control"  placeholder="" datepicker required/>
+                                         <input type="text" style="width: 90%;" ng-model="order.departingDate" class="form-control"  placeholder="" datepicker/>
                                        </div>
                                        <div style="width: 50%; float: left;">
                                         Time 
-                                          <select class="form-control" ng-model="order.etdTime" style="width: 100%;" required>
+                                          <select class="form-control" ng-model="order.etdTime" style="width: 100%;">
                                              <option ng-repeat="list in etdTimeList">{{list.time}}</option>
                                          </select>
                                       </div>
@@ -211,7 +211,7 @@
                                        <label class="new-input-label"><b>Certificate Type</b></label>
                                     </div>
 		                                 <div class="pull-left" style="width: calc(100% - 110px);">
-		                                      <select class="form-control" ng-model="order.certificateType"  style="width: 100%;" required>
+		                                      <select class="form-control" ng-model="order.certificateType"  style="width: 100%;">
 		                                       <option value="" disabled selected hidden>Select...</option>
 		                                       <option value="corporate">Part 91 (Corporate)</option>
 		                                       <option value="charter">Part 135 (Charter)</option>
@@ -228,10 +228,10 @@
 	                                    </div>
 	                                    <div class="pull-left" style="width: calc(100% - 110px);">
 	                                       <select  class="form-control" ng-model="order.status"  style="width: 100%;">
-	                                          <option value=""  disabled selected hidden>Select Status</option>
-	                                          <option value="pending">pending</option>
-	                                          <option value="invoiced">invoiced</option>
-	                                          <option value="paid">paid</option>
+ 	                                          <option value="" selected disabled hidden>pending</option> 
+	                                         <!--  <option value="pending">pending</option>  -->
+                                            <option value="invoiced">invoiced</option>
+                                            <option value="paid">paid</option>
 	                                          <option value="cancelled">cancelled</option>
 	                                          <option value="archived">archived</option>
 	                                       </select>
@@ -292,7 +292,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
             $scope.fuelData.invoiced = $scope.order.invoiced;
             $scope.fuelData.volume = $scope.order.volume; 
             $scope.fuelData.source = $scope.order.source; 
-            $scope.fuelData.status = $scope.order.status;
+           
             $scope.fuelData.total = $scope.order.total;
             //tier no use
             $scope.fuelData.tierBreak = $scope.order.tierBreak;
@@ -322,19 +322,26 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
               $scope.fuelData.departingDate = $scope.order.departingDate.getTime();
             }
  
+            if($scope.order.status === null || $scope.order.status === undefined){
+
+                $scope.fuelData.status = "pending"; //default status
+
+              }else {
+                
+                 $scope.fuelData.status = $scope.order.status;
+              } 
  
-          
-          $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
-          //console.log("=====$scope.fueldata======",$scope.fuelData)
-           fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {
-            $scope.showLoader = false;
-            $scope.order = {};
-            $scope.dispatchOrder.fuelOrderList = [];
-            $('#demo-modal-4').css('display', '');
-            $scope.getOrders();
-            toastr.success('Fuel Order Dispatched Successfully', {
-                    closeButton: true
-                  })
+            $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
+           // console.log("=====$scope.fueldata======",$scope.fuelData)
+            fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {
+                $scope.showLoader = false;
+                $scope.order = {};
+                $scope.dispatchOrder.fuelOrderList = [];
+                $('#demo-modal-4').css('display', '');
+                $scope.getOrders();
+                toastr.success('Fuel Order Dispatched Successfully', {
+                        closeButton: true
+                      })
           }) 
  
  
@@ -630,7 +630,7 @@
                                        <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
                                     </div>
                                     <div class="pull-left" style="width: calc(100% - 110px);">
-                                       <input type="text" ng-model="order.invoiced" ng-keyup="addTotal(order.invoiced,'i')" class="form-control"  placeholder="" required>
+                                       <input type="text" ng-model="order.invoiced" ng-keyup="addTotal(order.invoiced,'i')" class="form-control"  placeholder="">
                                     </div>
                                     <div class="clearfix"></div>
                                  </div>
@@ -647,11 +647,11 @@
                                     <div class="pull-left" style="width: calc(100% - 110px);">  
                                       <div style="width: 50%; float: left;">
                                         Date
-                                         <input type="text" style="width: 90%;" ng-model="order.departingDate" class="form-control"  placeholder="" datepicker required/>
+                                         <input type="text" style="width: 90%;" ng-model="order.departingDate" class="form-control"  placeholder="" datepicker/>
                                        </div>
                                        <div style="width: 50%; float: left;">
                                         Time 
-                                          <select class="form-control" ng-model="order.etdTime" style="width: 100%;" required>
+                                          <select class="form-control" ng-model="order.etdTime" style="width: 100%;">
                                              <option ng-repeat="list in etdTimeList">{{list.time}}</option>
                                          </select>
  
@@ -728,7 +728,7 @@
                                        <label class="new-input-label"><b>Certificate Type</b></label>
                                     </div>
                                      <div class="pull-left" style="width: calc(100% - 110px);">
-                                          <select class="form-control" ng-model="order.certificateType"  style="width: 100%;" required>
+                                          <select class="form-control" ng-model="order.certificateType"  style="width: 100%;">
                                            <option value="" disabled selected hidden>Select...</option>
                                            <option value="corporate">Part 91 (Corporate)</option>
                                            <option value="charter">Part 135 (Charter)</option>
@@ -745,8 +745,8 @@
                                       </div>
                                       <div class="pull-left" style="width: calc(100% - 110px);">
                                          <select  class="form-control" ng-model="order.status"  style="width: 100%;">
-                                            <option value=""  disabled selected hidden>Select Status</option>
-                                            <option value="pending">pending</option>
+                                            <option value=""  disabled selected hidden>pending</option>
+                                            <!-- <option value="pending">pending</option> -->
                                             <option value="invoiced">invoiced</option>
                                             <option value="paid">paid</option>
                                             <option value="cancelled">cancelled</option>
...	...	@@ -98,8 +98,10 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
98	98
99	99	$scope.addTotal = function(value, valueOf){
100	100	if(valueOf == 'v'){
	101	+ console.log("total v",value,$scope.order.invoiced)
101	102	$scope.order.total = value * $scope.order.invoiced
102	103	}else if(valueOf == 'i'){
	104	+ console.log("total i",value,$scope.order.volume)
103	105	$scope.order.total = $scope.order.volume * value
104	106	}
105	107	}
...	...	@@ -117,7 +119,7 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
117	119	$scope.order.invoiced = $scope.order.invoiced;
118	120	$scope.order.volume = $scope.order.volume;
119	121	$scope.order.source = $scope.order.source;
120		- $scope.order.status = $scope.order.status;
	122	+
121	123	$scope.order.total = $scope.order.total;
122	124
123	125	var obj =JSON.parse($scope.order.priceQuote);
...	...	@@ -144,7 +146,15 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
144	146	$scope.order.departingDate = new Date($scope.order.departingDate);
145	147	$scope.order.departingDate = $scope.order.departingDate.getTime();
146	148	}
147		-
	149	+
	150	+ if($scope.order.status === null \|\| $scope.order.status === undefined){
	151	+
	152	+ $scope.order.status = "pending"; //default status
	153	+
	154	+ }else {
	155	+
	156	+ $scope.order.status = $scope.order.status;
	157	+ }
148	158	//console.log("===order====",$scope.order);
149	159
150	160	$scope.dispatchOrder.fuelOrderList.push($scope.order);
...	...
...	...	@@ -114,7 +114,7 @@
114	114	<span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
115	115	</div>
116	116	<div class="pull-left" style="width: calc(100% - 110px);">
117		- <input type="text" ng-model="order.invoiced" ng-keyup="addTotal(order.invoiced,'i')" class="form-control" placeholder="" required>
	117	+ <input type="text" ng-model="order.invoiced" ng-keyup="addTotal(order.invoiced,'i')" class="form-control" placeholder="">
118	118	</div>
119	119	<div class="clearfix"></div>
120	120	</div>
...	...	@@ -131,11 +131,11 @@
131	131	<div class="pull-left" style="width: calc(100% - 110px);">
132	132	<div style="width: 50%; float: left;">
133	133	Date
134		- <input type="text" style="width: 90%;" ng-model="order.departingDate" class="form-control" placeholder="" datepicker required/>
	134	+ <input type="text" style="width: 90%;" ng-model="order.departingDate" class="form-control" placeholder="" datepicker/>
135	135	</div>
136	136	<div style="width: 50%; float: left;">
137	137	Time
138		- <select class="form-control" ng-model="order.etdTime" style="width: 100%;" required>
	138	+ <select class="form-control" ng-model="order.etdTime" style="width: 100%;">
139	139	<option ng-repeat="list in etdTimeList">{{list.time}}</option>
140	140	</select>
141	141	</div>
...	...	@@ -211,7 +211,7 @@
211	211	<label class="new-input-label"><b>Certificate Type</b></label>
212	212	</div>
213	213	<div class="pull-left" style="width: calc(100% - 110px);">
214		- <select class="form-control" ng-model="order.certificateType" style="width: 100%;" required>
	214	+ <select class="form-control" ng-model="order.certificateType" style="width: 100%;">
215	215	<option value="" disabled selected hidden>Select...</option>
216	216	<option value="corporate">Part 91 (Corporate)</option>
217	217	<option value="charter">Part 135 (Charter)</option>
...	...	@@ -228,10 +228,10 @@
228	228	</div>
229	229	<div class="pull-left" style="width: calc(100% - 110px);">
230	230	<select class="form-control" ng-model="order.status" style="width: 100%;">
231		- <option value="" disabled selected hidden>Select Status</option>
232		- <option value="pending">pending</option>
233		- <option value="invoiced">invoiced</option>
234		- <option value="paid">paid</option>
	231	+ <option value="" selected disabled hidden>pending</option>
	232	+ <!-- <option value="pending">pending</option> -->
	233	+ <option value="invoiced">invoiced</option>
	234	+ <option value="paid">paid</option>
235	235	<option value="cancelled">cancelled</option>
236	236	<option value="archived">archived</option>
237	237	</select>
...	...
...	...	@@ -292,7 +292,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
292	292	$scope.fuelData.invoiced = $scope.order.invoiced;
293	293	$scope.fuelData.volume = $scope.order.volume;
294	294	$scope.fuelData.source = $scope.order.source;
295		- $scope.fuelData.status = $scope.order.status;
	295	+
296	296	$scope.fuelData.total = $scope.order.total;
297	297	//tier no use
298	298	$scope.fuelData.tierBreak = $scope.order.tierBreak;
...	...	@@ -322,19 +322,26 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
322	322	$scope.fuelData.departingDate = $scope.order.departingDate.getTime();
323	323	}
324	324
	325	+ if($scope.order.status === null \|\| $scope.order.status === undefined){
	326	+
	327	+ $scope.fuelData.status = "pending"; //default status
	328	+
	329	+ }else {
	330	+
	331	+ $scope.fuelData.status = $scope.order.status;
	332	+ }
325	333
326		-
327		- $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
328		- //console.log("=====$scope.fueldata======",$scope.fuelData)
329		- fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {
330		- $scope.showLoader = false;
331		- $scope.order = {};
332		- $scope.dispatchOrder.fuelOrderList = [];
333		- $('#demo-modal-4').css('display', '');
334		- $scope.getOrders();
335		- toastr.success('Fuel Order Dispatched Successfully', {
336		- closeButton: true
337		- })
	334	+ $scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
	335	+ // console.log("=====$scope.fueldata======",$scope.fuelData)
	336	+ fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {
	337	+ $scope.showLoader = false;
	338	+ $scope.order = {};
	339	+ $scope.dispatchOrder.fuelOrderList = [];
	340	+ $('#demo-modal-4').css('display', '');
	341	+ $scope.getOrders();
	342	+ toastr.success('Fuel Order Dispatched Successfully', {
	343	+ closeButton: true
	344	+ })
338	345	})
339	346
340	347
...	...
...	...	@@ -630,7 +630,7 @@
630	630	<span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
631	631	</div>
632	632	<div class="pull-left" style="width: calc(100% - 110px);">
633		- <input type="text" ng-model="order.invoiced" ng-keyup="addTotal(order.invoiced,'i')" class="form-control" placeholder="" required>
	633	+ <input type="text" ng-model="order.invoiced" ng-keyup="addTotal(order.invoiced,'i')" class="form-control" placeholder="">
634	634	</div>
635	635	<div class="clearfix"></div>
636	636	</div>
...	...	@@ -647,11 +647,11 @@
647	647	<div class="pull-left" style="width: calc(100% - 110px);">
648	648	<div style="width: 50%; float: left;">
649	649	Date
650		- <input type="text" style="width: 90%;" ng-model="order.departingDate" class="form-control" placeholder="" datepicker required/>
	650	+ <input type="text" style="width: 90%;" ng-model="order.departingDate" class="form-control" placeholder="" datepicker/>
651	651	</div>
652	652	<div style="width: 50%; float: left;">
653	653	Time
654		- <select class="form-control" ng-model="order.etdTime" style="width: 100%;" required>
	654	+ <select class="form-control" ng-model="order.etdTime" style="width: 100%;">
655	655	<option ng-repeat="list in etdTimeList">{{list.time}}</option>
656	656	</select>
657	657
...	...	@@ -728,7 +728,7 @@
728	728	<label class="new-input-label"><b>Certificate Type</b></label>
729	729	</div>
730	730	<div class="pull-left" style="width: calc(100% - 110px);">
731		- <select class="form-control" ng-model="order.certificateType" style="width: 100%;" required>
	731	+ <select class="form-control" ng-model="order.certificateType" style="width: 100%;">
732	732	<option value="" disabled selected hidden>Select...</option>
733	733	<option value="corporate">Part 91 (Corporate)</option>
734	734	<option value="charter">Part 135 (Charter)</option>
...	...	@@ -745,8 +745,8 @@
745	745	</div>
746	746	<div class="pull-left" style="width: calc(100% - 110px);">
747	747	<select class="form-control" ng-model="order.status" style="width: 100%;">
748		- <option value="" disabled selected hidden>Select Status</option>
749		- <option value="pending">pending</option>
	748	+ <option value="" disabled selected hidden>pending</option>
	749	+ <!-- <option value="pending">pending</option> -->
750	750	<option value="invoiced">invoiced</option>
751	751	<option value="paid">paid</option>
752	752	<option value="cancelled">cancelled</option>
...	...