viithiisys / Acufuel

Download as
Browse Code ยป

Commit d1e8d9afb3a474f71a230a037c8a2801a744e5a6

Authored by Kuldeep Arora
1 parent 4ecd206b20
Exists in master

fuel order & home screen

Showing 10 changed files with 47 additions and 41 deletions   Show diff stats
app/css/custom.css
Diff comments   View file @d1e8d9a
... ... @@ -300,10 +300,6 @@ font-size: 10px !important;
300 300 margin-top: 20px;
301 301 }
302 302  
303   -
304   -
305   -
306   -
307 303 .new-widget-content{
308 304 padding: 0 0 0 0 !important;
309 305 }
... ... @@ -759,7 +755,9 @@ font-size: 10px !important;
759 755 text-align: center !important;
760 756 outline: none !important;
761 757 }
762   -
  758 +.nvd3-svg{
  759 + text-transform: capitalize;
  760 + }
763 761  
764 762 /*--Highlight today date--*/
765 763 .ui-datepicker-today {
... ...
app/partials/analytics/analytics.controller.js
Diff comments   View file @d1e8d9a
... ... @@ -356,7 +356,8 @@ angular.module('acufuel')
356 356 //staggerLabels: true,
357 357 duration: 500,
358 358 stacked: false,
359   - color: ["#FEDFC3", "#990000", "#000099", "#009900"],
  359 + /*color: ["#FEDFC3", "#990000", "#000099", "#009900"],*/
  360 + color: ["#A9A9A9", "#000099", "#990000", "#009900"],
360 361 xAxis: {
361 362 axisLabel: 'Months',
362 363 showMaxMin: false,
... ... @@ -634,7 +635,6 @@ angular.module('acufuel')
634 635 $scope.td = $scope.td1.join("-");
635 636  
636 637 analyticsService.getDRFHfpChart($scope.fd, $scope.td).then(function(result) {
637   - console.log("===DRF HPF====",result)
638 638 $scope.hfpValues = result;
639 639 $scope.optionshfp = {
640 640 chart: {
... ...
app/partials/customers/customers.controller.js
Diff comments   View file @d1e8d9a
... ... @@ -51,8 +51,6 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
51 51  
52 52 );
53 53  
54   - getAllCompanies();
55   -
56 54 /*function getAllCompanies(){
57 55 CustomersService.getAllCompanies().then(function(result) {
58 56 $scope.companyList = result;
... ... @@ -108,6 +106,8 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta
108 106 })
109 107 }
110 108  
  109 + getAllCompanies();
  110 +
111 111 $scope.editMargin = function(customer) {
112 112 //console.log('customer', customer);
113 113 $scope.showLoader = true;
... ...
app/partials/customers/customers.html
Diff comments   View file @d1e8d9a
... ... @@ -123,7 +123,7 @@
123 123 <button type="button" ng-if="row.activate == true" class="btn btn-success btn-xs">Active</button>
124 124 <button type="button" ng-if="row.activate == false" class="btn btn-warning btn-xs">InActive</button>
125 125 </td>
126   - <td class="margin-media" data-title="'Margin Setting'" filter="{masterMargin: 'select'}" filter-data="marginFilterOptions" sortable="'masterMargin'">
  126 + <td style="width: 130px;" class="margin-media" data-title="'Margin Setting'" filter="{masterMargin: 'select'}" filter-data="marginFilterOptions" sortable="'masterMargin'">
127 127 <select class="form-control" ng-change="editMargin(row)" style="height:31px;" ng-model="row.masterMargin" ng-selected="" ng-options="margin.id as margin.marginName for margin in jetMarginList" required></select>
128 128 </td>
129 129 <td data-title="'All In'" filter="{marginAllIn: 'text'}" sortable="'marginAllIn'" ui-sref="app.viewCompany({id : row.id})">
... ...
app/partials/dashboard/dashboard.controller.js
Diff comments   View file @d1e8d9a
... ... @@ -213,6 +213,8 @@
213 213 $scope.saveAndCloseConfirm = function(){
214 214 $('#confirm1').css('display', 'none');
215 215 updateFuelManagerService.sendMailToGroupMargin($scope.sendEmail.pricing).then(function(result) {
  216 + // console.log("--email---",$scope.sendEmail.pricing);
  217 + // console.lo("==result==",result)
216 218 $scope.sendEmail = {};
217 219 if(result.error) {
218 220 toastr.error('' + result.error + '', {
... ... @@ -233,6 +235,7 @@
233 235  
234 236 $scope.pendingMessageRecord=[];
235 237 dashboardService.getPendingMessage().then(function(result) {
  238 + // console.log("==message===",result)
236 239 $scope.pendingMessageRecord=result;
237 240 })
238 241  
... ... @@ -267,7 +270,8 @@
267 270 //staggerLabels: true,
268 271 duration: 500,
269 272 stacked: false,
270   - color: ["#FEDFC3", "#990000", "#000099", "#009900"],
  273 + //color: ["#FEDFC3", "#990000", "#000099", "#009900"],
  274 + color: ["#A9A9A9", "#000099", "#990000", "#009900"],
271 275 xAxis: {
272 276 axisLabel: 'Months',
273 277 showMaxMin: false,
... ...
app/partials/dashboard/dashboard.html
Diff comments   View file @d1e8d9a
1   -<style>
  1 + <style>
2 2 .subnavbar .mainnav > li:first-child > a{
3 3 color: #ca5c6a;
4 4 }
  5 +
5 6 </style>
6 7 <!-- <style>
7 8 table, th , td {
... ... @@ -24,7 +25,7 @@ table tr:nth-child(even) {
24 25 <div class="row">
25 26 <div class="col-md-3">
26 27 <div class="widget-header">
27   - <i class="fa fa-tint"></i> &nbsp; Fuel Orders
  28 + <i class="fa fa-tint"></i> &nbsp; Reconciled Orders
28 29  
29 30 </div>
30 31 <div class="custom-widget-content">
... ... @@ -49,7 +50,7 @@ table tr:nth-child(even) {
49 50 </div>
50 51 <div class="col-md-3">
51 52 <div class="widget-header">
52   - <i class="fa fa-tint"></i> &nbsp; Fuel Orders
  53 + <i class="fa fa-tint"></i> &nbsp; Pending Orders
53 54  
54 55 </div>
55 56 <div class="custom-widget-content">
... ... @@ -73,7 +74,7 @@ table tr:nth-child(even) {
73 74 <div class="col-md-6">
74 75 <div class="widget-header">
75 76 <i class="fa fa-list-alt "></i>
76   - <h3>Fuel Order</h3>
  77 + <h3>Airport Operations</h3>
77 78 </div>
78 79 <div class="custom-widget-content">
79 80 <div>
... ... @@ -176,7 +177,7 @@ table tr:nth-child(even) {
176 177 <div class="widget widget-nopad stacked">
177 178 <div class="widget-header">
178 179 <i class="fa fa-comment" aria-hidden="true"></i>
179   - <h3>Messages</h3>
  180 + <h3>Needs Attention</h3>
180 181 </div>
181 182 <!-- /widget-header -->
182 183 <div class="widget-content">
... ...
app/partials/enterFuelOrder/enterFuelOrder.controller.js
Diff comments   View file @d1e8d9a
... ... @@ -96,15 +96,19 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http,
96 96 }
97 97 }
98 98  
99   - $scope.addTotal = function(value, valueOf){
  99 + /*$scope.addTotal = function(value, valueOf){
100 100 if(valueOf == 'v'){
101   - console.log("total v",value,$scope.order.invoiced)
102 101 $scope.order.total = value * $scope.order.invoiced
103 102 }else if(valueOf == 'i'){
104   - console.log("total i",value,$scope.order.volume)
105 103 $scope.order.total = $scope.order.volume * value
106 104 }
107   - }
  105 + } */
  106 + $scope.addTotal = function(value, valueOf) {
  107 + if (value != undefined && valueOf != undefined) {
  108 + value = JSON.parse(value)
  109 + $scope.order.total = value.cost * valueOf;
  110 + }
  111 + }
108 112  
109 113 $scope.dispatchFuel = function(){
110 114 $scope.showLoader = true;
... ...
app/partials/enterFuelOrder/enterFuelOrder.html
Diff comments   View file @d1e8d9a
... ... @@ -45,7 +45,7 @@
45 45 <label class="new-input-label"><b>Product</b></label>
46 46 </div>
47 47 <div class="pull-left" style="width: calc(100% - 110px);">
48   - <select class="form-control" ng-model="order.priceQuote" ng-change="setCost(order.priceQuote)" required>
  48 + <select class="form-control" ng-model="order.priceQuote" ng-change="setCost(order.priceQuote); addTotal(order.priceQuote, order.volume)" required>
49 49 <option value="" selected disabled>Select Product</option>
50 50 <option ng-repeat="margin in marginList" value="{{margin}}">${{margin.papTotal | number : 4}} {{margin.productName}}</option>
51 51 </select>
... ... @@ -77,7 +77,7 @@
77 77 <label class="new-input-label"><b>Volume</b></label>
78 78 </div>
79 79 <div class="pull-left" style="width: calc(100% - 110px);">
80   - <input type="text" ng-model="order.volume" ng-keyup="addTotal(order.volume,'v')" class="form-control" placeholder="" required>
  80 + <input type="text" ng-model="order.volume" ng-keyup="addTotal(order.priceQuote, order.volume)" class="form-control" placeholder="" required>
81 81 </div>
82 82 <div class="clearfix"></div>
83 83 </div>
... ... @@ -108,13 +108,13 @@
108 108 <div class="clearfix"></div>
109 109 </div>
110 110  
111   - <div class="col-md-6" style="margin-top: 22px;">
  111 + <div class="col-md-6" style="margin-top: 22px;" ng-if ="order.status === 'invoiced'">
112 112 <div class="pull-left" style="width: 110px;">
113 113 <label class="new-input-label"><b>Invoiced</b></label>
114 114 <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
115 115 </div>
116 116 <div class="pull-left" style="width: calc(100% - 110px);">
117   - <input type="text" ng-model="order.invoiced" ng-keyup="addTotal(order.invoiced,'i')" class="form-control" placeholder="">
  117 + <input type="text" ng-model="order.invoiced" class="form-control" placeholder="">
118 118 </div>
119 119 <div class="clearfix"></div>
120 120 </div>
... ... @@ -229,11 +229,11 @@
229 229 <div class="pull-left" style="width: calc(100% - 110px);">
230 230 <select class="form-control" ng-model="order.status" style="width: 100%;">
231 231 <option value="" selected disabled hidden>pending</option>
232   - <!-- <option value="pending">pending</option> -->
  232 + <option value="pending">pending</option>
233 233 <option value="invoiced">invoiced</option>
234 234 <option value="paid">paid</option>
235   - <option value="cancelled">cancelled</option>
236   - <option value="archived">archived</option>
  235 + <!-- <option value="cancelled">cancelled</option>
  236 + <option value="archived">archived</option> -->
237 237 </select>
238 238 </div>
239 239 <div class="clearfix"></div>
... ...
app/partials/fuelOrders/fuelOrders.controller.js
Diff comments   View file @d1e8d9a
... ... @@ -270,13 +270,12 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
270 270  
271 271 }
272 272  
273   - $scope.addTotal = function(value, valueOf){
274   - if(valueOf == 'v'){
275   - $scope.order.total = value * $scope.order.invoiced
276   - }else if(valueOf == 'i'){
277   - $scope.order.total = $scope.order.volume * value
278   - }
279   - }
  273 + $scope.addTotal = function(value, valueOf) {
  274 + if (value != undefined && valueOf != undefined) {
  275 + value = JSON.parse(value)
  276 + $scope.order.total = value.cost * valueOf;
  277 + }
  278 + }
280 279  
281 280 $scope.addFuelData = function() {
282 281 $scope.showLoader = true;
... ...
app/partials/fuelOrders/fuelOrders.html
Diff comments   View file @d1e8d9a
... ... @@ -561,7 +561,7 @@
561 561 <label class="new-input-label"><b>Product</b></label>
562 562 </div>
563 563 <div class="pull-left" style="width: calc(100% - 110px);">
564   - <select class="form-control" ng-model="order.priceQuote" ng-change="setCost(order.priceQuote)" required>
  564 + <select class="form-control" ng-model="order.priceQuote" ng-change="setCost(order.priceQuote);addTotal(order.priceQuote, order.volume)" required>
565 565 <option value="" selected disabled>Select Product</option>
566 566 <option ng-repeat="margin in marginList" value="{{margin}}">${{margin.papTotal | number : 4}} {{margin.productName}}</option>
567 567 </select>
... ... @@ -593,7 +593,7 @@
593 593 <label class="new-input-label"><b>Volume</b></label>
594 594 </div>
595 595 <div class="pull-left" style="width: calc(100% - 110px);">
596   - <input type="text" ng-model="order.volume" ng-keyup="addTotal(order.volume,'v')" class="form-control" placeholder="" required>
  596 + <input type="text" ng-model="order.volume" ng-keyup="addTotal(order.priceQuote, order.volume)" class="form-control" placeholder="" required>
597 597 </div>
598 598 <div class="clearfix"></div>
599 599 </div>
... ... @@ -624,13 +624,13 @@
624 624 <div class="clearfix"></div>
625 625 </div>
626 626  
627   - <div class="col-md-6" style="margin-top: 22px;">
  627 + <div class="col-md-6" style="margin-top: 22px;" ng-if ="order.status === 'invoiced'">
628 628 <div class="pull-left" style="width: 110px;">
629 629 <label class="new-input-label"><b>Invoiced</b></label>
630 630 <span style="margin-top: 6px; margin-right: 3px; float: right;">$</span>
631 631 </div>
632 632 <div class="pull-left" style="width: calc(100% - 110px);">
633   - <input type="text" ng-model="order.invoiced" ng-keyup="addTotal(order.invoiced,'i')" class="form-control" placeholder="">
  633 + <input type="text" ng-model="order.invoiced" class="form-control" placeholder="">
634 634 </div>
635 635 <div class="clearfix"></div>
636 636 </div>
... ... @@ -746,11 +746,11 @@
746 746 <div class="pull-left" style="width: calc(100% - 110px);">
747 747 <select class="form-control" ng-model="order.status" style="width: 100%;">
748 748 <option value="" disabled selected hidden>pending</option>
749   - <!-- <option value="pending">pending</option> -->
  749 + <option value="pending">pending</option>
750 750 <option value="invoiced">invoiced</option>
751 751 <option value="paid">paid</option>
752   - <option value="cancelled">cancelled</option>
753   - <option value="archived">archived</option>
  752 + <!-- <option value="cancelled">cancelled</option>
  753 + <option value="archived">archived</option> -->
754 754 </select>
755 755 </div>
756 756 <div class="clearfix"></div>
... ...