viithiisys / Acufuel

Download as
Browse Code ยป

Commit 32ea0c4765b995908c066e3562c984297ebb15f1

Authored by Swarn Singh
1 parent 28af27a3fe
Exists in master

working on fuel manager and resolved UI issue

Showing 7 changed files with 569 additions and 497 deletions   Show diff stats
... ... @@ -38,7 +38,8 @@
38 38 <link href="js/plugins/msgbox/jquery.msgbox.css" rel="stylesheet">
39 39 <link href="css/pages/pricing.css" rel="stylesheet">
40 40 <link href="css/pages/reports.css" rel="stylesheet">
41   - <link rel="stylesheet" type="text/css" href="css/datepicker3.css">
  41 + <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.6.4/css/bootstrap-datepicker.css">
  42 +
42 43  
43 44  
44 45  
... ... @@ -49,6 +50,7 @@
49 50 <!-- scripts -->
50 51 <script src="bower_components/jquery/dist/jquery.min.js"></script>
51 52 <script src="js/libs/jquery-ui-1.10.0.custom.min.js"></script>
  53 + <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.6.4/js/bootstrap-datepicker.js"></script>
52 54 <!--<script src="js/plugins/flot/jquery.flot.js"></script>
53 55 <script src="js/plugins/flot/jquery.flot.pie.js"></script>
54 56 <script src="js/plugins/flot/jquery.flot.resize.js"></script>
... ...
... ... @@ -271,4 +271,26 @@
271 271 }])
272 272  
273 273  
  274 + .directive("datepicker", function () {
  275 + return {
  276 + restrict: "A",
  277 + require: "ngModel",
  278 + link: function (scope, elem, attrs, ngModelCtrl) {
  279 + var updateModel = function (dateText) {
  280 + scope.$apply(function () {
  281 + ngModelCtrl.$setViewValue(dateText);
  282 + });
  283 + };
  284 + var options = {
  285 + dateFormat: "dd/mm/yy",
  286 + onSelect: function (dateText) {
  287 + updateModel(dateText);
  288 + }
  289 + };
  290 + elem.datepicker(options);
  291 + }
  292 + }
  293 + })
  294 +
  295 +
274 296  
... ...
app/partials/fuelManager/fuelManager.controller.js
Diff comments   View file @32ea0c4
... ... @@ -221,6 +221,24 @@
221 221 $('#'+id).slideToggle();
222 222 }
223 223  
  224 + $scope.dates = [{date:'01-05-2001'}, {date:'05-05-2014'}, {date:'10-11-2008'}]
  225 +
  226 + $scope.open = function($event, dt) {
  227 + $event.preventDefault();
  228 + $event.stopPropagation();
  229 +
  230 + dt.opened = true;
  231 + };
  232 +
  233 + $scope.dateOptions = {
  234 + formatYear: 'yy',
  235 + startingDay: 1
  236 + };
  237 +
  238 +
  239 + $scope.format = 'dd-MMMM-yyyy'
  240 +
  241 +
224 242 $(document).ready(function(){
225 243  
226 244 setInterval(function(){
... ...
app/partials/fuelManager/fuelManager.html
Diff comments   View file @32ea0c4
... ... @@ -7,105 +7,338 @@
7 7 <img src="../img/hourglass.gif" width="50px;">
8 8 </div>
9 9  
10   -<div class="container" style="display: none;">
  10 +
  11 +
  12 +
  13 +<div class="container">
11 14 <div class="row">
12 15 <div class="col-md-10">
13 16 <div class="widget stacked">
14 17 <div class="widget-header">
15 18 <i class="fa fa-pencil"></i>
16 19 <h3>Ramp Fee Manager</h3>
17   - <select>
18   - <option>Ramp Fee By Category</option>
19   - <option>Make And Model</option>
20   - <option>Weight</option>
21   - <option>Wingspan</option>
  20 + <select style="float: right; margin: 8px 10px;" ng-model="customRampData.rampFeesAndAvoidanceList.aircraftType" ng-change="openRampModal()">
  21 + <option disabled selected value="">Ramp Fee By Category</option>
  22 + <option ng-repeat="modals in dropOptions" value="{{modals.size}}">{{modals.size}}</option>
22 23 </select>
23 24 </div>
24 25 <!-- /widget-header -->
25   - <div class="widget-content">
26   - <h3>Ramp Fees & Avoidance</h3>
27   - <section id="accordions">
  26 + <div class="widget-content new-widget-content">
  27 + <section id="accordions1">
28 28 <div class="newCustomAccordian">
29   - <!-- tab 1 -->
30   - <div class="customAccordianHeader customActive" id="customTabs1">
31   - <span>Jet Aircraft</span>
32   - <select class="form-control">
33   - <option>Pricing Structure</option>
34   - <option>Retail-(minus)</option>
35   - <option>Cost+(plus)</option>
36   - <option>Direct=(equals)</option>
37   - </select>
38   - <input type="text" name="" class="form-control" value="$1.7500">
39   - <div class="pull-right">
40   - <button class="btn btn-success">Save</button>
41   - <button class="btn btn-danger">Delete</button>
42   - <button class="btn btn-default" id="customTabToggle1" style="display: none;">Edit</button>
  29 +
  30 + <div class="col-md-9 feeManagerLeft" style="padding: 0;">
  31 +
  32 + <div ng-repeat="list in fullJetList">
  33 + <div class="new-tab-heading">
  34 + <i class="fa fa-plus-circle" ng-click="parentOpen($index)" id="parentOpen{{$index}}" aria-hidden="true"></i>
  35 + <i class="fa fa-minus-circle" ng-click="parentClose($index)" id="parentClose{{$index}}" aria-hidden="true" style="display: none;"></i>
  36 + <span>{{list.type}}</span>
  37 + </div>
  38 + <div class="new-tab-body" id="parentTogglebody{{$index}}" style="display: none;">
  39 + <div class="new-tab-body-th">
  40 + <div class="col-md-4">
  41 + Aircraft Size
  42 + </div>
  43 + <div class="col-md-2">
  44 + Ramp/Facil. Fee
  45 + </div>
  46 + <div class="col-md-2">
  47 + Avoidance
  48 + </div>
  49 + <div class="col-md-2">
  50 + Expiration Date
  51 + </div>
  52 + <div class="col-md-2">
  53 + Applicable
  54 + </div>
  55 + <div class="clearfix"></div>
  56 + </div>
  57 + <div class="new-tab-body-td" ng-repeat="jets in list.aircraftsSize">
  58 + <div>
  59 + <div class="col-md-4">
  60 + <i class="fa fa-plus-circle {{jets.id}}" ng-click="toggleChild(jets.id)" aria-hidden="true"></i>
  61 + <span style="margin-left: 5px;">{{jets.size}}</span>
  62 + </div>
  63 + <div class="col-md-2">
  64 + <input type="text" ng-disabled="jets.rampFeesAndAvoidance.applicable == false || jets.rampFeesAndAvoidance.applicable == null" ng-model="jets.rampFeesAndAvoidance.rampFees" style="padding: 5px 5px;">
  65 + </div>
  66 + <div class="col-md-2">
  67 + <input type="text" ng-disabled="jets.rampFeesAndAvoidance.applicable == false || jets.rampFeesAndAvoidance.applicable == null" ng-model="jets.rampFeesAndAvoidance.avoidance" style="padding: 5px 5px;">
  68 + </div>
  69 + <div class="col-md-2">
  70 + <!-- <input type="date" ng-disabled="jets.rampFeesAndAvoidance.applicable == false || jets.rampFeesAndAvoidance.applicable == null" name="" ng-model="jets.rampFeesAndAvoidance.expirationDate"> -->
  71 +
  72 +
  73 + <input type="text" ng-model="datePicker" datepicker -disabled="jets.rampFeesAndAvoidance.applicable == false || jets.rampFeesAndAvoidance.applicable == null" ng-model="jets.rampFeesAndAvoidance.expirationDate" style="width: 90px; padding: 5px 5px;" />
  74 +
  75 + </div>
  76 + <div class="col-md-2">
  77 + <!-- <input type="checkbox" ng-model="jets.rampFeesAndAvoidance.applicable"> -->
  78 + <div class="onoffswitch">
  79 + <input type="checkbox" name="onoffswitch" class="onoffswitch-checkbox" id="{{jets.id}}{{$index}}" ng-model="jets.rampFeesAndAvoidance.applicable">
  80 + <label class="onoffswitch-label" for="{{jets.id}}{{$index}}">
  81 + <span class="onoffswitch-inner"></span>
  82 + <span class="onoffswitch-switch">
  83 + <i class="fa fa-check" ng-show="jets.rampFeesAndAvoidance.applicable" aria-hidden="true"></i>
  84 + <i class="fa fa-times" ng-hide="jets.rampFeesAndAvoidance.applicable" aria-hidden="true"></i>
  85 + </span>
  86 + </label>
  87 + </div>
  88 + </div>
  89 + <div class="clearfix"></div>
  90 + </div>
  91 + <div style="display: none;" class="toggleCHildBody" id="{{jets.id}}">
  92 + <div class="col-xs-12">
  93 + <div class="col-xs-12">
  94 + <div class="appliesTableHeading">Applies To:</div>
  95 + <div class="appliesTableBody">
  96 + <div class="firstDiv">
  97 + <label style="font-weight: normal;" ng-repeat="aircraftList in jets.aircrafts">{{aircraftList.model}}</label>
  98 + </div>
  99 + <div class="lastDiv">
  100 + <textarea ng-model="jets.rampFeesAndAvoidance.notes"></textarea>
  101 + <div class="reportedByTag">
  102 + <div class="confirmedTag">Confirmed</div>
  103 + <table>
  104 + <tr>
  105 + <td width="50%">
  106 + Reported By:
  107 + </td>
  108 + <td width="50%">
  109 + {{jets.rampFeesAndAvoidance.reportedBy}}
  110 + </td>
  111 + </tr>
  112 + <tr>
  113 + <td width="50%">
  114 + Reported On:
  115 + </td>
  116 + <td width="50%">
  117 + {{jets.rampFeesAndAvoidance.reportedOn}}
  118 + </td>
  119 + </tr>
  120 + <tr>
  121 + <td colspan="2">
  122 + <i>Click the Save Form button to Re-Confirm</i>
  123 + </td>
  124 + </tr>
  125 + </table>
  126 + </div>
  127 + </div>
  128 + <div class="clearfix"></div>
  129 + </div>
  130 + </div>
  131 + <div class="clearfix"></div>
  132 + </div>
  133 + <div class="clearfix"></div>
  134 + </div>
  135 + </div>
  136 + </div>
43 137 </div>
44   - <div class="clearfix"></div>
45 138 </div>
46   - <div class="customAccordianTabBody" id="customTabsBody1">
47   - <table class="customTableWithFilter">
48   - <thead>
49   - <tr>
50   - <th>
51   - <span class="pull-left">1-250 gal.</span>
52   - <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
53   - </th>
54   - <th>
55   - <span class="pull-left">1-250 gal.</span>
56   - <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
57   - </th>
58   - <th>
59   - <input type="text" placeholder="min" name=""> -
60   - <input type="text" placeholder="max" name="">
61   - <span>gal.</span>
62   - </th>
63   - <th> &nbsp; </th>
64   - </tr>
65   - </thead>
66   - <tbody>
67   - <tr>
68   - <td>
69   - <span class="pull-left">-$0.0000</span> &nbsp;
70   - <span class="pull-right">($1.7500)</span>
71   - </td>
72   - <td>
73   - <span class="pull-left">-$0.0000</span> &nbsp;
74   - <span class="pull-right">($1.7500)</span>
75   - </td>
76   - <td>
77   - <span>$</span>
78   - <input type="text" placeholder="margin" class="tierTextBox" name="">
79   - <button class="addTierButton">Add Tier</button>
80   - </td>
81   - <td>
82   - <i class="fa fa-trash-o" aria-hidden="true"></i>
83   - </td>
84   - </tr>
85   - </tbody>
86   - </table>
87   - <textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>
  139 + <div class="col-md-3 text-center feeManagerRight" style="padding: 0;">
  140 + <div class="text-center">
  141 + <button type="submit" ng-click="updateList(fullJetList)" class="btn btn-success"><i class="icon-ok"></i> Save Form</button>&nbsp;&nbsp;
  142 + <button type="reset" class="btn btn-default">Cancel</button>
  143 + </div>
88 144 </div>
  145 + <div class="clearfix"></div>
  146 + <br/>
  147 + </div>
  148 + </section>
  149 + </div>
  150 + <!-- /widget-content -->
  151 + </div>
  152 + <!-- /widget -->
  153 + </div>
  154 + <!-- /span6 -->
  155 + </div>
  156 + <!-- /span12 -->
  157 +</div> <!-- /container 2 -->
  158 +
  159 +<div ng-show="openRampFeeModal">
  160 + <div class="customBackdrop">
  161 + <div class="customModalInner">
  162 + <div class="customModelHead">
  163 + <p class="pull-left">
  164 + <i class="fa fa-list-alt" aria-hidden="true"></i>
  165 + Add Ramp Fee
  166 + </p>
  167 + <p class="pull-right">
  168 + <i class="fa fa-times" aria-hidden="true" style="cursor: pointer;" ng-click="closeRampFeeModel()"></i>
  169 + </p>
  170 + <div class="clearfix"></div>
  171 + </div>
  172 + <div class="customModelBody">
  173 +
  174 + <div class="col-xs-12 col-sm-4">
  175 + Type:
  176 + </div>
  177 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  178 + <select class="form-control" style="border-radius: 0; height: 26px; padding: 0;" ng-model="customRampData.rampFeesAndAvoidanceList.aircraftType" ng-change="openRampModal()">
  179 + <option ng-repeat="modalsNew in dropOptions" value="{{modalsNew.size}}">{{modalsNew.size}}</option>
  180 + </select>
  181 + </div>
  182 + <div class="clearfix"></div>
  183 + <br/>
  184 +
  185 + <div ng-show="showAircraft">
  186 + <div class="col-xs-12 col-sm-4">
  187 + Aircraft Make:
  188 + </div>
  189 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  190 + <select class="form-control" style="border-radius: 0; height: 26px; padding: 0;" ng-model="customRampData.rampFeesAndAvoidanceList.aircraftMake">
  191 + <option ng-repeat="crafts in aircrafts" value="{{crafts}}">{{crafts}}</option>
  192 + </select>
  193 + </div>
  194 + <div class="clearfix"></div>
  195 + <br/>
  196 + </div>
  197 +
  198 + <div ng-show="showTail">
  199 + <div class="col-xs-12 col-sm-4">
  200 + Tail Numbers:
  201 + </div>
  202 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  203 + <select class="form-control" style="border-radius: 0; height: 26px; padding: 0;" ng-model="customRampData.rampFeesAndAvoidanceList.tailNumber">
  204 + <!-- <option ng-repeat="crafts in aircrafts" value="{{crafts}}">{{crafts}}</option> -->
  205 + </select>
  206 + </div>
  207 + <div class="clearfix"></div>
  208 + <br/>
  209 + </div>
  210 +
  211 + <div ng-show="showWingspan">
  212 + <div class="col-xs-12 col-sm-4">
  213 + Wingspan Min:
  214 + </div>
  215 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  216 + <input type="number" value="0.00" ng-model="customRampData.rampFeesAndAvoidanceList.wingspanMin" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
  217 + </div>
  218 + <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
  219 + ft.
  220 + </div>
  221 + <div class="clearfix"></div>
  222 + <br/>
  223 + <div class="col-xs-12 col-sm-4">
  224 + Wingspan Max:
  225 + </div>
  226 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  227 + <input type="number" value="0.00" ng-model="customRampData.rampFeesAndAvoidanceList.wingspanMax" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
  228 + </div>
  229 + <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
  230 + ft.
  231 + </div>
  232 + <div class="clearfix"></div>
  233 + <br/>
  234 + </div>
  235 +
  236 + <div ng-show="showWeight">
  237 + <div class="col-xs-12 col-sm-4">
  238 + Weight Range Min:
  239 + </div>
  240 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  241 + <input type="number" value="0.00" ng-model="customRampData.rampFeesAndAvoidanceList.weightRangeMin" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
  242 + </div>
  243 + <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
  244 + lbs.
  245 + </div>
  246 + <div class="clearfix"></div>
  247 + <br/>
  248 + <div class="col-xs-12 col-sm-4">
  249 + Weight Range Max:
  250 + </div>
  251 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  252 + <input type="number" value="0.00" ng-model="customRampData.rampFeesAndAvoidanceList.weightRangeMax" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
  253 + </div>
  254 + <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
  255 + lbs.
  256 + </div>
  257 + <div class="clearfix"></div>
  258 + <br/>
  259 + </div>
  260 +
  261 + <div>
  262 + <div class="col-xs-12 col-sm-4">
  263 + Ramp/Facil. Fee($):
  264 + </div>
  265 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  266 + <input type="number" value="0" ng-model="customRampData.rampFeesAndAvoidanceList.rampFees" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
  267 + </div>
  268 + <div class="clearfix"></div>
  269 + <br/>
  270 + </div>
  271 + <div>
  272 + <div class="col-xs-12 col-sm-4">
  273 + Avoidance:
  274 + </div>
  275 + <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
  276 + <input type="number" value="0" ng-model="customRampData.rampFeesAndAvoidanceList.avoidance" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
  277 + </div>
  278 + <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
  279 + gal.
  280 + </div>
  281 + <div class="clearfix"></div>
  282 + </div>
  283 +
  284 + </div>
  285 + <div class="customModelFooter text-center">
  286 + <input type="submit" value="Save" class="btn" ng-click="addCustomRamp(customRampData)">
  287 + <button class="btn" ng-click="closeRampFeeModel()">Cancel</button>
  288 + </div>
  289 + </div>
  290 + </div>
  291 +</div>
  292 +
  293 +
  294 +
  295 +
  296 +
89 297  
90   - <!-- tab 2 -->
91 298  
92   - <div class="customAccordianHeader" id="customTabs2">
  299 +
  300 +
  301 +
  302 +
  303 +
  304 +
  305 +<div class="container" style="display: none;">
  306 + <div class="row">
  307 + <div class="col-md-10">
  308 + <div class="widget stacked">
  309 + <div class="widget-header">
  310 + <i class="fa fa-pencil"></i>
  311 + <h3>Ramp Fee Manager</h3>
  312 + <select>
  313 + <option>Ramp Fee By Category</option>
  314 + <option>Make And Model</option>
  315 + <option>Weight</option>
  316 + <option>Wingspan</option>
  317 + </select>
  318 + </div>
  319 + <!-- /widget-header -->
  320 + <div class="widget-content">
  321 + <h3>Ramp Fees & Avoidance</h3>
  322 + <section id="accordions">
  323 + <div class="newCustomAccordian">
  324 + <!-- tab 1 -->
  325 + <div class="customAccordianHeader customActive" id="customTabs1">
93 326 <span>Jet Aircraft</span>
94   - <select class="form-control" disabled="true">
  327 + <select class="form-control">
95 328 <option>Pricing Structure</option>
96 329 <option>Retail-(minus)</option>
97 330 <option>Cost+(plus)</option>
98 331 <option>Direct=(equals)</option>
99 332 </select>
100   - <input type="text" name="" disabled="true" class="form-control" value="$1.7500">
  333 + <input type="text" name="" class="form-control" value="$1.7500">
101 334 <div class="pull-right">
102   - <button class="btn btn-success" style="display: none;">Save</button>
103   - <button class="btn btn-danger" style="display: none;">Delete</button>
104   - <button class="btn btn-default" id="customTabToggle2">Edit</button>
  335 + <button class="btn btn-success">Save</button>
  336 + <button class="btn btn-danger">Delete</button>
  337 + <button class="btn btn-default" id="customTabToggle1" style="display: none;">Edit</button>
105 338 </div>
106 339 <div class="clearfix"></div>
107 340 </div>
108   - <div class="customAccordianTabBody" id="customTabsBody2" style="display: none;">
  341 + <div class="customAccordianTabBody" id="customTabsBody1">
109 342 <table class="customTableWithFilter">
110 343 <thead>
111 344 <tr>
... ... @@ -149,9 +382,9 @@
149 382 <textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>
150 383 </div>
151 384  
152   - <!-- tab 3 -->
  385 + <!-- tab 2 -->
153 386  
154   - <div class="customAccordianHeader" id="customTabs3">
  387 + <div class="customAccordianHeader" id="customTabs2">
155 388 <span>Jet Aircraft</span>
156 389 <select class="form-control" disabled="true">
157 390 <option>Pricing Structure</option>
... ... @@ -163,11 +396,11 @@
163 396 <div class="pull-right">
164 397 <button class="btn btn-success" style="display: none;">Save</button>
165 398 <button class="btn btn-danger" style="display: none;">Delete</button>
166   - <button class="btn btn-default" id="customTabToggle3">Edit</button>
  399 + <button class="btn btn-default" id="customTabToggle2">Edit</button>
167 400 </div>
168 401 <div class="clearfix"></div>
169 402 </div>
170   - <div class="customAccordianTabBody" id="customTabsBody3" style="display: none;">
  403 + <div class="customAccordianTabBody" id="customTabsBody2" style="display: none;">
171 404 <table class="customTableWithFilter">
172 405 <thead>
173 406 <tr>
... ... @@ -211,9 +444,9 @@
211 444 <textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>
212 445 </div>
213 446  
214   - <!-- tab 4 -->
  447 + <!-- tab 3 -->
215 448  
216   - <div class="customAccordianHeader" id="customTabs4">
  449 + <div class="customAccordianHeader" id="customTabs3">
217 450 <span>Jet Aircraft</span>
218 451 <select class="form-control" disabled="true">
219 452 <option>Pricing Structure</option>
... ... @@ -225,233 +458,133 @@
225 458 <div class="pull-right">
226 459 <button class="btn btn-success" style="display: none;">Save</button>
227 460 <button class="btn btn-danger" style="display: none;">Delete</button>
228   - <button class="btn btn-default" id="customTabToggle4">Edit</button>
  461 + <button class="btn btn-default" id="customTabToggle3">Edit</button>
229 462 </div>
230 463 <div class="clearfix"></div>
231 464 </div>
232   - <div class="customAccordianTabBody" id="customTabsBody4" style="display: none;">
  465 + <div class="customAccordianTabBody" id="customTabsBody3" style="display: none;">
233 466 <table class="customTableWithFilter">
234 467 <thead>
235 468 <tr>
236   - <th>
237   - <span class="pull-left">1-250 gal.</span>
238   - <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
239   - </th>
240   - <th>
241   - <span class="pull-left">1-250 gal.</span>
242   - <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
243   - </th>
244   - <th>
245   - <input type="text" placeholder="min" name=""> -
246   - <input type="text" placeholder="max" name="">
247   - <span>gal.</span>
248   - </th>
249   - <th> &nbsp; </th>
250   - </tr>
251   - </thead>
252   - <tbody>
253   - <tr>
254   - <td>
255   - <span class="pull-left">-$0.0000</span> &nbsp;
256   - <span class="pull-right">($1.7500)</span>
257   - </td>
258   - <td>
259   - <span class="pull-left">-$0.0000</span> &nbsp;
260   - <span class="pull-right">($1.7500)</span>
261   - </td>
262   - <td>
263   - <span>$</span>
264   - <input type="text" placeholder="margin" class="tierTextBox" name="">
265   - <button class="addTierButton">Add Tier</button>
266   - </td>
267   - <td>
268   - <i class="fa fa-trash-o" aria-hidden="true"></i>
269   - </td>
270   - </tr>
271   - </tbody>
272   - </table>
273   - <textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>
274   - </div>
275   -
276   -
277   - </div>
278   - </section>
279   - <div class="row">&nbsp;</div>
280   - <div class="row">
281   - <div class="col-md-7">
282   - </div>
283   - <div class="col-md-5">
284   - <div class="form-group">
285   - <div class="col-lg-4"></div>
286   - <div class="col-lg-8">
287   - <button type="submit" class="btn btn-success"><i class="icon-ok"></i> Save Form</button>&nbsp;&nbsp;
288   - <button type="reset" class="btn btn-default">Cancel</button>
289   - </div>
290   - </div>
291   - </div>
292   - </div>
293   - </div>
294   - <!-- /widget-content -->
295   - </div>
296   - <!-- /widget -->
297   - </div>
298   - <!-- /span6 -->
299   - </div>
300   - <!-- /span12 -->
301   -</div> <!-- /container 1 -->
302   -<!-- Le javascript
303   - ================================================== -->
304   -<!-- Placed at the end of the document so the pages load faster -->
305   -
306   -
307   -
308   -
309   -
310   -
311   -
312   -
313   -
314   -
315   -
316   -
317   -<div class="container">
318   - <div class="row">
319   - <div class="col-md-10">
320   - <div class="widget stacked">
321   - <div class="widget-header">
322   - <i class="fa fa-pencil"></i>
323   - <h3>Ramp Fee Manager</h3>
324   - <select style="float: right; margin: 8px 10px;" ng-model="customRampData.rampFeesAndAvoidanceList.aircraftType" ng-change="openRampModal()">
325   - <option disabled selected value="">Ramp Fee By Category</option>
326   - <option ng-repeat="modals in dropOptions" value="{{modals.size}}">{{modals.size}}</option>
327   - </select>
328   - </div>
329   - <!-- /widget-header -->
330   - <div class="widget-content new-widget-content">
331   - <section id="accordions1">
332   - <div class="newCustomAccordian">
333   -
334   - <div class="col-md-9 feeManagerLeft" style="padding: 0;">
335   -
336   - <div ng-repeat="list in fullJetList">
337   - <div class="new-tab-heading">
338   - <i class="fa fa-plus-circle" ng-click="parentOpen($index)" id="parentOpen{{$index}}" aria-hidden="true"></i>
339   - <i class="fa fa-minus-circle" ng-click="parentClose($index)" id="parentClose{{$index}}" aria-hidden="true" style="display: none;"></i>
340   - <span>{{list.type}}</span>
341   - </div>
342   - <div class="new-tab-body" id="parentTogglebody{{$index}}" style="display: none;">
343   - <div class="new-tab-body-th">
344   - <div class="col-md-4">
345   - Aircraft Size
346   - </div>
347   - <div class="col-md-2">
348   - Ramp/Facil. Fee
349   - </div>
350   - <div class="col-md-2">
351   - Avoidance
352   - </div>
353   - <div class="col-md-2">
354   - Expiration Date
355   - </div>
356   - <div class="col-md-2">
357   - Applicable
358   - </div>
359   - <div class="clearfix"></div>
360   - </div>
361   - <div class="new-tab-body-td" ng-repeat="jets in list.aircraftsSize">
362   - <div>
363   - <div class="col-md-4">
364   - <i class="fa fa-plus-circle {{jets.id}}" ng-click="toggleChild(jets.id)" aria-hidden="true"></i>
365   - <span style="margin-left: 5px;">{{jets.size}}</span>
366   - </div>
367   - <div class="col-md-2">
368   - <input type="text" ng-disabled="jets.rampFeesAndAvoidance.applicable == false || jets.rampFeesAndAvoidance.applicable == null" ng-model="jets.rampFeesAndAvoidance.rampFees" name="">
369   - </div>
370   - <div class="col-md-2">
371   - <input type="text" ng-disabled="jets.rampFeesAndAvoidance.applicable == false || jets.rampFeesAndAvoidance.applicable == null" ng-model="jets.rampFeesAndAvoidance.avoidance" name="">
372   - </div>
373   - <div class="col-md-2">
374   - <input type="date" ng-disabled="jets.rampFeesAndAvoidance.applicable == false || jets.rampFeesAndAvoidance.applicable == null" name="" ng-model="jets.rampFeesAndAvoidance.expirationDate">
375   - <!-- <div class="form-group" id="data_1">
376   - <div class="input-group date">
377   - <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
378   - <input type="text" style="height: 34px;" class="form-control" >
379   - </div>
380   - </div> -->
381   - </div>
382   - <div class="col-md-2">
383   - <!-- <input type="checkbox" ng-model="jets.rampFeesAndAvoidance.applicable"> -->
384   - <div class="onoffswitch">
385   - <input type="checkbox" name="onoffswitch" class="onoffswitch-checkbox" id="{{jets.id}}{{$index}}" ng-model="jets.rampFeesAndAvoidance.applicable">
386   - <label class="onoffswitch-label" for="{{jets.id}}{{$index}}">
387   - <span class="onoffswitch-inner"></span>
388   - <span class="onoffswitch-switch">
389   - <i class="fa fa-check" ng-show="jets.rampFeesAndAvoidance.applicable" aria-hidden="true"></i>
390   - <i class="fa fa-times" ng-hide="jets.rampFeesAndAvoidance.applicable" aria-hidden="true"></i>
391   - </span>
392   - </label>
393   - </div>
394   - </div>
395   - <div class="clearfix"></div>
396   - </div>
397   - <div style="display: none;" class="toggleCHildBody" id="{{jets.id}}">
398   - <div class="col-xs-12">
399   - <div class="col-xs-12">
400   - <div class="appliesTableHeading">Applies To:</div>
401   - <div class="appliesTableBody">
402   - <div class="firstDiv">
403   - <label style="font-weight: normal;" ng-repeat="aircraftList in jets.aircrafts">{{aircraftList.model}}</label>
404   - </div>
405   - <div class="lastDiv">
406   - <textarea ng-model="jets.rampFeesAndAvoidance.notes"></textarea>
407   - <div class="reportedByTag">
408   - <div class="confirmedTag">Confirmed</div>
409   - <table>
410   - <tr>
411   - <td width="50%">
412   - Reported By:
413   - </td>
414   - <td width="50%">
415   - {{jets.rampFeesAndAvoidance.reportedBy}}
416   - </td>
417   - </tr>
418   - <tr>
419   - <td width="50%">
420   - Reported On:
421   - </td>
422   - <td width="50%">
423   - {{jets.rampFeesAndAvoidance.reportedOn}}
424   - </td>
425   - </tr>
426   - <tr>
427   - <td colspan="2">
428   - <i>Click the Save Form button to Re-Confirm</i>
429   - </td>
430   - </tr>
431   - </table>
432   - </div>
433   - </div>
434   - <div class="clearfix"></div>
435   - </div>
436   - </div>
437   - <div class="clearfix"></div>
438   - </div>
439   - <div class="clearfix"></div>
440   - </div>
441   - </div>
442   - </div>
  469 + <th>
  470 + <span class="pull-left">1-250 gal.</span>
  471 + <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
  472 + </th>
  473 + <th>
  474 + <span class="pull-left">1-250 gal.</span>
  475 + <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
  476 + </th>
  477 + <th>
  478 + <input type="text" placeholder="min" name=""> -
  479 + <input type="text" placeholder="max" name="">
  480 + <span>gal.</span>
  481 + </th>
  482 + <th> &nbsp; </th>
  483 + </tr>
  484 + </thead>
  485 + <tbody>
  486 + <tr>
  487 + <td>
  488 + <span class="pull-left">-$0.0000</span> &nbsp;
  489 + <span class="pull-right">($1.7500)</span>
  490 + </td>
  491 + <td>
  492 + <span class="pull-left">-$0.0000</span> &nbsp;
  493 + <span class="pull-right">($1.7500)</span>
  494 + </td>
  495 + <td>
  496 + <span>$</span>
  497 + <input type="text" placeholder="margin" class="tierTextBox" name="">
  498 + <button class="addTierButton">Add Tier</button>
  499 + </td>
  500 + <td>
  501 + <i class="fa fa-trash-o" aria-hidden="true"></i>
  502 + </td>
  503 + </tr>
  504 + </tbody>
  505 + </table>
  506 + <textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>
  507 + </div>
  508 +
  509 + <!-- tab 4 -->
  510 +
  511 + <div class="customAccordianHeader" id="customTabs4">
  512 + <span>Jet Aircraft</span>
  513 + <select class="form-control" disabled="true">
  514 + <option>Pricing Structure</option>
  515 + <option>Retail-(minus)</option>
  516 + <option>Cost+(plus)</option>
  517 + <option>Direct=(equals)</option>
  518 + </select>
  519 + <input type="text" name="" disabled="true" class="form-control" value="$1.7500">
  520 + <div class="pull-right">
  521 + <button class="btn btn-success" style="display: none;">Save</button>
  522 + <button class="btn btn-danger" style="display: none;">Delete</button>
  523 + <button class="btn btn-default" id="customTabToggle4">Edit</button>
443 524 </div>
  525 + <div class="clearfix"></div>
444 526 </div>
445   - <div class="col-md-3 text-center feeManagerRight" style="padding: 0;">
446   - <div class="text-center">
447   - <button type="submit" ng-click="updateList(fullJetList)" class="btn btn-success"><i class="icon-ok"></i> Save Form</button>&nbsp;&nbsp;
  527 + <div class="customAccordianTabBody" id="customTabsBody4" style="display: none;">
  528 + <table class="customTableWithFilter">
  529 + <thead>
  530 + <tr>
  531 + <th>
  532 + <span class="pull-left">1-250 gal.</span>
  533 + <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
  534 + </th>
  535 + <th>
  536 + <span class="pull-left">1-250 gal.</span>
  537 + <i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
  538 + </th>
  539 + <th>
  540 + <input type="text" placeholder="min" name=""> -
  541 + <input type="text" placeholder="max" name="">
  542 + <span>gal.</span>
  543 + </th>
  544 + <th> &nbsp; </th>
  545 + </tr>
  546 + </thead>
  547 + <tbody>
  548 + <tr>
  549 + <td>
  550 + <span class="pull-left">-$0.0000</span> &nbsp;
  551 + <span class="pull-right">($1.7500)</span>
  552 + </td>
  553 + <td>
  554 + <span class="pull-left">-$0.0000</span> &nbsp;
  555 + <span class="pull-right">($1.7500)</span>
  556 + </td>
  557 + <td>
  558 + <span>$</span>
  559 + <input type="text" placeholder="margin" class="tierTextBox" name="">
  560 + <button class="addTierButton">Add Tier</button>
  561 + </td>
  562 + <td>
  563 + <i class="fa fa-trash-o" aria-hidden="true"></i>
  564 + </td>
  565 + </tr>
  566 + </tbody>
  567 + </table>
  568 + <textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>
  569 + </div>
  570 +
  571 +
  572 + </div>
  573 + </section>
  574 + <div class="row">&nbsp;</div>
  575 + <div class="row">
  576 + <div class="col-md-7">
  577 + </div>
  578 + <div class="col-md-5">
  579 + <div class="form-group">
  580 + <div class="col-lg-4"></div>
  581 + <div class="col-lg-8">
  582 + <button type="submit" class="btn btn-success"><i class="icon-ok"></i> Save Form</button>&nbsp;&nbsp;
448 583 <button type="reset" class="btn btn-default">Cancel</button>
449 584 </div>
450 585 </div>
451   - <div class="clearfix"></div>
452   - <br/>
453 586 </div>
454   - </section>
  587 + </div>
455 588 </div>
456 589 <!-- /widget-content -->
457 590 </div>
... ... @@ -460,141 +593,12 @@
460 593 <!-- /span6 -->
461 594 </div>
462 595 <!-- /span12 -->
463   -</div> <!-- /container 2 -->
464   -
465   -<div ng-show="openRampFeeModal">
466   - <div class="customBackdrop">
467   - <div class="customModalInner">
468   - <div class="customModelHead">
469   - <p class="pull-left">
470   - <i class="fa fa-list-alt" aria-hidden="true"></i>
471   - Add Ramp Fee
472   - </p>
473   - <p class="pull-right">
474   - <i class="fa fa-times" aria-hidden="true" style="cursor: pointer;" ng-click="closeRampFeeModel()"></i>
475   - </p>
476   - <div class="clearfix"></div>
477   - </div>
478   - <div class="customModelBody">
479   -
480   - <div class="col-xs-12 col-sm-4">
481   - Type:
482   - </div>
483   - <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
484   - <select class="form-control" style="border-radius: 0; height: 26px; padding: 0;" ng-model="customRampData.rampFeesAndAvoidanceList.aircraftType" ng-change="openRampModal()">
485   - <option ng-repeat="modalsNew in dropOptions" value="{{modalsNew.size}}">{{modalsNew.size}}</option>
486   - </select>
487   - </div>
488   - <div class="clearfix"></div>
489   - <br/>
490   -
491   - <div ng-show="showAircraft">
492   - <div class="col-xs-12 col-sm-4">
493   - Aircraft Make:
494   - </div>
495   - <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
496   - <select class="form-control" style="border-radius: 0; height: 26px; padding: 0;" ng-model="customRampData.rampFeesAndAvoidanceList.aircraftMake">
497   - <option ng-repeat="crafts in aircrafts" value="{{crafts}}">{{crafts}}</option>
498   - </select>
499   - </div>
500   - <div class="clearfix"></div>
501   - <br/>
502   - </div>
503   -
504   - <div ng-show="showTail">
505   - <div class="col-xs-12 col-sm-4">
506   - Tail Numbers:
507   - </div>
508   - <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
509   - <select class="form-control" style="border-radius: 0; height: 26px; padding: 0;" ng-model="customRampData.rampFeesAndAvoidanceList.tailNumber">
510   - <!-- <option ng-repeat="crafts in aircrafts" value="{{crafts}}">{{crafts}}</option> -->
511   - </select>
512   - </div>
513   - <div class="clearfix"></div>
514   - <br/>
515   - </div>
516   -
517   - <div ng-show="showWingspan">
518   - <div class="col-xs-12 col-sm-4">
519   - Wingspan Min:
520   - </div>
521   - <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
522   - <input type="number" value="0.00" ng-model="customRampData.rampFeesAndAvoidanceList.wingspanMin" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
523   - </div>
524   - <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
525   - ft.
526   - </div>
527   - <div class="clearfix"></div>
528   - <br/>
529   - <div class="col-xs-12 col-sm-4">
530   - Wingspan Max:
531   - </div>
532   - <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
533   - <input type="number" value="0.00" ng-model="customRampData.rampFeesAndAvoidanceList.wingspanMax" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
534   - </div>
535   - <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
536   - ft.
537   - </div>
538   - <div class="clearfix"></div>
539   - <br/>
540   - </div>
541   -
542   - <div ng-show="showWeight">
543   - <div class="col-xs-12 col-sm-4">
544   - Weight Range Min:
545   - </div>
546   - <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
547   - <input type="number" value="0.00" ng-model="customRampData.rampFeesAndAvoidanceList.weightRangeMin" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
548   - </div>
549   - <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
550   - lbs.
551   - </div>
552   - <div class="clearfix"></div>
553   - <br/>
554   - <div class="col-xs-12 col-sm-4">
555   - Weight Range Max:
556   - </div>
557   - <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
558   - <input type="number" value="0.00" ng-model="customRampData.rampFeesAndAvoidanceList.weightRangeMax" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
559   - </div>
560   - <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
561   - lbs.
562   - </div>
563   - <div class="clearfix"></div>
564   - <br/>
565   - </div>
  596 +</div> <!-- /container 1 -->
  597 +<!-- Le javascript
  598 + ================================================== -->
  599 +<!-- Placed at the end of the document so the pages load faster -->
566 600  
567   - <div>
568   - <div class="col-xs-12 col-sm-4">
569   - Ramp/Facil. Fee($):
570   - </div>
571   - <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
572   - <input type="number" value="0" ng-model="customRampData.rampFeesAndAvoidanceList.rampFees" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
573   - </div>
574   - <div class="clearfix"></div>
575   - <br/>
576   - </div>
577   - <div>
578   - <div class="col-xs-12 col-sm-4">
579   - Avoidance:
580   - </div>
581   - <div class="col-xs-12 col-sm-4" style="padding-right: 0;">
582   - <input type="number" value="0" ng-model="customRampData.rampFeesAndAvoidanceList.avoidance" class="form-control" style="border-radius: 0; height: 26px; padding: 0 5px;" >
583   - </div>
584   - <div class="col-xs-12 col-sm-4" style="padding-left: 5px;">
585   - gal.
586   - </div>
587   - <div class="clearfix"></div>
588   - </div>
589 601  
590   - </div>
591   - <div class="customModelFooter text-center">
592   - <input type="submit" value="Save" class="btn" ng-click="addCustomRamp(customRampData)">
593   - <button class="btn" ng-click="closeRampFeeModel()">Cancel</button>
594   - </div>
595   - </div>
596   - </div>
597   -</div>
598 602  
599 603 <script src="js/jquery-3.1.1.min.js"></script>
600 604 <script src="js/plugins/bootstrap-datepicker.js"></script>
... ...
app/partials/updateFuelManager/updateFuelManager.controller.js
Diff comments   View file @32ea0c4
... ... @@ -304,60 +304,101 @@
304 304 $scope.sendEmail.pricing = '';
305 305 $('#confirm1').css('display', 'none');
306 306 }
307   - $scope.fuelPricing;
308   - updateFuelManagerService.getFuelPricing($scope.userProfileId).then(function(result) {
309   - $scope.fuelPricing = result;
310   - for (var i = 0; i<$scope.fuelPricing.length; i++) {
311   - if ($scope.fuelPricing[i].expirationDate != null) {
312   - $scope.fuelPricing[i].expirationDate = new Date($scope.fuelPricing[i].expirationDate)
313   - }
314   - }
  307 +
  308 + $scope.newFuelPricing = {};
  309 + updateFuelManagerService.getFuelPricingNew().then(function(result) {
  310 + $scope.newFuelPricing = result;
315 311 })
  312 +
316 313 $scope.updateFuelPricing = {};
317 314 $scope.updateFuelPricing.fuelPricingList = [];
318   - //$scope.testingArray = [];
319 315 $scope.updateFuelPricing.userProfileId = $scope.userProfileId;
320 316 $scope.updateFuelPricingClick = function(){
321   - for (var i = 0; i<$scope.fuelPricing.length; i++) {
322   - if ($scope.fuelPricing[i].expirationDate != null) {
323   - $scope.fuelPricing[i].expirationDate = $scope.fuelPricing[i].expirationDate.getTime();
  317 + $scope.showLoader = true;
  318 + for (var i = 0; i<$scope.newFuelPricing.length; i++) {
  319 + /*if ($scope.newFuelPricing[i].expirationDate != null) {
  320 + $scope.newFuelPricing[i].expirationDate = $scope.newFuelPricing[i].expirationDate.getTime();
  321 + }*/
  322 + if ($scope.newFuelPricing[i].fuelPricing != null) {
  323 + $scope.newFuelPricing[i].fuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].fuelPricing.cost) + parseFloat($scope.newFuelPricing[i].fuelPricing.papMargin);
  324 + if ($scope.newFuelPricing[i].fuelPricing.cost == null) {
  325 + $scope.newFuelPricing[i].fuelPricing.cost = '';
  326 + }
  327 + if ($scope.newFuelPricing[i].fuelPricing.papMargin == null) {
  328 + $scope.newFuelPricing[i].fuelPricing.papMargin = '';
  329 + }
  330 + if ($scope.newFuelPricing[i].fuelPricing.papTotal == null) {
  331 + $scope.newFuelPricing[i].fuelPricing.papTotal = '';
  332 + }
  333 + if ($scope.newFuelPricing[i].fuelPricing.expirationDate == null) {
  334 + $scope.newFuelPricing[i].fuelPricing.expirationDate = '';
  335 + }
  336 + $scope.updateFuelPricing.fuelPricingList.push({
  337 + 'cost': $scope.newFuelPricing[i].fuelPricing.cost,
  338 + 'papMargin': $scope.newFuelPricing[i].fuelPricing.papMargin,
  339 + 'papTotal': $scope.newFuelPricing[i].fuelPricing.papTotal,
  340 + 'expirationDate': $scope.newFuelPricing[i].fuelPricing.expirationDate,
  341 + 'productId': $scope.newFuelPricing[i].id,
  342 + 'id': $scope.newFuelPricing[i].fuelPricing.id,
  343 + })
324 344 }
325   -
326   - $scope.updateFuelPricing.fuelPricingList.push({
327   - 'cost': $scope.fuelPricing[i].cost,
328   - 'papMargin': $scope.fuelPricing[i].papMargin,
329   - 'papTotal': $scope.fuelPricing[i].papTotal,
330   - 'productId': $scope.fuelPricing[i].product.id,
331   - 'expirationDate': $scope.fuelPricing[i].expirationDate
332   - })
333 345 }
334   -
335 346 updateFuelManagerService.updateFuelPricing($scope.updateFuelPricing).then(function(result) {
336 347 toastr.success('Successfully Updated', {
337 348 closeButton: true
338 349 })
339   - updateFuelManagerService.getFuelPricing($scope.userProfileId).then(function(result) {
340   - $scope.fuelPricing = result;
341   - for (var i = 0; i<$scope.fuelPricing.length; i++) {
342   - if ($scope.fuelPricing[i].expirationDate != null) {
343   - $scope.fuelPricing[i].expirationDate = new Date($scope.fuelPricing[i].expirationDate)
344   - }
345   - }
  350 + updateFuelManagerService.getFuelPricingNew().then(function(result) {
  351 + $scope.newFuelPricing = result;
  352 + $scope.showLoader = false;
346 353 })
347 354 })
348 355  
349 356 }
350 357  
351   - updateFuelManagerService.getFutureFuelPricing($scope.userProfileId).then(function(result) {
352   - $scope.futureFuelPricing = result;
353   - console.log('$scope.futureFuelPricing', $scope.futureFuelPricing);
354   - /*for (var i = 0; i<$scope.fuelPricing.length; i++) {
355   - if ($scope.fuelPricing[i].expirationDate != null) {
356   - $scope.fuelPricing[i].expirationDate = new Date($scope.fuelPricing[i].expirationDate)
  358 + $scope.updateFutureFuelPricing = {};
  359 + $scope.updateFutureFuelPricing.fuelPricingList = [];
  360 + $scope.updateFutureFuelPricing.userProfileId = $scope.userProfileId;
  361 + $scope.updateFutureFuelPricingClick = function(){
  362 + $scope.showLoader = true;
  363 + for (var i = 0; i<$scope.newFuelPricing.length; i++) {
  364 + /*if ($scope.newFuelPricing[i].expirationDate != null) {
  365 + $scope.newFuelPricing[i].expirationDate = $scope.newFuelPricing[i].expirationDate.getTime();
  366 + }*/
  367 + if ($scope.newFuelPricing[i].futureFuelPricing != null) {
  368 + $scope.newFuelPricing[i].futureFuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].futureFuelPricing.cost) + parseFloat($scope.newFuelPricing[i].futureFuelPricing.papMargin);
  369 + if ($scope.newFuelPricing[i].futureFuelPricing.cost == null) {
  370 + $scope.newFuelPricing[i].futureFuelPricing.cost = '';
  371 + }
  372 + if ($scope.newFuelPricing[i].futureFuelPricing.papMargin == null) {
  373 + $scope.newFuelPricing[i].futureFuelPricing.papMargin = '';
  374 + }
  375 + if ($scope.newFuelPricing[i].futureFuelPricing.papTotal == null) {
  376 + $scope.newFuelPricing[i].futureFuelPricing.papTotal = '';
  377 + }
  378 + if ($scope.newFuelPricing[i].futureFuelPricing.expirationDate == null) {
  379 + $scope.newFuelPricing[i].futureFuelPricing.expirationDate = '';
  380 + }
  381 + $scope.updateFutureFuelPricing.fuelPricingList.push({
  382 + 'cost': $scope.newFuelPricing[i].futureFuelPricing.cost,
  383 + 'papMargin': $scope.newFuelPricing[i].futureFuelPricing.papMargin,
  384 + 'papTotal': $scope.newFuelPricing[i].futureFuelPricing.papTotal,
  385 + 'expirationDate': $scope.newFuelPricing[i].futureFuelPricing.expirationDate,
  386 + 'productId': $scope.newFuelPricing[i].id,
  387 + 'id': $scope.newFuelPricing[i].futureFuelPricing.id,
  388 + })
  389 + }
357 390 }
358   - }*/
359   - })
360   -
  391 + updateFuelManagerService.updateFuelPricing($scope.updateFutureFuelPricing).then(function(result) {
  392 + toastr.success('Successfully Updated', {
  393 + closeButton: true
  394 + })
  395 + updateFuelManagerService.getFuelPricingNew().then(function(result) {
  396 + $scope.newFuelPricing = result;
  397 + $scope.showLoader = false;
  398 + })
  399 + })
  400 +
  401 + }
361 402  
362 403 }]);
363 404  
... ...
app/partials/updateFuelManager/updateFuelManager.html
Diff comments   View file @32ea0c4
... ... @@ -34,21 +34,21 @@
34 34 </tr>
35 35 </thead>
36 36 <tbody>
37   - <tr ng-repeat="fuelPricing in fuelPricing">
  37 + <tr ng-repeat="fuelPricing in newFuelPricing">
38 38 <td>
39   - <span style="line-height: 31px;">{{fuelPricing.product.name}}</span>
  39 + <span>{{fuelPricing.name}}</span>
40 40 </td>
41 41 <td>
42   - <input type="text" class="form-control" ng-model="fuelPricing.cost" style="height:31px; width: 50px; padding: 6px 0;">
  42 + <input type="text" class="form-control" ng-model="fuelPricing.fuelPricing.cost" style="height:31px; width: 50px; padding: 6px 0;">
43 43 </td>
44 44 <td>
45   - <input type="text" class="form-control" ng-model="fuelPricing.papMargin" style="height:31px; width: 50px; padding: 6px 0;">
  45 + <input type="text" class="form-control" ng-model="fuelPricing.fuelPricing.papMargin" style="height:31px; width: 50px; padding: 6px 0;">
46 46 </td>
47 47 <td>
48   - <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.cost -- fuelPricing.papMargin}}</span>
  48 + <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.fuelPricing.cost -- fuelPricing.fuelPricing.papMargin}}</span>
49 49 </td>
50 50 <td>
51   - <input type="date" class="form-control" ng-model="fuelPricing.expirationDate" style="height:31px; padding: 6px 0; width: 100px; color: #F90;">
  51 + <input type="date" class="form-control" ng-model="fuelPricing.fuelPricing.expirationDate" style="height:31px; padding: 6px 0; width: 100px; color: #F90;">
52 52 </td>
53 53 </tr>
54 54 </tbody>
... ... @@ -191,28 +191,28 @@
191 191 </tr>
192 192 </thead>
193 193 <tbody>
194   - <tr ng-repeat="fuelPricing in futureFuelPricing">
  194 + <tr ng-repeat="fuelPricing in newFuelPricing">
195 195 <td>
196   - <span style="line-height: 31px;">{{fuelPricing.product.name}}</span>
  196 + <span>{{fuelPricing.name}}</span>
197 197 </td>
198 198 <td>
199   - <input type="text" class="form-control" ng-model="fuelPricing.cost" style="height:31px; width: 50px; padding: 6px 0;">
  199 + <input type="text" class="form-control" ng-model="fuelPricing.futureFuelPricing.cost" style="height:31px; width: 50px; padding: 6px 0;">
200 200 </td>
201 201 <td>
202   - <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.cost -- fuelPricing.papMargin}}</span>
  202 + <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.futureFuelPricing.cost -- fuelPricing.papMargin}}</span>
203 203 </td>
204 204 <td>
205   - <input type="date" class="form-control" ng-model="fuelPricing.expirationDate" style="height:31px; padding: 6px 0; width: 100px;">
  205 + <input type="date" class="form-control " ng-model="fuelPricing.futureFuelPricing.expirationDate" style="height:31px; padding: 6px 0; width: 100px;">
206 206 </td>
207 207 <td>
208   - <input type="date" class="form-control" ng-model="fuelPricing.expirationDate" style="height:31px; padding: 6px 0; width: 100px; color: #F90;">
  208 + <input type="date" class="form-control" ng-model="fuelPricing.futureFuelPricing.expirationDate" style="height:31px; padding: 6px 0; width: 100px; color: #F90;">
209 209 </td>
210 210 </tr>
211 211 </tbody>
212 212 </table>
213 213 <div class="row" style="margin-left: 0px;">
214 214 <div class="col-md-12" style= "text-align: right;">
215   - <button type="button" class="btn btn-success btn-xs" ng-click="updateFuelPricingClick()">Save</button>
  215 + <button type="button" class="btn btn-success btn-xs" ng-click="updateFutureFuelPricingClick()">Save</button>
216 216 </div>
217 217 </div>
218 218 </div>
... ...
app/partials/updateFuelManager/updateFuelManager.service.js
Diff comments   View file @32ea0c4
... ... @@ -166,12 +166,12 @@
166 166 return deferred.promise;
167 167 }
168 168  
169   - this.getFuelPricing = function(id) {
  169 + this.getFuelPricingNew = function() {
170 170  
171 171 var deferred = $q.defer();
172 172 $http({
173 173 method : 'GET',
174   - url : BASE_URL.url +'/fuelPricing/getPriceManagerProducts/'+id,
  174 + url : BASE_URL.url +'/user/products',
175 175 headers : {'Content-Type': 'application/json'},
176 176 })
177 177 .then(function (result){
... ... @@ -181,7 +181,7 @@
181 181 })
182 182 return deferred.promise;
183 183 }
184   -
  184 +
185 185 this.updateFuelPricing = function(data){
186 186 var deferred = $q.defer();
187 187 $http({
... ... @@ -198,21 +198,6 @@
198 198 return deferred.promise;
199 199 }
200 200  
201   - this.getFutureFuelPricing = function(id) {
202   -
203   - var deferred = $q.defer();
204   - $http({
205   - method : 'GET',
206   - url : BASE_URL.url +'/fuelPricing/getFuturePriceManagerProducts/'+id,
207   - headers : {'Content-Type': 'application/json'},
208   - })
209   - .then(function (result){
210   - deferred.resolve(result.data);
211   - },function (result){
212   - deferred.resolve(result.data);
213   - })
214   - return deferred.promise;
215   - }
216 201  
217 202  
218 203 }
... ...