viithiisys / Acufuel

Download as
Browse Code ยป

Commit d121d55391511438a4b4250cb3aca6d03d2d162a

Authored by Kuldeep Arora
1 parent 565570086e
Exists in master

UI Changes

Showing 11 changed files with 168 additions and 114 deletions   Show diff stats
app/css/custom.css
Diff comments   View file @d121d55
... ... @@ -186,6 +186,10 @@ font-size: 10px !important;
186 186 color: #FFF;
187 187 border-radius: 3px 3px 0 0;
188 188 }
  189 +.customAccordianHeader.customActive .form-control{
  190 + margin-left: 5px;
  191 + margin-right: 5px;
  192 +}
189 193 .customAccordianHeader > span{
190 194 font-size: 15px;
191 195 line-height: 22px;
... ... @@ -749,4 +753,12 @@ font-size: 10px !important;
749 753 color: #fff;
750 754 text-align: center !important;
751 755 outline: none !important;
752   -}
753 756 \ No newline at end of file
  757 +}
  758 +
  759 +/*--Highlight today date--*/
  760 +.ui-datepicker-today {
  761 + background: lightgray !important;
  762 +}
  763 +/*.ui-datepicker-current-day {
  764 + background: #999 !important;
  765 +}*/
754 766 \ No newline at end of file
... ...
... ... @@ -76,6 +76,7 @@ background: #f3f3f3;
76 76  
77 77 .password-field { background: url(../../img/signin/password.png) no-repeat; }
78 78  
  79 +.email-field { background: url(../../img/forgetPassword/forgetPassword.png) no-repeat; }
79 80  
80 81  
81 82  
... ... @@ -318,4 +319,17 @@ background: #f3f3f3;
318 319 .icon-tint-margin{
319 320 margin-bottom: 5px;
320 321 }
  322 +
  323 +.forget-password{
  324 + color:#f90;
  325 + font-size: 21px;
  326 +
  327 +}
  328 +
  329 +.forget{
  330 +position:relative;
  331 +right: 120px;
  332 +}
  333 +
  334 +
321 335 /* login page css */
... ...
... ... @@ -365,6 +365,12 @@
365 365 controller: "flightDepOrdersController"
366 366 })
367 367  
  368 + .state("forgetPassword", {
  369 + url: "/forgetPassword",
  370 + templateUrl: "partials/forgetPassword/forgetPassword.html",
  371 + controller: "forgetPasswordController"
  372 + })
  373 +
368 374 }
369 375 ])
370 376  
... ... @@ -409,7 +415,7 @@
409 415 });
410 416 }])
411 417  
412   -
  418 +
413 419 .directive("datepicker",function(){
414 420 return {
415 421 restrict:"A",
... ... @@ -418,9 +424,7 @@
418 424 }
419 425 };
420 426 })
421   -
422 427  
423   -
424   -
  428 +
425 429  
426 430  
... ...
app/partials/analytics/analytics.controller.js
Diff comments   View file @d121d55
... ... @@ -366,7 +366,9 @@
366 366 ,
367 367 mean: 250
368 368 }];
369   -
  369 + //console.log("--datahfp---",$scope.datahfp);
  370 +
  371 +
370 372 /*Date Range Filter*/
371 373 $scope.submitDate = function(){
372 374 /*if($scope.drf == undefined || $scope.drf.fromDate == undefined || $scope.drf.fromDate === '' || $scope.drf.fromDate === null){
... ...
app/partials/analytics/analytics.html
Diff comments   View file @d121d55
... ... @@ -25,9 +25,10 @@
25 25  
26 26 </style>
27 27 <div class="main">
  28 + <div style="padding: 0 3%; margin-left: 15px;">
28 29 <div class="customInputWrap">
29 30  
30   - <div class="col-md-12" >
  31 + <div style="margin-left: -15px;">
31 32 <!-- <table>
32 33 <tr><label>Date Range Filter</label></tr>
33 34 <tr>
... ... @@ -42,9 +43,9 @@
42 43 -->
43 44 <label>Date Range Filter</label>
44 45 <form name="myForm">
45   - <input type="text" ng-model="drf.fromDate" datepicker class="form-control" placeholder="From Date" required ng-required="true" style="width: 150px; float: left; margin-right: 15px;"/>
  46 + <input type="text" ng-model="drf.fromDate" datepicker class="form-control" placeholder="From Date" required ng-required="true" style="width: 120px; float: left; margin-right: 15px;"/>
46 47  
47   - <input type="text" ng-model="drf.toDate" datepicker class="form-control" placeholder="To Date" style="width: 150px; float: left; margin-right: 15px;">
  48 + <input type="text" ng-model="drf.toDate" datepicker class="form-control" placeholder="To Date" style="width: 120px; float: left; margin-right: 15px;">
48 49  
49 50 <button class="btn btn-primary" ng-disabled="myForm.$invalid" ng-click="submitDate()" style="float: left; display: none;">Apply</button>
50 51  
... ... @@ -57,7 +58,7 @@
57 58 </div>
58 59  
59 60  
60   - <div class="container">
  61 +
61 62 <div class="row">
62 63 <div class="col-md-6">
63 64 <div class="widget stacked">
... ...
app/partials/dashboard/dashboard.html
Diff comments   View file @d121d55
... ... @@ -151,7 +151,7 @@ table tr:nth-child(even) {
151 151 <div class="widget stacked">
152 152 <div class="widget-header">
153 153 <i class="fa fa-pencil"></i>
154   - <h3>Price Manager</h3>
  154 + <h3>Price Manager Active</h3>
155 155 <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()">
156 156 <option value="" disabled selected="selected">Email All Pricing</option>
157 157 <option value="JET-A">Email JET-A pricing only</option>
... ... @@ -188,7 +188,7 @@ table tr:nth-child(even) {
188 188 <span>{{fuelPricing.fuelPricing.papMargin}}</span>
189 189 </td>
190 190 <td>
191   - <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.fuelPricing.cost -- fuelPricing.fuelPricing.papMargin | number : 2 }}</span>
  191 + <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.fuelPricing.cost -- fuelPricing.fuelPricing.papMargin | number : 4 }}</span>
192 192 </td>
193 193 <td>
194 194 <span>{{fuelPricing.fuelPricing.expirationDate}}</span>
... ...
app/partials/enterFuelOrder/enterFuelOrder.html
Diff comments   View file @d121d55
... ... @@ -23,14 +23,14 @@
23 23 <h3>Search and Dispatch Fuel</h3>
24 24 </div>
25 25 <div class="widget-content new-widget-content">
26   - <form>
  26 + <form name="orderform" novalidate>
27 27  
28 28 <div class="customInputWrap">
29 29 <div class="col-md-3 text-right">
30 30 <label>Company</label>
31 31 </div>
32 32 <div class="col-md-9">
33   - <select ui-select2 ng-model="order.companyName" ng-change="getAircraft(order.companyName)" style="width: 100%;">
  33 + <select ui-select2 ng-model="order.companyName" ng-change="getAircraft(order.companyName)" style="width: 100%;" required>
34 34 <option value="" selected disabled>Select Company</option>
35 35 <option ng-repeat="list in companyList">{{list.companyName}}</option>
36 36 </select>
... ... @@ -43,16 +43,16 @@
43 43 <label>Aircraft</label>
44 44 </div>
45 45 <div class="col-md-3">
46   - <select class="form-control" ng-model="order.aircraftName">
  46 + <select class="form-control" ng-model="order.aircraftName" required>
47 47 <option selected disabled value="">Select Aircraft</option>
48   - <option ng-repeat="list in aircraftList" value="{{list.tail}}">{{list.tail}}</option>
  48 + <option ng-repeat="list in aircraftList" value="{{list}}">{{list.tail}}</option>
49 49 </select>
50 50 </div>
51 51 <div class="col-md-3 text-right">
52 52 <label>Requested Volume</label>
53 53 </div>
54 54 <div class="col-md-3">
55   - <input type="text" ng-model="order.volume" class="form-control">
  55 + <input type="text" ng-model="order.volume" class="form-control" required>
56 56 </div>
57 57 <div class="clearfix"></div>
58 58 </div>
... ... @@ -62,7 +62,7 @@
62 62 <label>Price Quote</label>
63 63 </div>
64 64 <div class="col-md-8 col-md-offset-1">
65   - <select class="form-control" ng-model="order.priceQuote" ng-change="setCost(order.priceQuote)">
  65 + <select class="form-control" ng-model="order.priceQuote" ng-change="setCost(order.priceQuote)" required>
66 66 <option value="" selected disabled>Select Price Quote</option>
67 67 <option ng-repeat="margin in marginList" value="{{margin}}">${{margin.papTotal}} {{margin.productName}}</option>
68 68 </select>
... ... @@ -90,13 +90,13 @@
90 90 <label>Uplift Date</label>
91 91 </div>
92 92 <div class="col-md-3">
93   - <input type="text" ng-model="order.upliftDate" datepicker class="form-control">
  93 + <input type="text" ng-model="order.upliftDate" datepicker class="form-control" style="width: 100px" required>
94 94 </div>
95 95 <div class="col-md-3 text-right">
96   - <label>Departing FBO</label>
  96 + <!-- <label>Departing FBO</label> -->
97 97 </div>
98 98 <div class="col-md-3">
99   - <input type="text" ng-model="order.departingDate" datepicker class="form-control">
  99 + <!-- <input type="text" ng-model="order.departingDate" datepicker class="form-control"> -->
100 100 </div>
101 101 <div class="clearfix"></div>
102 102 </div>
... ... @@ -104,7 +104,7 @@
104 104 <div class="customInputWrap text-right">
105 105 <div class="col-xs-12">
106 106 <input type="cancel" value="Cancel" ng-click="cancelOrder()" class="btn btn-default" style="margin-right: 15px; width: 100px;">
107   - <input type="submit" value="Dispatch" ng-click="dispatchFuel()" class="btn btn-primary">
  107 + <input type="submit" value="Dispatch" ng-click="dispatchFuel()" class="btn btn-primary" ng-disabled="orderform.$invalid">
108 108 </div>
109 109 <div class="clearfix"></div>
110 110 </div>
... ... @@ -114,4 +114,4 @@
114 114 </div>
115 115 </div>
116 116 </div>
117   -</div>
118 117 \ No newline at end of file
  118 +</div>
... ...
app/partials/login/login.html
Diff comments   View file @d121d55
... ... @@ -58,7 +58,7 @@
58 58 <!-- Text Under Box -->
59 59 <div class="login-extra">
60 60 Don't have an account? <a href="./signup.html">Sign Up</a><br/>
61   - Remind <a href="#">Password</a>
  61 + Forget <a href="#!forgetPassword">Password</a>
62 62 </div>
63 63 <!-- /login-extra -->
64 64 <!-- Le javascript
... ...
app/partials/updateFuelManager/updateFuelManager.controller.js
Diff comments   View file @d121d55
... ... @@ -8,8 +8,8 @@
8 8 .controller('updateFuelManagerController', ['$scope','$uibModal', 'updateFuelManagerService', function($scope , $uibModal, updateFuelManagerService) {
9 9 $scope.showLoader = true;
10 10 $scope.yes = function(data){
11   - console.log('========');
12   - console.log('value', data);
  11 + // console.log('========');
  12 + //console.log('value', data);
13 13 $uibModal.yes({
14 14 templateUrl: 'partials/pricingcontact/pricingcontact.html',
15 15 backdrop: true,
... ... @@ -170,6 +170,7 @@
170 170 toastr.success(''+result.success+'', {
171 171 closeButton: true
172 172 })
  173 + // console.log("--tier id custom",$scope.deleteTierObject.id)
173 174 updateFuelManagerService.getJetTiers($scope.deleteTierObject.jetId).then(function(tiers) {
174 175 $scope.aTypeJets[$scope.deleteTierObject.index].tierList = tiers;
175 176 $scope.showLoader = false;
... ... @@ -180,7 +181,7 @@
180 181 }
181 182  
182 183 $scope.cancelTierDelete = function(){
183   - console.log('cancel');
  184 + // console.log('cancel');
184 185 $('#deleteTierConfirm').css('display', 'none');
185 186 $scope.deleteTierObject = {};
186 187 }
... ... @@ -222,7 +223,7 @@
222 223 }
223 224  
224 225 $scope.cancelVtypeTierDelete = function(){
225   - console.log('cancel');
  226 + // console.log('cancel');
226 227 $('#deleteVtypeTierConfirm').css('display', 'none');
227 228 $scope.deleteVtypeTierObject = {};
228 229 }
... ... @@ -242,12 +243,12 @@
242 243 var editJetData = 'productType='+$scope.jetsDetail.productType+'&marginName='+$scope.jetsDetail.marginName+'&pricingStructure='+$scope.jetsDetail.pricingStructure+'&marginValue='+$scope.jetsDetail.marginValue+'&userProfileId='+$scope.jetsDetail.userProfileId+'&marginId='+$scope.jetsDetail.id+'&message='+$scope.jetsDetail.message;
243 244  
244 245 updateFuelManagerService.editAtypeJetMargin(editJetData).then(function(result) {
245   - console.log('newJet', editJetData);
  246 + // console.log('newJet', editJetData);
246 247 toastr.success('Successfully Updated', {
247 248 closeButton: true
248 249 })
249 250 updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) {
250   - console.log('result', result);
  251 + // console.log('result', result);
251 252 $scope.aTypeJets = result;
252 253 $scope.showLoader = false;
253 254 })
... ... @@ -288,13 +289,13 @@
288 289 var editVtypeJetData = 'productType='+$scope.jetsDetail.productType+'&marginName='+$scope.jetsDetail.marginName+'&pricingStructure='+$scope.jetsDetail.pricingStructure+'&marginValue='+$scope.jetsDetail.marginValue+'&userProfileId='+$scope.jetsDetail.userProfileId+'&marginId='+$scope.jetsDetail.id+'&message='+$scope.jetsDetail.message;
289 290  
290 291 updateFuelManagerService.editVtypeJetMargin(editVtypeJetData).then(function(result) {
291   - console.log('newJet', editVtypeJetData);
  292 + //console.log('newJet', editVtypeJetData);
292 293 toastr.success('Successfully Updated', {
293 294 closeButton: true
294 295 })
295 296 updateFuelManagerService.getVTypeJets($scope.userProfileId).then(function(result) {
296 297 $scope.vTypeJets = result;
297   - console.log('second jets', result);
  298 + //console.log('second jets', result);
298 299 $scope.showLoader = false;
299 300 })
300 301 })
... ... @@ -321,13 +322,13 @@
321 322 var jetData = 'productType='+$scope.newJet.productType+'&marginName='+$scope.newJet.marginName+'&pricingStructure='+$scope.newJet.pricingStructure+'&marginValue='+$scope.newJet.marginValue+'&userProfileId='+$scope.newJet.userProfileId+'&message='+$scope.newJet.message;
322 323  
323 324 updateFuelManagerService.addNewAtypeJetMargin(jetData).then(function(result) {
324   - console.log('newJet', jetData);
  325 + // console.log('newJet', jetData);
325 326 toastr.success('Successfully Added', {
326 327 closeButton: true
327 328 })
328 329 $('.addNewMargin').css('display', 'none');
329 330 updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) {
330   - console.log('result', result);
  331 + // console.log('result', result);
331 332 $scope.aTypeJets = result;
332 333 $scope.showLoader = false;
333 334 })
... ... @@ -405,10 +406,17 @@
405 406 $('#confirm1').css('display', 'none');
406 407 }
407 408  
  409 + $(document).ready(function(){
  410 + $('.ui-datepicker-today a').addClass('ui-state-active');
  411 + })
  412 +
408 413 $scope.newFuelPricing = {};
409 414 $scope.holdFuelPricing = {};
410   - updateFuelManagerService.getFuelPricingNew().then(function(result) {
  415 +
  416 + $scope.formFunction = function(){
  417 + updateFuelManagerService.getFuelPricingNew().then(function(result) {
411 418 $scope.newFuelPricing = result;
  419 + // console.log('kd testing', result);
412 420 for (var i = 0; i<$scope.newFuelPricing.length; i++) {
413 421 if ($scope.newFuelPricing[i].fuelPricing != null) {
414 422 if ($scope.newFuelPricing[i].fuelPricing.expirationDate != null && $scope.newFuelPricing[i].fuelPricing.expirationDate != '') {
... ... @@ -494,6 +502,10 @@
494 502 $scope.showLoader = false;
495 503  
496 504 })
  505 + };
  506 +
  507 + $scope.formFunction();
  508 +
497 509 $scope.$watch("fuelPricing.fuelPricing.expirationDate",function(old,newv){
498 510 });
499 511 $scope.updateFuelPricing = {};
... ... @@ -518,7 +530,7 @@
518 530 $scope.newFuelPricing[i].fuelPricing.expirationDate = '';
519 531 }else{
520 532 $scope.newFuelPricing[i].fuelPricing.expirationDate = new Date($scope.newFuelPricing[i].fuelPricing.expirationDate);
521   - console.log('$scope.newFuelPricing[i].fuelPricing.expirationDate', $scope.newFuelPricing[i].fuelPricing.expirationDate);
  533 + // console.log('$scope.newFuelPricing[i].fuelPricing.expirationDate', $scope.newFuelPricing[i].fuelPricing.expirationDate);
522 534 $scope.newFuelPricing[i].fuelPricing.expirationDate = $scope.newFuelPricing[i].fuelPricing.expirationDate.getTime();
523 535 }
524 536  
... ... @@ -591,7 +603,7 @@
591 603 $scope.showLoader = true;
592 604 for (var i = 0; i<$scope.newFuelPricing.length; i++) {
593 605 //console.log(parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].fuelPricing.papMargin));
594   - console.log('-----',$scope.newFuelPricing[i].futureFuelPricing);
  606 + // console.log('-----',$scope.newFuelPricing[i].futureFuelPricing);
595 607 if ($scope.newFuelPricing[i].futureFuelPricing != null) {
596 608 if ($scope.newFuelPricing[i].futureFuelPricing.cost != null || $scope.newFuelPricing[i].futureFuelPricing.cost != '' || $scope.newFuelPricing[i].futureFuelPricing.cost != undefined) {
597 609 $scope.newFuelPricing[i].futureFuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].futureFuelPricing.papMargin);
... ... @@ -608,7 +620,7 @@
608 620 $scope.newFuelPricing[i].futureFuelPricing.nextExpiration = '';
609 621 }else{
610 622 $scope.newFuelPricing[i].futureFuelPricing.nextExpiration = new Date($scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
611   - console.log('$scope.newFuelPricing[i].futureFuelPricing.nextExpiration', $scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
  623 + // console.log('$scope.newFuelPricing[i].futureFuelPricing.nextExpiration', $scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
612 624 $scope.newFuelPricing[i].futureFuelPricing.nextExpiration = $scope.newFuelPricing[i].futureFuelPricing.nextExpiration.getTime();
613 625 }
614 626 if ($scope.newFuelPricing[i].futureFuelPricing.deployDate == null) {
... ... @@ -704,7 +716,7 @@
704 716  
705 717 $scope.updateFutureFuelPricingImmediatelyClick = function(){
706 718 $scope.showLoader = true;
707   - console.log('--$scope.newFuelPricing--',$scope.newFuelPricing);
  719 + // console.log('--$scope.newFuelPricing--', $scope.newFuelPricing);
708 720 for (var i = 0; i<$scope.newFuelPricing.length; i++) {
709 721 //console.log(parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].fuelPricing.papMargin));
710 722 if ($scope.newFuelPricing[i].futureFuelPricing != null) {
... ... @@ -723,7 +735,7 @@
723 735 $scope.newFuelPricing[i].futureFuelPricing.nextExpiration = '';
724 736 }else{
725 737 $scope.newFuelPricing[i].futureFuelPricing.nextExpiration = new Date($scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
726   - console.log('$scope.newFuelPricing[i].futureFuelPricing.nextExpiration', $scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
  738 + //console.log('$scope.newFuelPricing[i].futureFuelPricing.nextExpiration', $scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
727 739 $scope.newFuelPricing[i].futureFuelPricing.nextExpiration = $scope.newFuelPricing[i].futureFuelPricing.nextExpiration.getTime();
728 740 }
729 741 if ($scope.newFuelPricing[i].futureFuelPricing.deployDate == null) {
... ... @@ -829,6 +841,7 @@
829 841 $('#deleteMargin').css('display', 'none');
830 842 $scope.showLoader = true;
831 843 updateFuelManagerService.deleteMargin($scope.marginIdDelete).then(function(result) {
  844 + // console.log("--kd---",$scope.marginIdDelete)
832 845 toastr.success(''+result.success+'', {
833 846 closeButton: true
834 847 })
... ... @@ -868,20 +881,24 @@
868 881 $scope.marginVtypeIdDelete = '';
869 882 $('#deleteVtypeMargin').css('display', 'none');
870 883 }
871   -
  884 +
872 885 $scope.resetFutureFuelPricingClick = function(){
  886 + //$scope.newFuelPricing='';
873 887 $('#resetPricing').css('display', 'block');
874 888 }
875 889  
876 890 $scope.confirmReset = function(){
877 891 $('#resetPricing').css('display', 'none');
878   - $scope.showLoader = true;
879   - updateFuelManagerService.resetPricing().then(function(result) {
  892 + $scope.formFunction();
  893 + //$scope.showLoader = true;
  894 + //document.getElementById("resetForm").reset();
  895 + // $scope.fuelPricing.futureFuelPricing.cost="";
  896 + /*updateFuelManagerService.resetPricing().then(function(result) {
880 897 toastr.success(''+result.success+'', {
881 898 closeButton: true
882 899 })
883 900 $scope.showLoader = false;
884   - })
  901 + })*/
885 902 }
886 903  
887 904 $scope.cancelReset = function(){
... ... @@ -898,7 +915,7 @@
898 915 }
899 916  
900 917  
901   -
  918 +
902 919  
903 920  
904 921 }]);
... ...
app/partials/updateFuelManager/updateFuelManager.html
Diff comments   View file @d121d55
... ... @@ -8,30 +8,36 @@
8 8 color: #fff;
9 9 }
10 10 </style>
  11 +
11 12 <div class="myLoader" ng-show="showLoader">
12 13 <img src="../img/hourglass.gif" width="50px;">
13 14 </div>
14 15  
15 16 <div class="col-xs-12 col-md-6">
16   -
  17 +
17 18 <div class="widget stacked">
18 19 <div class="widget-header">
19 20 <i class="fa fa-pencil"></i>
20   - <h3>Price Manager Staging</h3>
  21 + <h3>Price Manager Active</h3>
  22 + <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()">
  23 + <option value="" disabled selected="selected">Email All Pricing</option>
  24 + <option value="JET-A">Email JET-A pricing only</option>
  25 + <option value="AVGAS">Email AVGAS pricing only</option>
  26 + <option disabled>_______________________________</option>
  27 + <option value="all">Distribute All</option>
  28 + </select>
21 29 </div>
22 30 <!-- /widget-header -->
23 31 <div class="widget-content">
24   - <h6 style="color:#F90">Queue Pricing for Deployment in the Price Manager below</h6>
25   - <form>
  32 + <h4>Deployed Fuel Prices</h4>
26 33 <table class="table">
27 34 <thead>
28 35 <tr>
29 36 <th> Product</th>
30 37 <th> Cost</th>
31   - <th> PAP(Margin)</th>
32   - <th> Deploy Date</th>
33   - <th style="color: #F90;">Price Expires</th>
  38 + <th> Margin</th>
34 39 <th> PAP(Total)</th>
  40 + <th style="color: #F90;"> Expires</th>
35 41 </tr>
36 42 </thead>
37 43 <tbody>
... ... @@ -43,67 +49,46 @@
43 49 <span ng-show="fuelPricing.avgas">{{fuelPricing.nameavgasrest}}</span>
44 50 </td>
45 51 <td>
46   - <input type="text" class="form-control" ng-keyup="disableButtons(fuelPricing.futureFuelPricing.cost)" ng-model="fuelPricing.futureFuelPricing.cost" style="height:31px; width: 50px; padding: 6px 6px;">
47   - </td>
48   - <td>
49   - <input type="text" class="form-control" ng-model="fuelPricing.futureFuelPricing.papMargin" style="height:31px; width: 80px; padding: 6px 6px;">
50   - </td>
  52 + <span>{{fuelPricing.fuelPricing.cost}}</span>
  53 + </td>
51 54 <td>
52   - <input type="text" class="form-control" ng-disabled="fuelPricing.futureFuelPricing.cost == undefined || fuelPricing.futureFuelPricing.cost == null || fuelPricing.futureFuelPricing.cost == ''" datepicker ng-model="fuelPricing.futureFuelPricing.deployDate" style="height:31px; width: 80px; padding: 6px 6px;">
53   - </td>
  55 + <span>{{fuelPricing.fuelPricing.papMargin}}</span>
  56 + </td>
54 57 <td>
55   - <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;">
  58 + <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.fuelPricing.cost -- fuelPricing.fuelPricing.papMargin | number : 4 }}</span>
56 59 </td>
57 60 <td>
58   - <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.futureFuelPricing.cost -- fuelPricing.futureFuelPricing.papMargin | number : 2}}</span>
  61 + <span>{{fuelPricing.fuelPricing.expirationDate}}</span>
59 62 </td>
60 63 </tr>
61 64 </tbody>
62 65 </table>
63   - <div class="row" style="margin-left: 0px;">
64   - <div class="col-md-12" style= "text-align: right; padding-left: 0;">
65   - <div style="float: left;">
66   - <button type="button" class="btn btn-primary btn-xs" ng-click="updateFutureFuelPricingImmediatelyClick()" ng-disabled="noPrices" style= "text-align: center; font-size:12px">Save & Deploy Immediately</button>
67   -
68   - <button type="button" ng-click="resetFutureFuelPricingClick()" class="btn btn-default btn-xs">Reset All</button>
69   - </div>
70   - <div style="float: right;">
71   - <button type="button" class="btn btn-success btn-xs" ng-click="updateFutureFuelPricingClick()" ng-disabled="noPrices" style="margin-right:3%">Save & Stage for Deploy</button>
72   - </div>
73   - <div style="clear: both;"></div>
74   - </div>
75   - </div>
76   - </form>
77   - </div>
  66 +
  67 + </div>
78 68 <!-- /widget-content -->
79 69 </div>
80   - <!-- /widget -->
81   -
  70 + <!-- /widget -->
82 71  
83 72  
  73 +
84 74 <div class="widget stacked">
85 75 <div class="widget-header">
86 76 <i class="fa fa-pencil"></i>
87   - <h3>Price Manager</h3>
88   - <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()">
89   - <option value="" disabled selected="selected">Email All Pricing</option>
90   - <option value="JET-A">Email JET-A pricing only</option>
91   - <option value="AVGAS">Email AVGAS pricing only</option>
92   - <option disabled>_______________________________</option>
93   - <option value="all">Distribute All</option>
94   - </select>
  77 + <h3>Price Manager Staging</h3>
95 78 </div>
96 79 <!-- /widget-header -->
97 80 <div class="widget-content">
98   - <h4>Deployed Fuel Prices</h4>
  81 + <h6 style="color:#F90">Queue Pricing for Deployment in the Price Manager below</h6>
  82 + <form>
99 83 <table class="table">
100 84 <thead>
101 85 <tr>
102 86 <th> Product</th>
103 87 <th> Cost</th>
104   - <th> Margin</th>
  88 + <th> PAP(Margin)</th>
  89 + <th> Effective Date</th>
  90 + <th style="color: #F90;">Price Expires</th>
105 91 <th> PAP(Total)</th>
106   - <th style="color: #F90;"> Expires</th>
107 92 </tr>
108 93 </thead>
109 94 <tbody>
... ... @@ -115,28 +100,44 @@
115 100 <span ng-show="fuelPricing.avgas">{{fuelPricing.nameavgasrest}}</span>
116 101 </td>
117 102 <td>
118   - <span>{{fuelPricing.futureFuelPricing.cost}}</span>
119   - </td>
  103 + <input type="text" class="form-control" ng-keyup="disableButtons(fuelPricing.futureFuelPricing.cost)" ng-model="fuelPricing.futureFuelPricing.cost" style="height:31px; width: 60px; padding: 6px 6px; font-size:12px;">
  104 + </td>
  105 + <td>
  106 + <input type="text" class="form-control" ng-model="fuelPricing.futureFuelPricing.papMargin" style="height:31px; width: 80px; padding: 6px 6px; font-size:12px;">
  107 + </td>
120 108 <td>
121   - <span>{{fuelPricing.futureFuelPricing.papMargin}}</span>
122   - </td>
  109 + <input type="text" class="form-control" ng-disabled="fuelPricing.futureFuelPricing.cost == undefined || fuelPricing.futureFuelPricing.cost == null || fuelPricing.futureFuelPricing.cost == ''" datepicker ng-model="fuelPricing.futureFuelPricing.deployDate" style="height:31px; width: 80px; padding: 6px 6px; font-size:12px;">
  110 + </td>
123 111 <td>
124   - <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.futureFuelPricing.cost -- fuelPricing.futureFuelPricing.papMargin | number : 2 }}</span>
  112 + <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; font-size:12px;">
125 113 </td>
126 114 <td>
127   - <span>{{fuelPricing.futureFuelPricing.expirationDate}}</span>
  115 + <span style="line-height: 31px; color: #1ab394; font-size:12px;">$ {{fuelPricing.futureFuelPricing.cost -- fuelPricing.futureFuelPricing.papMargin | number : 4}}</span>
128 116 </td>
129 117 </tr>
130 118 </tbody>
131 119 </table>
132   -
133   - </div>
  120 + <div class="row" style="margin-left: 0px;">
  121 + <div class="col-md-12" style= "text-align: right; padding-left: 0;">
  122 + <div style="float: left;">
  123 + <button type="button" class="btn btn-primary btn-xs" ng-click="updateFutureFuelPricingImmediatelyClick()" ng-disabled="noPrices" style= "text-align: center; font-size:12px">Save & Deploy Immediately</button>
  124 +
  125 + <button type="button" ng-click="resetFutureFuelPricingClick()" class="btn btn-default btn-xs">Reset All</button>
  126 + </div>
  127 + <div style="float: right;">
  128 + <button type="button" class="btn btn-success btn-xs" ng-click="updateFutureFuelPricingClick()" ng-disabled="noPrices" style="margin-right:3%">Save & Stage for Deploy</button>
  129 + </div>
  130 + <div style="clear: both;"></div>
  131 + </div>
  132 + </div>
  133 + </form>
  134 + </div>
134 135 <!-- /widget-content -->
135 136 </div>
136 137 <!-- /widget -->
137   -
138   -
  138 +
139 139 </div>
  140 +
140 141 <div class="col-xs-12 col-md-6">
141 142  
142 143  
... ... @@ -156,8 +157,8 @@
156 157 <span>{{jets.marginName}}</span>
157 158 <select class="form-control" disabled="true" ng-model="jets.pricingStructure">
158 159 <option value="" disabled selected>Pricing Structure</option>
159   - <option value="minus">Retail/PAP-(minus)</option>
160   - <option value="plus">Cost+(plus)</option>
  160 + <option value="minus">Retail/PAP - (minus)</option>
  161 + <option value="plus">Cost + (plus)</option>
161 162 </select>
162 163 <span style="margin-right: 0;">$</span>
163 164 <input type="text" disabled="true" class="form-control" ng-model="jets.marginValue">
... ... @@ -261,9 +262,9 @@
261 262 <span>{{jets.marginName}}</span>
262 263 <select class="form-control" disabled="true" ng-model="jets.pricingStructure">
263 264 <option value="" disabled selected>Pricing Structure</option>
264   - <option value="minus">Retail-(minus)</option>
265   - <option value="plus">Cost+(plus)</option>
266   - <option value="equal">Direct=(equal)</option>
  265 + <option value="minus">Retail - (minus)</option>
  266 + <option value="plus">Cost + (plus)</option>
  267 + <option value="equal">Direct = (equal)</option>
267 268 </select>
268 269 <span style="margin-right: 0;">$</span>
269 270 <input type="text" disabled="true" class="form-control" ng-model="jets.marginValue">
... ... @@ -372,9 +373,9 @@
372 373 <input type="text" class="form-control" style="width: 120px; margin-right: 10px;" placeholder="Margin Name" ng-model="newJet.marginName">
373 374 <select class="form-control" ng-model="newJet.pricingStructure">
374 375 <option value="" disabled selected>Pricing Structure</option>
375   - <option value="minus">Retail-(minus)</option>
376   - <option value="plus">Cost+(plus)</option>
377   - <option value="equal">Direct=(equal)</option>
  376 + <option value="minus">Retail -(minus)</option>
  377 + <option value="plus">Cost +(plus)</option>
  378 + <option value="equal">Direct =(equal)</option>
378 379 </select>
379 380 <span style="margin-right: 0;">$</span>
380 381 <input type="text" class="form-control" style="width: 120px;" placeholder="Margin Price" ng-model="newJet.marginValue">
... ... @@ -412,9 +413,9 @@
412 413 <input type="text" class="form-control" style="width: 120px; margin-right: 10px;" placeholder="Margin Name" ng-model="newVtypeJet.marginName">
413 414 <select class="form-control" ng-model="newVtypeJet.pricingStructure">
414 415 <option value="" disabled selected>Pricing Structure</option>
415   - <option value="minus">Retail-(minus)</option>
416   - <option value="plus">Cost+(plus)</option>
417   - <option value="equal">Direct=(equal)</option>
  416 + <option value="minus">Retail -(minus)</option>
  417 + <option value="plus">Cost +(plus)</option>
  418 + <option value="equal">Direct =(equal)</option>
418 419 </select>
419 420 <span style="margin-right: 0;">$</span>
420 421 <input type="text" class="form-control" style="width: 120px;" placeholder="Margin Price" ng-model="newVtypeJet.marginValue">
... ...
app/partials/updateFuelManager/updateFuelManager.service.js
Diff comments   View file @d121d55
1   -(function(){
  1 + (function(){
2 2 'use strict';
3 3 angular.module('acufuel')
4 4 .service('updateFuelManagerService', ['$q', '$http', 'BASE_URL', updateFuelManagerService]);
... ... @@ -290,8 +290,11 @@
290 290 })
291 291 return deferred.promise;
292 292 }
293   -
294   - this.resetPricing = function(data){
  293 +
  294 + /**
  295 + Not use for ResetAll
  296 + **/
  297 + /* this.resetPricing = function(data){
295 298 var deferred = $q.defer();
296 299 $http({
297 300 method : 'DELETE',
... ... @@ -305,7 +308,7 @@
305 308 deferred.resolve(result.data);
306 309 })
307 310 return deferred.promise;
308   - }
  311 + }*/
309 312  
310 313  
311 314  
... ...