viithiisys / Acufuel

Download as
Browse Code ยป

Commit f65c9665ee6197fd0bc0891e0083b79eff80a9af

Authored by Anchit Jindal
2 parents cdf7752243 6284a85b90
Exists in master

Merge branch 'master' of http://git.viithiisys.com/viithiisys/acufuel

Showing 11 changed files   Show diff stats
... ... @@ -44,11 +44,18 @@
44 44 <link rel="stylesheet" type="text/css" href="css/ngTable.css">
45 45 <link rel="stylesheet" href="bower_components/select2/select2.css">
46 46  
47   - <link rel="stylesheet" type="text/css" href="css/fullcalender.css">
48   - <link rel="stylesheet" type="text/css" href="css/fullcalenderprint.css">
  47 + <!-- <link rel="stylesheet" type="text/css" href="css/fullcalender.css">
  48 + <link rel="stylesheet" type="text/css" href="css/fullcalenderprint.css"> -->
49 49  
50 50 <!-- <link rel="stylesheet"; href="https://unpkg.com/ng-table@2.0.2/bundles/ng-table.min.css"> -->
51 51  
  52 + <!-- <link href='https://fullcalendar.io/js/fullcalendar-3.4.0/fullcalendar.min.css' rel='stylesheet' />
  53 + <link href='https://fullcalendar.io/js/fullcalendar-3.4.0/fullcalendar.print.min.css' rel='stylesheet' media='print' />
  54 + <script src='https://fullcalendar.io/js/fullcalendar-3.4.0/lib/moment.min.js'></script>
  55 + <script src='https://fullcalendar.io/js/fullcalendar-3.4.0/lib/jquery.min.js'></script>
  56 + <script src='https://fullcalendar.io/js/fullcalendar-3.4.0/lib/jquery-ui.min.js'></script> -->
  57 +
  58 +
52 59 </head>
53 60 <body>
54 61 <!-- views -->
... ... @@ -86,7 +93,7 @@
86 93 <script src="bower_components/angular-bootstrap-toggle/dist/angular-bootstrap-toggle.min.js"></script>
87 94 <script src="bower_components/select2/select2.js"></script>
88 95 <script src="bower_components/angular-ui-select2/src/select2.js"></script>
89   -
  96 + <script src="bower_components/angular-ckeditor/angular-ckeditor.js"></script>
90 97  
91 98 <!-- <script src="https://unpkg.com/ng-table@2.0.2/bundles/ng-table.min.js"></script> -->
92 99  
... ... @@ -112,7 +119,7 @@
112 119  
113 120 <script src="js/ngTable.js"></script>
114 121  
115   - <script src="js/fullcalender.js"></script>
  122 + <!-- <script src="js/fullcalender.js"></script> -->
116 123  
117 124 <script src="http://cdn.ckeditor.com/4.6.1/standard-all/ckeditor.js"></script>
118 125 <script src="https://code.highcharts.com/maps/highmaps.js"></script>
... ... @@ -190,7 +197,7 @@
190 197 <script src="partials/enterFuelOrder/enterFuelOrder.service.js"></script>
191 198  
192 199 <script src="partials/main/main.service.js"></script>
193   -
  200 + <script src='https://fullcalendar.io/js/fullcalendar-3.4.0/fullcalendar.min.js'></script>
194 201  
195 202 </body>
196 203 </html>
197 204 \ No newline at end of file
... ...
1 1 'use strict';
2 2  
3 3  
4   - angular.module('acufuel', ['ngCookies', 'ngResource', 'ui.router', 'ngAnimate', 'ui.bootstrap', 'xeditable', 'ui.toggle', 'ngTable', 'ui.select2'])
  4 + angular.module('acufuel', ['ngCookies', 'ngResource', 'ui.router', 'ngAnimate', 'ui.bootstrap', 'xeditable', 'ui.toggle', 'ngTable', 'ui.select2', 'ckeditor'])
5 5  
6 6 .config(['$httpProvider', function($httpProvider) {
7 7 $httpProvider.defaults.withCredentials = true;
... ...
app/partials/enterFuelOrder/enterFuelOrder.controller.js
Diff comments   View file @f65c966
... ... @@ -16,7 +16,7 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
16 16  
17 17 $scope.order = {};
18 18 $scope.dispatchOrder = {};
19   - $scope.dispatchOrder.fuelOrderObj = [];
  19 + $scope.dispatchOrder.fuelOrderList = [];
20 20 $scope.order.upliftDate = '';
21 21 $scope.order.departingDate = '';
22 22 $scope.selectedCompanyName = '';
... ... @@ -54,6 +54,7 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
54 54 }
55 55  
56 56 $scope.dispatchFuel = function(){
  57 + $scope.showLoader = true;
57 58 $scope.order.companyId = $scope.selectedCompanyId;
58 59 if ($scope.order.upliftDate != '') {
59 60 $scope.order.upliftDate = new Date($scope.order.upliftDate);
... ... @@ -63,10 +64,15 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
63 64 $scope.order.departingDate = new Date($scope.order.departingDate);
64 65 $scope.order.departingDate = $scope.order.departingDate.getTime();
65 66 }
66   - $scope.dispatchOrder.fuelOrderObj.push($scope.order);
  67 + $scope.dispatchOrder.fuelOrderList.push($scope.order);
67 68 console.log('$scope.order', $scope.dispatchOrder);
68 69 enterFuelOrderService.dispathFuelOrder($scope.dispatchOrder).then(function(result) {
69 70 console.log('result', result);
  71 + $scope.showLoader = false;
  72 + $scope.order = {};
  73 + toastr.success('Fuel Order Dispatched Successfully', {
  74 + closeButton: true
  75 + })
70 76 })
71 77 }
72 78  
... ...
app/partials/fuelOrders/fuelOrders.controller.js
Diff comments   View file @f65c966
1   -
2 1 'use strict';
3 2  
4   - //Load controller
5   - angular.module('acufuel')
  3 +angular.module('acufuel')
  4 +
  5 +.controller('fuelOrdersController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'NgTableParams','fuelOrdersService', fuelOrdersController]);
  6 +
  7 +function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgTableParams,fuelOrdersService) {
  8 +
  9 + $scope.showFuelOrderModal = false;
  10 + $scope.optionSelected;
  11 +
  12 + $scope.data = {};
  13 +
  14 + fuelOrdersService.getOrders().then(function(result) {
  15 + $scope.orderdata = result;
  16 + for(var i=0;i<$scope.orderdata.length;i++){
  17 + $scope.orderdata[i].departingDate = new Date($scope.orderdata[i].departingDate);
  18 +
  19 + var str = ""+$scope.orderdata[i].departingDate;
  20 + str = str.slice(4,16)
  21 + $scope.orderdata[i].departingDateString = str
  22 + console.log(str);
  23 +
  24 + }
  25 +
  26 + $scope.displayFuelOrderList = new NgTableParams({
  27 + page: 1,
  28 + count: 10,
  29 + }, {
  30 + data: $scope.orderdata
  31 + });
  32 + })
  33 +
  34 +
  35 + $scope.onDTSelect = function() {
  36 + if($scope.optionSelected == 'dt'){
  37 + $('#demo-modal-4').css('display', 'block');
  38 + }
  39 + }
  40 +
  41 + $scope.editdata = {};
  42 + $scope.editTableRow = function(rowData){
  43 + console.log('row data', rowData);
  44 + $scope.editdata = rowData;
  45 + $('#demo-modal-5').css('display', 'block');
  46 + }
  47 +
  48 + $scope.cancelData = function() {
  49 + $('#demo-modal-4').css('display', '');
  50 + }
  51 + $scope.canceleditdata = function() {
  52 + $('#demo-modal-5').css('display', '');
  53 + }
  54 +
  55 + $scope.companyList = {};
  56 +
  57 + fuelOrdersService.getAllCompanies().then(function(result) {
  58 + $scope.showLoader = false;
  59 + $scope.companyList = result;
  60 + console.log(result)
  61 + })
6 62  
7   - .controller('fuelOrdersController', ['$scope',function($scope) {
  63 + $scope.sourceList = [{source:"Direct Jet-A"},{source:"Direct AVGAS 100LL"}];
8 64  
9   - $scope.test = "Testing...";
  65 + $scope.data = {};
  66 +
  67 +
10 68  
11   - }]);
12 69 \ No newline at end of file
  70 + }
13 71 \ No newline at end of file
... ...
app/partials/fuelOrders/fuelOrders.html
Diff comments   View file @f65c966
... ... @@ -2,7 +2,74 @@
2 2 .subnavbar .mainnav > li:nth-child(3) > a{
3 3 color: #ff9900;
4 4 }
  5 +
  6 + .button1 {
  7 + display: inline-block;
  8 + height: 35px;
  9 + line-height: 35px;
  10 + padding-right: 15px;
  11 + padding-left: 50px;
  12 + position: relative;
  13 + background-color:rgb(41,127,184);
  14 + color:rgb(255,255,255);
  15 + text-decoration: none;
  16 + text-transform: uppercase;
  17 + letter-spacing: 1px;
  18 + margin-bottom: 15px;
  19 + border: 0;
  20 +
  21 +
  22 + border-radius: 5px;
  23 + -moz-border-radius: 5px;
  24 + -webkit-border-radius: 5px;
  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;
  27 + filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true);
  28 +
  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);
  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)";
  33 + filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true);
  34 + }
  35 +
  36 + .button1 span {
  37 + position: absolute;
  38 + left: 0;
  39 + top: 0;
  40 + width: 35px;
  41 + background-color:rgba(0,0,0,0.5);
  42 +
  43 + -webkit-border-top-left-radius: 5px;
  44 + -webkit-border-bottom-left-radius: 5px;
  45 + -moz-border-radius-topleft: 5px;
  46 + -moz-border-radius-bottomleft: 5px;
  47 + border-top-left-radius: 5px;
  48 + border-bottom-left-radius: 5px;
  49 + border-right: 1px solid rgba(0,0,0,0.15);
  50 + }
  51 +
  52 + .button1:hover span, .button1.active span {
  53 + background-color:rgb(0,102,26);
  54 + border-right: 1px solid rgba(0,0,0,0.3);
  55 + }
  56 +
  57 + .button1:active {
  58 + margin-top: 2px;
  59 + margin-bottom: 13px;
  60 +
  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);
  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)";
  65 + filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true);
  66 + }
  67 +
  68 + .button1.turquoise {
  69 + background: #449d44;
  70 + }
5 71 </style>
  72 +
6 73 <div class="main">
7 74 <div class="container">
8 75 <div class="row">
... ... @@ -10,225 +77,766 @@
10 77 <div class="widget stacked ">
11 78 <div class="widget-content">
12 79 <div class="tabbable">
13   - <ul class="nav nav-tabs Search-tabs">
14   - <h2> Corman Air Coeporation</h2>
15   - <li style="margin: 0px 10px 0px 0px;"><input type="text" style="height:31px;" class="form-control" name="name" id="name" placeholder="Search In Table"></li>
16   - <li><button type="button" class="btn btn-default">Clear Search & Filters</button></li>
17   -
18   - <!-- <li style="float:right"></li> -->
  80 + <ul class="nav nav-tabs">
  81 + <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>
  82 + <li><button type="button" class="btn btn-default btn-sm " ng-click="displayFuelOrderList.filter({}); searchText=null">Clear Search And Filters</button></li>
  83 + <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>
19 84 </ul>
20 85 <br>
21   - <div class="tab-content" style="margin:0px">
  86 + <div class="tab-content customer-table" style="margin:0px">
22 87 <div class="tab-pane active" id="companyView">
23   - <table class="table table-striped">
24   - <thead>
25   - <tr>
26   - <th>
27   - <input type="text" class="form-control" style="height:31px;" name="name" id="name">
28   - <lable class="font-company">Fueling date</lable>
29   - </th>
30   - <th>
31   - <input type="text" class="form-control" style="height:31px;" name="name" id="name">
32   - <lable class="font-company">Tail #</lable>
33   - </th>
34   - <th>
35   - <input type="text" class="form-control" style="height:31px;" name="name" id="name">
36   - <lable class="font-company">FBO Name</lable>
37   - </th>
38   - <th>
39   - <input type="text" class="form-control" style="height:31px;" name="name" id="name">
40   - <lable class="font-company">Volume</lable>
41   - </th>
42   - <th>
43   - <input type="text" class="form-control" style="height:31px;" name="name" id="name">
44   - <lable class="font-company">Quoted</lable>
45   - </th>
46   - <th>
47   - <input type="text" class="form-control" style="height:31px;" name="name" id="name">
48   - <lable class="font-company">Invoiced</lable>
49   - </th>
50   - <th>
51   - <input type="text" class="form-control" style="height:31px;" name="name" id="name">
52   - <lable class="font-company">Total</lable>
53   - </th>
54   - <th>
55   - <select style="float: right;margin:7px;">
56   - <option>Show all</option>
57   - <option>paid</option>
58   - <option>pending</option>
59   - <option>cancelled</option>
60   - </select>
61   - <lable class="font-company">Status</lable>
62   - </th>
63   - <th>
64   - <select style="float: right;margin:7px;">
65   - <option>Show all</option>
66   - <option>Attachmens</option>
67   - <option>No Attachmens</option>
  88 + <table ng-table="displayFuelOrderList" class="table table-striped table-condensed" show-filter="true">
  89 + <tr ng-repeat="row in $data | filter:searchText" style="cursor: pointer;" ng-click="editTableRow(row)" >
  90 + <td data-title="'Company Name'" filter="{companyName: 'text'}" sortable="'companyName'">
  91 + {{row.companyName}}
  92 + </td>
  93 + <td data-title="'Fueling date'" filter="{departingDate: 'text'}" sortable="'departingDate'">
  94 + {{row.departingDateString}}
  95 + </td>
  96 + <td data-title="'Tail #'" filter="{aircraftName: 'text'}" sortable="'aircraftName'">
  97 + {{row.aircraftName}}
  98 + </td>
  99 + <td data-title="'Source'" filter="{source: 'text'}" sortable="'source'">
  100 + {{row.source}}
  101 + </td>
  102 + <td data-title="'Volume'" filter="{requestedVolume: 'text'}" sortable="'requestedVolume'">
  103 + {{row.requestedVolume}}
  104 + </td>
  105 + <td data-title="'FBO Cost'" filter="{fboCost: 'text'}" sortable="'fboCost'">
  106 + {{row.fboCost}}
  107 + </td>
  108 + <td data-title="'Quoted'" filter="{priceQuote: 'text'}" sortable="'priceQuote'">
  109 + {{row.priceQuote}}
  110 + </td>
  111 + <td data-title="'Invoiced'" filter="{invoiced: 'text'}" sortable="'invoiced'">
  112 + {{row.invoiced}}
  113 + </td>
  114 + <td data-title="'Total'" filter="{total: 'text'}" sortable="'total'">
  115 + {{row.total}}
  116 + </td>
  117 + <td data-title="'Status'" filter="{status: 'text'}" sortable="'status'">
  118 + {{row.status}}
  119 + </td>
  120 + <td data-title="'Attachments'" filter="{allIn: 'text'}" sortable="'allIn'">
  121 +
  122 + </td>
  123 + </tr>
  124 + </table>
  125 +
  126 + <select class="btn btn-warning exportBtn" ng-model="optionSelected" ng-change="onDTSelect()">
  127 + <option value="" disabled selected="selected">Fuel Widget</option>
  128 + <option value="dt" >Direct Transaction</option>
  129 + <option value="efo" >Export Fuel Orders</option>
68 130 </select>
69   - <lable class="font-company">Attachmens</lable>
70   - </th>
71   - <th></th>
72   - <th></th>
73   - </tr>
74   - </thead>
75   - <tbody>
76   - <tr>
77   - <td class="font-company">04/05/2017</td>
78   - <td class="font-company">N500HG</td>
79   - <td class="font-company">TBase FBO</td>
80   - <td class="font-company">1000</td>
81   - <td class="font-company">$4.4500</td>
82   - <td class="font-company">$0.000</td>
83   - <td class="font-company">$691.42</td>
84   - <td class="font-company">paid</td>
85   - <td class="font-company"><i class="fa fa-paperclip" aria-hidden="true"></i></td>
86   - <td ></td>
87   - <td></td>
88   - </tr>
89   - <tr>
90   - <td class="font-company">04/05/2017</td>
91   - <td class="font-company">N968HG</td>
92   - <td class="font-company">TBase FBO</td>
93   - <td class="font-company">1000</td>
94   - <td class="font-company">$4.4500</td>
95   - <td class="font-company">$0.000</td>
96   - <td class="font-company">$691.42</td>
97   - <td class="font-company">pending</td>
98   - <td class="font-company"><i class="fa fa-paperclip" aria-hidden="true"></i></td>
99   - <td></td>
100   - <td></td>
101   - </tr>
102   - <tr>
103   - <td class="font-company">04/05/2017</td>
104   - <td class="font-company">N300HG</td>
105   - <td class="font-company">TBase FBO</td>
106   - <td class="font-company">1000</td>
107   - <td class="font-company">$4.4500</td>
108   - <td class="font-company">$0.000</td>
109   - <td class="font-company">$691.42</td>
110   - <td class="font-company">Cancelled</td>
111   - <td class="font-company"><i class="fa fa-paperclip" aria-hidden="true"></i></td>
112   - <td></td>
113   - <td ></td>
114   - </tr>
115   - <tr>
116   - <td class="font-company">04/05/2017</td>
117   - <td class="font-company">N500HG</td>
118   - <td class="font-company">TBase FBO</td>
119   - <td class="font-company">1000</td>
120   - <td class="font-company">$4.4500</td>
121   - <td class="font-company">$0.000</td>
122   - <td class="font-company">$691.42</td>
123   - <td class="font-company">pending</td>
124   - <td class="font-company"><i class="fa fa-paperclip" aria-hidden="true"></i></td>
125   - <td ></td>
126   - <td></td>
127   - </tr>
128   - <tr>
129   - <td class="font-company">04/05/2017</td>
130   - <td class="font-company">N600HG</td>
131   - <td class="font-company">TBase FBO</td>
132   - <td class="font-company">1000</td>
133   - <td class="font-company">$4.4500</td>
134   - <td class="font-company">$0.000</td>
135   - <td class="font-company">$691.42</td>
136   - <td class="font-company">paid</td>
137   - <td class="font-company"><i class="fa fa-paperclip" aria-hidden="true"></i></td>
138   - <td ></td>
139   - <td></td>
140   - </tr>
141   - <tr>
142   - <td class="font-company">04/05/2017</td>
143   - <td class="font-company">N500HG</td>
144   - <td class="font-company">TBase FBO</td>
145   - <td class="font-company">1000</td>
146   - <td class="font-company">$4.4500</td>
147   - <td class="font-company">$0.000</td>
148   - <td class="font-company">$691.42</td>
149   - <td class="font-company">Cancelled</td>
150   - <td class="font-company"><i class="fa fa-paperclip" aria-hidden="true"></i></td>
151   - <td ></td>
152   - <td></td>
153   - </tr>
154   - <tr>
155   - <td class="font-company">04/05/2017</td>
156   - <td class="font-company">N900HG</td>
157   - <td class="font-company">TBase FBO</td>
158   - <td class="font-company">1000</td>
159   - <td class="font-company">$4.4500</td>
160   - <td class="font-company">$0.000</td>
161   - <td class="font-company">$691.42</td>
162   - <td class="font-company">paid</td>
163   - <td class="font-company"><i class="fa fa-paperclip" aria-hidden="true"></i></td>
164   - <td ></td>
165   - <td></td>
166   - </tr>
167   - <tr>
168   - <td class="font-company">04/05/2017</td>
169   - <td class="font-company">N500HG</td>
170   - <td class="font-company">TBase FBO</td>
171   - <td class="font-company">1000</td>
172   - <td class="font-company">$4.4500</td>
173   - <td class="font-company">$0.000</td>
174   - <td class="font-company">$691.42</td>
175   - <td class="font-company">pending</td>
176   - <td class="font-company"><i class="fa fa-paperclip" aria-hidden="true"></i></td>
177   - <td ></td>
178   - <td></td>
179   - </tr>
180   - <tr>
181   - <td class="font-company">04/05/2017</td>
182   - <td class="font-company">N580HG</td>
183   - <td class="font-company">TBase FBO</td>
184   - <td class="font-company">1000</td>
185   - <td class="font-company">$4.4500</td>
186   - <td class="font-company">$0.000</td>
187   - <td class="font-company">$691.42</td>
188   - <td class="font-company">Cancelled</td>
189   - <td class="font-company"><i class="fa fa-paperclip" aria-hidden="true"></i></td>
190   - <td ></td>
191   - <td></td>
192   - </tr>
193   - </tbody>
194   - </table>
195   - <div class="row" style="margin-left: 0px;">
196   - <div class="col-md-2">
197   - <button type="button" class="btn btn-warning">Export Fuel Orders</button>
198   - </div>
199   - <div class="col-md-10">
200   - <div class="row" style="margin-left: 0px;">
201   - <div class="col-md-6">
202   - </div>
203   - <div class="col-md-2">
204   - <select class="form-control">
205   - <option>20 Records Per Page</option>
206   - <option>50 Records Per Page</option>
207   - <option>100 Records Per Page</option>
208   - </select>
  131 +
  132 + </div>
  133 + </div>
  134 + </div>
  135 + </div>
  136 + <!-- /widget-content -->
  137 + </div>
  138 + <!-- /widget -->
  139 + </div>
  140 + <!-- /span8 -->
  141 + </div>
  142 + <!-- /row -->
  143 + </div>
  144 + <!-- /container -->
  145 +</div>
  146 +<!-- /main -->
  147 +
  148 +
  149 +<form class="modal multi-step" id="demo-modal-3" name="companyForm">
  150 + <div class="modal-dialog modal-lg">
  151 + <div class="modal-content">
  152 + <div class="modal-body step-1" data-step="1" style="padding: 0;">
  153 + <div>
  154 + <div class="row" style="margin: 0;">
  155 + <div>
  156 + <div class="widget" style="margin-bottom: 0;">
  157 + <div class="widget-header">
  158 + <i class="icon-pencil"></i>
  159 + <i class="fa fa-tasks" aria-hidden="true"></i>
  160 + <h3>Add a New Company</h3>
  161 + <div class="pull-right my-toggle-switch" style="margin-right: 30px;">
  162 + <div style="color: #ff9a01;">Activate &nbsp &nbsp
  163 + <toggle ng-model="data.activate" size="customToogle"></toggle>
  164 + </div>
  165 + </div>
  166 + <div class="clearfix"></div>
  167 + </div>
  168 + <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
  169 + <div class="col-xs-12">
  170 + <div class="col-md-8">
  171 + <div class="pull-left">
  172 + <label class="new-input-label"><b>Company Name *</b></label>
  173 + </div>
  174 + <div class="pull-left" style="margin-left: 15px;">
  175 + <input type="text" ng-model="data.companyName" class="form-control companyNameInput" ng-keyup="removeValidation()" placeholder="" required>
  176 + <label class="customErrorMessage" ng-show="showCompanyError">This field is required.</label>
  177 + </div>
  178 + <div class="clearfix"></div>
  179 + </div>
  180 + <div class="col-md-4">
  181 +
  182 + <div class="pull-right">
  183 + <input type="text" ng-model="data.baseIcao" style="width: 100px;" class="form-control" placeholder="">
  184 + </div>
  185 + <div class="pull-right">
  186 + <label style="margin-right: 15px;" class="new-input-label"><b>Base ICAO</b></label>
  187 + </div>
  188 + <div class="clearfix"></div>
  189 + </div>
  190 + </div>
  191 + <div class="clearfix"></div><br>
  192 + <div class="col-xs-12">
  193 + <div class="col-md-7">
  194 + <div class="pull-left">
  195 + <label class="new-input-label"><b>Relationship&nbsp;</b></label>
  196 + </div>
  197 + <div class="pull-left" style="margin-left: 32px;">
  198 + <input type="checkbox" ng-model="data.baseTenant" name="vehicle" value="Bike"> Check here if this is a Base Tenant<br>
  199 + <input type="checkbox" ng-model="data.fuelerlinxCustomer" name="vehicle" value="Car" checked> Check here if this is a FuelerLinx Customer<br>
  200 + <input type="checkbox" ng-model="data.contractFuelVendor" name="vehicle" value="Car" checked> Check here if this is a Contract Fuel Vendor
  201 + </div>
  202 + <div class="clearfix"></div>
  203 + </div>
  204 + <div class="col-md-2 Airport" style="text-align: right;">
  205 + <b>Certificate Type</b>
  206 + </div>
  207 + <div class="col-md-3 Airport">
  208 + <select required class="form-control" ng-model="data.certificateType">
  209 + <option value="" disabled selected hidden>Select...</option>
  210 + <option value="corporate">Part 91 (Corporate)</option>
  211 + <option value="charter">Part 135 (Charter)</option>
  212 + <option value="scheduled">Part 121 (Scheduled)</option>
  213 + <option value="military">Military</option>
  214 + <option value="government">Government</option>
  215 + </select>
  216 + </div>
  217 + <div class="clearfix"></div>
  218 + </div>
  219 + <div class="clearfix"></div>
  220 + <br/>
  221 + <div class="col-xs-12">
  222 + <div class="col-md-6">
  223 + <div class="pull-left" style="width: 110px;">
  224 + <b>JET A Margin *</b>
  225 + </div>
  226 + <div class="pull-left">
  227 + <select class="form-control marginSelectBox" ng-model="data.masterMargin" ng-options="margin.id as margin.marginName for margin in jetMarginList" required ng-change="removeMarginValidation()">
  228 + <option value="" disabled>Select...</option>
  229 + </select>
  230 + <label ng-show="showMarginError" class="customErrorMessage">This field is required.</label>
  231 +
  232 + <div class="clearfix"></div>
  233 + </div>
  234 + </div>
  235 +
  236 + <div class="col-md-3 Airport" style="text-align: right;">
  237 + <b>AVGAS 100LL Margin</b>
  238 + </div>
  239 + <div class="col-md-3 Airport">
  240 + <select class="form-control" ng-model="data.avgasMargin" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList">
  241 + <option value="" disabled>Select...</option>
  242 + </select>
  243 + </div>
  244 + <div class="clearfix"></div>
  245 + </div>
  246 + <div class="clearfix"></div>
  247 + <br/>
  248 + <div class="col-xs-12">
  249 + <div class="col-md-12">
  250 + <div class="pull-left" style="width: 110px;">
  251 + <label class="new-input-label"><b>Address</b></label>
  252 + </div>
  253 + <div class="pull-left" style="width: calc(100% - 110px);">
  254 + <input type="text" class="form-control" ng-model="data.addressOne" placeholder="">
  255 + </div>
  256 + <div class="clearfix"></div>
  257 + </div>
  258 + </div>
  259 + <div class="clearfix"></div>
  260 + <br/>
  261 + <div class="col-xs-12">
  262 + <div class="col-md-12">
  263 + <div class="pull-left" style="width: 110px;">
  264 + <label class="new-input-label"><b>Address2</b></label>
  265 + </div>
  266 + <div class="pull-left" style="width: calc(100% - 110px);">
  267 + <input type="text" ng-model="data.addressTwo" class="form-control" placeholder="">
  268 + </div>
  269 + <div class="clearfix"></div>
  270 + </div>
  271 + </div>
  272 + <div class="clearfix"></div>
  273 + <br/>
  274 + <div class="col-xs-12">
  275 +
  276 + <div class="col-md-6">
  277 + <div class="pull-left" style="width: 110px;">
  278 + <label class="new-input-label"><b>City</b></label>
  279 + </div>
  280 + <div class="pull-left" style="width: calc(100% - 110px);">
  281 + <input type="text" ng-model="data.city" class="form-control" placeholder="">
  282 + </div>
  283 + <div class="clearfix"></div>
  284 + </div>
  285 + <div class="col-md-3">
  286 + <div class="pull-left" style="width: 40px;">
  287 + <label class="new-input-label"><b>State</b></label>
  288 + </div>
  289 + <div class="pull-left" style="width: calc(100% - 110px);">
  290 + <input type="text" ng-model="data.state" class="form-control" placeholder="">
  291 + </div>
  292 + <div class="clearfix"></div>
  293 + </div>
  294 + <div class="col-md-3">
  295 + <div class="pull-left">
  296 + <label class="new-input-label"><b>Zip Code</b></label>
  297 + </div>
  298 + <div class="pull-right" style="width: calc(100% - 60px);">
  299 + <input type="tel" ng-model="data.zipcode" class="form-control" placeholder="">
  300 + </div>
  301 + <div class="clearfix"></div>
  302 + </div>
  303 + </div>
  304 + <div class="clearfix"></div>
  305 + <br/>
  306 + <div class="col-xs-12">
  307 +
  308 + <div class="col-md-6">
  309 + <div class="pull-left" style="width: 110px;">
  310 + <label class="new-input-label"><b>Country</b></label>
  311 + </div>
  312 + <div class="pull-left" style="width: calc(100% - 110px);">
  313 + <input type="text" ng-model="data.country" class="form-control" placeholder="">
  314 + </div>
  315 + <div class="clearfix"></div>
  316 + </div>
  317 + <div class="col-md-6">
  318 + <div class="pull-left" style="width: 110px;">
  319 + <label class="new-input-label"><b>Internal Note</b></label>
209 320 </div>
210   - <div class="col-md-4">
211   - <ul class="pagination" style="margin:0px">
212   - <li><a href="javascript:;">ยซ</a></li>
213   - <li class="active"><a href="#">1</a></li>
214   - <li><a href="javascript:;">2</a></li>
215   - <li><a href="javascript:;">3</a></li>
216   - <li><a href="javascript:;">4</a></li>
217   - <li><a href="javascript:;">5</a></li>
218   - <li><a href="javascript:;">ยป</a></li>
219   - </ul>
  321 + <div class="pull-left" style="width: calc(100% - 110px);">
  322 + <textarea name="message" ng-model="data.internalNote" rows="4" cols="34"></textarea>
220 323 </div>
  324 + <div class="clearfix"></div>
221 325 </div>
222 326 </div>
  327 + <div class="clearfix"></div>
  328 + <!-- <br/>
  329 + <div class="col-xs-12">
  330 + <div class="col-md-2 Airport"></div>
  331 + <div class="col-md-10 Airport">
  332 + <div class="pull-right">
  333 + <button type="button" class="btn btn-default" ng-click="cancel()">Cancel</button>
  334 + <button type="button" class="btn btn-warning" ng-click="addAircraft()">Next: Add Aircraft</button>
  335 + </div>
  336 + </div>
  337 + </div> -->
223 338 </div>
224 339 </div>
225   -
  340 + <div class="clearfix"></div>
  341 + </div>
  342 + </div>
  343 + </div>
226 344 </div>
227   -
228   - </div>
229   -
230   - </div>
231   -
232   - </div>
  345 + <div class="modal-body step-2" data-step="2" style="padding: 0;">
  346 + <div>
  347 + <div class="row" style="margin: 0;">
  348 + <div>
  349 + <div class="widget" style="margin-bottom: 0;">
  350 + <div class="widget-header">
  351 + <i class="icon-pencil"></i>
  352 + <i class="fa fa-tasks" aria-hidden="true"></i>
  353 + <h3>Add a New Company</h3>
  354 + <div class="clearfix"></div>
  355 + </div>
  356 + <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
  357 + <div class="col-xs-12">
  358 + <div class="widget-header">
  359 + <i class="fa fa-list"></i>
  360 + <h3>Aircraft List</h3>
  361 + </div>
  362 + <div class="widget-content" style="padding:0px;border: 0px; ">
  363 + <div class="table-responsive">
  364 + <!-- <table class="table table-bordered table-hover table-striped addRow" style="margin-bottom: 0px;">
  365 + <thead>
  366 + <tr>
  367 + <th>Tail</th>
  368 + <th>Make</th>
  369 + <th>Model</th>
  370 + <th>Size</th>
  371 + <th>Margin</th>
  372 + </tr>
  373 + </thead>
  374 + <tbody>
  375 + <tr>
  376 + <td>
  377 + <input type="text" style="width:100px;" ng-model="aircraft.tail" class="form-control">
  378 + </td>
  379 + <td style="width: 25%;">
  380 + <select class="form-control" ng-model="aircraft.make" ng-change="getModal()">
  381 + <option ng-repeat="make in aircraftMakeList">{{make}}</option>
  382 + </select>
  383 + </td>
  384 + <td style="width: 20%;">
  385 + <select class="form-control" ng-model="aircraft.model" ng-change="getSize()">
  386 + <option ng-repeat="model in aircraftModalList">{{model}}</option>
  387 + </select>
  388 + </td>
  389 + <td style="width: 25%;">
  390 + <select class="form-control" ng-model="aircraft.size">
  391 + <option ng-repeat="size in aircraftSizeList">{{size}}</option>
  392 + </select>
  393 + </td>
  394 + <td>
  395 + <select class="form-control">
  396 + <option>Margin1</option>
  397 + <option>Margin2</option>
  398 + </select>
  399 + </td>
  400 + </tr>
  401 + </tbody>
  402 +
  403 + </table> -->
  404 + <table class="table table-striped table-bordered">
  405 + <thead>
  406 + <tr>
  407 + <!-- <th><input type="checkbox" ng-model="selectedAll" ng-click="checkAll()" /></th> -->
  408 + <th>Tail</th>
  409 + <th>Make</th>
  410 + <th>Model</th>
  411 + <th>Size</th>
  412 + <th>JET A Margin</th>
  413 + <th>AVGS 100LL Margin</th>
  414 + </tr>
  415 + </thead>
  416 + <tbody>
  417 + <tr ng-repeat="aircraftData in aircraftDetails track by $index">
  418 + <!-- <td>
  419 + <input type="checkbox" ng-model="aircraftData.selected"/>
  420 + </td> -->
  421 + <td style="width: 15%">
  422 + <input type="text" class="form-control" ng-model="aircraftData.tail" required/>
  423 + </td>
  424 + <td style="width: 17%">
  425 + <select class="form-control" ng-model="aircraftData.make" ng-change="getModal(aircraftData.make, $index)">
  426 + <option ng-repeat="make in aircraftMakeList">{{make}}</option>
  427 + <option value="" disabled>Select...</option>
  428 + </select>
  429 + </td>
  430 + <td style="width: 17%">
  431 + <select class="form-control" ng-model="aircraftData.model" ng-change="getSize(aircraftData.model, $index)">
  432 + <option ng-repeat="model in aircraftData.aircraftModalList">{{model}}</option>
  433 + <option value="" disabled>Select...</option>
  434 + </select>
  435 + </td>
  436 + <td style="width: 17%">
  437 + <select class="form-control" ng-model="aircraftData.sizeId" ng-options="size.aircraftSize.id as size.aircraftSize.size for size in aircraftData.aircraftSizeList">
  438 + <option value="" disabled>Select...</option>
  439 + </select>
  440 + <!-- <select class="form-control" ng-model="aircraftData.size">
  441 + <option ng-repeat="size in aircraftData.aircraftSizeList">{{size}}</option>
  442 + </select> -->
  443 + </td>
  444 + <td style="width: 17%">
  445 + <select class="form-control" ng-model="aircraftData.marginId" ng-options="margin.id as margin.marginName for margin in jetMarginList">
  446 + <option value="" disabled>Select...</option>
  447 + </select>
  448 + </td>
  449 + <td style="width: 17%">
  450 + <select class="form-control marginSelectBox" ng-model="aircraftData.avgasMarginId" ng-options="avgs.id as avgs.marginName for avgs in avgsMarginList">
  451 + <option value="" disabled>Select...</option>
  452 + </select>
  453 + </td>
  454 + </tr>
  455 + </tbody>
  456 + </table>
  457 + </div>
  458 + <div class="clearfix"></div>
  459 + </div>
  460 + </div>
  461 + <div class="clearfix"></div>
  462 + <div class="col-xs-12" style="margin-bottom: 50px;margin-top: 10px;">
  463 + <button ng-click="addNew()" class="button1 turquoise pull-right"><span>+</span>Add Aircraft</button>
  464 + </div>
  465 + <!-- <div class="col-xs-12" style="margin-bottom: 20px;">
  466 + <div class="pull-right">
  467 + <button type="button" class="btn btn-default" ng-click="cancelCraft()">Cancel</button>
  468 + <button type="button" class="btn btn-warning" ng-click="goBack()">Go Back</button>
  469 + <button type="button" class="btn btn-success" ng-click="goBack()">Save</button>
  470 + </div>
  471 + </div> -->
  472 + </div>
  473 + </div>
  474 + <div class="clearfix"></div>
  475 + </div>
  476 + </div>
  477 + </div>
  478 + </div>
  479 + <!-- <div class="modal-body step-3" data-step="3">
  480 + This is the final step.
  481 + </div> -->
  482 + <div class="modal-footer" style="border-top: 0;">
  483 + <button type="button" class="btn btn-default" ng-click="reset2()" data-dismiss="modal">Cancel</button>
  484 + <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addFirstData('#demo-modal-3', 2)">Next: Add Aircraft</button>
  485 + <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#demo-modal-3', 1)">Go Back</button>
  486 + <!-- <button type="button" class="btn btn-primary step step-2" data-step="2" onclick="sendEvent('#demo-modal-3', 3)">Continue</button> -->
  487 + <button type="button" class="btn btn-success step step-2" data-step="2" ng-click="saveCompanyData()">Save</button>
  488 + </div>
  489 + </div>
  490 + </div>
  491 +</form>
  492 +
233 493  
  494 +
  495 +<form class="modal multi-step" id="demo-modal-4" name="fuelOrderForm">
  496 + <div class="modal-dialog modal-lg">
  497 + <div class="modal-content">
  498 + <div class="modal-body step-1" data-step="1" style="padding: 0;">
  499 + <div>
  500 + <div class="row" style="margin: 0;">
  501 + <div>
  502 + <div class="widget" style="margin-bottom: 0;">
  503 + <div class="widget-header">
  504 + <i class="icon-pencil"></i>
  505 + <i class="fa fa-tasks" aria-hidden="true"></i>
  506 + <h3>Add a Fuel Order</h3>
  507 + <div class="clearfix"></div>
  508 + </div>
  509 + <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
  510 + <div class="col-xs-12">
  511 + <div class="col-xs-12">
  512 +
  513 + <div class="col-md-6">
  514 + <div class="pull-left" style="width: 110px;">
  515 + <label class="new-input-label"><b>Fueling Date</b></label>
  516 + </div>
  517 + <div class="pull-left" style="width: calc(100% - 110px);">
  518 + <input type="date" ng-model="data.date" class="form-control" placeholder="">
  519 + <!--<md-datepicker ng-model="myDate" md-placeholder="Enter date"></md-datepicker>-->
  520 + </div>
  521 + <div class="clearfix"></div>
  522 + </div>
  523 + <div class="col-md-6">
  524 + <div class="pull-left" style="width: 110px;">
  525 + <label class="new-input-label"><b>Tail #</b></label>
  526 + </div>
  527 + <div class="pull-left" style="width: calc(100% - 110px);">
  528 + <input type="text" ng-model="data.tail" class="form-control" placeholder="">
  529 + </div>
  530 + <div class="clearfix"></div>
  531 + </div>
  532 + </div>
  533 + <div class="clearfix"></div><br>
  534 +
  535 + <div class="col-xs-12">
  536 +
  537 + <div class="col-md-6">
  538 + <div class="pull-left" style="width: 110px;">
  539 + <label class="new-input-label"><b>Company</b></label>
  540 + </div>
  541 + <div class="pull-left" style="width: calc(100% - 110px);">
  542 + <select ui-select2 ng-model="data.company" style="width: 100%;">
  543 + <option value="" selected disabled>Select Company</option>
  544 + <option ng-repeat="list in companyList">{{list.companyName}}</option>
  545 + </select>
  546 + </div>
  547 + <div class="clearfix"></div>
  548 + </div>
  549 + <div class="col-md-6">
  550 + <div class="pull-left" style="width: 110px;">
  551 + <label class="new-input-label"><b>Source</b></label>
  552 + </div>
  553 + <div class="pull-left" style="width: calc(100% - 110px);">
  554 + <select ui-select2 ng-model="data.source" style="width: 100%;">
  555 + <option value="" selected disabled>Select Source</option>
  556 + <option ng-repeat="list in sourceList">{{list.source}}</option>
  557 + </select>
  558 + </div>
  559 + <div class="clearfix"></div>
  560 + </div>
  561 + </div>
  562 + <div class="clearfix"></div>
  563 + <br/>
  564 +
  565 +
  566 + <div class="col-xs-12">
  567 +
  568 + <div class="col-md-6">
  569 + <div class="pull-left" style="width: 110px;">
  570 + <label class="new-input-label"><b>Volume</b></label>
  571 + </div>
  572 + <div class="pull-left" style="width: calc(100% - 110px);">
  573 + <input type="text" ng-model="data.volume" class="form-control" placeholder="">
  574 + </div>
  575 + <div class="clearfix"></div>
  576 + </div>
  577 + <div class="col-md-6">
  578 + <div class="pull-left" style="width: 110px;">
  579 + <label class="new-input-label"><b>Invoiced</b></label>
  580 + </div>
  581 + <div class="pull-left" style="width: calc(100% - 110px);">
  582 + <input type="text" ng-model="data.invoiced" class="form-control" placeholder="">
  583 + </div>
  584 + <div class="clearfix"></div>
  585 + </div>
  586 + </div>
  587 + <div class="clearfix"></div>
  588 + <br/>
  589 + <div class="col-xs-12">
  590 +
  591 + <div class="col-md-6">
  592 + <div class="pull-left" style="width: 110px;">
  593 + <label class="new-input-label"><b>Total</b></label>
  594 + </div>
  595 + <div class="pull-left" style="width: calc(100% - 110px);">
  596 + <input type="text" class="form-control" placeholder="0.0" value="{{data.volume * data.invoiced}}">
  597 +
  598 + </div>
  599 + <div class="clearfix"></div>
  600 + </div>
  601 + <div class="col-md-6">
  602 + <div class="pull-left" style="width: 110px;">
  603 + <label class="new-input-label"><b>FBO Cost</b></label>
  604 + </div>
  605 + <div class="pull-left" style="width: calc(100% - 110px);">
  606 + <input type="text" ng-model="data.fbo" class="form-control" placeholder="">
  607 + </div>
  608 + <div class="clearfix"></div>
  609 + </div>
  610 + </div>
  611 + <div class="clearfix"></div>
  612 + <br/>
  613 + <div class="col-xs-12">
  614 +
  615 +
  616 + <div class="col-md-6">
  617 + <div class="pull-left" style="width: 110px;">
  618 + <label class="new-input-label"><b>Status</b></label>
  619 + </div>
  620 + <div class="pull-left" style="width: calc(100% - 110px);">
  621 + <select ui-select2 ng-model="data.status" style="width: 100%;">
  622 + <option value="" selected disabled>Select Status</option>
  623 + <option>Pending</option>
  624 + <option>Invoiced</option>
  625 + <option>Paid</option>
  626 + <option>Cancelled</option>
  627 + <option>Archived</option>
  628 + </select>
  629 + </div>
  630 + <div class="clearfix"></div>
  631 + </div>
  632 + </div>
  633 + <div class="clearfix"></div>
  634 + <br/>
  635 + <div class="col-xs-12">
  636 +
  637 +
  638 + </div>
  639 + <div class="clearfix"></div>
  640 + <br/>
  641 + <div class="col-xs-12">
  642 +
  643 + </div>
  644 + <div class="clearfix"></div>
  645 +
  646 + </div>
  647 + </div>
  648 + <div class="clearfix"></div>
  649 + </div>
  650 + </div>
  651 + </div>
  652 + </div>
  653 +
  654 + <div class="modal-footer" style="border-top: 0;">
  655 + <button type="button" class="btn btn-default" ng-click="cancelData()" data-dismiss="modal">Cancel</button>
  656 + <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="addData">Save</button>
  657 + </div>
  658 + </div>
  659 + </div>
  660 +</div>
  661 +</form>
  662 +
  663 +
  664 + <form class="modal multi-step" id="demo-modal-5" name="fuelOrderUpdateForm">
  665 + <div class="modal-dialog modal-lg">
  666 + <div class="modal-content">
  667 + <div class="modal-body step-1" data-step="1" style="padding: 0;">
  668 + <div>
  669 + <div class="row" style="margin: 0;">
  670 + <div>
  671 + <div class="widget" style="margin-bottom: 0;">
  672 + <div class="widget-header">
  673 + <i class="icon-pencil"></i>
  674 + <i class="fa fa-tasks" aria-hidden="true"></i>
  675 + <h3>Update Fuel Order</h3>
  676 + <div class="clearfix"></div>
  677 + </div>
  678 + <div class="widget-content" style="padding-left: 0; padding-right: 0; border-bottom: 0;">
  679 + <div class="col-xs-12">
  680 + <div class="col-xs-12">
  681 +
  682 + <div class="col-md-6">
  683 + <div class="pull-left" style="width: 110px;">
  684 + <label class="new-input-label"><b>Fueling Date</b></label>
  685 + </div>
  686 + <div class="pull-left" style="width: calc(100% - 110px);">
  687 + <input type="date" ng-model="editdata.departingDate" class="form-control" placeholder="">
  688 + <!--<md-datepicker ng-model="myDate" md-placeholder="Enter date"></md-datepicker>-->
  689 + </div>
  690 + <div class="clearfix"></div>
  691 + </div>
  692 + <div class="col-md-6">
  693 + <div class="pull-left" style="width: 110px;">
  694 + <label class="new-input-label"><b>Tail #</b></label>
  695 + </div>
  696 + <div class="pull-left" style="width: calc(100% - 110px);">
  697 + <input type="text" ng-model="editdata.aircraftName" class="form-control" placeholder="">
  698 + </div>
  699 + <div class="clearfix"></div>
  700 + </div>
  701 + </div>
  702 + <div class="clearfix"></div><br>
  703 +
  704 + <div class="col-xs-12">
  705 +
  706 + <div class="col-md-6">
  707 + <div class="pull-left" style="width: 110px;">
  708 + <label class="new-input-label"><b>Company</b></label>
  709 + </div>
  710 + <div class="pull-left" style="width: calc(100% - 110px);">
  711 + <select ui-select2 ng-model="editdata.companyName" style="width: 100%;">
  712 + <option value="" selected disabled>Select Company</option>
  713 + <option ng-repeat="list in companyList">{{list.companyName}}</option>
  714 + </select>
  715 + </div>
  716 + <div class="clearfix"></div>
  717 + </div>
  718 + <div class="col-md-6">
  719 + <div class="pull-left" style="width: 110px;">
  720 + <label class="new-input-label"><b>Source</b></label>
  721 + </div>
  722 + <div class="pull-left" style="width: calc(100% - 110px);">
  723 + <select ui-select2 ng-model="editdata.source" style="width: 100%;">
  724 + <option value="" selected disabled>Select Source</option>
  725 + <option ng-repeat="list in sourceList">{{list.source}}</option>
  726 + </select>
  727 + </div>
  728 + <div class="clearfix"></div>
  729 + </div>
  730 + </div>
  731 + <div class="clearfix"></div>
  732 + <br/>
  733 +
  734 +
  735 + <div class="col-xs-12">
  736 +
  737 + <div class="col-md-6">
  738 + <div class="pull-left" style="width: 110px;">
  739 + <label class="new-input-label"><b>Volume</b></label>
  740 + </div>
  741 + <div class="pull-left" style="width: calc(100% - 110px);">
  742 + <input type="text" ng-model="editdata.requestedVolume" class="form-control" placeholder="">
  743 + </div>
  744 + <div class="clearfix"></div>
  745 + </div>
  746 + <div class="col-md-6">
  747 + <div class="pull-left" style="width: 110px;">
  748 + <label class="new-input-label"><b>Invoiced</b></label>
  749 + </div>
  750 + <div class="pull-left" style="width: calc(100% - 110px);">
  751 + <input type="text" ng-model="editdata.invoiced" class="form-control" placeholder="">
  752 + </div>
  753 + <div class="clearfix"></div>
  754 + </div>
  755 + </div>
  756 + <div class="clearfix"></div>
  757 + <br/>
  758 + <div class="col-xs-12">
  759 +
  760 + <div class="col-md-6">
  761 + <div class="pull-left" style="width: 110px;">
  762 + <label class="new-input-label"><b>Total</b></label>
  763 + </div>
  764 + <div class="pull-left" style="width: calc(100% - 110px);">
  765 + <input type="text" class="form-control" placeholder="0.0" value="{{editdata.requestedVolume * editdata.invoiced}}">
  766 +
  767 + </div>
  768 + <div class="clearfix"></div>
  769 + </div>
  770 + <div class="col-md-6">
  771 + <div class="pull-left" style="width: 110px;">
  772 + <label class="new-input-label"><b>FBO Cost</b></label>
  773 + </div>
  774 + <div class="pull-left" style="width: calc(100% - 110px);">
  775 + <input type="text" ng-model="editdata.fboCost" class="form-control" placeholder="">
  776 + </div>
  777 + <div class="clearfix"></div>
  778 + </div>
  779 + </div>
  780 + <div class="clearfix"></div>
  781 + <br/>
  782 + <div class="col-xs-12">
  783 +
  784 +
  785 + <div class="col-md-6">
  786 + <div class="pull-left" style="width: 110px;">
  787 + <label class="new-input-label"><b>Status</b></label>
  788 + </div>
  789 + <div class="pull-left" style="width: calc(100% - 110px);">
  790 + <select ui-select2 ng-model="editdata.status" style="width: 100%;">
  791 + <option value="" selected disabled>Select Status</option>
  792 + <option>Pending</option>
  793 + <option>Invoiced</option>
  794 + <option>Paid</option>
  795 + <option>Cancelled</option>
  796 + <option>Archived</option>
  797 + </select>
  798 + </div>
  799 + <div class="clearfix"></div>
  800 + </div>
  801 + </div>
  802 + <div class="clearfix"></div>
  803 + <br/>
  804 + <div class="col-xs-12">
  805 +
  806 +
  807 + </div>
  808 + <div class="clearfix"></div>
  809 + <br/>
  810 + <div class="col-xs-12">
  811 +
  812 + </div>
  813 + <div class="clearfix"></div>
  814 +
  815 + </div>
  816 + </div>
  817 + <div class="clearfix"></div>
  818 + </div>
  819 + </div>
  820 + </div>
  821 + </div>
  822 +
  823 + <div class="modal-footer" style="border-top: 0;">
  824 + <button type="button" class="btn btn-default" ng-click="canceleditdata()" data-dismiss="modal">Cancel</button>
  825 + <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="updateData">Save</button>
  826 + </div>
  827 + </div>
  828 + </div>
  829 +</div>
  830 +</form>
  831 +
  832 +
  833 +
  834 +<div class="myLoader" ng-show="showLoader">
  835 + <img src="../img/hourglass.gif" width="50px;">
234 836 </div>
  837 +<script src="js/multi-step-modal.js"></script>
  838 +<script>
  839 +sendEvent = function(sel, step) {
  840 + $(sel).trigger('next.m.' + step);
  841 +}
  842 +</script>
... ...
app/partials/fuelOrders/fuelOrders.service.js
Diff comments   View file @f65c966
1 1 (function(){
2   - 'use strict';
3   - angular.module('acufuel')
4   - .service('fuelOrdersService', ['$q', '$http', 'BE', fuelOrdersService]);
  2 + 'use strict';
  3 + angular.module('acufuel')
  4 + .service('fuelOrdersService', ['$q', '$http', 'BASE_URL', fuelOrdersService]);
5 5  
6   - function fuelOrdersService($q, $http, BE) {
7   - var temp = {};
  6 + function fuelOrdersService($q, $http, BASE_URL) {
  7 +
  8 + this.getAllCompanies = function() {
  9 + var deferred = $q.defer();
  10 + $http({
  11 + method : 'GET',
  12 + url : BASE_URL.url +'/user/allCompanies',
  13 + headers : {'Content-Type': 'application/json'},
  14 + })
  15 + .then(function (result){
  16 + deferred.resolve(result.data);
  17 + },function (result){
  18 + deferred.resolve(result.data);
  19 + })
  20 + return deferred.promise;
  21 + }
  22 +
  23 +
  24 + this.getOrders = function() {
  25 +
  26 + var deferred = $q.defer();
  27 + $http({
  28 + method : 'GET',
  29 + url : BASE_URL.url +'/user/orders',
  30 + headers : {'Content-Type': 'application/json'},
  31 + })
  32 + .then(function (result){
  33 + deferred.resolve(result.data);
  34 + },function (result){
  35 + deferred.resolve(result.data);
  36 + })
  37 + return deferred.promise;
  38 + }
  39 +
  40 + this.dispathFuelOrder = function(data) {
  41 + var deferred = $q.defer();
  42 + $http({
  43 + method : 'POST',
  44 + url : BASE_URL.url +'/fuelOrder',
  45 + headers : {'Content-Type': 'application/json'},
  46 + data: data
  47 + })
  48 + .then(function (result){
  49 + deferred.resolve(result.data);
  50 + },function (result){
  51 + deferred.resolve(result.data);
  52 + })
  53 + return deferred.promise;
  54 + }
  55 +
  56 + }
8 57  
9   -
10   -
11   - }
12   -
13 58 })();
14 59 \ No newline at end of file
... ...
app/partials/scheduler/scheduler.controller.js
Diff comments   View file @f65c966
... ... @@ -6,10 +6,9 @@ angular.module(&#39;acufuel&#39;)
6 6 .controller('schedulerController', ['$scope', function($scope) {
7 7  
8 8 $scope.test = "Testing...";
9   -
10   - $(document).ready(function() {
  9 +
11 10  
12   - $('#calendar').fullCalendar({
  11 + /*$('#calendar').fullCalendar({
13 12 header: {
14 13 left: 'prev,next today',
15 14 center: 'title',
... ... @@ -76,7 +75,7 @@ angular.module(&#39;acufuel&#39;)
76 75 ]
77 76 });
78 77  
79   - });
  78 + });*/
80 79  
81 80  
82 81 }]);
... ...
app/partials/scheduler/scheduler.html
Diff comments   View file @f65c966
... ... @@ -18,72 +18,76 @@
18 18 color: #fff;
19 19 background-color: #ff9900;
20 20 }
  21 +
  22 +
  23 + /*#wrap {
  24 + width: 1100px;
  25 + margin: 0 auto;
  26 + }
  27 +
  28 + #external-events {
  29 + float: left;
  30 + width: 150px;
  31 + padding: 0 10px;
  32 + border: 1px solid #ccc;
  33 + background: #eee;
  34 + text-align: left;
  35 + }
  36 +
  37 + #external-events h4 {
  38 + font-size: 16px;
  39 + margin-top: 0;
  40 + padding-top: 1em;
  41 + }
  42 +
  43 + #external-events .fc-event {
  44 + margin: 10px 0;
  45 + cursor: pointer;
  46 + }
  47 +
  48 + #external-events p {
  49 + margin: 1.5em 0;
  50 + font-size: 11px;
  51 + color: #666;
  52 + }
  53 +
  54 + #external-events p input {
  55 + margin: 0;
  56 + vertical-align: middle;
  57 + }
  58 +
  59 + #calendar {
  60 + float: right;
  61 + width: 900px;
  62 + }*/
21 63 </style>
22 64 <div class="main">
23 65 <div class="container">
24 66 <div class="row">
25   - <div class="col-md-3 col-xs-12">
26   - <div class="widget stacked">
27   - <div class="widget-header">
28   - <i class="fa fa-plane"></i>
29   - <h3>Entry Support Service</h3>
30   - </div>
31   - <!-- /widget-header -->
32   - <div class="widget-content">
33   - <div id='external-events'>
34   - <h6>Drag a event and drop into callender</h6>
35   - <ul style="list-style: none;padding: 0px">
36   - <li class="active">
37   - <div class='fc-event newUlView'>My Event 1</div>
38   - </li>
39   - <li class="active">
40   - <div class='fc-event newUlView' >My Event 2</div>
41   - </li>
42   - <li class="active">
43   - <div class='fc-event newUlView'>My Event 3</div>
44   - </li>
45   - <li class="active">
46   - <div class='fc-event newUlView'>My Event 4</div>
47   - </li>
48   - <li class="active">
49   - <div class='fc-event newUlView'>My Event 5</div>
50   - </li>
51   - <li class="active">
52   - <div class='fc-event newUlView'>My Event 6</div>
53   - </li>
54   - </ul>
55   - </div>
56   - <button type="reset" style="margin-left: 145px;" class="btn btn-default btn-default-bottom"> Add Event</button>
57   - </div>
58   - <!-- /widget-content -->
59   - </div>
60   - <!-- /widget -->
61   - </div>
62   - <!-- /span6 -->
  67 + <div class="col-xs-12">
  68 + <!-- <div id='wrap'>
  69 +
  70 + <div id='external-events'>
  71 + <h4>Draggable Events</h4>
  72 + <div class='fc-event'>My Event 1</div>
  73 + <div class='fc-event'>My Event 2</div>
  74 + <div class='fc-event'>My Event 3</div>
  75 + <div class='fc-event'>My Event 4</div>
  76 + <div class='fc-event'>My Event 5</div>
  77 + <p>
  78 + <input type='checkbox' id='drop-remove' />
  79 + <label for='drop-remove'>remove after drop</label>
  80 + </p>
  81 + </div>
  82 +
  83 + <div id='calendar'></div>
  84 +
  85 + <div style='clear:both'></div>
63 86  
64   - <div class="col-md-9">
65   - <div class="widget stacked">
66   - <div class="widget-header">
67   - <i class="fa fa-calendar"></i>
68   - <h3>Schedule</h3>
69   - </div>
70   - <!-- /widget-header -->
71   - <div class="widget-content">
72   - <!-- <div class="btn-group">
73   - <button class="btn btn-success" ng-click="changeView('agendaDay', 'myCalendar1')">AgendaDay</button>
74   - <button class="btn btn-success" ng-click="changeView('agendaWeek', 'myCalendar1')">AgendaWeek</button>
75   - <button class="btn btn-success" ng-click="changeView('month', 'myCalendar1')">Month</button>
76   - </div>
77   - <div ui-calendar="uiConfig.calendar" class="span8 calendar" ng-model="eventSources"></div> -->
78   - <div id='calendar'></div>
  87 + </div> -->
79 88  
80   - <div style='clear:both'></div>
81   - </div>
82   - <!-- /widget-content -->
83   - </div>
84   - <!-- /widget -->
  89 +
85 90 </div>
86   - <!-- /span6 -->
87 91  
88 92 </div>
89 93 <!-- /row -->
... ...
app/partials/updateFuelManager/updateFuelManager.controller.js
Diff comments   View file @f65c966
... ... @@ -17,6 +17,17 @@
17 17 })
18 18 }
19 19  
  20 + $scope.options = {
  21 + language: 'en',
  22 + allowedContent: true,
  23 + entities: false
  24 + };
  25 +
  26 + // Called when the editor is completely ready.
  27 + $scope.onReady = function () {
  28 + // ...
  29 + };
  30 +
20 31 $scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId'));
21 32  
22 33 updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) {
... ... @@ -241,6 +252,22 @@
241 252  
242 253 }
243 254  
  255 + $scope.closeAccordian = function(jets){
  256 + $('.'+jets.id).slideUp();
  257 + $('#'+jets.id).removeClass('customActive');
  258 + $('#'+jets.id+' select, #'+jets.id+' input').prop("disabled", true);
  259 + $('#'+jets.id+' .btn-success, #'+jets.id+' .btn-danger').css('display', 'none');
  260 + $('#'+jets.id+' .btn-default').css('display', 'inline-block');
  261 + }
  262 +
  263 + $scope.closeAccordianVtype = function(jets){
  264 + $('.'+jets.id).slideUp();
  265 + $('#'+jets.id).removeClass('customActive');
  266 + $('#'+jets.id+' select, #'+jets.id+' input').prop("disabled", true);
  267 + $('#'+jets.id+' .btn-success, #'+jets.id+' .btn-danger').css('display', 'none');
  268 + $('#'+jets.id+' .btn-default').css('display', 'inline-block');
  269 + }
  270 +
244 271 $scope.saveVtypeJetAccordian = function(jets){
245 272 $scope.showLoader = true;
246 273 $scope.jetsDetail = jets;
... ...
app/partials/updateFuelManager/updateFuelManager.html
Diff comments   View file @f65c966
... ... @@ -92,6 +92,7 @@
92 92 <span style="margin-right: 0;">$</span>
93 93 <input type="text" disabled="true" class="form-control" ng-model="jets.marginValue">
94 94 <div class="pull-right">
  95 + <button class="btn btn-success" style="display: none; background-image: none; background-color: #f3f3f3; color: #333; border:0;" ng-click="closeAccordian(jets)">Close</button>
95 96 <button class="btn btn-success" style="display: none;" ng-click="saveJetAccordian(jets)">Save</button>
96 97 <button class="btn btn-danger" style="display: none;" ng-click="deleteJetAccordian(jets.id)">Delete</button>
97 98 <button class="btn btn-default" ng-click="toggleJestAccordian(jets.id, $index)">Edit</button>
... ... @@ -147,7 +148,9 @@
147 148 </div>
148 149 </div> -->
149 150 <div class="clearfix"></div>
150   - <textarea class="form-control resizeTextarea" ng-model="jets.message" placeholder="Message..."></textarea>
  151 + <!-- <textarea class="form-control resizeTextarea" ng-model="jets.message" placeholder="Message..."></textarea> -->
  152 + <br/>
  153 + <div ckeditor="options" ng-model="jets.message" ready="onReady()"></div>
151 154 </div>
152 155 </div>
153 156 </div>
... ... @@ -248,6 +251,7 @@
248 251 <span style="margin-right: 0;">$</span>
249 252 <input type="text" disabled="true" class="form-control" ng-model="jets.marginValue">
250 253 <div class="pull-right">
  254 + <button class="btn btn-success" style="display: none; background-image: none; background-color: #f3f3f3; color: #333; border:0;" ng-click="closeAccordianVtype(jets)">Close</button>
251 255 <button class="btn btn-success" style="display: none;" ng-click="saveVtypeJetAccordian(jets)">Save</button>
252 256 <button class="btn btn-danger" style="display: none;" ng-click="deleteVtypeJetAccordian(jets.id)">Delete</button>
253 257 <button class="btn btn-default" ng-click="toggleVtypeJestAccordian(jets.id, $index)">Edit</button>
... ... @@ -303,7 +307,8 @@
303 307 </div>
304 308 </div> -->
305 309 <div class="clearfix"></div>
306   - <textarea class="form-control resizeTextarea" ng-model="jets.message" placeholder="Message..."></textarea>
  310 + <br/>
  311 + <div ckeditor="options" ng-model="jets.message" ready="onReady()"></div>
307 312 </div>
308 313 </div>
309 314 </div>
... ... @@ -357,7 +362,7 @@
357 362 <div class="clearfix"></div>
358 363 </div>
359 364 <div class="customAccordianTabBody">
360   - <textarea class="form-control resizeTextarea" ng-model="newJet.message" placeholder="Message..."></textarea>
  365 + <div ckeditor="options" ng-model="newJet.message" ready="onReady()"></div>
361 366 </div>
362 367  
363 368 </div>
... ... @@ -397,7 +402,7 @@
397 402 <div class="clearfix"></div>
398 403 </div>
399 404 <div class="customAccordianTabBody">
400   - <textarea class="form-control resizeTextarea" ng-model="newVtypeJet.message" placeholder="Message..."></textarea>
  405 + <div ckeditor="options" ng-model="newVtypeJet.message" ready="onReady()"></div>
401 406 </div>
402 407  
403 408 </div>
... ...
... ... @@ -34,6 +34,8 @@
34 34 "angular-resource": "~1.6.4",
35 35 "angular-xeditable": "~0.7.1",
36 36 "angular-bootstrap-toggle": "~0.1.2",
37   - "angular-ui-select2": "^0.0.5"
  37 + "angular-ui-select2": "^0.0.5",
  38 + "angular-ckeditor": "^1.0.3",
  39 + "angular-ui-calendar": "^1.0.2"
38 40 }
39 41 }
... ...