From 084c4873ba0c09ebbf2387060a24329d05eeca22 Mon Sep 17 00:00:00 2001
From: "kuldeep.arora" <kuldeep.arora@viithiisys.com>
Date: Mon, 17 Sep 2018 11:39:15 +0530
Subject: [PATCH] validation for required fields

---
 .../enterFuelOrder/enterFuelOrder.controller.js    | 14 +++++++--
 app/partials/enterFuelOrder/enterFuelOrder.html    | 16 +++++------
 app/partials/fuelOrders/fuelOrders.controller.js   | 33 +++++++++++++---------
 app/partials/fuelOrders/fuelOrders.html            | 12 ++++----
 4 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/app/partials/enterFuelOrder/enterFuelOrder.controller.js b/app/partials/enterFuelOrder/enterFuelOrder.controller.js
index 2f3ccea..0c3e310 100644
--- a/app/partials/enterFuelOrder/enterFuelOrder.controller.js
+++ b/app/partials/enterFuelOrder/enterFuelOrder.controller.js
@@ -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);
diff --git a/app/partials/enterFuelOrder/enterFuelOrder.html b/app/partials/enterFuelOrder/enterFuelOrder.html
index c2a2a9a..9bce96a 100644
--- a/app/partials/enterFuelOrder/enterFuelOrder.html
+++ b/app/partials/enterFuelOrder/enterFuelOrder.html
@@ -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>
diff --git a/app/partials/fuelOrders/fuelOrders.controller.js b/app/partials/fuelOrders/fuelOrders.controller.js
index b963423..e0f4d56 100644
--- a/app/partials/fuelOrders/fuelOrders.controller.js
+++ b/app/partials/fuelOrders/fuelOrders.controller.js
@@ -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
+                      })
           }) 
 
                
diff --git a/app/partials/fuelOrders/fuelOrders.html b/app/partials/fuelOrders/fuelOrders.html
index 6d8acdf..8d2b36e 100644
--- a/app/partials/fuelOrders/fuelOrders.html
+++ b/app/partials/fuelOrders/fuelOrders.html
@@ -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>
-- 
2.0.0