viithiisys / Acufuel

Download as
Browse Code ยป

Commit 259cb85cd60b66a729665f2c0a6304bd94850612

Authored by Swarn Singh
2 parents 4728ddfddf ab64126b20
Exists in master

confilct fixed

Showing 13 changed files   Show diff stats
... ... @@ -4,6 +4,11 @@
4 4 <meta name="viewport" content="width=device-width, initial-scale=1.0">
5 5 <meta name="description" content="">
6 6 <meta name="author" content="">
  7 +
  8 + <link rel="stylesheet" href="bower_components/nvd3/build/nv.d3.css">
  9 +
  10 +
  11 +
7 12 <title>Acufuel</title>
8 13 <!-- styles -->
9 14 <link rel="stylesheet" href="css/ui-lightness/jquery-ui-1.10.0.custom.min.css"/>
... ... @@ -204,5 +209,12 @@
204 209 <script type="text/javascript" src="bower_components/fullcalendar/dist/fullcalendar.min.js"></script>
205 210 <script type="text/javascript" src="bower_components/fullcalendar/dist/gcal.js"></script>
206 211  
  212 +
  213 + <script src="bower_components/angular/angular.js"></script>
  214 + <script src="bower_components/d3/d3.js"></script>
  215 + <script src="bower_components/nvd3/build/nv.d3.js"></script> <!-- or use another assembly -->
  216 +
  217 + <script src="bower_components/angular-nvd3/dist/angular-nvd3.js"></script>
  218 +
207 219 </body>
208 220 </html>
209 221 \ 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', 'ckeditor', 'ui.calendar', 'ngDragDrop'])
  4 + angular.module('acufuel', ['nvd3', 'ngCookies', 'ngResource', 'ui.router', 'ngAnimate', 'ui.bootstrap', 'xeditable', 'ui.toggle', 'ngTable', 'ui.select2', 'ckeditor', 'ui.calendar', 'ngDragDrop'])
5 5  
6 6 .config(['$httpProvider', function($httpProvider) {
7 7 $httpProvider.defaults.withCredentials = true;
... ...
app/partials/analytics/analytics.controller.js
Diff comments   View file @259cb85
... ... @@ -5,7 +5,169 @@
5 5  
6 6 .controller('analyticsController', ['$scope',function($scope) {
7 7  
8   - $scope.test = "Testing...";
  8 + $(document).ready(function(){
  9 + $(function () {
  10 +
  11 + $.getJSON('https://www.highcharts.com/samples/data/jsonp.php?filename=us-population-density.json&callback=?', function (data) {
  12 +
  13 + // Make codes uppercase to match the map data
  14 + $.each(data, function () {
  15 + this.code = this.code.toUpperCase();
  16 + });
  17 +
  18 + // Instanciate the map
  19 + Highcharts.mapChart('container', {
  20 +
  21 + chart: {
  22 + borderWidth: 1
  23 + },
  24 +
  25 + title: {
  26 + text: 'US population density (/kmยฒ)'
  27 + },
  28 +
  29 + legend: {
  30 + layout: 'horizontal',
  31 + borderWidth: 0,
  32 + backgroundColor: 'rgba(255,255,255,0.85)',
  33 + floating: true,
  34 + verticalAlign: 'top',
  35 + y: 25
  36 + },
  37 +
  38 + mapNavigation: {
  39 + enabled: true
  40 + },
  41 +
  42 + colorAxis: {
  43 + min: 1,
  44 + type: 'logarithmic',
  45 + minColor: '#EEEEFF',
  46 + maxColor: '#000022',
  47 + stops: [
  48 + [0, '#EFEFFF'],
  49 + [0.67, '#4444FF'],
  50 + [1, '#000022']
  51 + ]
  52 + },
  53 +
  54 + series: [{
  55 + animation: {
  56 + duration: 1000
  57 + },
  58 + data: data,
  59 + mapData: Highcharts.maps['countries/us/us-all'],
  60 + joinBy: ['postal-code', 'code'],
  61 + dataLabels: {
  62 + enabled: true,
  63 + color: '#FFFFFF',
  64 + format: '{point.code}'
  65 + },
  66 + name: 'Population density',
  67 + tooltip: {
  68 + pointFormat: '{point.code}: {point.value}/kmยฒ'
  69 + }
  70 + }]
  71 + });
  72 + });
  73 + });
  74 + })
  75 +
  76 + $scope.optionsmfs = {
  77 + chart: {
  78 + type: 'discreteBarChart',
  79 + height: 450,
  80 + margin : {
  81 + top: 20,
  82 + right: 20,
  83 + bottom: 60,
  84 + left: 55,
  85 + },
  86 + color: ["#FF7F0E"],
  87 + x: function(d){ return d.label; },
  88 + y: function(d){ return d.value; },
  89 + showValues: false,
  90 + valueFormat: function(d){
  91 + return d3.format(',.4f')(d);
  92 + },
  93 + transitionDuration: 500,
  94 + xAxis: {
  95 + axisLabel: 'X Axis'
  96 + },
  97 + yAxis: {
  98 + axisLabel: 'Y Axis',
  99 + axisLabelDistance: 30
  100 + }
  101 + }
  102 + };
  103 +
  104 + $scope.datamfs = [{
  105 + key: "Cumulative Return",
  106 + values: [
  107 + { "label" : "A" , "value" : 229.765957771107 },
  108 + { "label" : "B" , "value" : 0 },
  109 + { "label" : "C" , "value" : 32.807804682612 },
  110 + { "label" : "D" , "value" : 196.45946739256 },
  111 + { "label" : "E" , "value" : 0.19434030906893 },
  112 + { "label" : "F" , "value" : 98.079782601442 },
  113 + { "label" : "G" , "value" : 13.925743130903 },
  114 + { "label" : "H" , "value" : 5.1387322875705 },
  115 + { "label" : "I" , "value" : 4.1387322875705 },
  116 + { "label" : "J" , "value" : 23.1387322875705 },
  117 + { "label" : "K" , "value" : 233.1387322875705 },
  118 + { "label" : "L" , "value" : 22.1387322875705 },
  119 + ]
  120 + }]
  121 +
  122 + $scope.optionspc = {
  123 + chart: {
  124 + type: 'pieChart',
  125 + height: 500,
  126 + minColor: ["#FEDFC3"],
  127 + maxColor: ["#FF7F0E"],
  128 + x: function(d){return d.key;},
  129 + y: function(d){return d.y;},
  130 + showLabels: false,
  131 + segmentShowStroke : false,
  132 + animationSteps : 20,
  133 + animationEasing : "linear",
  134 + animateScale : true,
  135 + duration: 500,
  136 + labelThreshold: 0.01,
  137 + labelSunbeamLayout: true,
  138 + legend: {
  139 + margin: {
  140 + top: 5,
  141 + right: 35,
  142 + bottom: 5,
  143 + left: 0
  144 + }
  145 + }
  146 + }
  147 + };
  148 +
  149 + $scope.datapc = [
  150 + {
  151 + key: "A",
  152 + y: 3
  153 + },
  154 + {
  155 + key: "B",
  156 + y: 2
  157 + },
  158 + {
  159 + key: "C",
  160 + y: 3
  161 + },
  162 + {
  163 + key: "D",
  164 + y: 1
  165 + },
  166 + {
  167 + key: "E",
  168 + y: 5
  169 + }
  170 + ];
9 171  
10 172 }]);
11 173  
... ...
app/partials/analytics/analytics.html
Diff comments   View file @259cb85
... ... @@ -22,11 +22,11 @@
22 22 <div class="widget stacked">
23 23 <div class="widget-header">
24 24 <i class="icon-bar-chart"></i>
25   - <h3>Bar Chart</h3>
  25 + <h3>Monthly Fuel Sales</h3>
26 26 </div>
27 27 <!-- /widget-header -->
28 28 <div class="widget-content">
29   - <div id="bar-chart" class="chart-holder"></div>
  29 + <nvd3 options="optionsmfs" data="datamfs"></nvd3>
30 30 <!-- /bar-chart -->
31 31 </div>
32 32 <!-- /widget-content -->
... ... @@ -34,73 +34,20 @@
34 34 <!-- /widget -->
35 35 </div>
36 36 <!-- /.span6 -->
37   - <div class="col-md-6">
38   - <div class="widget stacked">
39   - <div class="widget-header">
40   - <i class="icon-bar-chart"></i>
41   - <h3>Regional PAP Pricing</h3>
42   - </div>
43   - <!-- /widget-header -->
44   - <div class="widget-content">
45   - <div id="container" style="width: 100%; height: 325px;"></div>
46   - </div>
47   - <!-- /widget-content -->
48   - </div>
49   - <!-- /widget -->
50   - </div>
51   - <!-- /.span6 -->
52 37 </div>
53 38 <div class="row">
54   - <div class="col-md-6">
55   - <div class="widget stacked">
56   - <div class="widget-header">
57   - <i class="icon-bar-chart"></i>
58   - <h3>Cirque Stats</h3>
59   - </div>
60   - <!-- /widget-header -->
61   - <div class="widget-content">
62   - <div class="cirque-stats">
63   - <div class="ui-cirque" data-value="2875" data-total="3245" data-arc-color="#FF9900" data-label="ratio"></div>
64   - <div class="ui-cirque" data-value="13" data-arc-color="#222222"></div>
65   - <div class="ui-cirque" data-value="63" data-total="225" data-arc-color="#888888" data-label="ratio"></div>
66   - <div class="ui-cirque" data-value="40" data-arc-color="#222222"></div>
67   - <div class="ui-cirque" data-value="72" data-arc-color="#888888" data-label="ratio"></div>
68   - <div class="ui-cirque" data-value="57" data-arc-color="#FF9900"></div>
69   - </div>
70   - <!-- /.cirque-stats -->
71   - </div>
72   - <!-- /widget-content -->
73   - </div>
74   - <!-- /widget -->
75   - </div>
76   - <!-- /.span6 -->
77   - <div class="col-md-6">
78   - <div class="widget stacked">
79   - <div class="widget-header">
80   - <i class="icon-bar-chart"></i>
81   - <h3>Area Chart</h3>
82   - </div>
83   - <!-- /widget-header -->
84   - <div class="widget-content">
85   - <div id="area-chart" class="chart-holder"></div>
86   - <!-- /area-chart -->
87   - </div>
88   - <!-- /widget-content -->
89   - </div>
90   - <!-- /widget -->
91   - </div>
92   - <!-- /.span6 -->
  39 +
93 40 </div>
94 41 <div class="row">
95 42 <div class="col-md-6">
96 43 <div class="widget stacked">
97 44 <div class="widget-header">
98 45 <i class="icon-bar-chart"></i>
99   - <h3>Pie Chart</h3>
  46 + <h3>Customer Sources</h3>
100 47 </div>
101 48 <!-- /widget-header -->
102 49 <div class="widget-content">
103   - <div id="pie-chart" class="chart-holder"></div>
  50 + <nvd3 options="optionspc" data="datapc"></nvd3>
104 51 <!-- /pie-chart -->
105 52 </div>
106 53 <!-- /widget-content -->
... ... @@ -108,42 +55,25 @@
108 55 <!-- /widget -->
109 56 </div>
110 57 <!-- /span6 -->
111   - <div class="col-md-6">
112   - <div class="widget stacked">
113   - <div class="widget-header">
114   - <i class="icon-bar-chart"></i>
115   - <h3>Donut Chart</h3>
116   - </div>
117   - <!-- /widget-header -->
118   - <div class="widget-content">
119   - <div id="donut-chart" class="chart-holder"></div>
120   - <!-- /bar-chart -->
121   - </div>
122   - <!-- /widget-content -->
123   - </div>
124   - <!-- /widget -->
125   - </div>
126   - <!-- /span6 -->
127   - </div>
128   - <div class="row">
129   - <div class="col-md-6">
  58 +
  59 + <div class="col-md-6">
130 60 <div class="widget stacked">
131 61 <div class="widget-header">
132 62 <i class="icon-bar-chart"></i>
133   - <h3>Line Chart</h3>
  63 + <h3>Regional PAP Pricing</h3>
134 64 </div>
135 65 <!-- /widget-header -->
136 66 <div class="widget-content">
137   - <div id="line-chart" class="chart-holder"></div>
138   - <!-- /line-chart -->
  67 + <div id="container" style="width: 100%; height: 325px;"></div>
139 68 </div>
140 69 <!-- /widget-content -->
141 70 </div>
142   - <!-- /widget -->
  71 + <!-- /widget -->
143 72 </div>
144   - <!-- /span6 -->
  73 + <!-- /.span6 -->
  74 +
145 75 </div>
146   - <!-- /row -->
  76 +
147 77 </div>
148 78 <!-- /container -->
149 79 </div>
... ... @@ -166,71 +96,5 @@
166 96 <script src="./js/charts/pie.js"></script>
167 97 <script src="./js/charts/area.js"></script>
168 98 <script type="text/javascript">
169   - $(document).ready(function(){
170   - $(function () {
171   -
172   - $.getJSON('https://www.highcharts.com/samples/data/jsonp.php?filename=us-population-density.json&callback=?', function (data) {
173   -
174   - // Make codes uppercase to match the map data
175   - $.each(data, function () {
176   - this.code = this.code.toUpperCase();
177   - });
178   -
179   - // Instanciate the map
180   - Highcharts.mapChart('container', {
181   -
182   - chart: {
183   - borderWidth: 1
184   - },
185   -
186   - title: {
187   - text: 'US population density (/kmยฒ)'
188   - },
189   -
190   - legend: {
191   - layout: 'horizontal',
192   - borderWidth: 0,
193   - backgroundColor: 'rgba(255,255,255,0.85)',
194   - floating: true,
195   - verticalAlign: 'top',
196   - y: 25
197   - },
198   -
199   - mapNavigation: {
200   - enabled: true
201   - },
202   -
203   - colorAxis: {
204   - min: 1,
205   - type: 'logarithmic',
206   - minColor: '#EEEEFF',
207   - maxColor: '#000022',
208   - stops: [
209   - [0, '#EFEFFF'],
210   - [0.67, '#4444FF'],
211   - [1, '#000022']
212   - ]
213   - },
214 99  
215   - series: [{
216   - animation: {
217   - duration: 1000
218   - },
219   - data: data,
220   - mapData: Highcharts.maps['countries/us/us-all'],
221   - joinBy: ['postal-code', 'code'],
222   - dataLabels: {
223   - enabled: true,
224   - color: '#FFFFFF',
225   - format: '{point.code}'
226   - },
227   - name: 'Population density',
228   - tooltip: {
229   - pointFormat: '{point.code}: {point.value}/kmยฒ'
230   - }
231   - }]
232   - });
233   - });
234   - });
235   - })
236 100 </script>
237 101 \ No newline at end of file
... ...
app/partials/customers/customers.controller.js
Diff comments   View file @259cb85
... ... @@ -6,18 +6,19 @@
6 6  
7 7 function customersController($scope, $rootScope, $uibModal, $filter, $http, $state, CustomersService, ViewCompanyService, NgTableParams) {
8 8 $(document).ready(function() {
9   - $('#example').DataTable();
  9 + // $('#example').DataTable();
10 10 });
11 11 $scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId'))
12 12 $scope.reset2 = function(){
13 13 $("input").val("");
14 14 $scope.removeMarginValidation();
15 15 }
  16 +
16 17  
17 18 $scope.data = {};
18 19 $scope.aircraft = {};
19 20 $scope.data.activate = true;
20   - $scope.showLoader = false;
  21 + $scope.showLoader = true;
21 22 getAllCompanies();
22 23  
23 24 /*function getAllCompanies(){
... ... @@ -87,6 +88,7 @@
87 88 }, {
88 89 data: $scope.companyList
89 90 });
  91 + $scope.showLoader = false;
90 92 })
91 93 }
92 94  
... ... @@ -119,8 +121,10 @@
119 121  
120 122 getData();
121 123 function getData(){
  124 + $scope.showLoader = true;
122 125 CustomersService.getAircraftMake().then(function(result) {
123 126 $scope.aircraftMakeList = result;
  127 + $scope.showLoader = false;
124 128 })
125 129 }
126 130  
... ...
app/partials/customers/customers.html
Diff comments   View file @259cb85
... ... @@ -69,6 +69,9 @@
69 69 background: #449d44;
70 70 }
71 71 </style>
  72 +<div class="myLoader" ng-show="showLoader">
  73 + <img src="../img/hourglass.gif" width="50px;">
  74 +</div>
72 75  
73 76 <div class="main">
74 77 <div class="container">
... ...
app/partials/dashboard/dashboard.controller.js
Diff comments   View file @259cb85
... ... @@ -53,6 +53,22 @@
53 53 }
54 54 }
55 55 }
  56 + var str =""+ $scope.newFuelPricing[i].name
  57 + if(str.startsWith("J")){
  58 + $scope.newFuelPricing[i].jeta = true;
  59 + var str1 = str.substring(0,5)
  60 + var str2 = str.substring(6, str.length)
  61 + $scope.newFuelPricing[i].name = str1
  62 + $scope.newFuelPricing[i].namejetrest = str2
  63 +
  64 +
  65 + }else if(str.startsWith("100")){
  66 + $scope.newFuelPricing[i].avgas = true;
  67 + var str1 = str.substring(0,5)
  68 + var str2 = str.substring(6, str.length)
  69 + $scope.newFuelPricing[i].name = str1
  70 + $scope.newFuelPricing[i].nameavgasrest = str2
  71 + }
56 72 }
57 73 $scope.showLoader = false;
58 74 })
... ...
app/partials/dashboard/dashboard.html
Diff comments   View file @259cb85
... ... @@ -140,16 +140,17 @@
140 140 <div class="widget-header">
141 141 <i class="fa fa-pencil"></i>
142 142 <h3>Price Manager</h3>
143   - <select style="float: right; margin: 7px 10px; width: 150px; height: 26px; padding: 0 0;" class="form-control" ng-model="sendEmail.pricing" ng-change="confirmMail()">
144   - <option value="" disabled selected="selected">Send Pricing Email</option>
145   - <option ng-repeat="margins in marginList" value="{{margins.id}}">{{margins.marginName}}</option>
146   - <option disabled>_______________</option>
  143 + <select style="float: right; margin: 7px 10px; width: 150px; height: 26px; padding: 0 0;" class="btn btn-primary" class="form-control" ng-model="sendEmail.pricing" ng-change="confirmMail()">
  144 + <option value="" disabled selected="selected">Email All Pricing</option>
  145 + <option value="JET-A">Email JET-A pricing only</option>
  146 + <option value="AVGAS">Email AVGAS pricing only</option>
  147 + <option disabled>_______________________________</option>
147 148 <option value="all">Distribute All</option>
148 149 </select>
149 150 </div>
150 151 <!-- /widget-header -->
151   - <div class="widget-content">
152   - <h4>Update Fuel Price Here</h4>
  152 + <div class="widget-content">
  153 + <h4>Deployed Fuel Prices</h4>
153 154 <table class="table">
154 155 <thead>
155 156 <tr>
... ... @@ -161,30 +162,29 @@
161 162 </tr>
162 163 </thead>
163 164 <tbody>
164   - <tr ng-repeat="fuelPricing in newFuelPricing">
  165 + <tr ng-repeat="fuelPricing in newFuelPricing | filter:{ status: true }">
165 166 <td>
166   - <span>{{fuelPricing.name}}</span>
  167 + <span style="color: #2196f3" ng-show="fuelPricing.jeta">{{fuelPricing.name}}</span>
  168 + <span ng-show="fuelPricing.jeta">{{fuelPricing.namejetrest}}</span>
  169 + <span style="color: 39c" ng-show="fuelPricing.avgas">{{fuelPricing.name}}</span>
  170 + <span ng-show="fuelPricing.avgas">{{fuelPricing.nameavgasrest}}</span>
167 171 </td>
168 172 <td>
169   - <input type="text" class="form-control" ng-model="fuelPricing.fuelPricing.cost" style="height:31px; width: 50px; padding: 6px 6px">
170   - </td>
  173 + <span>{{fuelPricing.fuelPricing.cost}}</span>
  174 + </td>
171 175 <td>
172   - <input type="text" class="form-control" ng-model="fuelPricing.fuelPricing.papMargin" style="height:31px; width: 50px; padding: 6px 6px;">
173   - </td>
  176 + <span>{{fuelPricing.fuelPricing.papMargin}}</span>
  177 + </td>
174 178 <td>
175   - <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.fuelPricing.cost -- fuelPricing.fuelPricing.papMargin}}</span>
  179 + <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.fuelPricing.cost -- fuelPricing.fuelPricing.papMargin | number : 2 }}</span>
176 180 </td>
177 181 <td>
178   - <input type="text" class="form-control" datepicker ng-model="fuelPricing.fuelPricing.expirationDate" style="height:31px; width: 100px; padding: 6px 6px;">
  182 + <span>{{fuelPricing.fuelPricing.expirationDate}}</span>
179 183 </td>
180 184 </tr>
181 185 </tbody>
182 186 </table>
183   - <div class="row" style="margin-left: 0px;">
184   - <div class="col-md-12" style= "text-align: right;">
185   - <button type="button" class="btn btn-success btn-xs" ng-click="updateFuelPricingClick()">Save</button>
186   - </div>
187   - </div>
  187 +
188 188 </div>
189 189 <!-- /widget-content -->
190 190 </div>
... ...
app/partials/updateFuelManager/updateFuelManager.html
Diff comments   View file @259cb85
... ... @@ -8,7 +8,7 @@
8 8 <div class="myLoader" ng-show="showLoader">
9 9 <img src="../img/hourglass.gif" width="50px;">
10 10 </div>
11   -<div style="width: 96%; margin-left: 2%;">
  11 +<div style="width: 90%; margin-left: 5%;">
12 12 <div class="row">
13 13  
14 14 <div class="col-md-6">
... ... @@ -33,7 +33,7 @@
33 33 </tr>
34 34 </thead>
35 35 <tbody>
36   - <tr ng-repeat="fuelPricing in newFuelPricing">
  36 + <tr ng-repeat="fuelPricing in newFuelPricing | filter:{ status: true }">
37 37 <td>
38 38 <span style="color: #2196f3" ng-show="fuelPricing.jeta">{{fuelPricing.name}}</span>
39 39 <span ng-show="fuelPricing.jeta">{{fuelPricing.namejetrest}}</span>
... ... @@ -53,7 +53,7 @@
53 53 <input type="text" class="form-control" datepicker ng-disabled="fuelPricing.futureFuelPricing.cost == undefined || fuelPricing.futureFuelPricing.cost == null || fuelPricing.futureFuelPricing.cost == ''" ng-model="fuelPricing.futureFuelPricing.nextExpiration" style="height:31px; width: 80px; padding: 6px 6px;">
54 54 </td>
55 55 <td>
56   - <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.futureFuelPricing.cost -- fuelPricing.futureFuelPricing.papMargin | number : 2}}</span>
  56 + <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.futureFuelPricing.cost -- fuelPricing.fuelPricing.papMargin | number : 2}}</span>
57 57 </td>
58 58 </tr>
59 59 </tbody>
... ... @@ -104,7 +104,7 @@
104 104 <button class="btn btn-success" style="display: none; background-image: none; background-color: #f3f3f3; color: #333; border:0;" ng-click="closeAccordian(jets)">Close</button>
105 105 <button class="btn btn-success" style="display: none;" ng-click="saveJetAccordian(jets)">Save</button>
106 106 <button class="btn btn-danger" style="display: none;" ng-click="deleteJetAccordian(jets.id)">Delete</button>
107   - <button type="button" class="btn btn-primary" ng-click="emailPricingForMargin(jets.id)" style= "font-weight: normal; text-align: center; font-size:12px">Email Pricing for this Margin</button>
  107 + <button type="button" class="btn btn-primary" ng-model="" ng-click="emailPricingForMargin(jets.id)" style= "font-weight: normal; text-align: center; font-size:12px">Email Pricing for this Margin</button>
108 108 <button class="btn btn-default" ng-click="toggleJestAccordian(jets.id, $index)" style= "text-align: center; font-size:12px">Edit</button>
109 109 </div>
110 110 <div class="clearfix"></div>
... ... @@ -204,7 +204,7 @@
204 204 </div>
205 205 <!-- /widget-header -->
206 206 <div class="widget-content">
207   - <h4>Update Fuel Price Here</h4>
  207 + <h4>Deployed Fuel Prices</h4>
208 208 <table class="table">
209 209 <thead>
210 210 <tr>
... ... @@ -216,7 +216,7 @@
216 216 </tr>
217 217 </thead>
218 218 <tbody>
219   - <tr ng-repeat="fuelPricing in newFuelPricing">
  219 + <tr ng-repeat="fuelPricing in newFuelPricing | filter:{ status: true }">
220 220 <td>
221 221 <span style="color: #2196f3" ng-show="fuelPricing.jeta">{{fuelPricing.name}}</span>
222 222 <span ng-show="fuelPricing.jeta">{{fuelPricing.namejetrest}}</span>
... ... @@ -238,11 +238,7 @@
238 238 </tr>
239 239 </tbody>
240 240 </table>
241   - <div class="row" style="margin-left: 0px;">
242   - <div class="col-md-12" style= "text-align: right;">
243   - <button type="button" class="btn btn-success btn-xs" ng-click="updateFuelPricingClick()" style="font-size:14px; margin-right:3%">Save</button>
244   - </div>
245   - </div>
  241 +
246 242 </div>
247 243 <!-- /widget-content -->
248 244 </div>
... ...
app/partials/viewCompany/viewCompany.controller.js
Diff comments   View file @259cb85
... ... @@ -30,6 +30,7 @@
30 30 $scope.companyData.masterMargin = "";
31 31 getCompanyDetail();
32 32 function getCompanyDetail(){
  33 + $scope.showLoader = true;
33 34 ViewCompanyService.getCompany(companyId).then(function(result) {
34 35 $scope.companyData = result;
35 36 if(result.margin != null){
... ... @@ -54,6 +55,7 @@
54 55 }
55 56  
56 57 $scope.companyStatus = function(){
  58 + $scope.showLoader = true;
57 59 var statusData = "status=" + $scope.companyData.activate;
58 60 ViewCompanyService.changeStatus(companyId, statusData).then(function(result) {
59 61 if(result.success){
... ... @@ -64,6 +66,7 @@
64 66 getContactList();
65 67 }
66 68 })
  69 + $scope.showLoader = false;
67 70 }
68 71  
69 72  
... ... @@ -107,6 +110,7 @@
107 110 $scope.contactData = {};
108 111 $scope.contactData.contactList = [];
109 112 $scope.addContact = function(){
  113 + $scope.showLoader = true;
110 114 $scope.data.companyId = companyId;
111 115 $scope.contactData.contactList.push($scope.data);
112 116 ViewCompanyService.addContact($scope.contactData).then(function(result) {
... ... @@ -126,13 +130,16 @@
126 130 })
127 131 }
128 132 })
  133 + $scope.showLoader = false;
129 134 }
130 135  
131 136 getData();
132 137 function getData(){
  138 + $scope.showLoader = true;
133 139 CustomersService.getAircraftMake().then(function(result) {
134 140 $scope.aircraftMakeList = result;
135 141 })
  142 + $scope.showLoader = false;
136 143 }
137 144  
138 145 $scope.clearAircrafts = function(){
... ...
app/partials/viewCompany/viewCompany.html
Diff comments   View file @259cb85
... ... @@ -354,7 +354,7 @@
354 354 </tr>
355 355 </thead>
356 356 <tbody>
357   - <tr ng-repeat="fuel in fuelPricing">
  357 + <tr ng-repeat="fuel in fuelPricing | filter:{ status: true }">
358 358 <td><input type="checkbox" ng-model="fuel.fuelPricing.omit" ng-change="updateOmit(fuel.fuelPricing, fuel.status)"></td>
359 359 <td>{{fuel.name}}</td>
360 360 <td>${{fuel.fuelPricing.cost}}</td>
... ...
app/partials/viewFuelVendor/viewFuelVendor.html
Diff comments   View file @259cb85
... ... @@ -231,7 +231,7 @@
231 231 </tr>
232 232 </thead>
233 233 <tbody>
234   - <tr ng-repeat="fuel in fuelPricing">
  234 + <tr ng-repeat="fuel in fuelPricing | filter:{ status: true }">
235 235 <td><input type="checkbox" ng-model="fuel.fuelPricing.omit" ng-change="updateOmit(fuel.fuelPricing, fuel.status)"></td>
236 236 <td>{{fuel.name}}</td>
237 237 <td>${{fuel.fuelPricing.cost}}</td>
... ...
... ... @@ -15,7 +15,7 @@
15 15 "tests"
16 16 ],
17 17 "dependencies": {
18   - "angular": "^1.6.2",
  18 + "angular": "^1.6.4",
19 19 "angular-animate": "^1.6.2",
20 20 "angular-route": "^1.6.2",
21 21 "jquery": "^3.1.1",
... ... @@ -37,6 +37,10 @@
37 37 "angular-ui-select2": "^0.0.5",
38 38 "angular-ckeditor": "^1.0.3",
39 39 "angular-ui-calendar": "^1.0.2",
40   - "angular-dragdrop": "^1.0.13"
  40 + "angular-dragdrop": "^1.0.13",
  41 + "angular-nvd3": "^1.0.9"
  42 + },
  43 + "resolutions": {
  44 + "angular": "^1.x"
41 45 }
42 46 }
... ...