viithiisys / Acufuel

Browse Code »

Commit 5a792005349243eededd2fb0004e4bb3b2f1a398

Authored by Swarn Singh 2017-07-19 09:11:11 -0400

1 parent e4b25147ac

Exists in master

selectbox color issue fixed

Showing 3 changed files with 89 additions and 38 deletions Show diff stats

app/css/custom.css

Diff comments View file @5a79200

 /*------------------------------------------------------------------
 [Custom Stylesheet]
 Last change:	03/25/2013
 Assigned to:	You
 -------------------------------------------------------------------*/
 body{
 	color: #333;
 }
 .custom-widget-content{
 	width: 100%;
 	height: auto;
 	padding: 15px 0;
 	background-color: #fff;
 	border: 1px solid #D5D5D5;
 	border-radius: 0 0 5px 5px;
 }
 .hr{
 	margin: 5px 0;
 }
 .disableSelect:disabled{
 	border: 0;
 	background-color: transparent;
 	color: #f90;
 	box-shadow: none;
 	-webkit-appearance: none;
     appearance: none;
 }
 .disableInput:disabled{
 	border: 0;
 	background-color: transparent;
 	color: #222;
 	box-shadow: none;
 }
 .img-logo{
 	height: 25px;
 	padding-left: 10%;
 }
 .widget-header > i{
 	display: inline-block;
     margin-top: -3px;
     margin-left: 13px;
     margin-right: -2px;
     font-size: 16px;
     color: #555;
     vertical-align: middle;
 }
 table{
 	width: 100%;
 }
 table th, td{
 	font-size: 13px;
 }
 .navbar-brand{
 	height: auto;
 }
 .custom-widget-content .btn-xs{
 	padding: 3px 5px;
 }
 .fc-event{
 	background-color: #ff9900 !important;
 	color: #fff !important;
 	border: 1px solid #ff9900 !important;
 	padding: 5px;
 	font-size: 14px;
 	border-radius: 0 !important;
 }
 .pull-right-color{
 	background-image: linear-gradient(to bottom, #1c84c6  0%, #1c84c6  100%);
 }
 .pull-right-setup{
 	margin-bottom: 10px;
 	background-image: linear-gradient(to bottom, #1c84c6  0%, #1c84c6  100%);
 }
 .Airport{
 	padding-top: 5px;
 }
 .src-image{
 	width: 50px;
 	height: 50px;
 }
 .Accept{
 	padding-top: 25px;
 }
 .dis{
 	float: left;
 	margin-right:100px;
 }
 /*.email-password{
 	width: 40px;
 	height: 24px;
 }*/
 .email-password-icon{
 	width: 10px;
 	height: 10px;
 }
 @media( max-width: 768px;){
 .btn{
 font-size: 10px !important;
 }
 .dis{
 	float: none;
 	margin-right: 0px;
 }
 }
 .Search-tabs{
 	border-bottom: 0px solid #ddd; */
 }
 .customer-table table{
 	width: 100%;
 }
 .customer-table input{
 	border-radius: 0;
 	box-shadow: none;
 	border: 1px solid #e4e3e3;
 	padding: 0px;
 	font-size: 10px;
 	display: -webkit-inline-box;
 	display: inline-box;
 	height: 31px;
 }
 .customer-table select{
 	border-radius: 0;
 	box-shadow: none;
 	border: 1px solid #e4e3e3;
 	padding: 0px;
 	font-size: 10px;
 	height: 31px;
 	display: -webkit-inline-box;
 	display: inline-box;
 }
 .customer-table th > label{
 	font-weight: bold;
 	padding: 10px 5px 2px 5px;
 	margin-bottom: 0;
 }
 .customer-table td{
 	padding: 5px !important;
 	height: auto !important;
 	vertical-align: middle !important;
 }
 .customer-table td > select{
 	height: 22px !important;
 }
 .customer-table td > button{
 	font-size: 10px;
 }
 /*.new-input-label{
 	margin-bottom: 0;
 	line-height: 34px;
 }*/
 /*  new custom css for accrodian tabs */
 .customAccordianHeader{
 	width: 100%;
 	height: auto;
 	background-color: #F3F3F3;
 	border: 1px solid #ddd;
     color: #333;
     box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.35);
     border-radius: 3px 3px 3px 3px;
     padding: 10px 15px;
     margin-top: 10px;
 }
 .customAccordianHeader.customActive{
 	background-image: -webkit-gradient(linear, left 0%, left 100%, from(#555555), to(#3b3b3b));
 	background-image: linear-gradient(to bottom, #555555 0%, #3b3b3b 100%);
 	background-repeat: repeat-x;
 	border: 1px solid #222222;
     color: #FFF;
     border-radius: 3px 3px 0 0;
 }
 .customAccordianHeader > span{
 	font-size: 15px;
 	line-height: 22px;
 	float: left;
 }
 .customAccordianHeader .btn{
 	padding: 2px 12px;
 }
 .customAccordianHeader > .form-control{
 	outline: none;
 	box-shadow: none;
 }
 .customAccordianHeader > select.form-control{
 	width: 150px;
 	height: 26px;
 	padding: 0 6px;
 	float: left;
 }
 .customAccordianHeader > select.form-control[disabled]{
 	border: none;
 	-webkit-appearance: none;
 	-moz-appearance: none;
 	appearance: none;
 	background-color: transparent;
 	color: #f90;
 	width: auto;
 }
 .customAccordianHeader > input.form-control{
 	width: 70px;
 	height: 26px;
 	padding: 0 6px;
 	float: left;
 }
 .customAccordianHeader > input.form-control[disabled]{
 	border: none;
 	-webkit-appearance: none;
 	-moz-appearance: none;
 	appearance: none;
 	background-color: transparent;
 	color: #333;
 }
 .customAccordianTabBody{
 	width: 100%;
 	height: auto;
 	padding: 15px;
 	border: 1px solid #ddd;
 	border-top: 0;
 	border-radius: 0 0 3px 3px;
 }
 .customTableWithFilter{
 	width: auto;
 	height: auto;
 }
 .customTableWithFilter th{
 	padding: 5px;
 	background-color: #f3f3f3;
 	border: 1px solid #ddd;
 }
 .customTableWithFilter th i{
 	margin-top: 3px;
 }
 .customTableWithFilter th span{
 	font-size: 11px;
 	color: #222;
 }
 .customTableWithFilter th input{
 	width: 50px;
 }
 .customTableWithFilter td{
 	padding: 5px;
 	border: 1px solid #ddd;
 }
 .customTableWithFilter td span{
 	font-size: 11px;
 }
 .customTableWithFilter td span:first-child{
 	color: #449d44;
 	font-weight: bold;
 }
 .customTableWithFilter td span:last-child{
 	color: #c9302c;
 	font-style: italic;
 	font-weight: bold;
 }
 .customTableWithFilter td .tierTextBox{
 	width: 70px;
 }
 .customTableWithFilter .addTierButton{
 	color: #fff;
 	background-color: #2196f3;
 	border: none;
 	padding: 3px 5px;
 }
 .customTableWithFilter td .fa-trash-o{
 	color: #fff;
 	background-color: #c9302c;
 	padding: 5px;
 	border-radius: 3px;
 	cursor: pointer;
 }
 .resizeTextarea{
 	resize: vertical;
 	margin-top: 20px;
 }
 .new-widget-content{
 	padding: 0 0 0 0 !important;
 }
 .new-tab-heading{
 	padding: 5px;
 	color: #333;
 	background-color: #fcfcfc;
 	border-bottom: 1px solid #d5d5d5;
 	border-right: 1px solid #d5d5d5;
 }
 .new-tab-body{
 	border-right: 1px solid #d5d5d5;
 	border-bottom: 1px solid #d5d5d5;
 	padding-left: 15px;
 	padding-bottom: 5px;
 }
 .new-tab-heading i.fa{
 	font-size: 16px;
 	cursor: pointer;
 }
 .new-tab-heading span{
 	font-size: 14px;
 	margin-left: 5px;
 }
 .new-tab-heading i.fa-plus-circle{
 	color: #067dfc;
 }
 .new-tab-heading i.fa-minus-circle{
 	color: #d00d09;
 }
 .new-tab-body-th{
 	color: #333;
 }
 .new-tab-body-th > div{
 	font-size: 12px;
 	font-weight: bold;
 	padding-right: 5px;
 	padding-left: 5px;
 	text-align: center;
 }
 .new-tab-body-th > div:first-child{
 	font-size: 14px;
 	font-weight: bold;
 	text-align: left;
 }
 .new-tab-body-td i.fa-plus-circle{
 	color: #067dfc;
 }
 .new-tab-body-td i.fa-minus-circle{
 	color: #d00d09;
 }
 .new-tab-body-td input{
 	width: 50px;
 	height: 24px;
 }
 .new-tab-body-td .fa{
 	font-size: 14px;
 }
 .new-tab-body-td > div:first-child > div{
 	padding-right: 5px;
 	padding-left: 5px;
 	text-align: center;
 }
 .new-tab-body-td > div:first-child > div:first-child{
 	text-align: left;
 }
 .appliesTableHeading{
 	border: 1px solid #d5d5d5;
 	padding: 5px;
 	color: #333;
 	font-weight: bold;
 	background-color: #fcfcfc;
 	margin: 10px 0 0 0;
 }
 .appliesTableBody{
 	border: 1px solid #d5d5d5;
 	border-top: 0;
 	background-color: #ffffe0;
 	margin-bottom: 10px;
 	height: auto;
 }
 .appliesTableBody > div.firstDiv{
 	height: 100px;
 	float: left;
 	width: 40%;
 	border-right: 1px solid #d5d5d5;
 	overflow: auto;
 	padding: 5px;
 }
 .appliesTableBody > div.lastDiv{
 	width: 59%;
 	height: 100px;
 	padding: 5px;
 	float: left;
 }
 .appliesTableBody > div.lastDiv textarea{
 	width: 40%;
 	height: 60px;
 	margin: 15px 0;
 	resize: none;
 	float: left;
 }
 .reportedByTag{
 	width: 60%;
 	height: 80px;
 	border-top: 10px solid #393;
 	border-left: 10px solid #6c6;
 	border-radius: 5px 0 0 5px;
 	background-color: #d7d7d7;
 	float: right;
 	position: relative;
     right: -13px;
     margin-top: 5px;
     font-size: 11px;
 }
 .confirmedTag{
 	background-color: #393;
 	color: #fff;
 	-webkit-transform: rotate(-90deg);
     -moz-transform: rotate(-90deg);
     -o-transform: rotate(-90deg);
     -ms-transform: rotate(-90deg);
     transform: rotate(-90deg);
     position: absolute;
     bottom: 25px;
     left: -24px;
     width: 71px;
     text-align: center;
     font-size: 11px;
 }
 .reportedByTag table{
 	margin-left: 27px;
 	width: calc(100% - 27px);
 }
 .reportedByTag table td{
 	font-size: 11px;
 	text-align: center;
 	font-weight: bold;
 }
 .reportedByTag table tr:last-child td{
 	text-align: left;
 	font-weight: normal;
 	font-size: 10px;
 }
 .feeManagerRight{
 	min-height: 70px;
 	position: relative;
 }
 .feeManagerRight div{
 	position: absolute;
 	bottom: 0;
 	width: 100%;
 }
 .new-tab-body-td{
 	padding: 5px 0;
 }
 /*  new checkbox slide css */
 .onoffswitch {
     position: relative; width: 80px;
     -webkit-user-select:none;
     -moz-user-select:none;
     -ms-user-select: none;
     margin: auto;
 }
 .onoffswitch-checkbox {
     display: none;
 }
 .onoffswitch-label {
     display: block;
     overflow: hidden;
     cursor: pointer;
     border: 2px solid #999999;
     border-radius: 0px;
 }
 .onoffswitch-inner {
     display: block;
     width: 200%;
     margin-left: -100%;
     transition: margin 0.3s ease-in 0s;
 }
 .onoffswitch-inner:before, .onoffswitch-inner:after {
     display: block;
     float: left;
     width: 50%;
     height: 18px;
     padding: 0;
     line-height: 18px;
     font-size: 10px;
     color: white;
     font-family: Trebuchet, Arial, sans-serif;
     font-weight: bold;
     box-sizing: border-box;
 }
 .onoffswitch-inner:before {
     content: "Include";
     padding-left: 5px;
     background-color: #016ADB; color: #FFFFFF;
     text-align: left;
 }
 .onoffswitch-inner:after {
     content: "Exclude";
     padding-right: 5px;
     background-color: ; color: #333333;
     text-align: right;
 }
 .onoffswitch-switch {
     display: block;
     width: 25px;
     margin: -3.5px;
     background: #FFFFFF;
     position: absolute;
     top: 0;
     bottom: 0;
     right: 58px;
     border: 2px solid #999999;
     border-radius: 0px;
     transition: all 0.3s ease-in 0s;
 }
 .onoffswitch-switch i{
 	line-height: 25px;
 }
 .onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-inner {
     margin-left: 0;
 }
 .onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-switch {
     right: 0px;
 }
 .onoffswitch-checkbox fa-check{
 	color: #00ff00;
 }
 .onoffswitch-checkbox fa-times{
 	color: #ff0000;
 }
 .newButtons{
 	background-color: #fff;
 	border-radius: 10px;
 	color: #333;
 	border: 1px solid #eee;
 	box-shadow: 5px 5px 6px rgba(0,0,0,0.3);
 	padding: 6px 15px;
 	margin-right: 10px;
 }
 .newButtons:disabled{
 	background-color: #eee;
 }
 *{
 	outline: none;
 }
 /*   my custom modal  */
 .customBackdrop{
 	position: fixed;
 	background-color: rgba(0, 0, 0, 0.15);
 	top: 0;
 	left: 0;
 	width: 100%;
 	height: 100%;
 	z-index: 999;
 }
 .customModalInner{
 	width: 100%;
 	max-width: 500px;
 	height: 200px;
 	top: 15%;
 	position: relative;
 	margin: auto;
 }
 .customModelHead, .customModelFooter{
 	width: 100%;
 	background-color: #fafafa;
 	border-bottom: 1px solid #ccc;
 	color: #333;
 	padding: 10px;
 }
 .customModelFooter{
 	border-top: 1px solid #ccc;
 }
 .customModelBody{
 	width: 100%;
 	height: auto;
 	background-color: #fff;
 	color: #333;
 	padding: 10px;
 }
 .customModelHead p{
 	margin-bottom: 0;
 	font-size: 14px;
 }
 .customModelFooter button{
 	border: 1px solid #ccc;
 }
 .customModelFooter input[type="submit"]{
 	background-color: #6ad46a;
 	border: 1px solid #ccc;
 }
 /*  custom confirmation model */
 .customConfirmPopBackdrop{
 	position: fixed;
 	background-color: rgba(0, 0, 0, 0.3);
 	top: 0;
 	left: 0;
 	width: 100%;
 	height: 100%;
 	z-index: 999999999;
 	display: none;
 }
 .customConfirmPopBackdrop .customModalInner{
 	top: 30%;
 }
 /*  tier list table */
 .tierListWrap{
 	width: 120px;
 	height: auto;
 	float: left;
 }
 .tierListHead{
 	width: 100%;
 	padding: 5px;
 	background-color: #f3f3f3;
     border: 1px solid #ddd;
     border-right: none;
 }
 .tierListBody{
 	width: 100%;
 	padding: 5px;
 	border: 1px solid #ddd;
 	border-top: none;
 	border-right: none;
 }
 .minTierSpan{
 	color: #449d44;
 	font-weight: bold;
 	font-size: 11px;
 }
 .maxTierSpan{
 	color: #c9302c;
 	font-style: italic;
 	font-size: 11px;
 	font-weight: bold;
 }
 .tierHeadingSpan{
 	font-size: 11px;
 	color: #222;
 	font-weight: bold;
 }
 .tierListHead input{
 	width: 50px;
 	height: 24px;
 }
 .addTierBtn{
 	color: #fff;
 	background-color: #2196f3;
 	border: none;
 	padding: 1px 5px;
 }
 .deleteTierIcon{
 	color: #fff;
 	background-color: #c9302c;
 	padding: 5px;
 	border-radius: 3px;
 	cursor: pointer;
 }
 .customToogle {
 	padding: 2px 6px !important;
 	height: auto !important;
 	min-height: 28px !important;
 }
 .myLoader{
 	width: 100%;
 	height: 100%;
 	position: fixed;
 	z-index: 9999;
 	top: 0;
 	left: 0;
 	text-align: center;
 	background-color: rgba(0, 0, 0, 0.2);
 }
 .myLoader img{
 	position: relative;
 	top: calc(50% - 25px);
 }
 .customErrorInput{
     background-color: rgb(251, 227, 228);
     border: 1px solid #fbc2c4;
     color: #8a1f11;
 }
 .customErrorMessage{
     color: #8a1f11;
     font-weight: bold;
 }
 .ui-datepicker .ui-widget-header{
 	background-image: none !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;
+}
+.blackOption{
+	color: #000;
+	background-color: #fff;
+}
+.blueOption{
+	color: #1c84c6;
+	background-color: #fff;
+}
+.greenOption{
+	color: #419641;
+	background-color: #fff;
+}
+.redOption{
+	color: #ed5565;
+	background-color: #fff;
+}
+.yellowOption{
+	color: #ff9900;
+	background-color: #fff;
+}
+.colorfulSelectbox, .colorfulSelectbox:focus, .colorfulSelectbox:hover{
+	color: #fff;
+	text-align: center !important;
+	outline: none !important;
 }

app/partials/fuelOrders/fuelOrders.controller.js

Diff comments View file @5a79200

1	'use strict';	1	'use strict';
2		2
3	angular.module('acufuel')	3	angular.module('acufuel')
4		4
5	.controller('fuelOrdersController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'NgTableParams','fuelOrdersService', fuelOrdersController]);	5	.controller('fuelOrdersController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'NgTableParams','fuelOrdersService', fuelOrdersController]);
6		6
7	function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgTableParams,fuelOrdersService) {	7	function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgTableParams,fuelOrdersService) {
8		8
9	$scope.showFuelOrderModal = false;	9	$scope.showFuelOrderModal = false;
10	$scope.optionSelected;	10	$scope.optionSelected;
11	$scope.orderdata = {}	11	$scope.orderdata = {}
12	$scope.showLoader = false;	12	$scope.showLoader = false;
13		13
14	$scope.data = {};	14	$scope.data = {};
15	$scope.order = {};	15	$scope.order = {};
16	$scope.dispatchOrder = {};	16	$scope.dispatchOrder = {};
17	$scope.dispatchOrder.fuelOrderList = [];	17	$scope.dispatchOrder.fuelOrderList = [];
18		18
19	$scope.statusFilterOptions = [];	19	$scope.statusFilterOptions = [];
20	$scope.statusFilterOptions.push({	20	$scope.statusFilterOptions.push({
21	'id': '', 'title': 'Show All'	21	'id': '', 'title': 'Show All'
22	},{	22	},{
23	'id': 'pending', 'title': 'Pending'	23	'id': 'pending', 'title': 'Pending'
24	},{	24	},{
25	'id': 'invoiced', 'title': 'Invoiced'	25	'id': 'invoiced', 'title': 'Invoiced'
26	},{	26	},{
27	'id': 'paid', 'title': 'Paid'	27	'id': 'paid', 'title': 'Paid'
28	},{	28	},{
29	'id': 'cancelled', 'title': 'Cancelled'	29	'id': 'cancelled', 'title': 'Cancelled'
30	},{	30	},{
31	'id': 'archived', 'title': 'Archived'	31	'id': 'archived', 'title': 'Archived'
32	}	32	}
33		33
34	);	34	);
35		35
		36	function colourFunction() {
		37	var myselect = document.getElementById('colorfulSelectbox'),
		38	colour = myselect.options[myselect.selectedIndex].className;
		39	myselect.style.background = colour;
		40	console.log('colour', myselect);
		41	myselect.blur();
		42	}
		43
		44	//setInterval(function(){
		45	// colourFunction();
		46	//}, 1)
		47
36		48
37	$scope.attachmentFilterOptions = [];	49	$scope.attachmentFilterOptions = [];
38	$scope.attachmentFilterOptions.push({	50	$scope.attachmentFilterOptions.push({
39	'id': '', 'title': 'Show All'	51	'id': '', 'title': 'Show All'
40	},{	52	},{
41	'id': '!null', 'title': 'Attachments'	53	'id': '!null', 'title': 'Attachments'
42	},{	54	},{
43	'id': 'null', 'title': 'No Attachments'	55	'id': 'null', 'title': 'No Attachments'
44	}	56	}
45	);	57	);
46		58
47	// $(document).ready(function() {	59	// $(document).ready(function() {
48	// $scope.showLoader = true;	60	// $scope.showLoader = true;
49	// $('#example').DataTable();	61	// $('#example').DataTable();
50	// $scope.showLoader = false;	62	// $scope.showLoader = false;
51	// });	63	// });
52		64
53	$scope.getOrders = function() {	65	$scope.getOrders = function() {
54	fuelOrdersService.getOrders().then(function(result) {	66	fuelOrdersService.getOrders().then(function(result) {
55		67
56	$scope.orderdata = result;	68	$scope.orderdata = result;
57	for(var i=0;i<$scope.orderdata.length;i++){	69	for(var i=0;i<$scope.orderdata.length;i++){
58	$scope.orderdata[i].upliftDateS = new Date($scope.orderdata[i].upliftDate);	70	$scope.orderdata[i].upliftDateS = new Date($scope.orderdata[i].upliftDate);
59		71
60	var str = "" + $scope.orderdata[i].upliftDateS.getDate() + "/" + ($scope.orderdata[i].upliftDateS.getMonth() + 1) + "/" + $scope.orderdata[i].upliftDateS.getFullYear()	72	var str = "" + $scope.orderdata[i].upliftDateS.getDate() + "/" + ($scope.orderdata[i].upliftDateS.getMonth() + 1) + "/" + $scope.orderdata[i].upliftDateS.getFullYear()
61	// str = str.slice(4,16)	73	// str = str.slice(4,16)
62	$scope.orderdata[i].upliftDateString = str	74	$scope.orderdata[i].upliftDateString = str
63	console.log(str);	75	console.log(str);
64		76
65	}	77	}
66		78
67	$scope.displayFuelOrderList = new NgTableParams({	79	$scope.displayFuelOrderList = new NgTableParams({
68	page: 1,	80	page: 1,
69	count: 10,	81	count: 10,
70	}, {	82	}, {
71	data: $scope.orderdata	83	data: $scope.orderdata
72	});	84	});
		85	$(document).ready(function(){
		86	var myselect = document.getElementsByClassName('colorfulSelectbox');
		87
		88	for (var i = 0; i < myselect.length; i++) {
		89	var colourIndex = $(myselect[i]).prop('selectedIndex');
		90	colourIndex = colourIndex + 1;
		91	console.log(colourIndex);
		92	var getColor = $('.colorfulSelectbox option:nth-child('+colourIndex+')').css('color');
		93	$(myselect[i]).css('background-color', getColor);
		94	console.log('colour', getColor);
		95	myselect[i].blur();
		96	}
		97
		98	})
73		99
74	})	100	})
75	}	101	}
76		102
77	$scope.getOrders();	103	$scope.getOrders();
78		104
79	$scope.onFWSelect = function() {	105	$scope.onFWSelect = function() {
80	if($scope.optionSelected == 'dt'){	106	if($scope.optionSelected == 'dt'){
81	$('#demo-modal-4').css('display', 'block');	107	$('#demo-modal-4').css('display', 'block');
82	}	108	}
83	if($scope.optionSelected == 'efo'){	109	if($scope.optionSelected == 'efo'){
84	$scope.showLoader = true;	110	$scope.showLoader = true;
85	var fileName = "orders.csv";	111	var fileName = "orders.csv";
86	var a = document.createElement("a");	112	var a = document.createElement("a");
87	document.body.appendChild(a);	113	document.body.appendChild(a);
88	fuelOrdersService.exportCompany().then(function(result) {	114	fuelOrdersService.exportCompany().then(function(result) {
89	var file = new Blob([result], {type: 'application/csv'});	115	var file = new Blob([result], {type: 'application/csv'});
90	var fileURL = URL.createObjectURL(file);	116	var fileURL = URL.createObjectURL(file);
91	a.href = fileURL;	117	a.href = fileURL;
92	a.download = fileName;	118	a.download = fileName;
93	a.click();	119	a.click();
94	$scope.showLoader = false;	120	$scope.showLoader = false;
95	})	121	})
96	}	122	}
97	}	123	}
98	$scope.attachmentrowid = ""	124	$scope.attachmentrowid = ""
99		125
100		126
101	$scope.attachment = function(id, value, url) {	127	$scope.attachment = function(id, value, url) {
102	console.log(id, value)	128	console.log(id, value)
103	$scope.attachmentrowid = id	129	$scope.attachmentrowid = id
104	// $scope.attachmentdeleteid = attachdeleteid	130	// $scope.attachmentdeleteid = attachdeleteid
105	if(value == 'uploadAttachment'){	131	if(value == 'uploadAttachment'){
106	$('#demo-modal-6').css('display', 'block');	132	$('#demo-modal-6').css('display', 'block');
107	}else if(value == 'viewAttachment'){	133	}else if(value == 'viewAttachment'){
108	var win = window.open(url, '_blank');	134	var win = window.open(url, '_blank');
109	win.focus();	135	win.focus();
110	}else if(value == 'deleteAttachment'){	136	}else if(value == 'deleteAttachment'){
111	$('#delete1').css('display', 'block');	137	$('#delete1').css('display', 'block');
112	}	138	}
113	}	139	}
114		140
115	$scope.cancelDeleteAttachment = function() {	141	$scope.cancelDeleteAttachment = function() {
116	$('#delete1').css('display', '');	142	$('#delete1').css('display', '');
117	}	143	}
118		144
119	$scope.deleteAttachment = function() {	145	$scope.deleteAttachment = function() {
120	$scope.showLoader = true;	146	$scope.showLoader = true;
121	fuelOrdersService.deleteAttachment($scope.attachmentrowid).then(function(result) {	147	fuelOrdersService.deleteAttachment($scope.attachmentrowid).then(function(result) {
122	console.log(result, $scope.attachmentrowid)	148	console.log(result, $scope.attachmentrowid)
123		149
124	if(result.success){	150	if(result.success){
125	toastr.success(''+result.success+'', {	151	toastr.success(''+result.success+'', {
126	closeButton: true	152	closeButton: true
127	})	153	})
128	}	154	}
129	})	155	})
130	$scope.showLoader = false;	156	$scope.showLoader = false;
131	$('#delete1').css('display', '');	157	$('#delete1').css('display', '');
132	}	158	}
133		159
134	$scope.saveUploadAttachment = function(attachmentData) {	160	$scope.saveUploadAttachment = function(attachmentData) {
135	$scope.showLoader = true;	161	$scope.showLoader = true;
136	$scope.data.media = attachmentData	162	$scope.data.media = attachmentData
137	$scope.data.id = $scope.attachmentrowid	163	$scope.data.id = $scope.attachmentrowid
138	fuelOrdersService.uploadAttachment($scope.data).then(function(result) {	164	fuelOrdersService.uploadAttachment($scope.data).then(function(result) {
139	console.log(result)	165	console.log(result)
140	if(result){	166	if(result){
141	// console.log(result.success)	167	// console.log(result.success)
142	toastr.success(''+"Upload Successful"+'', {	168	toastr.success(''+"Upload Successful"+'', {
143	closeButton: true	169	closeButton: true
144	})	170	})
145	}	171	}
146		172
147	})	173	})
148	$scope.showLoader = false;	174	$scope.showLoader = false;
149	$('#demo-modal-6').css('display', 'none');	175	$('#demo-modal-6').css('display', 'none');
150	}	176	}
151		177
152	$scope.cancelUploadAttachment = function() {	178	$scope.cancelUploadAttachment = function() {
153	$('#demo-modal-6').css('display', 'none');	179	$('#demo-modal-6').css('display', 'none');
154	}	180	}
155		181
156	$scope.editdata = {};	182	$scope.editdata = {};
157		183
158		184
159	$scope.editTableRow = function(rowData){	185	$scope.editTableRow = function(rowData){
160	console.log('row data', rowData);	186	console.log('row data', rowData);
161	$scope.editdata = rowData;	187	$scope.editdata = rowData;
162	$('#demo-modal-5').css('display', 'block');	188	$('#demo-modal-5').css('display', 'block');
163	}	189	}
164		190
165	$scope.updateTotal = function(value, valueOf){	191	$scope.updateTotal = function(value, valueOf){
166	if(valueOf == 'v'){	192	if(valueOf == 'v'){
167	$scope.editdata.total = value * $scope.editdata.invoiced	193	$scope.editdata.total = value * $scope.editdata.invoiced
168	}else if(valueOf == 'i'){	194	}else if(valueOf == 'i'){
169	$scope.editdata.total = $scope.editdata.requestedVolume * value	195	$scope.editdata.total = $scope.editdata.requestedVolume * value
170	}	196	}
171	}	197	}
172		198
173	$scope.addTotal = function(value, valueOf){	199	$scope.addTotal = function(value, valueOf){
174	if(valueOf == 'v'){	200	if(valueOf == 'v'){
175	$scope.order.total = value * $scope.order.invoiced	201	$scope.order.total = value * $scope.order.invoiced
176	}else if(valueOf == 'i'){	202	}else if(valueOf == 'i'){
177	$scope.order.total = $scope.order.volume * value	203	$scope.order.total = $scope.order.volume * value
178	}	204	}
179	}	205	}
180		206
181	$scope.addData = function() {	207	$scope.addData = function() {
182	$scope.showLoader = true;	208	$scope.showLoader = true;
183		209
184	if ($scope.order.upliftDate != '') {	210	if ($scope.order.upliftDate != '') {
185	$scope.order.upliftDate = new Date($scope.order.upliftDate);	211	$scope.order.upliftDate = new Date($scope.order.upliftDate);
186	$scope.order.upliftDate = $scope.order.upliftDate.getTime();	212	$scope.order.upliftDate = $scope.order.upliftDate.getTime();
187	}	213	}
188	if ($scope.order.departingDate != '') {	214	if ($scope.order.departingDate != '') {
189	$scope.order.departingDate = new Date($scope.order.departingDate);	215	$scope.order.departingDate = new Date($scope.order.departingDate);
190	$scope.order.departingDate = $scope.order.departingDate.getTime();	216	$scope.order.departingDate = $scope.order.departingDate.getTime();
191	}	217	}
192	console.log($scope.order.quotePrice);	218	console.log($scope.order.quotePrice);
193	var obj =JSON.parse($scope.order.priceQuote);	219	var obj =JSON.parse($scope.order.priceQuote);
194	console.log('obj.papMargin',obj.papMargin);	220	console.log('obj.papMargin',obj.papMargin);
195	$scope.order.priceQuote = obj.papMargin;	221	$scope.order.priceQuote = obj.papMargin;
196		222
197	$scope.fuelData = {};	223	$scope.fuelData = {};
198	$scope.fuelData.aircraftName = $scope.order.aircraftName	224	$scope.fuelData.aircraftName = $scope.order.aircraftName
199	$scope.fuelData.companyName = $scope.order.companyName	225	$scope.fuelData.companyName = $scope.order.companyName
200	$scope.fuelData.departingDate = $scope.order.departingDate	226	$scope.fuelData.departingDate = $scope.order.departingDate
201	$scope.fuelData.fboCost = $scope.order.fboCost	227	$scope.fuelData.fboCost = $scope.order.fboCost
202	$scope.fuelData.id = $scope.order.id	228	$scope.fuelData.id = $scope.order.id
203	$scope.fuelData.invoiced = $scope.order.invoiced	229	$scope.fuelData.invoiced = $scope.order.invoiced
204	$scope.fuelData.priceQuote = $scope.order.priceQuote	230	$scope.fuelData.priceQuote = $scope.order.priceQuote
205	$scope.fuelData.volume = $scope.order.volume	231	$scope.fuelData.volume = $scope.order.volume
206	$scope.fuelData.source = $scope.order.source	232	$scope.fuelData.source = $scope.order.source
207	$scope.fuelData.status = $scope.order.status	233	$scope.fuelData.status = $scope.order.status
208	$scope.fuelData.tierBreak = $scope.order.tierBreak	234	$scope.fuelData.tierBreak = $scope.order.tierBreak
209	$scope.fuelData.total = $scope.order.total	235	$scope.fuelData.total = $scope.order.total
210	$scope.fuelData.upliftDate = $scope.order.upliftDate	236	$scope.fuelData.upliftDate = $scope.order.upliftDate
211	$scope.fuelData.companyId = $scope.selectedCompanyId;	237	$scope.fuelData.companyId = $scope.selectedCompanyId;
212		238
213		239
214		240
215	$scope.dispatchOrder.fuelOrderList.push($scope.fuelData);	241	$scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
216	console.log('$scope.order', $scope.dispatchOrder);	242	console.log('$scope.order', $scope.dispatchOrder);
217	fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {	243	fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {
218	console.log('result', result);	244	console.log('result', result);
219	$scope.showLoader = false;	245	$scope.showLoader = false;
220	$scope.order = {};	246	$scope.order = {};
221	$('#demo-modal-4').css('display', '');	247	$('#demo-modal-4').css('display', '');
222	$scope.getOrders();	248	$scope.getOrders();
223	toastr.success('Fuel Order Dispatched Successfully', {	249	toastr.success('Fuel Order Dispatched Successfully', {
224	closeButton: true	250	closeButton: true
225	})	251	})
226	})	252	})
227		253
228	}	254	}
229	$scope.updateStatus = function(row, status) {	255	$scope.updateStatus = function(row, status) {
230	$scope.showLoader = true;	256	$scope.showLoader = true;
231		257	$scope.fuelData = {};
232	$scope.fuelData = {};	258	$scope.fuelData.aircraftName = row.aircraftName
233	$scope.fuelData.aircraftName = row.aircraftName	259	$scope.fuelData.companyName = row.companyName
234	$scope.fuelData.companyName = row.companyName	260	$scope.fuelData.departingDate = row.departingDate
235	$scope.fuelData.departingDate = row.departingDate	261	$scope.fuelData.fboCost = row.fboCost
236	$scope.fuelData.fboCost = row.fboCost	262	$scope.fuelData.id = row.id
237	$scope.fuelData.id = row.id	263	$scope.fuelData.invoiced = row.invoiced
238	$scope.fuelData.invoiced = row.invoiced	264	$scope.fuelData.priceQuote = row.priceQuote
239	$scope.fuelData.priceQuote = row.priceQuote	265	$scope.fuelData.volume = row.requestedVolume
240	$scope.fuelData.volume = row.requestedVolume	266	$scope.fuelData.source = row.source
241	$scope.fuelData.source = row.source	267	$scope.fuelData.status = status
242	$scope.fuelData.status = status	268	$scope.fuelData.tierBreak = row.tierBreak
243	$scope.fuelData.tierBreak = row.tierBreak	269	$scope.fuelData.total = row.total
244	$scope.fuelData.total = row.total	270	$scope.fuelData.upliftDate = row.upliftDate
245	$scope.fuelData.upliftDate = row.upliftDate	271
246		272	$scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
247		273	fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) {
248		274	console.log('result', result);
249	$scope.dispatchOrder.fuelOrderList.push($scope.fuelData);	275	$scope.showLoader = false;
250	fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) {	276	$scope.editdata = {};
251	console.log('result', result);	277	$('#demo-modal-5').css('display', '');
252	$scope.showLoader = false;	278	$scope.getOrders();
253	$scope.editdata = {};	279	toastr.success('Fuel Order Updated Successfully', {
254	$('#demo-modal-5').css('display', '');	280	closeButton: true
255	$scope.getOrders();	281	});
256	toastr.success('Fuel Order Updated Successfully', {	282	})
257	closeButton: true	283
258	})	284	}
259	})
260	}
261		285
262	$scope.updateData = function() {	286	$scope.updateData = function() {
263	$scope.showLoader = true;	287	$scope.showLoader = true;
264	$scope.fuelData = {};	288	$scope.fuelData = {};
265	$scope.fuelData.aircraftName = $scope.editdata.aircraftName	289	$scope.fuelData.aircraftName = $scope.editdata.aircraftName
266	$scope.fuelData.companyName = $scope.editdata.companyName	290	$scope.fuelData.companyName = $scope.editdata.companyName
267	$scope.fuelData.departingDate = $scope.editdata.departingDate	291	$scope.fuelData.departingDate = $scope.editdata.departingDate
268	$scope.fuelData.fboCost = $scope.editdata.fboCost	292	$scope.fuelData.fboCost = $scope.editdata.fboCost
269	$scope.fuelData.id = $scope.editdata.id	293	$scope.fuelData.id = $scope.editdata.id
270	$scope.fuelData.invoiced = $scope.editdata.invoiced	294	$scope.fuelData.invoiced = $scope.editdata.invoiced
271	$scope.fuelData.priceQuote = $scope.editdata.priceQuote	295	$scope.fuelData.priceQuote = $scope.editdata.priceQuote
272	$scope.fuelData.volume = $scope.editdata.requestedVolume	296	$scope.fuelData.volume = $scope.editdata.requestedVolume
273	$scope.fuelData.source = $scope.editdata.source	297	$scope.fuelData.source = $scope.editdata.source
274	$scope.fuelData.status = $scope.editdata.status	298	$scope.fuelData.status = $scope.editdata.status
275	$scope.fuelData.tierBreak = $scope.editdata.tierBreak	299	$scope.fuelData.tierBreak = $scope.editdata.tierBreak
276	$scope.fuelData.total = $scope.editdata.total	300	$scope.fuelData.total = $scope.editdata.total
277	$scope.fuelData.upliftDate = $scope.editdata.upliftDate	301	$scope.fuelData.upliftDate = $scope.editdata.upliftDate
278		302
279		303
280		304
281	$scope.dispatchOrder.fuelOrderList.push($scope.fuelData);	305	$scope.dispatchOrder.fuelOrderList.push($scope.fuelData);
282	fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) {	306	fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) {
283	console.log('result', result);	307	console.log('result', result);
284	$scope.showLoader = false;	308	$scope.showLoader = false;
285	$scope.editdata = {};	309	$scope.editdata = {};
286	$('#demo-modal-5').css('display', '');	310	$('#demo-modal-5').css('display', '');
287	$scope.getOrders();	311	$scope.getOrders();
288	toastr.success('Fuel Order Updated Successfully', {	312	toastr.success('Fuel Order Updated Successfully', {
289	closeButton: true	313	closeButton: true
290	})	314	})
291	})	315	})
292	}	316	}
293		317
294	$scope.getAircraft = function(company){	318	$scope.getAircraft = function(company){
295	$scope.selectedCompanyName = company;	319	$scope.selectedCompanyName = company;
296	$scope.showLoader = true;	320	$scope.showLoader = true;
297	for (var i = 0; i < $scope.companyList.length; i++) {	321	for (var i = 0; i < $scope.companyList.length; i++) {
298	if ($scope.companyList[i].companyName == company) {	322	if ($scope.companyList[i].companyName == company) {
299	if($scope.companyList[i].margin != null && $scope.companyList[i].marginAVGAS != null){	323	if($scope.companyList[i].margin != null && $scope.companyList[i].marginAVGAS != null){
300	fuelOrdersService.getFuelCost($scope.companyList[i].id).then(function(margins) {	324	fuelOrdersService.getFuelCost($scope.companyList[i].id).then(function(margins) {
301	$scope.marginList = margins;	325	$scope.marginList = margins;
302	//console.log('$scope.marginList', $scope.marginList);	326	//console.log('$scope.marginList', $scope.marginList);
303	})	327	})
304	} else if ($scope.companyList[i].margin != null \|\| $scope.companyList[i].marginAVGAS == null) {	328	} else if ($scope.companyList[i].margin != null \|\| $scope.companyList[i].marginAVGAS == null) {
305	fuelOrdersService.getATypeFuelPricing($scope.companyList[i].id).then(function(margins) {	329	fuelOrdersService.getATypeFuelPricing($scope.companyList[i].id).then(function(margins) {
306	$scope.marginList = margins;	330	$scope.marginList = margins;
307	})	331	})
308	} else if ($scope.companyList[i].margin == null \|\| $scope.companyList[i].marginAVGAS != null) {	332	} else if ($scope.companyList[i].margin == null \|\| $scope.companyList[i].marginAVGAS != null) {
309	fuelOrdersService.getVTypeFuelPricing($scope.companyList[i].id).then(function(margins) {	333	fuelOrdersService.getVTypeFuelPricing($scope.companyList[i].id).then(function(margins) {
310	$scope.marginList = margins;	334	$scope.marginList = margins;
311	})	335	})
312	}	336	}
313	$scope.selectedCompanyId = $scope.companyList[i].id;	337	$scope.selectedCompanyId = $scope.companyList[i].id;
314	$scope.marginId = $scope.companyList[i].margin.id;	338	$scope.marginId = $scope.companyList[i].margin.id;
315	if ($scope.selectedCompanyId != '') {	339	if ($scope.selectedCompanyId != '') {
316	fuelOrdersService.getAircraft($scope.selectedCompanyId).then(function(aircraft) {	340	fuelOrdersService.getAircraft($scope.selectedCompanyId).then(function(aircraft) {
317	$scope.aircraftList = aircraft;	341	$scope.aircraftList = aircraft;
318	})	342	})
319	}	343	}
320	if ($scope.marginId != '') {	344	if ($scope.marginId != '') {
321	fuelOrdersService.getJetTiers($scope.marginId).then(function(tiers) {	345	fuelOrdersService.getJetTiers($scope.marginId).then(function(tiers) {
322	$scope.tierList = tiers;	346	$scope.tierList = tiers;
323	$scope.showLoader = false;	347	$scope.showLoader = false;
324	})	348	})
325	}else{	349	}else{
326	$scope.showLoader = false;	350	$scope.showLoader = false;
327	}	351	}
328	}	352	}
329	}	353	}
330		354
331	}	355	}
332	$scope.setCost = function(cost){	356	$scope.setCost = function(cost){
333	console.log(cost);	357	console.log(cost);
334	if(cost != null) {	358	if(cost != null) {
335	var obj =JSON.parse(cost);	359	var obj =JSON.parse(cost);
336	$scope.order.fboCost = obj.cost;	360	$scope.order.fboCost = obj.cost;
337	}	361	}
338		362
339	}	363	}
340		364
341		365
342	$scope.cancelData = function() {	366	$scope.cancelData = function() {
343	$('#demo-modal-4').css('display', '');	367	$('#demo-modal-4').css('display', '');
344	}	368	}
345	$scope.canceleditdata = function() {	369	$scope.canceleditdata = function() {
346	$('#demo-modal-5').css('display', '');	370	$('#demo-modal-5').css('display', '');
347	}	371	}
348		372
349		373
350		374
351	$scope.companyList = {};	375	$scope.companyList = {};
352		376
353	fuelOrdersService.getAllCompanies().then(function(result) {	377	fuelOrdersService.getAllCompanies().then(function(result) {
354	$scope.showLoader = true;	378	$scope.showLoader = true;
355	$scope.companyList = result;	379	$scope.companyList = result;
356	console.log(result)	380	console.log(result)
357	$scope.showLoader = false;	381	$scope.showLoader = false;
358	})	382	})
359		383
360	$scope.sourceList = [{source:"Direct Jet-A"},{source:"Direct AVGAS 100LL"}];	384	$scope.sourceList = [{source:"Direct Jet-A"},{source:"Direct AVGAS 100LL"}];
361		385
362	$scope.data = {};	386	$scope.data = {};
363		387
364		388

app/partials/fuelOrders/fuelOrders.html

Diff comments View file @5a79200

1	<style>	1	<style>
2	.subnavbar .mainnav > li:nth-child(3) > a{	2	.subnavbar .mainnav > li:nth-child(3) > a{
3	color: #ff9900;	3	color: #ff9900;
4	}	4	}
5		5
6	.button1 {	6	.button1 {
7	display: inline-block;	7	display: inline-block;
8	height: 35px;	8	height: 35px;
9	line-height: 35px;	9	line-height: 35px;
10	padding-right: 15px;	10	padding-right: 15px;
11	padding-left: 50px;	11	padding-left: 50px;
12	position: relative;	12	position: relative;
13	background-color:rgb(41,127,184);	13	background-color:rgb(41,127,184);
14	color:rgb(255,255,255);	14	color:rgb(255,255,255);
15	text-decoration: none;	15	text-decoration: none;
16	text-transform: uppercase;	16	text-transform: uppercase;
17	letter-spacing: 1px;	17	letter-spacing: 1px;
18	margin-bottom: 15px;	18	margin-bottom: 15px;
19	border: 0;	19	border: 0;
20		20
21		21
22	border-radius: 5px;	22	border-radius: 5px;
23	-moz-border-radius: 5px;	23	-moz-border-radius: 5px;
24	-webkit-border-radius: 5px;	24	-webkit-border-radius: 5px;
25	text-shadow:0px 1px 0px rgba(0,0,0,0.5);	25	text-shadow:0px 1px 0px rgba(0,0,0,0.5);
26	-ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true)";zoom:1;	26	-ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true)";zoom:1;
27	filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true);	27	filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true);
28		28
29	-moz-box-shadow:0px 2px 2px rgba(0,0,0,0.2);	29	-moz-box-shadow:0px 2px 2px rgba(0,0,0,0.2);
30	-webkit-box-shadow:0px 2px 2px rgba(0,0,0,0.2);	30	-webkit-box-shadow:0px 2px 2px rgba(0,0,0,0.2);
31	box-shadow:0px 2px 2px rgba(0,0,0,0.2);	31	box-shadow:0px 2px 2px rgba(0,0,0,0.2);
32	-ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true)";	32	-ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true)";
33	filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true);	33	filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true);
34	}	34	}
35		35
36	.button1 span {	36	.button1 span {
37	position: absolute;	37	position: absolute;
38	left: 0;	38	left: 0;
39	top: 0;	39	top: 0;
40	width: 35px;	40	width: 35px;
41	background-color:rgba(0,0,0,0.5);	41	background-color:rgba(0,0,0,0.5);
42		42
43	-webkit-border-top-left-radius: 5px;	43	-webkit-border-top-left-radius: 5px;
44	-webkit-border-bottom-left-radius: 5px;	44	-webkit-border-bottom-left-radius: 5px;
45	-moz-border-radius-topleft: 5px;	45	-moz-border-radius-topleft: 5px;
46	-moz-border-radius-bottomleft: 5px;	46	-moz-border-radius-bottomleft: 5px;
47	border-top-left-radius: 5px;	47	border-top-left-radius: 5px;
48	border-bottom-left-radius: 5px;	48	border-bottom-left-radius: 5px;
49	border-right: 1px solid rgba(0,0,0,0.15);	49	border-right: 1px solid rgba(0,0,0,0.15);
50	}	50	}
51		51
52	.button1:hover span, .button1.active span {	52	.button1:hover span, .button1.active span {
53	background-color:rgb(0,102,26);	53	background-color:rgb(0,102,26);
54	border-right: 1px solid rgba(0,0,0,0.3);	54	border-right: 1px solid rgba(0,0,0,0.3);
55	}	55	}
56		56
57	.button1:active {	57	.button1:active {
58	margin-top: 2px;	58	margin-top: 2px;
59	margin-bottom: 13px;	59	margin-bottom: 13px;
60		60
61	-moz-box-shadow:0px 1px 0px rgba(255,255,255,0.5);	61	-moz-box-shadow:0px 1px 0px rgba(255,255,255,0.5);
62	-webkit-box-shadow:0px 1px 0px rgba(255,255,255,0.5);	62	-webkit-box-shadow:0px 1px 0px rgba(255,255,255,0.5);
63	box-shadow:0px 1px 0px rgba(255,255,255,0.5);	63	box-shadow:0px 1px 0px rgba(255,255,255,0.5);
64	-ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true)";	64	-ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true)";
65	filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true);	65	filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true);
66	}	66	}
67		67
68	.button1.turquoise {	68	.button1.turquoise {
69	background: #449d44;	69	background: #449d44;
70	}	70	}
71	</style>	71	</style>
72		72
73	<div class="myLoader" ng-show="showLoader">	73	<div class="myLoader" ng-show="showLoader">
74	<img src="../img/hourglass.gif" width="50px;">	74	<img src="../img/hourglass.gif" width="50px;">
75	</div>	75	</div>
76		76
77		77
78	<div class="main">	78	<div class="main">
79	<div class="container">	79	<div class="container">
80	<div class="row">	80	<div class="row">
81	<div class="col-md-12">	81	<div class="col-md-12">
82	<div class="widget stacked ">	82	<div class="widget stacked ">
83	<div class="widget-content">	83	<div class="widget-content">
84	<div class="tabbable">	84	<div class="tabbable">
85	<ul class="nav nav-tabs">	85	<ul class="nav nav-tabs">
86	<li style="margin: 0px 10px 4px 10px;"><input type="text" style="height:31px;"class="form-control" name="name" id="name" ng-model="searchText" placeholder="Search In Table"></li>	86	<li style="margin: 0px 10px 4px 10px;"><input type="text" style="height:31px;"class="form-control" name="name" id="name" ng-model="searchText" placeholder="Search In Table"></li>
87	<li><button type="button" class="btn btn-default btn-sm " ng-click="displayFuelOrderList.filter({}); searchText=null">Clear Search And Filters</button></li>	87	<li><button type="button" class="btn btn-default btn-sm " ng-click="displayFuelOrderList.filter({}); searchText=null">Clear Search And Filters</button></li>
88	<li style="float:right"><button type="submit" data-toggle="modal" data-target="#demo-modal-3" class="btn btn-success btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> Add Company</button></li>	88	<li style="float:right"><button type="submit" data-toggle="modal" data-target="#demo-modal-3" class="btn btn-success btn-sm"><i class="fa fa-plus" aria-hidden="true"></i> Add Company</button></li>
89	</ul>	89	</ul>
90	<br>	90	<br>
91	<div class="tab-content customer-table" style="margin:0px">	91	<div class="tab-content customer-table" style="margin:0px">
92	<div class="tab-pane active" id="companyView">	92	<div class="tab-pane active" id="companyView">
93	<table ng-table="displayFuelOrderList" class="table table-striped table-condensed" show-filter="true">	93	<table ng-table="displayFuelOrderList" class="table table-striped table-condensed" show-filter="true">
94	<tr ng-repeat="row in $data \| filter:searchText" style="cursor: pointer;" >	94	<tr ng-repeat="row in $data \| filter:searchText" style="cursor: pointer;" >
95	<td data-title="'Company Name'" filter="{companyName: 'text'}" sortable="'companyName'" ng-click="editTableRow(row)">	95	<td data-title="'Company Name'" filter="{companyName: 'text'}" sortable="'companyName'" ng-click="editTableRow(row)">
96	{{row.companyName}}	96	{{row.companyName}}
97	</td>	97	</td>
98	<td data-title="'Fueling date'" filter="{departingDate: 'text'}" sortable="'departingDate'" ng-click="editTableRow(row)">	98	<td data-title="'Fueling date'" filter="{departingDate: 'text'}" sortable="'departingDate'" ng-click="editTableRow(row)">
99	{{row.upliftDateString}}	99	{{row.upliftDateString}}
100	</td>	100	</td>
101	<td data-title="'Tail #'" filter="{aircraftName: 'text'}" sortable="'aircraftName'" ng-click="editTableRow(row)">	101	<td data-title="'Tail #'" filter="{aircraftName: 'text'}" sortable="'aircraftName'" ng-click="editTableRow(row)">
102	{{row.aircraftName}}	102	{{row.aircraftName}}
103	</td>	103	</td>
104	<td data-title="'Source'" filter="{source: 'text'}" sortable="'source'" ng-click="editTableRow(row)">	104	<td data-title="'Source'" filter="{source: 'text'}" sortable="'source'" ng-click="editTableRow(row)">
105	{{row.source}}	105	{{row.source}}
106	</td>	106	</td>
107	<td data-title="'Volume'" filter="{requestedVolume: 'text'}" sortable="'requestedVolume'" ng-click="editTableRow(row)">	107	<td data-title="'Volume'" filter="{requestedVolume: 'text'}" sortable="'requestedVolume'" ng-click="editTableRow(row)">
108	{{row.requestedVolume}}	108	{{row.requestedVolume}}
109	</td>	109	</td>
110	<td data-title="'FBO Cost'" filter="{fboCost: 'text'}" sortable="'fboCost'" ng-click="editTableRow(row)">	110	<td data-title="'FBO Cost'" filter="{fboCost: 'text'}" sortable="'fboCost'" ng-click="editTableRow(row)">
111	{{row.fboCost}}	111	{{row.fboCost}}
112	</td>	112	</td>
113	<td data-title="'Quoted'" filter="{priceQuote: 'text'}" sortable="'priceQuote'" ng-click="editTableRow(row)">	113	<td data-title="'Quoted'" filter="{priceQuote: 'text'}" sortable="'priceQuote'" ng-click="editTableRow(row)">
114	{{row.priceQuote}}	114	{{row.priceQuote}}
115	</td>	115	</td>
116	<td data-title="'Invoiced'" filter="{invoiced: 'text'}" sortable="'invoiced'" ng-click="editTableRow(row)">	116	<td data-title="'Invoiced'" filter="{invoiced: 'text'}" sortable="'invoiced'" ng-click="editTableRow(row)">
117	{{row.invoiced}}	117	{{row.invoiced}}
118	</td>	118	</td>
119	<td data-title="'Total'" filter="{total: 'text'}" sortable="'total'" ng-click="editTableRow(row)">	119	<td data-title="'Total'" filter="{total: 'text'}" sortable="'total'" ng-click="editTableRow(row)">
120	{{row.total}}	120	{{row.total}}
121	</td>	121	</td>
122	<td data-title="'Status'" filter="{status: 'select'}" filter-data="statusFilterOptions" sortable="'status'">	122	<td data-title="'Status'" filter="{status: 'select'}" filter-data="statusFilterOptions" sortable="'status'">
123	<select class="btn btn-regular" ng-model="row.status" ng-style="abc" ng-change="updateStatus(row, row.status)">	123	<select class="btn btn-regular colorfulSelectbox" ng-model="row.status" ng-style="abc" ng-change="updateStatus(row, row.status)">
124	<option value="" disabled ng-selected="row.status == null"> Select</option>	124	<!-- <option value="" disabled ng-selected="row.status == null"> Select</option> -->
125	<option value="pending" ng-selected="row.status == pending"> Pending</option>	125	<option class="blackOption" value="pending" ng-selected="row.status == pending"> Pending</option>
126	<option value="invoiced" ng-selected="row.status == invoiced" >Invoiced</option>	126	<option class="blueOption" value="invoiced" ng-selected="row.status == invoiced" >Invoiced</option>
127	<option value="paid" ng-selected="row.status == paid" >Paid</option>	127	<option class="greenOption" value="paid" ng-selected="row.status == paid" >Paid</option>
128	<option value="cancelled" ng-selected="row.status == cancelled" >Cancelled</option>	128	<option class="redOption" value="cancelled" ng-selected="row.status == cancelled" >Cancelled</option>
129	<option value="archived" ng-selected="row.status == archived" >Archived</option>	129	<option class="yellowOption" value="archived" ng-selected="row.status == archived" >Archived</option>
130	</select>	130	</select>
131	</td>	131	</td>
132	<td data-title="'Attachments'" filter="{orderInvoice : 'select'}" filter-data="attachmentFilterOptions" sortable="'orderInvoice '">	132	<td data-title="'Attachments'" filter="{orderInvoice : 'select'}" filter-data="attachmentFilterOptions" sortable="'orderInvoice '">
133	<select class="btn btn-regular" ng-model="attachOptionSelected" ng-change="attachment(row.id,attachOptionSelected,row.orderInvoice.link, row)" >	133	<select class="btn btn-regular" ng-model="attachOptionSelected" ng-change="attachment(row.id,attachOptionSelected,row.orderInvoice.link, row)" >
134	<option value="" disabled selected="selected" >Invoice</option>	134	<option value="" disabled selected="selected" >Invoice</option>
135	<option value="viewAttachment" ng-if="row.orderInvoice !== null" >View</option>	135	<option value="viewAttachment" ng-if="row.orderInvoice !== null" >View</option>
136	<option value="deleteAttachment" ng-if="row.orderInvoice !== null">Delete</option>	136	<option value="deleteAttachment" ng-if="row.orderInvoice !== null">Delete</option>
137	<option value="0" disabled >_____________</option>	137	<option value="0" disabled >_____________</option>
138	<option value="uploadAttachment" >Upload</option>	138	<option value="uploadAttachment" >Upload</option>
139	</select>	139	</select>
140	<i class="fa fa-paperclip" ng-if="row.orderInvoice !== null"></i>	140	<i class="fa fa-paperclip" ng-if="row.orderInvoice !== null"></i>
141	</td>	141	</td>
142	</tr>	142	</tr>
143	</table>	143	</table>
144		144
145	<select class="btn btn-primary exportBtn" ng-model="optionSelected" ng-change="onFWSelect()">	145	<select class="btn btn-primary exportBtn" ng-model="optionSelected" ng-change="onFWSelect()">
146	<option value="" disabled selected="selected">Fuel Widget</option>	146	<option value="" disabled selected="selected">Fuel Widget</option>
147	<option value="dt" >Direct Transaction</option>	147	<option value="dt" >Direct Transaction</option>
148	<option value="efo" >Export Fuel Orders</option>	148	<option value="efo" >Export Fuel Orders</option>
149	</select>	149	</select>
150		150
151	</div>	151	</div>
152	</div>	152	</div>
153	</div>	153	</div>
154	</div>	154	</div>
155	<!-- /widget-content -->	155	<!-- /widget-content -->
156	</div>	156	</div>
157	<!-- /widget -->	157	<!-- /widget -->
158	</div>	158	</div>
159	<!-- /span8 -->	159	<!-- /span8 -->
160	</div>	160	</div>
161	<!-- /row -->	161	<!-- /row -->
162	</div>	162	</div>
163	<!-- /container -->	163	<!-- /container -->
164		164
165		165
166	</div>	166	</div>
167	<!-- /main -->	167	<!-- /main -->
168		168
169		169
170	<form class="modal multi-step" id="demo-modal-3" name="companyForm">	170	<form class="modal multi-step" id="demo-modal-3" name="companyForm">
171	<div class="modal-dialog modal-lg">	171	<div class="modal-dialog modal-lg">
172	<div class="modal-content">	172	<div class="modal-content">
173	<div class="modal-body step-1" data-step="1" style="padding: 0;">	173	<div class="modal-body step-1" data-step="1" style="padding: 0;">
174	<div>	174	<div>
175	<div class="row" style="margin: 0;">	175	<div class="row" style="margin: 0;">
176	<div>	176	<div>
177	<div class="widget" style="margin-bottom: 0;">	177	<div class="widget" style="margin-bottom: 0;">
178	<div class="widget-header">	178	<div class="widget-header">
179	<i class="icon-pencil"></i>	179	<i class="icon-pencil"></i>
180	<i class="fa fa-tasks" aria-hidden="true"></i>	180	<i class="fa fa-tasks" aria-hidden="true"></i>
181	<h3>Add a New Company</h3>	181	<h3>Add a New Company</h3>
182	<div class="pull-right my-toggle-switch" style="margin-right: 30px;">	182	<div class="pull-right my-toggle-switch" style="margin-right: 30px;">
183	<div style="color: #ff9a01;">Activate &nbsp &nbsp	183	<div style="color: #ff9a01;">Activate &nbsp &nbsp
184	<toggle ng-model="data.activate" size="customToogle"></toggle>	184	<toggle ng-model="data.activate" size="customToogle"></toggle>
185	</div>	185	</div>
186	</div>	186	</div>
187	<div class="clearfix"></div>	187	<div class="clearfix"></div>
188	</div>	188	</div>
189	<div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">	189	<div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
190	<div class="col-xs-12">	190	<div class="col-xs-12">
191	<div class="col-md-8">	191	<div class="col-md-8">
192	<div class="pull-left">	192	<div class="pull-left">
193	<label class="new-input-label"><b>Company Name *</b></label>	193	<label class="new-input-label"><b>Company Name *</b></label>
194	</div>	194	</div>
195	<div class="pull-left" style="margin-left: 15px;">	195	<div class="pull-left" style="margin-left: 15px;">
196	<input type="text" ng-model="data.companyName" class="form-control companyNameInput" ng-keyup="removeValidation()" placeholder="" required>	196	<input type="text" ng-model="data.companyName" class="form-control companyNameInput" ng-keyup="removeValidation()" placeholder="" required>
197	<label class="customErrorMessage" ng-show="showCompanyError">This field is required.</label>	197	<label class="customErrorMessage" ng-show="showCompanyError">This field is required.</label>
198	</div>	198	</div>
199	<div class="clearfix"></div>	199	<div class="clearfix"></div>
200	</div>	200	</div>
201	<div class="col-md-4">	201	<div class="col-md-4">
202		202
203	<div class="pull-right">	203	<div class="pull-right">
204	<input type="text" ng-model="data.baseIcao" style="width: 100px;" class="form-control" placeholder="">	204	<input type="text" ng-model="data.baseIcao" style="width: 100px;" class="form-control" placeholder="">
205	</div>	205	</div>
206	<div class="pull-right">	206	<div class="pull-right">
207	<label style="margin-right: 15px;" class="new-input-label"><b>Base ICAO</b></label>	207	<label style="margin-right: 15px;" class="new-input-label"><b>Base ICAO</b></label>
208	</div>	208	</div>
209	<div class="clearfix"></div>	209	<div class="clearfix"></div>
210	</div>	210	</div>
211	</div>	211	</div>
212	<div class="clearfix"></div><br>	212	<div class="clearfix"></div><br>
213	<div class="col-xs-12">	213	<div class="col-xs-12">
214	<div class="col-md-7">	214	<div class="col-md-7">
215	<div class="pull-left">	215	<div class="pull-left">
216	<label class="new-input-label"><b>Relationship </b></label>	216	<label class="new-input-label"><b>Relationship </b></label>
217	</div>	217	</div>
218	<div class="pull-left" style="margin-left: 32px;">	218	<div class="pull-left" style="margin-left: 32px;">
219	<input type="checkbox" ng-model="data.baseTenant" name="vehicle" value="Bike"> Check here if this is a Base Tenant<br>	219	<input type="checkbox" ng-model="data.baseTenant" name="vehicle" value="Bike"> Check here if this is a Base Tenant<br>
220	<input type="checkbox" ng-model="data.fuelerlinxCustomer" name="vehicle" value="Car" checked> Check here if this is a FuelerLinx Customer<br>	220	<input type="checkbox" ng-model="data.fuelerlinxCustomer" name="vehicle" value="Car" checked> Check here if this is a FuelerLinx Customer<br>
221	<input type="checkbox" ng-model="data.contractFuelVendor" name="vehicle" value="Car" checked> Check here if this is a Contract Fuel Vendor	221	<input type="checkbox" ng-model="data.contractFuelVendor" name="vehicle" value="Car" checked> Check here if this is a Contract Fuel Vendor
222	</div>	222	</div>
223	<div class="clearfix"></div>	223	<div class="clearfix"></div>
224	</div>	224	</div>
225	<div class="col-md-2 Airport" style="text-align: right;">	225	<div class="col-md-2 Airport" style="text-align: right;">
226	<b>Certificate Type</b>	226	<b>Certificate Type</b>
227	</div>	227	</div>
228	<div class="col-md-3 Airport">	228	<div class="col-md-3 Airport">
229	<select required class="form-control" ng-model="data.certificateType">	229	<select required class="form-control" ng-model="data.certificateType">
230	<option value="" disabled selected hidden>Select...</option>	230	<option value="" disabled selected hidden>Select...</option>
231	<option value="corporate">Part 91 (Corporate)</option>	231	<option value="corporate">Part 91 (Corporate)</option>
232	<option value="charter">Part 135 (Charter)</option>	232	<option value="charter">Part 135 (Charter)</option>
233	<option value="scheduled">Part 121 (Scheduled)</option>	233	<option value="scheduled">Part 121 (Scheduled)</option>
234	<option value="military">Military</option>	234	<option value="military">Military</option>
235	<option value="government">Government</option>	235	<option value="government">Government</option>
236	</select>	236	</select>
237	</div>	237	</div>
238	<div class="clearfix"></div>	238	<div class="clearfix"></div>
239	</div>	239	</div>
240	<div class="clearfix"></div>	240	<div class="clearfix"></div>
241	<br/>	241	<br/>
242	<div class="col-xs-12">	242	<div class="col-xs-12">
243	<div class="col-md-6">	243	<div class="col-md-6">
244	<div class="pull-left" style="width: 110px;">	244	<div class="pull-left" style="width: 110px;">
245	<b>JET A Margin *</b>	245	<b>JET A Margin *</b>
246	</div>	246	</div>
247	<div class="pull-left">	247	<div class="pull-left">
248	<select class="form-control marginSelectBox" ng-model="data.masterMargin" ng-options="margin.id as margin.marginName for margin in jetMarginList" required ng-change="removeMarginValidation()">	248	<select class="form-control marginSelectBox" ng-model="data.masterMargin" ng-options="margin.id as margin.marginName for margin in jetMarginList" required ng-change="removeMarginValidation()">
249	<option value="" disabled>Select...</option>	249	<option value="" disabled>Select...</option>
250	</select>	250	</select>
251	<label ng-show="showMarginError" class="customErrorMessage">This field is required.</label>	251	<label ng-show="showMarginError" class="customErrorMessage">This field is required.</label>
252		252
253	<div class="clearfix"></div>	253	<div class="clearfix"></div>
254	</div>	254	</div>
255	</div>	255	</div>
256		256
257	<div class="col-md-3 Airport" style="text-align: right;">	257	<div class="col-md-3 Airport" style="text-align: right;">
258	<b>AVGAS 100LL Margin</b>	258	<b>AVGAS 100LL Margin</b>
259	</div>	259	</div>
260	<div class="col-md-3 Airport">	260	<div class="col-md-3 Airport">
261	<select class="form-control" ng-model="data.avgasMargin" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList">	261	<select class="form-control" ng-model="data.avgasMargin" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList">
262	<option value="" disabled>Select...</option>	262	<option value="" disabled>Select...</option>
263	</select>	263	</select>
264	</div>	264	</div>
265	<div class="clearfix"></div>	265	<div class="clearfix"></div>
266	</div>	266	</div>
267	<div class="clearfix"></div>	267	<div class="clearfix"></div>
268	<br/>	268	<br/>
269	<div class="col-xs-12">	269	<div class="col-xs-12">
270	<div class="col-md-12">	270	<div class="col-md-12">
271	<div class="pull-left" style="width: 110px;">	271	<div class="pull-left" style="width: 110px;">
272	<label class="new-input-label"><b>Address</b></label>	272	<label class="new-input-label"><b>Address</b></label>
273	</div>	273	</div>
274	<div class="pull-left" style="width: calc(100% - 110px);">	274	<div class="pull-left" style="width: calc(100% - 110px);">
275	<input type="text" class="form-control" ng-model="data.addressOne" placeholder="">	275	<input type="text" class="form-control" ng-model="data.addressOne" placeholder="">
276	</div>	276	</div>
277	<div class="clearfix"></div>	277	<div class="clearfix"></div>
278	</div>	278	</div>
279	</div>	279	</div>
280	<div class="clearfix"></div>	280	<div class="clearfix"></div>
281	<br/>	281	<br/>
282	<div class="col-xs-12">	282	<div class="col-xs-12">
283	<div class="col-md-12">	283	<div class="col-md-12">
284	<div class="pull-left" style="width: 110px;">	284	<div class="pull-left" style="width: 110px;">
285	<label class="new-input-label"><b>Address2</b></label>	285	<label class="new-input-label"><b>Address2</b></label>
286	</div>	286	</div>
287	<div class="pull-left" style="width: calc(100% - 110px);">	287	<div class="pull-left" style="width: calc(100% - 110px);">
288	<input type="text" ng-model="data.addressTwo" class="form-control" placeholder="">	288	<input type="text" ng-model="data.addressTwo" class="form-control" placeholder="">
289	</div>	289	</div>
290	<div class="clearfix"></div>	290	<div class="clearfix"></div>
291	</div>	291	</div>
292	</div>	292	</div>
293	<div class="clearfix"></div>	293	<div class="clearfix"></div>
294	<br/>	294	<br/>
295	<div class="col-xs-12">	295	<div class="col-xs-12">
296		296
297	<div class="col-md-6">	297	<div class="col-md-6">
298	<div class="pull-left" style="width: 110px;">	298	<div class="pull-left" style="width: 110px;">
299	<label class="new-input-label"><b>City</b></label>	299	<label class="new-input-label"><b>City</b></label>
300	</div>	300	</div>
301	<div class="pull-left" style="width: calc(100% - 110px);">	301	<div class="pull-left" style="width: calc(100% - 110px);">
302	<input type="text" ng-model="data.city" class="form-control" placeholder="">	302	<input type="text" ng-model="data.city" class="form-control" placeholder="">
303	</div>	303	</div>
304	<div class="clearfix"></div>	304	<div class="clearfix"></div>
305	</div>	305	</div>
306	<div class="col-md-3">	306	<div class="col-md-3">
307	<div class="pull-left" style="width: 40px;">	307	<div class="pull-left" style="width: 40px;">
308	<label class="new-input-label"><b>State</b></label>	308	<label class="new-input-label"><b>State</b></label>
309	</div>	309	</div>
310	<div class="pull-left" style="width: calc(100% - 110px);">	310	<div class="pull-left" style="width: calc(100% - 110px);">
311	<input type="text" ng-model="data.state" class="form-control" placeholder="">	311	<input type="text" ng-model="data.state" class="form-control" placeholder="">
312	</div>	312	</div>
313	<div class="clearfix"></div>	313	<div class="clearfix"></div>
314	</div>	314	</div>
315	<div class="col-md-3">	315	<div class="col-md-3">
316	<div class="pull-left">	316	<div class="pull-left">
317	<label class="new-input-label"><b>Zip Code</b></label>	317	<label class="new-input-label"><b>Zip Code</b></label>
318	</div>	318	</div>
319	<div class="pull-right" style="width: calc(100% - 60px);">	319	<div class="pull-right" style="width: calc(100% - 60px);">
320	<input type="tel" ng-model="data.zipcode" class="form-control" placeholder="">	320	<input type="tel" ng-model="data.zipcode" class="form-control" placeholder="">
321	</div>	321	</div>
322	<div class="clearfix"></div>	322	<div class="clearfix"></div>
323	</div>	323	</div>
324	</div>	324	</div>
325	<div class="clearfix"></div>	325	<div class="clearfix"></div>
326	<br/>	326	<br/>
327	<div class="col-xs-12">	327	<div class="col-xs-12">
328		328
329	<div class="col-md-6">	329	<div class="col-md-6">
330	<div class="pull-left" style="width: 110px;">	330	<div class="pull-left" style="width: 110px;">
331	<label class="new-input-label"><b>Country</b></label>	331	<label class="new-input-label"><b>Country</b></label>
332	</div>	332	</div>
333	<div class="pull-left" style="width: calc(100% - 110px);">	333	<div class="pull-left" style="width: calc(100% - 110px);">
334	<input type="text" ng-model="data.country" class="form-control" placeholder="">	334	<input type="text" ng-model="data.country" class="form-control" placeholder="">
335	</div>	335	</div>
336	<div class="clearfix"></div>	336	<div class="clearfix"></div>
337	</div>	337	</div>
338	<div class="col-md-6">	338	<div class="col-md-6">
339	<div class="pull-left" style="width: 110px;">	339	<div class="pull-left" style="width: 110px;">
340	<label class="new-input-label"><b>Internal Note</b></label>	340	<label class="new-input-label"><b>Internal Note</b></label>
341	</div>	341	</div>
342	<div class="pull-left" style="width: calc(100% - 110px);">	342	<div class="pull-left" style="width: calc(100% - 110px);">
343	<textarea name="message" ng-model="data.internalNote" rows="4" cols="34"></textarea>	343	<textarea name="message" ng-model="data.internalNote" rows="4" cols="34"></textarea>
344	</div>	344	</div>
345	<div class="clearfix"></div>	345	<div class="clearfix"></div>
346	</div>	346	</div>
347	</div>	347	</div>
348	<div class="clearfix"></div>	348	<div class="clearfix"></div>
349	<!-- <br/>	349	<!-- <br/>
350	<div class="col-xs-12">	350	<div class="col-xs-12">
351	<div class="col-md-2 Airport"></div>	351	<div class="col-md-2 Airport"></div>
352	<div class="col-md-10 Airport">	352	<div class="col-md-10 Airport">
353	<div class="pull-right">	353	<div class="pull-right">
354	<button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>	354	<button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>
355	<button type="button" class="btn btn-warning" ng-click="addAircraft()">Next: Add Aircraft</button>	355	<button type="button" class="btn btn-warning" ng-click="addAircraft()">Next: Add Aircraft</button>
356	</div>	356	</div>
357	</div>	357	</div>
358	</div> -->	358	</div> -->
359	</div>	359	</div>
360	</div>	360	</div>
361	<div class="clearfix"></div>	361	<div class="clearfix"></div>
362	</div>	362	</div>
363	</div>	363	</div>
364	</div>	364	</div>
365	</div>	365	</div>
366	<div class="modal-body step-2" data-step="2" style="padding: 0;">	366	<div class="modal-body step-2" data-step="2" style="padding: 0;">
367	<div>	367	<div>
368	<div class="row" style="margin: 0;">	368	<div class="row" style="margin: 0;">
369	<div>	369	<div>
370	<div class="widget" style="margin-bottom: 0;">	370	<div class="widget" style="margin-bottom: 0;">
371	<div class="widget-header">	371	<div class="widget-header">
372	<i class="icon-pencil"></i>	372	<i class="icon-pencil"></i>
373	<i class="fa fa-tasks" aria-hidden="true"></i>	373	<i class="fa fa-tasks" aria-hidden="true"></i>
374	<h3>Add a New Company</h3>	374	<h3>Add a New Company</h3>
375	<div class="clearfix"></div>	375	<div class="clearfix"></div>
376	</div>	376	</div>
377	<div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">	377	<div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
378	<div class="col-xs-12">	378	<div class="col-xs-12">
379	<div class="widget-header">	379	<div class="widget-header">
380	<i class="fa fa-list"></i>	380	<i class="fa fa-list"></i>
381	<h3>Aircraft List</h3>	381	<h3>Aircraft List</h3>
382	</div>	382	</div>
383	<div class="widget-content" style="padding:0px;border: 0px; ">	383	<div class="widget-content" style="padding:0px;border: 0px; ">
384	<div class="table-responsive">	384	<div class="table-responsive">
385	<!-- <table class="table table-bordered table-hover table-striped addRow" style="margin-bottom: 0px;">	385	<!-- <table class="table table-bordered table-hover table-striped addRow" style="margin-bottom: 0px;">
386	<thead>	386	<thead>
387	<tr>	387	<tr>
388	<th>Tail</th>	388	<th>Tail</th>
389	<th>Make</th>	389	<th>Make</th>
390	<th>Model</th>	390	<th>Model</th>
391	<th>Size</th>	391	<th>Size</th>
392	<th>Margin</th>	392	<th>Margin</th>
393	</tr>	393	</tr>
394	</thead>	394	</thead>
395	<tbody>	395	<tbody>
396	<tr>	396	<tr>
397	<td>	397	<td>
398	<input type="text" style="width:100px;" ng-model="aircraft.tail" class="form-control">	398	<input type="text" style="width:100px;" ng-model="aircraft.tail" class="form-control">
399	</td>	399	</td>
400	<td style="width: 25%;">	400	<td style="width: 25%;">
401	<select class="form-control" ng-model="aircraft.make" ng-change="getModal()">	401	<select class="form-control" ng-model="aircraft.make" ng-change="getModal()">
402	<option ng-repeat="make in aircraftMakeList">{{make}}</option>	402	<option ng-repeat="make in aircraftMakeList">{{make}}</option>
403	</select>	403	</select>
404	</td>	404	</td>
405	<td style="width: 20%;">	405	<td style="width: 20%;">
406	<select class="form-control" ng-model="aircraft.model" ng-change="getSize()">	406	<select class="form-control" ng-model="aircraft.model" ng-change="getSize()">
407	<option ng-repeat="model in aircraftModalList">{{model}}</option>	407	<option ng-repeat="model in aircraftModalList">{{model}}</option>
408	</select>	408	</select>
409	</td>	409	</td>
410	<td style="width: 25%;">	410	<td style="width: 25%;">
411	<select class="form-control" ng-model="aircraft.size">	411	<select class="form-control" ng-model="aircraft.size">
412	<option ng-repeat="size in aircraftSizeList">{{size}}</option>	412	<option ng-repeat="size in aircraftSizeList">{{size}}</option>
413	</select>	413	</select>
414	</td>	414	</td>
415	<td>	415	<td>
416	<select class="form-control">	416	<select class="form-control">
417	<option>Margin1</option>	417	<option>Margin1</option>
418	<option>Margin2</option>	418	<option>Margin2</option>
419	</select>	419	</select>
420	</td>	420	</td>
421	</tr>	421	</tr>
422	</tbody>	422	</tbody>
423		423
424	</table> -->	424	</table> -->
425	<table class="table table-striped table-bordered">	425	<table class="table table-striped table-bordered">
426	<thead>	426	<thead>
427	<tr>	427	<tr>
428	<!-- <th><input type="checkbox" ng-model="selectedAll" ng-click="checkAll()" /></th> -->	428	<!-- <th><input type="checkbox" ng-model="selectedAll" ng-click="checkAll()" /></th> -->
429	<th>Tail</th>	429	<th>Tail</th>
430	<th>Make</th>	430	<th>Make</th>
431	<th>Model</th>	431	<th>Model</th>
432	<th>Size</th>	432	<th>Size</th>
433	<th>JET A Margin</th>	433	<th>JET A Margin</th>
434	<th>AVGS 100LL Margin</th>	434	<th>AVGS 100LL Margin</th>
435	</tr>	435	</tr>
436	</thead>	436	</thead>
437	<tbody>	437	<tbody>
438	<tr ng-repeat="aircraftData in aircraftDetails track by $index">	438	<tr ng-repeat="aircraftData in aircraftDetails track by $index">
439	<!-- <td>	439	<!-- <td>
440	<input type="checkbox" ng-model="aircraftData.selected"/>	440	<input type="checkbox" ng-model="aircraftData.selected"/>
441	</td> -->	441	</td> -->
442	<td style="width: 15%">	442	<td style="width: 15%">
443	<input type="text" class="form-control" ng-model="aircraftData.tail" required/>	443	<input type="text" class="form-control" ng-model="aircraftData.tail" required/>
444	</td>	444	</td>
445	<td style="width: 17%">	445	<td style="width: 17%">
446	<select class="form-control" ng-model="aircraftData.make" ng-change="getModal(aircraftData.make, $index)">	446	<select class="form-control" ng-model="aircraftData.make" ng-change="getModal(aircraftData.make, $index)">
447	<option ng-repeat="make in aircraftMakeList">{{make}}</option>	447	<option ng-repeat="make in aircraftMakeList">{{make}}</option>
448	<option value="" disabled>Select...</option>	448	<option value="" disabled>Select...</option>
449	</select>	449	</select>
450	</td>	450	</td>
451	<td style="width: 17%">	451	<td style="width: 17%">
452	<select class="form-control" ng-model="aircraftData.model" ng-change="getSize(aircraftData.model, $index)">	452	<select class="form-control" ng-model="aircraftData.model" ng-change="getSize(aircraftData.model, $index)">
453	<option ng-repeat="model in aircraftData.aircraftModalList">{{model}}</option>	453	<option ng-repeat="model in aircraftData.aircraftModalList">{{model}}</option>
454	<option value="" disabled>Select...</option>	454	<option value="" disabled>Select...</option>
455	</select>	455	</select>
456	</td>	456	</td>
457	<td style="width: 17%">	457	<td style="width: 17%">
458	<select class="form-control" ng-model="aircraftData.sizeId" ng-options="size.aircraftSize.id as size.aircraftSize.size for size in aircraftData.aircraftSizeList">	458	<select class="form-control" ng-model="aircraftData.sizeId" ng-options="size.aircraftSize.id as size.aircraftSize.size for size in aircraftData.aircraftSizeList">
459	<option value="" disabled>Select...</option>	459	<option value="" disabled>Select...</option>
460	</select>	460	</select>
461	<!-- <select class="form-control" ng-model="aircraftData.size">	461	<!-- <select class="form-control" ng-model="aircraftData.size">
462	<option ng-repeat="size in aircraftData.aircraftSizeList">{{size}}</option>	462	<option ng-repeat="size in aircraftData.aircraftSizeList">{{size}}</option>
463	</select> -->	463	</select> -->
464	</td>	464	</td>
465	<td style="width: 17%">	465	<td style="width: 17%">
466	<select class="form-control" ng-model="aircraftData.marginId" ng-options="margin.id as margin.marginName for margin in jetMarginList">	466	<select class="form-control" ng-model="aircraftData.marginId" ng-options="margin.id as margin.marginName for margin in jetMarginList">
467	<option value="" disabled>Select...</option>	467	<option value="" disabled>Select...</option>
468	</select>	468	</select>
469	</td>	469	</td>
470	<td style="width: 17%">	470	<td style="width: 17%">
471	<select class="form-control marginSelectBox" ng-model="aircraftData.avgasMarginId" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList">	471	<select class="form-control marginSelectBox" ng-model="aircraftData.avgasMarginId" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList">
472	<option value="" disabled>Select...</option>	472	<option value="" disabled>Select...</option>
473	</select>	473	</select>
474	</td>	474	</td>
475	</tr>	475	</tr>
476	</tbody>	476	</tbody>
477	</table>	477	</table>
478	</div>	478	</div>
479	<div class="clearfix"></div>	479	<div class="clearfix"></div>
480	</div>	480	</div>
481	</div>	481	</div>
482	<div class="clearfix"></div>	482	<div class="clearfix"></div>
483	<div class="col-xs-12" style="margin-bottom: 50px;margin-top: 10px;">	483	<div class="col-xs-12" style="margin-bottom: 50px;margin-top: 10px;">
484	<button ng-click="addNew()" class="button1 turquoise pull-right"><span>+</span>Add Aircraft</button>	484	<button ng-click="addNew()" class="button1 turquoise pull-right"><span>+</span>Add Aircraft</button>
485	</div>	485	</div>
486	<!-- <div class="col-xs-12" style="margin-bottom: 20px;">	486	<!-- <div class="col-xs-12" style="margin-bottom: 20px;">
487	<div class="pull-right">	487	<div class="pull-right">
488	<button type="button" class="btn btn-default" ng-click="cancelCraft()">Cancel</button>	488	<button type="button" class="btn btn-default" ng-click="cancelCraft()">Cancel</button>
489	<button type="button" class="btn btn-warning" ng-click="goBack()">Go Back</button>	489	<button type="button" class="btn btn-warning" ng-click="goBack()">Go Back</button>
490	<button type="button" class="btn btn-success" ng-click="goBack()">Save</button>	490	<button type="button" class="btn btn-success" ng-click="goBack()">Save</button>
491	</div>	491	</div>
492	</div> -->	492	</div> -->
493	</div>	493	</div>
494	</div>	494	</div>
495	<div class="clearfix"></div>	495	<div class="clearfix"></div>
496	</div>	496	</div>
497	</div>	497	</div>
498	</div>	498	</div>
499	</div>	499	</div>
500	<!-- <div class="modal-body step-3" data-step="3">	500	<!-- <div class="modal-body step-3" data-step="3">
501	This is the final step.	501	This is the final step.
502	</div> -->	502	</div> -->
503	<div class="modal-footer" style="border-top: 0;">	503	<div class="modal-footer" style="border-top: 0;">
504	<button type="button" class="btn btn-default" ng-click="reset2()" data-dismiss="modal">Cancel</button>	504	<button type="button" class="btn btn-default" ng-click="reset2()" data-dismiss="modal">Cancel</button>
505	<button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addFirstData('#demo-modal-3', 2)">Next: Add Aircraft</button>	505	<button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addFirstData('#demo-modal-3', 2)">Next: Add Aircraft</button>
506	<button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#demo-modal-3', 1)">Go Back</button>	506	<button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#demo-modal-3', 1)">Go Back</button>
507	<!-- <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#demo-modal-3', 3)">Continue</button> -->	507	<!-- <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#demo-modal-3', 3)">Continue</button> -->
508	<button type="button" class="btn btn-success step step-2" data-step="2" ng-click="saveCompanyData()">Save</button>	508	<button type="button" class="btn btn-success step step-2" data-step="2" ng-click="saveCompanyData()">Save</button>
509	</div>	509	</div>
510	</div>	510	</div>
511	</div>	511	</div>
512	</form>	512	</form>
513		513
514		514
515		515
516	<form class="modal multi-step" id="demo-modal-4" name="fuelOrderForm">	516	<form class="modal multi-step" id="demo-modal-4" name="fuelOrderForm">
517	<div class="modal-dialog modal-lg">	517	<div class="modal-dialog modal-lg">
518	<div class="modal-content">	518	<div class="modal-content">
519	<div class="modal-body step-1" data-step="1" style="padding: 0;">	519	<div class="modal-body step-1" data-step="1" style="padding: 0;">
520	<div>	520	<div>
521	<div class="row" style="margin: 0;">	521	<div class="row" style="margin: 0;">
522	<div>	522	<div>
523	<div class="widget" style="margin-bottom: 0;">	523	<div class="widget" style="margin-bottom: 0;">
524	<div class="widget-header">	524	<div class="widget-header">
525	<i class="icon-pencil"></i>	525	<i class="icon-pencil"></i>
526	<i class="fa fa-tasks" aria-hidden="true"></i>	526	<i class="fa fa-tasks" aria-hidden="true"></i>
527	<h3>Add a Fuel Order</h3>	527	<h3>Add a Fuel Order</h3>
528	<div class="clearfix"></div>	528	<div class="clearfix"></div>
529	</div>	529	</div>
530	<div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">	530	<div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
531	<div class="col-xs-12">	531	<div class="col-xs-12">
532	<div class="col-xs-12">	532	<div class="col-xs-12">
533		533
534	<div class="col-md-6">	534	<div class="col-md-6">
535	<div class="pull-left" style="width: 110px;">	535	<div class="pull-left" style="width: 110px;">
536	<label class="new-input-label"><b>Fueling Date</b></label>	536	<label class="new-input-label"><b>Fueling Date</b></label>
537	</div>	537	</div>
538	<div class="pull-left" style="width: calc(100% - 110px);">	538	<div class="pull-left" style="width: calc(100% - 110px);">
539	<input type="date" ng-model="order.upliftDate" class="form-control" placeholder="">	539	<input type="date" ng-model="order.upliftDate" class="form-control" placeholder="">
540	<!--<md-datepicker ng-model="myDate" md-placeholder="Enter date"></md-datepicker>-->	540	<!--<md-datepicker ng-model="myDate" md-placeholder="Enter date"></md-datepicker>-->
541	</div>	541	</div>
542	<div class="clearfix"></div>	542	<div class="clearfix"></div>
543	</div>	543	</div>
544	<div class="col-md-6">	544	<div class="col-md-6">
545	<div class="pull-left" style="width: 110px;">	545	<div class="pull-left" style="width: 110px;">
546	<label class="new-input-label"><b>Volume</b></label>	546	<label class="new-input-label"><b>Volume</b></label>
547	</div>	547	</div>
548	<div class="pull-left" style="width: calc(100% - 110px);">	548	<div class="pull-left" style="width: calc(100% - 110px);">
549	<input type="text" ng-model="order.volume" ng-keyup="addTotal(order.volume,'v')" class="form-control" placeholder="">	549	<input type="text" ng-model="order.volume" ng-keyup="addTotal(order.volume,'v')" class="form-control" placeholder="">
550	</div>	550	</div>
551	<div class="clearfix"></div>	551	<div class="clearfix"></div>
552	</div>	552	</div>
553	</div>	553	</div>
554	<div class="clearfix"></div><br>	554	<div class="clearfix"></div><br>
555		555
556	<div class="col-xs-12">	556	<div class="col-xs-12">
557		557
558	<div class="col-md-6">	558	<div class="col-md-6">
559	<div class="pull-left" style="width: 110px;">	559	<div class="pull-left" style="width: 110px;">
560	<label class="new-input-label"><b>Company</b></label>	560	<label class="new-input-label"><b>Company</b></label>
561	</div>	561	</div>
562	<div class="pull-left" style="width: calc(100% - 110px);">	562	<div class="pull-left" style="width: calc(100% - 110px);">
563	<select ui-select2 ng-model="order.companyName" ng-change="getAircraft(order.companyName)" style="width: 100%;">	563	<select ui-select2 ng-model="order.companyName" ng-change="getAircraft(order.companyName)" style="width: 100%;">
564	<option value="" selected disabled>Select Company</option>	564	<option value="" selected disabled>Select Company</option>
565	<option ng-repeat="list in companyList">{{list.companyName}}</option>	565	<option ng-repeat="list in companyList">{{list.companyName}}</option>
566	</select>	566	</select>
567	</div>	567	</div>
568	<div class="clearfix"></div>	568	<div class="clearfix"></div>
569	</div>	569	</div>
570	<div class="col-md-6">	570	<div class="col-md-6">
571	<div class="pull-left" style="width: 110px;">	571	<div class="pull-left" style="width: 110px;">
572	<label class="new-input-label"><b>Invoiced</b></label>	572	<label class="new-input-label"><b>Invoiced</b></label>
573	</div>	573	</div>
574	<div class="pull-left" style="width: calc(100% - 110px);">	574	<div class="pull-left" style="width: calc(100% - 110px);">
575	<input type="text" ng-model="order.invoiced" ng-keyup="addTotal(order.invoiced,'i')" class="form-control" placeholder="">	575	<input type="text" ng-model="order.invoiced" ng-keyup="addTotal(order.invoiced,'i')" class="form-control" placeholder="">
576	</div>	576	</div>
577	<div class="clearfix"></div>	577	<div class="clearfix"></div>
578	</div>	578	</div>
579		579
580	</div>	580	</div>
581	<div class="clearfix"></div>	581	<div class="clearfix"></div>
582	<br/>	582	<br/>
583		583
584		584
585	<div class="col-xs-12">	585	<div class="col-xs-12">
586		586
587		587
588	<div class="col-md-6">	588	<div class="col-md-6">
589	<div class="pull-left" style="width: 110px;">	589	<div class="pull-left" style="width: 110px;">
590	<label class="new-input-label"><b>Tail #</b></label>	590	<label class="new-input-label"><b>Tail #</b></label>
591	</div>	591	</div>
592	<div class="pull-left" style="width: calc(100% - 110px);">	592	<div class="pull-left" style="width: calc(100% - 110px);">
593	<select class="form-control" ng-model="order.aircraftName">	593	<select class="form-control" ng-model="order.aircraftName">
594	<option selected disabled value="">Select Aircraft</option>	594	<option selected disabled value="">Select Aircraft</option>
595	<option ng-repeat="list in aircraftList" value="{{list.tail}}">{{list.tail}}</option>	595	<option ng-repeat="list in aircraftList" value="{{list.tail}}">{{list.tail}}</option>
596	</select>	596	</select>
597	</div>	597	</div>
598	<div class="clearfix"></div>	598	<div class="clearfix"></div>
599	</div>	599	</div>
600	<div class="col-md-6">	600	<div class="col-md-6">
601	<div class="pull-left" style="width: 110px;">	601	<div class="pull-left" style="width: 110px;">
602	<label class="new-input-label"><b>Total</b></label>	602	<label class="new-input-label"><b>Total</b></label>
603	</div>	603	</div>
604	<div class="pull-left" style="width: calc(100% - 110px);">	604	<div class="pull-left" style="width: calc(100% - 110px);">
605	<input type="text" disabled ng-model="order.total" class="form-control" placeholder="0.0" value="{{order.volume * order.invoiced}}">	605	<input type="text" disabled ng-model="order.total" class="form-control" placeholder="0.0" value="{{order.volume * order.invoiced}}">
606		606
607	</div>	607	</div>
608	<div class="clearfix"></div>	608	<div class="clearfix"></div>
609	</div>	609	</div>
610	</div>	610	</div>
611	<div class="clearfix"></div>	611	<div class="clearfix"></div>
612	<br/>	612	<br/>
613	<div class="col-xs-12">	613	<div class="col-xs-12">
614		614
615		615
616	<div class="col-md-6">	616	<div class="col-md-6">
617	<div class="pull-left" style="width: 110px;">	617	<div class="pull-left" style="width: 110px;">
618	<label class="new-input-label"><b>Source</b></label>	618	<label class="new-input-label"><b>Source</b></label>
619	</div>	619	</div>
620	<div class="pull-left" style="width: calc(100% - 110px);">	620	<div class="pull-left" style="width: calc(100% - 110px);">
621	<select ui-select2 ng-model="order.source" style="width: 100%;">	621	<select ui-select2 ng-model="order.source" style="width: 100%;">
622	<option value="" selected disabled>Select Source</option>	622	<option value="" selected disabled>Select Source</option>
623	<option ng-repeat="list in sourceList">{{list.source}}</option>	623	<option ng-repeat="list in sourceList">{{list.source}}</option>
624	</select>	624	</select>
625	</div>	625	</div>
626	<div class="clearfix"></div>	626	<div class="clearfix"></div>
627	</div>	627	</div>
628	<div class="col-md-6">	628	<div class="col-md-6">
629	<div class="pull-left" style="width: 110px;">	629	<div class="pull-left" style="width: 110px;">
630	<label class="new-input-label"><b>Price Quote</b></label>	630	<label class="new-input-label"><b>Price Quote</b></label>
631	</div>	631	</div>
632	<div class="pull-left" style="width: calc(100% - 110px);">	632	<div class="pull-left" style="width: calc(100% - 110px);">
633	<select ui-select2 style="width: 100%;" ng-model="order.priceQuote" ng-change="setCost(order.priceQuote)">	633	<select ui-select2 style="width: 100%;" ng-model="order.priceQuote" ng-change="setCost(order.priceQuote)">
634	<option value="" selected disabled>Select Price Quote</option>	634	<option value="" selected disabled>Select Price Quote</option>
635	<option ng-repeat="margin in marginList" value="{{margin}}">${{margin.papTotal}} {{margin.productName}}</option>	635	<option ng-repeat="margin in marginList" value="{{margin}}">${{margin.papTotal}} {{margin.productName}}</option>
636	</select>	636	</select>
637	</div>	637	</div>
638	<div class="clearfix"></div>	638	<div class="clearfix"></div>
639	</div>	639	</div>
640		640
641	</div>	641	</div>
642	<div class="clearfix"></div>	642	<div class="clearfix"></div>
643	<br/>	643	<br/>
644	<div class="col-xs-12">	644	<div class="col-xs-12">
645		645
646		646
647	<div class="col-md-6">	647	<div class="col-md-6">
648	<div class="pull-left" style="width: 110px;">	648	<div class="pull-left" style="width: 110px;">
649	<label class="new-input-label"><b>Status</b></label>	649	<label class="new-input-label"><b>Status</b></label>
650	</div>	650	</div>
651	<div class="pull-left" style="width: calc(100% - 110px);">	651	<div class="pull-left" style="width: calc(100% - 110px);">
652	<select ui-select2 ng-model="order.status" style="width: 100%;">	652	<select ui-select2 ng-model="order.status" style="width: 100%;">
653	<option value="" selected disabled>Select Status</option>	653	<option value="" selected disabled>Select Status</option>
654	<option>Pending</option>	654	<option>Pending</option>
655	<option>Invoiced</option>	655	<option>Invoiced</option>
656	<option>Paid</option>	656	<option>Paid</option>
657	<option>Cancelled</option>	657	<option>Cancelled</option>
658	<option>Archived</option>	658	<option>Archived</option>
659	</select>	659	</select>
660	</div>	660	</div>
661	<div class="clearfix"></div>	661	<div class="clearfix"></div>
662	</div>	662	</div>
663	<div class="col-md-6">	663	<div class="col-md-6">
664	<div class="pull-left" style="width: 110px;">	664	<div class="pull-left" style="width: 110px;">
665	<label class="new-input-label"><b>FBO Cost</b></label>	665	<label class="new-input-label"><b>FBO Cost</b></label>
666	</div>	666	</div>
667	<div class="pull-left" style="width: calc(100% - 110px);">	667	<div class="pull-left" style="width: calc(100% - 110px);">
668	<input type="text" disabled ng-model="order.fboCost" class="form-control" placeholder="">	668	<input type="text" disabled ng-model="order.fboCost" class="form-control" placeholder="">
669	</div>	669	</div>
670	<div class="clearfix"></div>	670	<div class="clearfix"></div>
671	</div>	671	</div>
672	</div>	672	</div>
673	<div class="clearfix"></div>	673	<div class="clearfix"></div>
674	<br/>	674	<br/>
675	<div class="col-xs-12">	675	<div class="col-xs-12">
676		676
677		677
678	</div>	678	</div>
679	<div class="clearfix"></div>	679	<div class="clearfix"></div>
680	<br/>	680	<br/>
681	<div class="col-xs-12">	681	<div class="col-xs-12">
682		682
683	</div>	683	</div>
684	<div class="clearfix"></div>	684	<div class="clearfix"></div>
685		685
686	</div>	686	</div>
687	</div>	687	</div>
688	<div class="clearfix"></div>	688	<div class="clearfix"></div>
689	</div>	689	</div>
690	</div>	690	</div>
691	</div>	691	</div>
692	</div>	692	</div>
693		693
694	<div class="modal-footer" style="border-top: 0;">	694	<div class="modal-footer" style="border-top: 0;">
695	<button type="button" class="btn btn-default" ng-click="cancelData()" data-dismiss="modal">Cancel</button>	695	<button type="button" class="btn btn-default" ng-click="cancelData()" data-dismiss="modal">Cancel</button>
696	<button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addData()">Save</button>	696	<button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addData()">Save</button>
697	</div>	697	</div>
698	</div>	698	</div>
699	</div>	699	</div>
700	</div>	700	</div>
701	</form>	701	</form>
702		702
703		703
704	<form class="modal multi-step" id="demo-modal-5" name="fuelOrderUpdateForm">	704	<form class="modal multi-step" id="demo-modal-5" name="fuelOrderUpdateForm">
705	<div class="modal-dialog modal-lg">	705	<div class="modal-dialog modal-lg">
706	<div class="modal-content">	706	<div class="modal-content">
707	<div class="modal-body step-1" data-step="1" style="padding: 0;">	707	<div class="modal-body step-1" data-step="1" style="padding: 0;">
708	<div>	708	<div>
709	<div class="row" style="margin: 0;">	709	<div class="row" style="margin: 0;">
710	<div>	710	<div>
711	<div class="widget" style="margin-bottom: 0;">	711	<div class="widget" style="margin-bottom: 0;">
712	<div class="widget-header">	712	<div class="widget-header">
713	<i class="icon-pencil"></i>	713	<i class="icon-pencil"></i>
714	<i class="fa fa-tasks" aria-hidden="true"></i>	714	<i class="fa fa-tasks" aria-hidden="true"></i>
715	<h3>Update Fuel Order</h3>	715	<h3>Update Fuel Order</h3>
716	<div class="clearfix"></div>	716	<div class="clearfix"></div>
717	</div>	717	</div>
718	<div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">	718	<div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
719	<div class="col-xs-12">	719	<div class="col-xs-12">
720	<div class="col-xs-12">	720	<div class="col-xs-12">
721		721
722	<div class="col-md-6">	722	<div class="col-md-6">
723	<div class="pull-left" style="width: 110px;">	723	<div class="pull-left" style="width: 110px;">
724	<label class="new-input-label"><b>Fueling Date</b></label>	724	<label class="new-input-label"><b>Fueling Date</b></label>
725	</div>	725	</div>
726	<div class="pull-left" style="width: calc(100% - 110px);">	726	<div class="pull-left" style="width: calc(100% - 110px);">
727	<!--<input type="date" ng-model="editdata.departingDate" class="form-control" placeholder="">-->	727	<!--<input type="date" ng-model="editdata.departingDate" class="form-control" placeholder="">-->
728	{{editdata.upliftDateString}}	728	{{editdata.upliftDateString}}
729	</div>	729	</div>
730	<div class="clearfix"></div>	730	<div class="clearfix"></div>
731	</div>	731	</div>
732	<div class="col-md-6">	732	<div class="col-md-6">
733	<div class="pull-left" style="width: 110px;">	733	<div class="pull-left" style="width: 110px;">
734	<label class="new-input-label"><b>Volume</b></label>	734	<label class="new-input-label"><b>Volume</b></label>
735	</div>	735	</div>
736	<div class="pull-left" style="width: calc(100% - 110px);">	736	<div class="pull-left" style="width: calc(100% - 110px);">
737	<input type="text" ng-model="editdata.requestedVolume" ng-keyup="updateTotal(editdata.requestedVolume,'v')" class="form-control" placeholder="">	737	<input type="text" ng-model="editdata.requestedVolume" ng-keyup="updateTotal(editdata.requestedVolume,'v')" class="form-control" placeholder="">
738	</div>	738	</div>
739	<div class="clearfix"></div>	739	<div class="clearfix"></div>
740	</div>	740	</div>
741		741
742	</div>	742	</div>
743	<div class="clearfix"></div><br>	743	<div class="clearfix"></div><br>
744		744
745	<div class="col-xs-12">	745	<div class="col-xs-12">
746		746
747	<div class="col-md-6">	747	<div class="col-md-6">
748	<div class="pull-left" style="width: 110px;">	748	<div class="pull-left" style="width: 110px;">
749	<label class="new-input-label"><b>Company</b></label>	749	<label class="new-input-label"><b>Company</b></label>
750	</div>	750	</div>
751	<div class="pull-left" style="width: calc(100% - 110px);">	751	<div class="pull-left" style="width: calc(100% - 110px);">
752	<!--<select ui-select2 ng-model="editdata.companyName" style="width: 100%;">	752	<!--<select ui-select2 ng-model="editdata.companyName" style="width: 100%;">
753	<option value="" selected disabled>Select Company</option>	753	<option value="" selected disabled>Select Company</option>
754	<option ng-repeat="list in companyList">{{list.companyName}}</option>	754	<option ng-repeat="list in companyList">{{list.companyName}}</option>
755	</select>-->	755	</select>-->
756	{{editdata.companyName}}	756	{{editdata.companyName}}
757	</div>	757	</div>
758	<div class="clearfix"></div>	758	<div class="clearfix"></div>
759	</div>	759	</div>
760	<div class="col-md-6">	760	<div class="col-md-6">
761	<div class="pull-left" style="width: 110px;">	761	<div class="pull-left" style="width: 110px;">
762	<label class="new-input-label"><b>Invoiced</b></label>	762	<label class="new-input-label"><b>Invoiced</b></label>
763	</div>	763	</div>
764	<div class="pull-left" style="width: calc(100% - 110px);">	764	<div class="pull-left" style="width: calc(100% - 110px);">
765	<input type="text" ng-model="editdata.invoiced" ng-keyup="updateTotal(editdata.invoiced,'i')" class="form-control" placeholder="">	765	<input type="text" ng-model="editdata.invoiced" ng-keyup="updateTotal(editdata.invoiced,'i')" class="form-control" placeholder="">
766	</div>	766	</div>
767	<div class="clearfix"></div>	767	<div class="clearfix"></div>
768	</div>	768	</div>
769		769
770	</div>	770	</div>
771	<div class="clearfix"></div>	771	<div class="clearfix"></div>
772	<br/>	772	<br/>
773		773
774		774
775	<div class="col-xs-12">	775	<div class="col-xs-12">
776		776
777	<div class="col-md-6">	777	<div class="col-md-6">
778	<div class="pull-left" style="width: 110px;">	778	<div class="pull-left" style="width: 110px;">
779	<label class="new-input-label"><b>Tail #</b></label>	779	<label class="new-input-label"><b>Tail #</b></label>
780	</div>	780	</div>
781	<div class="pull-left" style="width: calc(100% - 110px);">	781	<div class="pull-left" style="width: calc(100% - 110px);">
782	<!--<input type="text" ng-model="editdata.aircraftName" class="form-control" placeholder="">-->	782	<!--<input type="text" ng-model="editdata.aircraftName" class="form-control" placeholder="">-->
783	{{editdata.aircraftName}}	783	{{editdata.aircraftName}}
784	</div>	784	</div>
785	<div class="clearfix"></div>	785	<div class="clearfix"></div>
786	</div>	786	</div>
787	<div class="col-md-6">	787	<div class="col-md-6">
788	<div class="pull-left" style="width: 110px;">	788	<div class="pull-left" style="width: 110px;">
789	<label class="new-input-label"><b>Total</b></label>	789	<label class="new-input-label"><b>Total</b></label>
790	</div>	790	</div>
791	<div class="pull-left" style="width: calc(100% - 110px);">	791	<div class="pull-left" style="width: calc(100% - 110px);">
792	<input type="text" class="form-control" disabled ng-model="editdata.total" placeholder="0.0" ng-value="{{editdata.requestedVolume * editdata.invoiced}}">	792	<input type="text" class="form-control" disabled ng-model="editdata.total" placeholder="0.0" ng-value="{{editdata.requestedVolume * editdata.invoiced}}">
793	<!--{{editdata.total }}-->	793	<!--{{editdata.total }}-->
794	</div>	794	</div>
795	<div class="clearfix"></div>	795	<div class="clearfix"></div>
796	</div>	796	</div>
797	</div>	797	</div>
798	<div class="clearfix"></div>	798	<div class="clearfix"></div>
799	<br/>	799	<br/>
800	<div class="col-xs-12">	800	<div class="col-xs-12">
801		801
802		802
803	<div class="col-md-6">	803	<div class="col-md-6">
804	<div class="pull-left" style="width: 110px;">	804	<div class="pull-left" style="width: 110px;">
805	<label class="new-input-label"><b>Source</b></label>	805	<label class="new-input-label"><b>Source</b></label>
806	</div>	806	</div>
807	<div class="pull-left" style="width: calc(100% - 110px);">	807	<div class="pull-left" style="width: calc(100% - 110px);">
808	<!--<select ui-select2 ng-model="editdata.source" style="width: 100%;">	808	<!--<select ui-select2 ng-model="editdata.source" style="width: 100%;">
809	<option value="" selected disabled>Select Source</option>	809	<option value="" selected disabled>Select Source</option>
810	<option ng-repeat="list in sourceList">{{list.source}}</option>	810	<option ng-repeat="list in sourceList">{{list.source}}</option>
811	</select>-->	811	</select>-->
812	{{editdata.source}}	812	{{editdata.source}}
813	</div>	813	</div>
814	<div class="clearfix"></div>	814	<div class="clearfix"></div>
815	</div>	815	</div>
816	<div class="col-md-6">	816	<div class="col-md-6">
817	<div class="pull-left" style="width: 110px;">	817	<div class="pull-left" style="width: 110px;">
818	<label class="new-input-label"><b>FBO Cost</b></label>	818	<label class="new-input-label"><b>FBO Cost</b></label>
819	</div>	819	</div>
820	<div class="pull-left" style="width: calc(100% - 110px);">	820	<div class="pull-left" style="width: calc(100% - 110px);">
821	<!--<input type="text" ng-model="editdata.fboCost" class="form-control" placeholder="">-->	821	<!--<input type="text" ng-model="editdata.fboCost" class="form-control" placeholder="">-->
822	{{editdata.fboCost}}	822	{{editdata.fboCost}}
823	</div>	823	</div>
824	<div class="clearfix"></div>	824	<div class="clearfix"></div>
825	</div>	825	</div>
826	</div>	826	</div>
827	<div class="clearfix"></div>	827	<div class="clearfix"></div>
828	<br/>	828	<br/>
829	<div class="col-xs-12">	829	<div class="col-xs-12">
830		830
831		831
832	<div class="col-md-6">	832	<div class="col-md-6">
833	<div class="pull-left" style="width: 110px;">	833	<div class="pull-left" style="width: 110px;">
834	<label class="new-input-label"><b>Status</b></label>	834	<label class="new-input-label"><b>Status</b></label>
835	</div>	835	</div>
836	<div class="pull-left" style="width: calc(100% - 110px);">	836	<div class="pull-left" style="width: calc(100% - 110px);">
837	{{editdata.status}}	837	{{editdata.status}}
838	</div>	838	</div>
839	<div class="clearfix"></div>	839	<div class="clearfix"></div>
840	</div>	840	</div>
841	</div>	841	</div>
842	<div class="clearfix"></div>	842	<div class="clearfix"></div>
843	<br/>	843	<br/>
844	<div class="col-xs-12">	844	<div class="col-xs-12">
845		845
846		846
847	</div>	847	</div>
848	<div class="clearfix"></div>	848	<div class="clearfix"></div>
849	<br/>	849	<br/>
850	<div class="col-xs-12">	850	<div class="col-xs-12">
851		851
852	</div>	852	</div>
853	<div class="clearfix"></div>	853	<div class="clearfix"></div>
854		854
855	</div>	855	</div>
856	</div>	856	</div>
857	<div class="clearfix"></div>	857	<div class="clearfix"></div>
858	</div>	858	</div>
859	</div>	859	</div>
860	</div>	860	</div>
861	</div>	861	</div>
862		862
863	<div class="modal-footer" style="border-top: 0;">	863	<div class="modal-footer" style="border-top: 0;">
864	<button type="button" class="btn btn-default" ng-click="canceleditdata()" data-dismiss="modal">Cancel</button>	864	<button type="button" class="btn btn-default" ng-click="canceleditdata()" data-dismiss="modal">Cancel</button>
865	<button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="updateData()">Save</button>	865	<button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="updateData()">Save</button>
866	</div>	866	</div>
867	</div>	867	</div>
868	</div>	868	</div>
869	</div>	869	</div>
870	</form>	870	</form>
871		871
872	<form class="modal multi-step" id="demo-modal-6" name="uploadAttachmentForm">	872	<form class="modal multi-step" id="demo-modal-6" name="uploadAttachmentForm">
873	<div class="modal-dialog modal-xs">	873	<div class="modal-dialog modal-xs">
874	<div class="modal-content">	874	<div class="modal-content">
875	<div class="modal-body step-1" data-step="1" style="padding: 0;">	875	<div class="modal-body step-1" data-step="1" style="padding: 0;">
876	<div>	876	<div>
877	<div class="row" style="margin: 0;">	877	<div class="row" style="margin: 0;">
878	<div>	878	<div>
879	<div class="widget" style="margin-bottom: 0;">	879	<div class="widget" style="margin-bottom: 0;">
880	<div class="widget-header">	880	<div class="widget-header">
881	<i class="icon-pencil"></i>	881	<i class="icon-pencil"></i>
882	<i class="fa fa-tasks" aria-hidden="true"></i>	882	<i class="fa fa-tasks" aria-hidden="true"></i>
883	<h3>Upload Attachment</h3>	883	<h3>Upload Attachment</h3>
884	<div class="clearfix"></div>	884	<div class="clearfix"></div>
885	</div>	885	</div>
886	<div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">	886	<div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
887	<div class="col-xs-6">	887	<div class="col-xs-6">
888	<div class="col-xs-6">	888	<div class="col-xs-6">
889		889
890	<div class="col-md-6">	890	<div class="col-md-6">
891	<div class="pull-left" style="width: 110px;">	891	<div class="pull-left" style="width: 110px;">
892	<label class="new-input-label"><b>Upload</b></label>	892	<label class="new-input-label"><b>Upload</b></label>
893	<br>	893	<br>
894	<br>	894	<br>
895	</div>	895	</div>
896	<div class="pull-left" style="width: calc(100% - 110px);">	896	<div class="pull-left" style="width: calc(100% - 110px);">
897	<input type="file" accept=".pdf" file-model = "uploadFile.attachment">	897	<input type="file" accept=".pdf" file-model = "uploadFile.attachment">
898	<!--<md-datepicker ng-model="myDate" md-placeholder="Enter date"></md-datepicker>-->	898	<!--<md-datepicker ng-model="myDate" md-placeholder="Enter date"></md-datepicker>-->
899	</div>	899	</div>
900	<div class="clearfix"></div>	900	<div class="clearfix"></div>
901	</div>	901	</div>
902	</div>	902	</div>
903	<div class="clearfix"></div><br>	903	<div class="clearfix"></div><br>
904		904
905	</div>	905	</div>
906	</div>	906	</div>
907	<div class="clearfix"></div>	907	<div class="clearfix"></div>
908	</div>	908	</div>
909	</div>	909	</div>
910	</div>	910	</div>
911	</div>	911	</div>
912		912
913	<div class="modal-footer" style="border-top: 0;">	913	<div class="modal-footer" style="border-top: 0;">
914	<button type="button" class="btn btn-default" ng-click="cancelUploadAttachment()" data-dismiss="modal">Cancel</button>	914	<button type="button" class="btn btn-default" ng-click="cancelUploadAttachment()" data-dismiss="modal">Cancel</button>
915	<button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="saveUploadAttachment(uploadFile.attachment)">Upload</button>	915	<button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="saveUploadAttachment(uploadFile.attachment)">Upload</button>
916	</div>	916	</div>
917	</div>	917	</div>
918	</div>	918	</div>
919	</div>	919	</div>
920	</form>	920	</form>
921		921
922	<div class="customConfirmPopBackdrop" id="delete1">	922	<div class="customConfirmPopBackdrop" id="delete1">
923	<div class="customModalInner" style="max-width: 400px;">	923	<div class="customModalInner" style="max-width: 400px;">
924	<div class="customModelBody" style="border-radius: 5px 5px 0 0;">	924	<div class="customModelBody" style="border-radius: 5px 5px 0 0;">
925	<table>	925	<table>
926	<tr>	926	<tr>
927	<td>	927	<td>
928	<img src="img/info.png" style="width: 50px;">	928	<img src="img/info.png" style="width: 50px;">
929	</td>	929	</td>
930	<td>	930	<td>
931	<p style="padding: 5px 10px; margin-bottom: 0;">Are you sure you want to delete the attachment?</p>	931	<p style="padding: 5px 10px; margin-bottom: 0;">Are you sure you want to delete the attachment?</p>
932	</td>	932	</td>
933	</tr>	933	</tr>
934	</table>	934	</table>
935	</div>	935	</div>
936	<div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">	936	<div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;">
937	<button class="btn" style="padding: 4px 0; width: 80px;" ng-click="deleteAttachment()">Yes</button>	937	<button class="btn" style="padding: 4px 0; width: 80px;" ng-click="deleteAttachment()">Yes</button>
938	<button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelDeleteAttachment()">No</button>	938	<button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelDeleteAttachment()">No</button>
939	</div>	939	</div>
940	</div>	940	</div>
941	</div>	941	</div>
942		942
943		943
944		944
945	<div class="myLoader" ng-show="showLoader">	945	<div class="myLoader" ng-show="showLoader">
946	<img src="../img/hourglass.gif" width="50px;">	946	<img src="../img/hourglass.gif" width="50px;">
947	</div>	947	</div>
948	<script src="js/multi-step-modal.js"></script>	948	<script src="js/multi-step-modal.js"></script>
949	<script>	949	<script>
950	sendEvent = function(sel, step) {	950	sendEvent = function(sel, step) {
951	$(sel).trigger('next.m.' + step);	951	$(sel).trigger('next.m.' + step);
952	}	952	}
953	</script>	953	</script>
954		954