Compare View
Commits (2)
-
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
Showing
2 changed files
Show diff stats
app/partials/scheduler/scheduler.controller.js
1 | 'use strict'; | 1 | 'use strict'; |
2 | 2 | ||
3 | angular.module('acufuel') | 3 | angular.module('acufuel') |
4 | 4 | ||
5 | .controller('schedulerController', ['$scope','$compile', 'uiCalendarConfig', 'schedulerService', function($scope, $compile, uiCalendarConfig, schedulerService) { | 5 | .controller('schedulerController', ['$scope','$compile', 'uiCalendarConfig', 'schedulerService', function($scope, $compile, uiCalendarConfig, schedulerService) { |
6 | 6 | ||
7 | $scope.showLoader = true; | 7 | $scope.showLoader = true; |
8 | getEventsList(); | 8 | getEventsList(); |
9 | 9 | ||
10 | $scope.events = []; | 10 | $scope.events = []; |
11 | function getEventsList(){ | 11 | function getEventsList(){ |
12 | schedulerService.getEvents().then(function(result) { | 12 | schedulerService.getEvents().then(function(result) { |
13 | for (var i = 0; i < result.length; i++) { | 13 | for (var i = 0; i < result.length; i++) { |
14 | var newTime = new Date(result[i].deployDate); | 14 | var newTime = new Date(result[i].deployDate); |
15 | var dmonth = newTime.getUTCMonth() + 1; //months from 1-12 | 15 | var dmonth = newTime.getUTCMonth() + 1; //months from 1-12 |
16 | var dday = newTime.getUTCDate(); | 16 | var dday = newTime.getUTCDate(); |
17 | var dyear = newTime.getUTCFullYear(); | 17 | var dyear = newTime.getUTCFullYear(); |
18 | 18 | ||
19 | $scope.events.push({ | 19 | $scope.events.push({ |
20 | 'id': result[i].id, | 20 | 'id': result[i].id, |
21 | 'title': result[i].aircraft, | 21 | 'title': result[i].aircraft, |
22 | 'start': dyear+'-'+dmonth+'-'+dday | 22 | 'start': dyear+'-'+dmonth+'-'+dday |
23 | }) | 23 | }) |
24 | $scope.showLoader = false; | 24 | $scope.showLoader = false; |
25 | } | 25 | } |
26 | 26 | ||
27 | // $scope.newFuelPricing[i].futureFuelPricing.deployDate = dmonth+'/'+dday+'/'+dyear; | 27 | // $scope.newFuelPricing[i].futureFuelPricing.deployDate = dmonth+'/'+dday+'/'+dyear; |
28 | }) | 28 | }) |
29 | } | 29 | } |
30 | 30 | ||
31 | $scope.newEvent = {}; | 31 | $scope.newEvent = {}; |
32 | $scope.addNewEvent = function(){ | 32 | $scope.addNewEvent = function(){ |
33 | console.log('newEvent', $scope.newEvent); | 33 | console.log('newEvent', $scope.newEvent); |
34 | $scope.showLoader = true; | 34 | $scope.showLoader = true; |
35 | if ($scope.newEvent.deployDate != undefined) { | 35 | if ($scope.newEvent.deployDate != undefined) { |
36 | $scope.newEvent.deployDate = new Date($scope.newEvent.deployDate); | 36 | $scope.newEvent.deployDate = new Date($scope.newEvent.deployDate); |
37 | $scope.newEvent.deployDate = $scope.newEvent.deployDate.getTime(); | 37 | $scope.newEvent.deployDate = $scope.newEvent.deployDate.getTime(); |
38 | } | 38 | } |
39 | //var data = 'aircraft='+$scope.newEvent.aircraft+'&deployDate='+$scope.newEvent.deployDate; | 39 | //var data = 'aircraft='+$scope.newEvent.aircraft+'&deployDate='+$scope.newEvent.deployDate; |
40 | schedulerService.addNewEventService($scope.newEvent).then(function(response){ | 40 | schedulerService.addNewEventService($scope.newEvent).then(function(response){ |
41 | $scope.newEvent = {}; | 41 | $scope.newEvent = {}; |
42 | $('#addEvent').modal('hide'); | 42 | $('#addEvent').modal('hide'); |
43 | $scope.events = []; | ||
43 | $scope.events = []; | 44 | getEventsList(); |
44 | getEventsList(); | 45 | }) |
45 | }) | 46 | } |
46 | } | 47 | |
47 | 48 | $scope.cancelAdd = function(){ | |
48 | $scope.cancelAdd = function(){ | 49 | $scope.newEvent = {}; |
49 | $scope.newEvent = {}; | 50 | } |
50 | } | 51 | |
51 | 52 | $scope.editData = {}; | |
52 | $scope.editData = {}; | 53 | $scope.editEvent = function(data){ |
53 | $scope.editEvent = function(data){ | 54 | $scope.editData = data; |
54 | $scope.editData = data; | 55 | $('#editEvent').modal('show'); |
55 | $('#editEvent').modal('show'); | 56 | } |
56 | } | 57 | $scope.updateEvent = function(){ |
57 | $scope.updateEvent = function(){ | 58 | $scope.showLoader = true; |
58 | $scope.showLoader = true; | 59 | $scope.updatedData = {}; |
59 | $scope.updatedData = {}; | 60 | $scope.updatedData.id = $scope.editData.id; |
60 | $scope.updatedData.id = $scope.editData.id; | 61 | $scope.updatedData.aircraft = $scope.editData.title; |
61 | $scope.updatedData.aircraft = $scope.editData.title; | 62 | $scope.updatedData.deployDate = $scope.editData.start; |
62 | $scope.updatedData.deployDate = $scope.editData.start; | 63 | if ($scope.updatedData.deployDate != undefined) { |
63 | if ($scope.updatedData.deployDate != undefined) { | 64 | $scope.updatedData.deployDate = new Date($scope.updatedData.deployDate); |
64 | $scope.updatedData.deployDate = new Date($scope.updatedData.deployDate); | 65 | $scope.updatedData.deployDate = $scope.updatedData.deployDate.getTime(); |
65 | $scope.updatedData.deployDate = $scope.updatedData.deployDate.getTime(); | 66 | } |
66 | } | 67 | schedulerService.updateScheduledEvent($scope.updatedData).then(function(response){ |
67 | schedulerService.updateScheduledEvent($scope.updatedData).then(function(response){ | 68 | console.log('response', response); |
68 | console.log('response', response); | 69 | $scope.updatedData = {}; |
69 | $scope.updatedData = {}; | 70 | $('#editEvent').modal('hide'); |
70 | $('#editEvent').modal('hide'); | 71 | toastr.success('Updated Successfully', { |
71 | toastr.success('Updated Successfully', { | 72 | closeButton: true |
72 | closeButton: true | 73 | }) |
74 | $scope.events = []; | ||
73 | }) | 75 | getEventsList(); |
74 | $scope.events = []; | 76 | }) |
75 | getEventsList(); | 77 | } |
76 | }) | 78 | |
77 | } | 79 | |
78 | 80 | /* code for calendar */ | |
79 | 81 | ||
80 | /* code for calendar */ | 82 | var date = new Date(); |
81 | 83 | var d = date.getDate(); | |
82 | var date = new Date(); | 84 | var m = date.getMonth(); |
83 | var d = date.getDate(); | 85 | var y = date.getFullYear(); |
84 | var m = date.getMonth(); | 86 | |
85 | var y = date.getFullYear(); | 87 | $scope.changeTo = 'Hungarian'; |
86 | 88 | ||
87 | $scope.changeTo = 'Hungarian'; | 89 | $scope.eventSource = {}; |
88 | 90 | ||
89 | $scope.eventSource = {}; | 91 | $scope.eventsF = function (start, end, timezone, callback) { |
90 | 92 | var s = new Date(start).getTime() / 1000; | |
91 | $scope.eventsF = function (start, end, timezone, callback) { | 93 | var e = new Date(end).getTime() / 1000; |
92 | var s = new Date(start).getTime() / 1000; | 94 | var m = new Date(start).getMonth(); |
93 | var e = new Date(end).getTime() / 1000; | 95 | var events = [{title: 'Feed Me ' + m,start: s + (50000),end: s + (100000),allDay: false, className: ['customFeed']}]; |
94 | var m = new Date(start).getMonth(); | 96 | callback(events); |
95 | var events = [{title: 'Feed Me ' + m,start: s + (50000),end: s + (100000),allDay: false, className: ['customFeed']}]; | 97 | }; |
96 | callback(events); | 98 | |
97 | }; | 99 | $scope.calEventsExt = { |
98 | 100 | color: '#f00', | |
99 | $scope.calEventsExt = { | 101 | textColor: 'yellow', |
100 | color: '#f00', | 102 | events: [] |
101 | textColor: 'yellow', | 103 | }; |
102 | events: [] | 104 | |
103 | }; | 105 | $scope.alertOnEventClick = function( date, jsEvent, view){ |
104 | 106 | $scope.alertMessage = (date.title + ' was clicked '); | |
105 | $scope.alertOnEventClick = function( date, jsEvent, view){ | 107 | }; |
106 | $scope.alertMessage = (date.title + ' was clicked '); | 108 | |
107 | }; | 109 | $scope.alertOnDrop = function(event, delta, revertFunc, jsEvent, ui, view){ |
108 | 110 | var dmonth = event.start._d.getUTCMonth() + 1; //months from 1-12 | |
109 | $scope.alertOnDrop = function(event, delta, revertFunc, jsEvent, ui, view){ | 111 | var dday = event.start._d.getUTCDate(); |
110 | var dmonth = event.start._d.getUTCMonth() + 1; //months from 1-12 | 112 | var dyear = event.start._d.getUTCFullYear(); |
111 | var dday = event.start._d.getUTCDate(); | 113 | console.log('date', dyear+'-'+dmonth+'-'+dday); |
112 | var dyear = event.start._d.getUTCFullYear(); | 114 | for (var i = 0; i < $scope.events.length; i++) { |
113 | console.log('date', dyear+'-'+dmonth+'-'+dday); | 115 | if ($scope.events[i].id == event.id) { |
116 | |||
114 | for (var i = 0; i < $scope.events.length; i++) { | 117 | console.log('events', $scope.events[i]); |
115 | if ($scope.events[i].id == event.id) { | 118 | //$scope.events[i].start = dyear+'-'+dmonth+'-'+dday; |
119 | $scope.showLoader = true; | ||
120 | $scope.updatedDataDrop = {}; | ||
121 | $scope.updatedDataDrop.id = $scope.events[i].id; | ||
122 | $scope.updatedDataDrop.aircraft = $scope.events[i].title; | ||
123 | $scope.updatedDataDrop.deployDate = dyear+'-'+dmonth+'-'+dday; | ||
124 | if ($scope.updatedDataDrop.deployDate != undefined) { | ||
125 | $scope.updatedDataDrop.deployDate = new Date($scope.updatedDataDrop.deployDate); | ||
126 | $scope.updatedDataDrop.deployDate = $scope.updatedDataDrop.deployDate.getTime(); | ||
127 | } | ||
128 | schedulerService.updateScheduledEvent($scope.updatedDataDrop).then(function(response){ | ||
129 | console.log('response', response); | ||
130 | $scope.updatedDataDrop = {}; | ||
131 | $('#editEvent').modal('hide'); | ||
132 | toastr.success('Updated Successfully', { | ||
133 | closeButton: true | ||
134 | }) | ||
135 | $scope.events = []; | ||
136 | getEventsList(); | ||
137 | }) | ||
138 | |||
116 | 139 | } | |
117 | console.log('events', $scope.events[i]); | 140 | } |
118 | //$scope.events[i].start = dyear+'-'+dmonth+'-'+dday; | 141 | console.log('$scope.events new', $scope.events); |
119 | $scope.showLoader = true; | 142 | $scope.alertMessage = ('Event Droped to make dayDelta ' + delta); |
120 | $scope.updatedDataDrop = {}; | 143 | }; |
121 | $scope.updatedDataDrop.id = $scope.events[i].id; | 144 | |
122 | $scope.updatedDataDrop.aircraft = $scope.events[i].title; | 145 | $scope.alertOnResize = function(event, delta, revertFunc, jsEvent, ui, view ){ |
123 | $scope.updatedDataDrop.deployDate = dyear+'-'+dmonth+'-'+dday; | 146 | $scope.alertMessage = ('Event Resized to make dayDelta ' + delta); |
124 | if ($scope.updatedDataDrop.deployDate != undefined) { | 147 | }; |
125 | $scope.updatedDataDrop.deployDate = new Date($scope.updatedDataDrop.deployDate); | 148 | |
126 | $scope.updatedDataDrop.deployDate = $scope.updatedDataDrop.deployDate.getTime(); | 149 | $scope.addRemoveEventSource = function(sources,source) { |
127 | } | 150 | var canAdd = 0; |
128 | schedulerService.updateScheduledEvent($scope.updatedDataDrop).then(function(response){ | 151 | angular.forEach(sources,function(value, key){ |
129 | console.log('response', response); | 152 | if(sources[key] === source){ |
130 | $scope.updatedDataDrop = {}; | 153 | sources.splice(key,1); |
131 | $('#editEvent').modal('hide'); | 154 | canAdd = 1; |
132 | toastr.success('Updated Successfully', { | 155 | } |
133 | closeButton: true | 156 | }); |
134 | }) | 157 | if(canAdd === 0){ |
135 | $scope.events = []; | 158 | sources.push(source); |
136 | getEventsList(); | 159 | } |
137 | }) | 160 | }; |
138 | 161 | ||
139 | } | 162 | $scope.addEvent = function() { |
140 | } | 163 | $scope.events.push({ |
141 | console.log('$scope.events new', $scope.events); | 164 | title: 'Open Sesame', |
142 | $scope.alertMessage = ('Event Droped to make dayDelta ' + delta); | 165 | start: new Date(y, m, 28), |
143 | }; | 166 | end: new Date(y, m, 29), |
144 | 167 | className: ['openSesame'] | |
145 | $scope.alertOnResize = function(event, delta, revertFunc, jsEvent, ui, view ){ | 168 | }); |
146 | $scope.alertMessage = ('Event Resized to make dayDelta ' + delta); | 169 | }; |
147 | }; | 170 | |
148 | 171 | $scope.remove = function(index) { | |
149 | $scope.addRemoveEventSource = function(sources,source) { | 172 | $scope.events.splice(index,1); |
150 | var canAdd = 0; | 173 | }; |
151 | angular.forEach(sources,function(value, key){ | 174 | |
152 | if(sources[key] === source){ | 175 | $scope.changeView = function(view,calendar) { |
153 | sources.splice(key,1); | 176 | uiCalendarConfig.calendars[calendar].fullCalendar('changeView',view); |
154 | canAdd = 1; | 177 | }; |
155 | } | 178 | |
156 | }); | 179 | $scope.renderCalender = function(calendar) { |
157 | if(canAdd === 0){ | 180 | if(uiCalendarConfig.calendars[calendar]){ |
158 | sources.push(source); | 181 | uiCalendarConfig.calendars[calendar].fullCalendar('render'); |
159 | } | 182 | } |
160 | }; | 183 | }; |
161 | 184 | ||
162 | $scope.addEvent = function() { | 185 | $scope.eventRender = function( event, element, view ) { |
163 | $scope.events.push({ | 186 | element.attr({'tooltip': event.title, |
164 | title: 'Open Sesame', | 187 | 'tooltip-append-to-body': true}); |
165 | start: new Date(y, m, 28), | 188 | $compile(element)($scope); |
166 | end: new Date(y, m, 29), | 189 | }; |
167 | className: ['openSesame'] | 190 | |
168 | }); | 191 | $scope.uiConfig = { |
169 | }; | 192 | calendar:{ |
170 | 193 | height: 450, | |
171 | $scope.remove = function(index) { | 194 | editable: true, |
172 | $scope.events.splice(index,1); | 195 | droppable: true, |
173 | }; | 196 | drop: function (event, delta, revertFunc, jsEvent, ui, view) { |
174 | 197 | }, | |
175 | $scope.changeView = function(view,calendar) { | 198 | header:{ |
176 | uiCalendarConfig.calendars[calendar].fullCalendar('changeView',view); | 199 | right: 'month basicWeek basicDay', |
177 | }; | 200 | center: 'title', |
178 | 201 | left: 'prev,next, today' | |
179 | $scope.renderCalender = function(calendar) { | 202 | }, |
180 | if(uiCalendarConfig.calendars[calendar]){ | 203 | eventClick: $scope.alertOnEventClick, |
181 | uiCalendarConfig.calendars[calendar].fullCalendar('render'); | 204 | eventDrop: $scope.alertOnDrop, |
182 | } | 205 | eventResize: $scope.alertOnResize, |
183 | }; | 206 | eventRender: $scope.eventRender |
184 | 207 | } | |
185 | $scope.eventRender = function( event, element, view ) { | 208 | }; |
186 | element.attr({'tooltip': event.title, | 209 | |
187 | 'tooltip-append-to-body': true}); | 210 | $scope.addEvent = function(index) { |
188 | $compile(element)($scope); | 211 | //console.log('INDEX', index); |
189 | }; | 212 | //console.log('EVENTS', $scope.eventSources); |
190 | 213 | //$scope.events.push($scope.eventList[index]); | |
191 | $scope.uiConfig = { | 214 | } |
192 | calendar:{ | 215 | |
193 | height: 450, | 216 | $scope.eventSources = [$scope.events, $scope.eventSource, $scope.eventsF]; |
194 | editable: true, | 217 | $scope.eventSources2 = [$scope.calEventsExt, $scope.eventsF, $scope.events]; |
195 | droppable: true, | 218 | |
196 | drop: function (event, delta, revertFunc, jsEvent, ui, view) { | 219 | }]); |
197 | }, | 220 | |
198 | header:{ | 221 |
app/partials/updateFuelManager/updateFuelManager.html
1 | 1 | ||
2 | 2 | ||
3 | <style> | 3 | <style> |
4 | .subnavbar .mainnav > li:nth-child(2) > a{ | 4 | .subnavbar .mainnav > li:nth-child(2) > a{ |
5 | color: #ff9900; | 5 | color: #ff9900; |
6 | } | 6 | } |
7 | .extraClasToMerge{ | 7 | .extraClasToMerge{ |
8 | color: #fff; | 8 | color: #fff; |
9 | } | 9 | } |
10 | </style> | 10 | </style> |
11 | <div class="myLoader" ng-show="showLoader"> | 11 | <div class="myLoader" ng-show="showLoader"> |
12 | <img src="../img/hourglass.gif" width="50px;"> | 12 | <img src="../img/hourglass.gif" width="50px;"> |
13 | </div> | 13 | </div> |
14 | 14 | ||
15 | <div class="col-xs-12 col-md-6"> | 15 | <div class="col-xs-12 col-md-6"> |
16 | 16 | ||
17 | <div class="widget stacked"> | ||
18 | <div class="widget-header"> | 17 | <div class="widget stacked"> |
19 | <i class="fa fa-pencil"></i> | 18 | <div class="widget-header"> |
20 | <h3>Price Manager Staging</h3> | 19 | <i class="fa fa-pencil"></i> |
21 | </div> | 20 | <h3>Price Manager Staging</h3> |
22 | <!-- /widget-header --> | 21 | </div> |
23 | <div class="widget-content"> | 22 | <!-- /widget-header --> |
24 | <h6 style="color:#F90">Queue Pricing for Deployment in the Price Manager below</h6> | 23 | <div class="widget-content"> |
25 | <form> | 24 | <h6 style="color:#F90">Queue Pricing for Deployment in the Price Manager below</h6> |
26 | <table class="table"> | 25 | <form> |
27 | <thead> | 26 | <table class="table"> |
28 | <tr> | 27 | <thead> |
29 | <th> Product</th> | 28 | <tr> |
30 | <th> Cost</th> | 29 | <th> Product</th> |
31 | <th> PAP(Margin)</th> | 30 | <th> Cost</th> |
32 | <th> Deploy Date</th> | 31 | <th> PAP(Margin)</th> |
33 | <th style="color: #F90;">Price Expires</th> | 32 | <th> Deploy Date</th> |
34 | <th> PAP(Total)</th> | 33 | <th style="color: #F90;">Price Expires</th> |
35 | </tr> | 34 | <th> PAP(Total)</th> |
36 | </thead> | 35 | </tr> |
37 | <tbody> | 36 | </thead> |
38 | <tr ng-repeat="fuelPricing in newFuelPricing | filter:{ status: true }"> | 37 | <tbody> |
39 | <td> | 38 | <tr ng-repeat="fuelPricing in newFuelPricing | filter:{ status: true }"> |
40 | <span style="color: #2196f3" ng-show="fuelPricing.jeta">{{fuelPricing.name}}</span> | 39 | <td> |
41 | <span ng-show="fuelPricing.jeta">{{fuelPricing.namejetrest}}</span> | 40 | <span style="color: #2196f3" ng-show="fuelPricing.jeta">{{fuelPricing.name}}</span> |
42 | <span style="color: 39c" ng-show="fuelPricing.avgas">{{fuelPricing.name}}</span> | 41 | <span ng-show="fuelPricing.jeta">{{fuelPricing.namejetrest}}</span> |
43 | <span ng-show="fuelPricing.avgas">{{fuelPricing.nameavgasrest}}</span> | 42 | <span style="color: 39c" ng-show="fuelPricing.avgas">{{fuelPricing.name}}</span> |
44 | </td> | 43 | <span ng-show="fuelPricing.avgas">{{fuelPricing.nameavgasrest}}</span> |
45 | <td> | 44 | </td> |
46 | <input type="text" class="form-control" ng-model="fuelPricing.futureFuelPricing.cost" style="height:31px; width: 50px; padding: 6px 6px;"> | 45 | <td> |
47 | </td> | 46 | <input type="text" class="form-control" ng-model="fuelPricing.futureFuelPricing.cost" style="height:31px; width: 50px; padding: 6px 6px;"> |
48 | <td> | 47 | </td> |
49 | <input type="text" class="form-control" ng-model="fuelPricing.futureFuelPricing.papMargin" style="height:31px; width: 80px; padding: 6px 6px;"> | 48 | <td> |
50 | </td> | 49 | <input type="text" class="form-control" ng-model="fuelPricing.futureFuelPricing.papMargin" style="height:31px; width: 80px; padding: 6px 6px;"> |
51 | <td> | 50 | </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;"> | 51 | <td> |
53 | </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;"> |
54 | <td> | 53 | </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;"> | 54 | <td> |
56 | </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;"> |
57 | <td> | 56 | </td> |
58 | <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.futureFuelPricing.cost -- fuelPricing.fuelPricing.papMargin | number : 2}}</span> | 57 | <td> |
59 | </td> | 58 | <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.futureFuelPricing.cost -- fuelPricing.fuelPricing.papMargin | number : 2}}</span> |
60 | </tr> | 59 | </td> |
61 | </tbody> | 60 | </tr> |
62 | </table> | 61 | </tbody> |
63 | <div class="row" style="margin-left: 0px;"> | 62 | </table> |
64 | <div class="col-md-12" style= "text-align: right;"> | 63 | <div class="row" style="margin-left: 0px;"> |
65 | <div style="float: left;"> | 64 | <div class="col-md-12" style= "text-align: right;"> |
66 | <button type="button" class="btn btn-primary btn-xs" ng-click="updateFutureFuelPricingImmediatelyClick()" style= "text-align: center; font-size:12px">Save & Deploy Immediately</button> | 65 | <div style="float: left;"> |
67 | 66 | <button type="button" class="btn btn-primary btn-xs" ng-click="updateFutureFuelPricingImmediatelyClick()" style= "text-align: center; font-size:12px">Save & Deploy Immediately</button> | |
68 | <button type="reset" class="btn btn-default btn-xs">Reset All</button> | 67 | |
69 | </div> | 68 | <button type="reset" class="btn btn-default btn-xs">Reset All</button> |
70 | <div style="float: right;"> | 69 | </div> |
71 | <button type="button" class="btn btn-success btn-xs" ng-click="updateFutureFuelPricingClick()" style="margin-right:3%">Save & Stage for Deploy</button> | 70 | <div style="float: right;"> |
72 | </div> | 71 | <button type="button" class="btn btn-success btn-xs" ng-click="updateFutureFuelPricingClick()" style="margin-right:3%">Save & Stage for Deploy</button> |
73 | <div style="clear: both;"></div> | 72 | </div> |
74 | </div> | 73 | <div style="clear: both;"></div> |
75 | </div> | 74 | </div> |
76 | </form> | 75 | </div> |
77 | </div> | 76 | </form> |
78 | <!-- /widget-content --> | 77 | </div> |
79 | </div> | 78 | <!-- /widget-content --> |
80 | <!-- /widget --> | 79 | </div> |
81 | 80 | <!-- /widget --> | |
82 | |||
83 | 81 | ||
84 | <div class="widget stacked"> | 82 | |
83 | |||
84 | <div class="widget stacked"> | ||
85 | <div class="widget-header"> | ||
86 | <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> | ||
95 | </div> | ||
96 | <!-- /widget-header --> | ||
97 | <div class="widget-content"> | ||
98 | <h4>Deployed Fuel Prices</h4> | ||
99 | <table class="table"> | ||
100 | <thead> | ||
101 | <tr> | ||
102 | <th> Product</th> | ||
103 | <th> Cost</th> | ||
104 | <th> Margin</th> | ||
105 | <th> PAP(Total)</th> | ||
106 | <th style="color: #F90;"> Expires</th> | ||
107 | </tr> | ||
108 | </thead> | ||
109 | <tbody> | ||
110 | <tr ng-repeat="fuelPricing in newFuelPricing | filter:{ status: true }"> | ||
111 | <td> | ||
112 | <span style="color: #2196f3" ng-show="fuelPricing.jeta">{{fuelPricing.name}}</span> | ||
113 | <span ng-show="fuelPricing.jeta">{{fuelPricing.namejetrest}}</span> | ||
114 | <span style="color: 39c" ng-show="fuelPricing.avgas">{{fuelPricing.name}}</span> | ||
115 | <span ng-show="fuelPricing.avgas">{{fuelPricing.nameavgasrest}}</span> | ||
116 | </td> | ||
117 | <td> | ||
118 | <span>{{fuelPricing.fuelPricing.cost}}</span> | ||
119 | </td> | ||
120 | <td> | ||
121 | <span>{{fuelPricing.fuelPricing.papMargin}}</span> | ||
122 | </td> | ||
123 | <td> | ||
124 | <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.fuelPricing.cost -- fuelPricing.fuelPricing.papMargin | number : 2 }}</span> | ||
125 | </td> | ||
126 | <td> | ||
127 | <span>{{fuelPricing.fuelPricing.expirationDate}}</span> | ||
128 | </td> | ||
129 | </tr> | ||
130 | </tbody> | ||
131 | </table> | ||
132 | |||
133 | </div> | ||
134 | <!-- /widget-content --> | ||
135 | </div> | ||
136 | <!-- /widget --> | ||
137 | |||
138 | |||
139 | </div> | ||
140 | <div class="col-xs-12 col-md-6"> | ||
141 | |||
142 | |||
85 | <div class="widget-header"> | 143 | <div class="widget stacked"> |
86 | <i class="fa fa-pencil"></i> | 144 | <div class="widget-header"> |
87 | <h3>Price Manager</h3> | 145 | <i class="fa fa-pencil"></i> |
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()"> | 146 | <h3 style="font-style: italic"><b style="color: #2196f3; font-style: normal">JET-A</b> Customer Margin Template</h3> |
89 | <option value="" disabled selected="selected">Email All Pricing</option> | 147 | |
90 | <option value="JET-A">Email JET-A pricing only</option> | 148 | </div> |
91 | <option value="AVGAS">Email AVGAS pricing only</option> | 149 | <!-- /widget-header --> |
92 | <option disabled>_______________________________</option> | 150 | <div class="widget-content" style="padding-top: 10px;"> |
93 | <option value="all">Distribute All</option> | 151 | <section id="accordions"> |
94 | </select> | 152 | <div class="newCustomAccordian"> |
95 | </div> | 153 | <!-- tab 1 --> |
96 | <!-- /widget-header --> | 154 | <div ng-repeat="jets in aTypeJets"> |
97 | <div class="widget-content"> | 155 | <div class="customAccordianHeader" id="{{jets.id}}"> |
98 | <h4>Deployed Fuel Prices</h4> | 156 | <span>{{jets.marginName}}</span> |
99 | <table class="table"> | 157 | <select class="form-control" disabled="true" ng-model="jets.pricingStructure"> |
100 | <thead> | 158 | <option value="" disabled selected>Pricing Structure</option> |
101 | <tr> | 159 | <option value="minus">Retail/PAP-(minus)</option> |
102 | <th> Product</th> | 160 | <option value="plus">Cost+(plus)</option> |
103 | <th> Cost</th> | 161 | </select> |
104 | <th> Margin</th> | 162 | <span style="margin-right: 0;">$</span> |
105 | <th> PAP(Total)</th> | 163 | <input type="text" disabled="true" class="form-control" ng-model="jets.marginValue"> |
106 | <th style="color: #F90;"> Expires</th> | 164 | <div class="pull-right"> |
107 | </tr> | 165 | <button class="btn btn-success" style="display: none; background-image: none; background-color: #f3f3f3; color: #333; border:0;" ng-click="closeAccordian(jets)">Close</button> |
108 | </thead> | 166 | <button class="btn btn-success" style="display: none;" ng-click="saveJetAccordian(jets)">Save</button> |
109 | <tbody> | 167 | <button class="btn btn-danger" style="display: none;" ng-click="deleteJetAccordian(jets.id)">Delete</button> |
110 | <tr ng-repeat="fuelPricing in newFuelPricing | filter:{ status: true }"> | 168 | <button type="button" class="btn btn-primary" ng-click="emailPricingForMargin(jets.id)" style= "font-weight: normal; text-align: center; font-size:12px">Email Pricing for this Margin</button> |
111 | <td> | 169 | <button class="btn btn-default" ng-click="toggleJestAccordian(jets.id, $index)" style= "text-align: center; font-size:12px">Edit</button> |
112 | <span style="color: #2196f3" ng-show="fuelPricing.jeta">{{fuelPricing.name}}</span> | 170 | </div> |
113 | <span ng-show="fuelPricing.jeta">{{fuelPricing.namejetrest}}</span> | 171 | <div class="clearfix"></div> |
114 | <span style="color: 39c" ng-show="fuelPricing.avgas">{{fuelPricing.name}}</span> | 172 | </div> |
115 | <span ng-show="fuelPricing.avgas">{{fuelPricing.nameavgasrest}}</span> | 173 | <div class="customAccordianTabBody {{jets.id}}" style="display: none;"> |
116 | </td> | 174 | <div class="tierListWrap" ng-repeat="tier in aTypeJets[$index].tierList"> |
117 | <td> | 175 | <div class="tierListHead" style="height: 36px;"> |
118 | <span>{{fuelPricing.fuelPricing.cost}}</span> | 176 | <span class="pull-left tierHeadingSpan" ng-hide="showEditTier">{{tier.minTierBreak}}-{{tier.maxTierBreak}} gal. |
119 | </td> | 177 | </span> |
120 | <td> | 178 | <i class="fa fa-pencil-square-o pull-right" ng-click="showEditTier = ! showEditTier" ng-hide="showEditTier" style="margin-top: 5px; cursor: pointer;" aria-hidden="true"></i> |
121 | <span>{{fuelPricing.fuelPricing.papMargin}}</span> | 179 | |
122 | </td> | 180 | <input type="text" placeholder="min" style="width: 36px;" ng-model="tier.minTierBreak" ng-show="showEditTier"> |
123 | <td> | 181 | <span ng-show="showEditTier">-</span> |
124 | <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.fuelPricing.cost -- fuelPricing.fuelPricing.papMargin | number : 2 }}</span> | 182 | <input type="text" placeholder="max" style="width: 36px;" ng-model="tier.maxTierBreak" ng-show="showEditTier"> <b ng-show="showEditTier">gal.</b> |
125 | </td> | 183 | <div class="clearfix"></div> |
126 | <td> | 184 | </div> |
127 | <span>{{fuelPricing.fuelPricing.expirationDate}}</span> | 185 | <div class="tierListBody" style="height: 35px;"> |
128 | </td> | 186 | <span class="pull-left minTierSpan" ng-hide="showEditTier">-${{tier.margin}}</span> |
129 | </tr> | 187 | |
130 | </tbody> | 188 | <input type="text" placeholder="max" style="width: 36px;" ng-model="tier.margin" ng-show="showEditTier"> |
131 | </table> | 189 | |
132 | 190 | <span class="pull-right maxTierSpan" ng-hide="showEditTier">(${{tier.marginTotal | number : 2}})</span> | |
133 | </div> | 191 | |
134 | <!-- /widget-content --> | 192 | <button class="addTierBtn" ng-click="editTier(tier, $parent.$index)" ng-show="showEditTier">Save</button> |
135 | </div> | 193 | |
136 | <!-- /widget --> | 194 | <i class="fa fa-trash-o deleteTierIcon" ng-click="deleteTier(tier.id, jets.id, $parent.$index)" aria-hidden="true" ng-show="showEditTier"></i> |
137 | 195 | ||
138 | 196 | <div class="clearfix"></div> | |
139 | </div> | 197 | </div> |
140 | <div class="col-xs-12 col-md-6"> | 198 | </div> |
141 | 199 | <div class="tierListWrap" style="width: 160px;"> | |
142 | 200 | <div class="tierListHead" style="border-right: 1px solid #ddd;"> | |
143 | <div class="widget stacked"> | 201 | <input type="text" placeholder="min" ng-model="trData[$index].minTierBreak"> |
144 | <div class="widget-header"> | 202 | <span>-</span> |
145 | <i class="fa fa-pencil"></i> | 203 | <input type="text" placeholder="max" ng-model="trData[$index].maxTierBreak"> <b>gal.</b> |
146 | <h3 style="font-style: italic"><b style="color: #2196f3; font-style: normal">JET-A</b> Customer Margin Template</h3> | 204 | <div class="clearfix"></div> |
147 | 205 | </div> | |
148 | </div> | 206 | <div class="tierListBody" style="border-right: 1px solid #ddd;"> |
149 | <!-- /widget-header --> | 207 | <span style="color: #449d44;">$</span> |
150 | <div class="widget-content" style="padding-top: 10px;"> | 208 | <input type="text" placeholder="margin" ng-model="trData[$index].margin" class="tierTextBox" style="width: 70px; height: 24px;"> |
151 | <section id="accordions"> | 209 | <button class="addTierBtn" ng-click="addNewTier(jets.id, trData, $index)">Add Tier</button> |
152 | <div class="newCustomAccordian"> | 210 | <div class="clearfix"></div> |
153 | <!-- tab 1 --> | 211 | </div> |
154 | <div ng-repeat="jets in aTypeJets"> | 212 | </div> |
155 | <div class="customAccordianHeader" id="{{jets.id}}"> | 213 | <!-- <div class="tierListWrap" style="width: 32px;"> |
156 | <span>{{jets.marginName}}</span> | 214 | <div class="tierListHead" style="height: 36px; border-right: 1px solid #ddd;"> |
157 | <select class="form-control" disabled="true" ng-model="jets.pricingStructure"> | 215 | |
158 | <option value="" disabled selected>Pricing Structure</option> | 216 | </div> |
159 | <option value="minus">Retail/PAP-(minus)</option> | 217 | <div class="tierListBody" style="height: 35px; border-right: 1px solid #ddd;"> |
160 | <option value="plus">Cost+(plus)</option> | 218 | <i class="fa fa-trash-o deleteTierIcon" aria-hidden="true"></i> |
161 | </select> | 219 | </div> |
162 | <span style="margin-right: 0;">$</span> | 220 | </div> --> |
163 | <input type="text" disabled="true" class="form-control" ng-model="jets.marginValue"> | 221 | <div class="clearfix"></div> |
164 | <div class="pull-right"> | 222 | <!-- <textarea class="form-control resizeTextarea" ng-model="jets.message" placeholder="Message..."></textarea> --> |
165 | <button class="btn btn-success" style="display: none; background-image: none; background-color: #f3f3f3; color: #333; border:0;" ng-click="closeAccordian(jets)">Close</button> | 223 | <br/> |
166 | <button class="btn btn-success" style="display: none;" ng-click="saveJetAccordian(jets)">Save</button> | 224 | <div ckeditor="options" ng-model="jets.message" ready="onReady()"></div> |
167 | <button class="btn btn-danger" style="display: none;" ng-click="deleteJetAccordian(jets.id)">Delete</button> | 225 | </div> |
168 | <button type="button" class="btn btn-primary" ng-click="emailPricingForMargin(jets.id)" style= "font-weight: normal; text-align: center; font-size:12px">Email Pricing for this Margin</button> | 226 | </div> |
169 | <button class="btn btn-default" ng-click="toggleJestAccordian(jets.id, $index)" style= "text-align: center; font-size:12px">Edit</button> | 227 | </div> |
170 | </div> | 228 | <div class="pull-right"> |
171 | <div class="clearfix"></div> | 229 | <button type="submit" class="btn btn-success btn-sm" ng-click="addNewMarginBtn()" style="margin-top: 4px; margin-right: 10px;"><i class="fa fa-plus" aria-hidden="true"></i> Add New Margin</button> |
172 | </div> | 230 | </div> |
173 | <div class="customAccordianTabBody {{jets.id}}" style="display: none;"> | 231 | </section> |
174 | <div class="tierListWrap" ng-repeat="tier in aTypeJets[$index].tierList"> | 232 | <!-- <div class="row"> </div> |
175 | <div class="tierListHead" style="height: 36px;"> | 233 | <div class="row"> |
176 | <span class="pull-left tierHeadingSpan" ng-hide="showEditTier">{{tier.minTierBreak}}-{{tier.maxTierBreak}} gal. | 234 | <div class="form-group"> |
177 | </span> | 235 | <div class="col-lg-12 text-right"> |
178 | <i class="fa fa-pencil-square-o pull-right" ng-click="showEditTier = ! showEditTier" ng-hide="showEditTier" style="margin-top: 5px; cursor: pointer;" aria-hidden="true"></i> | 236 | <button type="submit" class="btn btn-success"><i class="icon-ok"></i> Save Form</button> |
179 | 237 | <button type="reset" class="btn btn-default">Cancel</button> | |
180 | <input type="text" placeholder="min" style="width: 36px;" ng-model="tier.minTierBreak" ng-show="showEditTier"> | 238 | </div> |
181 | <span ng-show="showEditTier">-</span> | 239 | </div> |
182 | <input type="text" placeholder="max" style="width: 36px;" ng-model="tier.maxTierBreak" ng-show="showEditTier"> <b ng-show="showEditTier">gal.</b> | 240 | </div> --> |
183 | <div class="clearfix"></div> | 241 | </div> |
184 | </div> | 242 | <!-- /widget-content --> |
185 | <div class="tierListBody" style="height: 35px;"> | 243 | </div> |
186 | <span class="pull-left minTierSpan" ng-hide="showEditTier">-${{tier.margin}}</span> | 244 | <!-- /widget --> |
187 | 245 | ||
188 | <input type="text" placeholder="max" style="width: 36px;" ng-model="tier.margin" ng-show="showEditTier"> | 246 | |
189 | 247 | ||
190 | <span class="pull-right maxTierSpan" ng-hide="showEditTier">(${{tier.marginTotal | number : 2}})</span> | ||
191 | |||
192 | <button class="addTierBtn" ng-click="editTier(tier, $parent.$index)" ng-show="showEditTier">Save</button> | ||
193 | |||
194 | <i class="fa fa-trash-o deleteTierIcon" ng-click="deleteTier(tier.id, jets.id, $parent.$index)" aria-hidden="true" ng-show="showEditTier"></i> | ||
195 | |||
196 | <div class="clearfix"></div> | ||
197 | </div> | ||
198 | </div> | ||
199 | <div class="tierListWrap" style="width: 160px;"> | ||
200 | <div class="tierListHead" style="border-right: 1px solid #ddd;"> | ||
201 | <input type="text" placeholder="min" ng-model="trData[$index].minTierBreak"> | ||
202 | <span>-</span> | ||
203 | <input type="text" placeholder="max" ng-model="trData[$index].maxTierBreak"> <b>gal.</b> | ||
204 | <div class="clearfix"></div> | ||
205 | </div> | ||
206 | <div class="tierListBody" style="border-right: 1px solid #ddd;"> | ||
207 | <span style="color: #449d44;">$</span> | ||
208 | <input type="text" placeholder="margin" ng-model="trData[$index].margin" class="tierTextBox" style="width: 70px; height: 24px;"> | ||
209 | <button class="addTierBtn" ng-click="addNewTier(jets.id, trData, $index)">Add Tier</button> | ||
210 | <div class="clearfix"></div> | ||
211 | </div> | ||
212 | </div> | ||
213 | <!-- <div class="tierListWrap" style="width: 32px;"> | ||
214 | <div class="tierListHead" style="height: 36px; border-right: 1px solid #ddd;"> | ||
215 | | ||
216 | </div> | ||
217 | <div class="tierListBody" style="height: 35px; border-right: 1px solid #ddd;"> | ||
218 | <i class="fa fa-trash-o deleteTierIcon" aria-hidden="true"></i> | ||
219 | </div> | ||
220 | </div> --> | ||
221 | <div class="clearfix"></div> | ||
222 | <!-- <textarea class="form-control resizeTextarea" ng-model="jets.message" placeholder="Message..."></textarea> --> | ||
223 | <br/> | ||
224 | <div ckeditor="options" ng-model="jets.message" ready="onReady()"></div> | ||
225 | </div> | ||
226 | </div> | ||
227 | </div> | ||
228 | <div class="pull-right"> | ||
229 | <button type="submit" class="btn btn-success btn-sm" ng-click="addNewMarginBtn()" style="margin-top: 4px; margin-right: 10px;"><i class="fa fa-plus" aria-hidden="true"></i> Add New Margin</button> | ||
230 | </div> | ||
231 | </section> | ||
232 | <!-- <div class="row"> </div> | ||
233 | <div class="row"> | ||
234 | <div class="form-group"> | ||
235 | <div class="col-lg-12 text-right"> | ||
236 | <button type="submit" class="btn btn-success"><i class="icon-ok"></i> Save Form</button> | ||
237 | <button type="reset" class="btn btn-default">Cancel</button> | ||
238 | </div> | ||
239 | </div> | ||
240 | </div> --> | ||
241 | </div> | ||
242 | <!-- /widget-content --> | ||
243 | </div> | ||
244 | <!-- /widget --> | ||
245 | |||
246 | |||
247 | |||
248 | <div class="widget stacked"> | ||
249 | <div class="widget-header"> | ||
250 | <i class="fa fa-pencil"></i> | ||
251 | <h3><b style="color: 39c;">AVGAS 100LL </b> <i>Customer Margin Template</i></h3> | ||
252 | 248 | <div class="widget stacked"> | |
253 | </div> | 249 | <div class="widget-header"> |
254 | <!-- /widget-header --> | 250 | <i class="fa fa-pencil"></i> |
255 | <div class="widget-content" style="padding-top: 10px;"> | 251 | <h3><b style="color: 39c;">AVGAS 100LL </b> <i>Customer Margin Template</i></h3> |
256 | <section id="accordions"> | 252 | |
257 | <div class="newCustomAccordian"> | 253 | </div> |
258 | <!-- tab 1 --> | 254 | <!-- /widget-header --> |
259 | <div ng-repeat="jets in vTypeJets"> | 255 | <div class="widget-content" style="padding-top: 10px;"> |
260 | <div class="customAccordianHeader" id="{{jets.id}}"> | 256 | <section id="accordions"> |
261 | <span>{{jets.marginName}}</span> | 257 | <div class="newCustomAccordian"> |
262 | <select class="form-control" disabled="true" ng-model="jets.pricingStructure"> | 258 | <!-- tab 1 --> |
263 | <option value="" disabled selected>Pricing Structure</option> | 259 | <div ng-repeat="jets in vTypeJets"> |
264 | <option value="minus">Retail-(minus)</option> | 260 | <div class="customAccordianHeader" id="{{jets.id}}"> |
265 | <option value="plus">Cost+(plus)</option> | 261 | <span>{{jets.marginName}}</span> |
266 | <option value="equal">Direct=(equal)</option> | 262 | <select class="form-control" disabled="true" ng-model="jets.pricingStructure"> |
267 | </select> | 263 | <option value="" disabled selected>Pricing Structure</option> |
268 | <span style="margin-right: 0;">$</span> | 264 | <option value="minus">Retail-(minus)</option> |
269 | <input type="text" disabled="true" class="form-control" ng-model="jets.marginValue"> | 265 | <option value="plus">Cost+(plus)</option> |
270 | <div class="pull-right"> | 266 | <option value="equal">Direct=(equal)</option> |
271 | <button class="btn btn-success" style="display: none; background-image: none; background-color: #f3f3f3; color: #333; border:0;" ng-click="closeAccordianVtype(jets)">Close</button> | 267 | </select> |
272 | <button class="btn btn-success" style="display: none;" ng-click="saveVtypeJetAccordian(jets)">Save</button> | 268 | <span style="margin-right: 0;">$</span> |
273 | <button class="btn btn-danger" style="display: none;" ng-click="deleteVtypeJetAccordian(jets.id)">Delete</button> | 269 | <input type="text" disabled="true" class="form-control" ng-model="jets.marginValue"> |
274 | <button type="button" class="btn btn-primary" ng-click="emailPricingForMargin()" style= "font-weight: normal; text-align: center; font-size:12px">Email Pricing for this Margin</button> | 270 | <div class="pull-right"> |
275 | <button class="btn btn-default" ng-click="toggleVtypeJestAccordian(jets.id, $index)" style= "text-align: center; font-size:12px">Edit</button> | 271 | <button class="btn btn-success" style="display: none; background-image: none; background-color: #f3f3f3; color: #333; border:0;" ng-click="closeAccordianVtype(jets)">Close</button> |
276 | </div> | 272 | <button class="btn btn-success" style="display: none;" ng-click="saveVtypeJetAccordian(jets)">Save</button> |
277 | <div class="clearfix"></div> | 273 | <button class="btn btn-danger" style="display: none;" ng-click="deleteVtypeJetAccordian(jets.id)">Delete</button> |
278 | </div> | 274 | <button type="button" class="btn btn-primary" ng-click="emailPricingForMargin()" style= "font-weight: normal; text-align: center; font-size:12px">Email Pricing for this Margin</button> |
279 | <div class="customAccordianTabBody {{jets.id}}" style="display: none;"> | 275 | <button class="btn btn-default" ng-click="toggleVtypeJestAccordian(jets.id, $index)" style= "text-align: center; font-size:12px">Edit</button> |
280 | <div class="tierListWrap" ng-repeat="tier in vTypeJets[$index].tierList"> | 276 | </div> |
281 | <div class="tierListHead" style="height: 36px;"> | 277 | <div class="clearfix"></div> |
282 | <span class="pull-left tierHeadingSpan" ng-hide="showEditTier">{{tier.minTierBreak}}-{{tier.maxTierBreak}} gal. | 278 | </div> |
283 | </span> | 279 | <div class="customAccordianTabBody {{jets.id}}" style="display: none;"> |
284 | <i class="fa fa-pencil-square-o pull-right" ng-click="showEditTier = ! showEditTier" ng-hide="showEditTier" style="margin-top: 5px; cursor: pointer;" aria-hidden="true"></i> | 280 | <div class="tierListWrap" ng-repeat="tier in vTypeJets[$index].tierList"> |
285 | 281 | <div class="tierListHead" style="height: 36px;"> | |
286 | <input type="text" placeholder="min" style="width: 36px;" ng-model="tier.minTierBreak" ng-show="showEditTier"> | 282 | <span class="pull-left tierHeadingSpan" ng-hide="showEditTier">{{tier.minTierBreak}}-{{tier.maxTierBreak}} gal. |
287 | <span ng-show="showEditTier">-</span> | 283 | </span> |
288 | <input type="text" placeholder="max" style="width: 36px;" ng-model="tier.maxTierBreak" ng-show="showEditTier"> <b ng-show="showEditTier">gal.</b> | 284 | <i class="fa fa-pencil-square-o pull-right" ng-click="showEditTier = ! showEditTier" ng-hide="showEditTier" style="margin-top: 5px; cursor: pointer;" aria-hidden="true"></i> |
289 | <div class="clearfix"></div> | 285 | |
290 | </div> | 286 | <input type="text" placeholder="min" style="width: 36px;" ng-model="tier.minTierBreak" ng-show="showEditTier"> |
291 | <div class="tierListBody" style="height: 35px;"> | 287 | <span ng-show="showEditTier">-</span> |
292 | <span class="pull-left minTierSpan" ng-hide="showEditTier">-${{tier.margin}}</span> | 288 | <input type="text" placeholder="max" style="width: 36px;" ng-model="tier.maxTierBreak" ng-show="showEditTier"> <b ng-show="showEditTier">gal.</b> |
293 | 289 | <div class="clearfix"></div> | |
294 | <input type="text" placeholder="max" style="width: 36px;" ng-model="tier.margin" ng-show="showEditTier"> | 290 | </div> |
295 | 291 | <div class="tierListBody" style="height: 35px;"> | |
296 | <span class="pull-right maxTierSpan" ng-hide="showEditTier">(${{tier.marginTotal | number : 2}})</span> | 292 | <span class="pull-left minTierSpan" ng-hide="showEditTier">-${{tier.margin}}</span> |
297 | 293 | ||
298 | <button class="addTierBtn" ng-click="editVtypeTier(tier, $parent.$index)" ng-show="showEditTier">Save</button> | 294 | <input type="text" placeholder="max" style="width: 36px;" ng-model="tier.margin" ng-show="showEditTier"> |
299 | 295 | ||
300 | <i class="fa fa-trash-o deleteTierIcon" ng-click="deleteVtypeTier(tier.id, jets.id, $parent.$index)" aria-hidden="true" ng-show="showEditTier"></i> | 296 | <span class="pull-right maxTierSpan" ng-hide="showEditTier">(${{tier.marginTotal | number : 2}})</span> |
301 | 297 | ||
302 | <div class="clearfix"></div> | 298 | <button class="addTierBtn" ng-click="editVtypeTier(tier, $parent.$index)" ng-show="showEditTier">Save</button> |
303 | </div> | 299 | |
304 | </div> | 300 | <i class="fa fa-trash-o deleteTierIcon" ng-click="deleteVtypeTier(tier.id, jets.id, $parent.$index)" aria-hidden="true" ng-show="showEditTier"></i> |
305 | <div class="tierListWrap" style="width: 160px;"> | 301 | |
306 | <div class="tierListHead" style="border-right: 1px solid #ddd;"> | 302 | <div class="clearfix"></div> |
307 | <input type="text" placeholder="min" ng-model="vtrData[$index].minTierBreak"> | 303 | </div> |
308 | <span>-</span> | 304 | </div> |
309 | <input type="text" placeholder="max" ng-model="vtrData[$index].maxTierBreak"> <b>gal.</b> | 305 | <div class="tierListWrap" style="width: 160px;"> |
310 | <div class="clearfix"></div> | 306 | <div class="tierListHead" style="border-right: 1px solid #ddd;"> |
311 | </div> | 307 | <input type="text" placeholder="min" ng-model="vtrData[$index].minTierBreak"> |
312 | <div class="tierListBody" style="border-right: 1px solid #ddd;"> | 308 | <span>-</span> |
313 | <span style="color: #449d44;">$</span> | 309 | <input type="text" placeholder="max" ng-model="vtrData[$index].maxTierBreak"> <b>gal.</b> |
314 | <input type="text" placeholder="margin" ng-model="vtrData[$index].margin" class="tierTextBox" style="width: 70px; height: 24px;"> | 310 | <div class="clearfix"></div> |
315 | <button class="addTierBtn" ng-click="addNewVtypeTier(jets.id, vtrData, $index)">Add Tier</button> | 311 | </div> |
316 | <div class="clearfix"></div> | 312 | <div class="tierListBody" style="border-right: 1px solid #ddd;"> |
317 | </div> | 313 | <span style="color: #449d44;">$</span> |
318 | </div> | 314 | <input type="text" placeholder="margin" ng-model="vtrData[$index].margin" class="tierTextBox" style="width: 70px; height: 24px;"> |
319 | <!-- <div class="tierListWrap" style="width: 32px;"> | 315 | <button class="addTierBtn" ng-click="addNewVtypeTier(jets.id, vtrData, $index)">Add Tier</button> |
320 | <div class="tierListHead" style="height: 36px; border-right: 1px solid #ddd;"> | 316 | <div class="clearfix"></div> |
321 | | 317 | </div> |
322 | </div> | 318 | </div> |
323 | <div class="tierListBody" style="height: 35px; border-right: 1px solid #ddd;"> | 319 | <!-- <div class="tierListWrap" style="width: 32px;"> |
324 | <i class="fa fa-trash-o deleteTierIcon" aria-hidden="true"></i> | 320 | <div class="tierListHead" style="height: 36px; border-right: 1px solid #ddd;"> |
325 | </div> | 321 | |
326 | </div> --> | 322 | </div> |
327 | <div class="clearfix"></div> | 323 | <div class="tierListBody" style="height: 35px; border-right: 1px solid #ddd;"> |
328 | <br/> | 324 | <i class="fa fa-trash-o deleteTierIcon" aria-hidden="true"></i> |
329 | <div ckeditor="options" ng-model="jets.message" ready="onReady()"></div> | 325 | </div> |
330 | </div> | 326 | </div> --> |
331 | </div> | 327 | <div class="clearfix"></div> |
332 | </div> | 328 | <br/> |
333 | <div class="pull-right"> | 329 | <div ckeditor="options" ng-model="jets.message" ready="onReady()"></div> |
334 | <button type="submit" class="btn btn-success btn-sm" ng-click="addNewVtypePop()" style="margin-top: 4px; margin-right: 10px;"><i class="fa fa-plus" aria-hidden="true"></i> Add New Margin</button> | 330 | </div> |
335 | </div> | 331 | </div> |
336 | </section> | 332 | </div> |
337 | <!-- <div class="row"> </div> | 333 | <div class="pull-right"> |
338 | <div class="row"> | 334 | <button type="submit" class="btn btn-success btn-sm" ng-click="addNewVtypePop()" style="margin-top: 4px; margin-right: 10px;"><i class="fa fa-plus" aria-hidden="true"></i> Add New Margin</button> |
339 | <div class="form-group"> | 335 | </div> |
340 | <div class="col-lg-12 text-right"> | 336 | </section> |
341 | <button type="submit" class="btn btn-success"><i class="icon-ok"></i> Save Form</button> | 337 | <!-- <div class="row"> </div> |
342 | <button type="reset" class="btn btn-default">Cancel</button> | 338 | <div class="row"> |
343 | </div> | 339 | <div class="form-group"> |
344 | </div> | 340 | <div class="col-lg-12 text-right"> |
345 | </div> --> | 341 | <button type="submit" class="btn btn-success"><i class="icon-ok"></i> Save Form</button> |
346 | </div> | 342 | <button type="reset" class="btn btn-default">Cancel</button> |
347 | <!-- /widget-content --> | 343 | </div> |
348 | </div> | 344 | </div> |
349 | <!-- /widget --> | 345 | </div> --> |
350 | 346 | </div> | |
351 | 347 | <!-- /widget-content --> | |
352 | 348 | </div> | |
353 | </div> | 349 | <!-- /widget --> |
354 | <div class="clearfix"></div> | 350 | |
355 | 351 | ||
356 | <div class="addNewMargin" style="display: none;"> | ||
357 | <div class="customBackdrop"> | ||
358 | <div class="customModalInner" style="max-width: 700px;"> | ||
359 | <div class="customModelHead"> | ||
360 | <p class="pull-left"> | 352 | |
353 | </div> | ||
354 | <div class="clearfix"></div> | ||
361 | <i class="fa fa-list-alt" aria-hidden="true"></i> | 355 | |
362 | Add New JET-A Customer Margin | 356 | <div class="addNewMargin" style="display: none;"> |
363 | </p> | 357 | <div class="customBackdrop"> |
364 | <p class="pull-right"> | 358 | <div class="customModalInner" style="max-width: 700px;"> |
365 | <i class="fa fa-times" aria-hidden="true" style="cursor: pointer;" ng-click="closeMarginPopup()"></i> | 359 | <div class="customModelHead"> |
366 | </p> | 360 | <p class="pull-left"> |
367 | <div class="clearfix"></div> | 361 | <i class="fa fa-list-alt" aria-hidden="true"></i> |
368 | </div> | 362 | Add New JET-A Customer Margin |
369 | <div class="customModelBody"> | 363 | </p> |
370 | 364 | <p class="pull-right"> | |
371 | <div class="customAccordianHeader customActive"> | 365 | <i class="fa fa-times" aria-hidden="true" style="cursor: pointer;" ng-click="closeMarginPopup()"></i> |
372 | <input type="text" class="form-control" style="width: 120px; margin-right: 10px;" placeholder="Margin Name" ng-model="newJet.marginName"> | 366 | </p> |
373 | <select class="form-control" ng-model="newJet.pricingStructure"> | 367 | <div class="clearfix"></div> |
374 | <option value="" disabled selected>Pricing Structure</option> | 368 | </div> |
375 | <option value="minus">Retail-(minus)</option> | 369 | <div class="customModelBody"> |
376 | <option value="plus">Cost+(plus)</option> | 370 | |
377 | <option value="equal">Direct=(equal)</option> | 371 | <div class="customAccordianHeader customActive"> |
378 | </select> | 372 | <input type="text" class="form-control" style="width: 120px; margin-right: 10px;" placeholder="Margin Name" ng-model="newJet.marginName"> |
379 | <span style="margin-right: 0;">$</span> | 373 | <select class="form-control" ng-model="newJet.pricingStructure"> |
380 | <input type="text" class="form-control" style="width: 120px;" placeholder="Margin Price" ng-model="newJet.marginValue"> | 374 | <option value="" disabled selected>Pricing Structure</option> |
381 | <div class="clearfix"></div> | 375 | <option value="minus">Retail-(minus)</option> |
382 | </div> | 376 | <option value="plus">Cost+(plus)</option> |
383 | <div class="customAccordianTabBody"> | 377 | <option value="equal">Direct=(equal)</option> |
384 | <div ckeditor="options" ng-model="newJet.message" ready="onReady()"></div> | 378 | </select> |
385 | </div> | 379 | <span style="margin-right: 0;">$</span> |
386 | 380 | <input type="text" class="form-control" style="width: 120px;" placeholder="Margin Price" ng-model="newJet.marginValue"> | |
387 | </div> | 381 | <div class="clearfix"></div> |
388 | <div class="customModelFooter text-center"> | 382 | </div> |
389 | <input type="submit" value="Save" class="btn" ng-click="addNewATypeJet()"> | 383 | <div class="customAccordianTabBody"> |
390 | <button class="btn" ng-click="closeMarginPopup()">Cancel</button> | 384 | <div ckeditor="options" ng-model="newJet.message" ready="onReady()"></div> |
391 | </div> | 385 | </div> |
392 | </div> | 386 | |
393 | </div> | 387 | </div> |
394 | </div> | 388 | <div class="customModelFooter text-center"> |
395 | 389 | <input type="submit" value="Save" class="btn" ng-click="addNewATypeJet()"> | |
396 | <div class="addNewVtype" style="display: none;"> | 390 | <button class="btn" ng-click="closeMarginPopup()">Cancel</button> |
397 | <div class="customBackdrop"> | 391 | </div> |
398 | <div class="customModalInner" style="max-width: 700px;"> | 392 | </div> |
399 | <div class="customModelHead"> | 393 | </div> |
400 | <p class="pull-left"> | 394 | </div> |
401 | <i class="fa fa-list-alt" aria-hidden="true"></i> | 395 | |
402 | Add New AVGAS 100LL Customer Margin Template | 396 | <div class="addNewVtype" style="display: none;"> |
403 | </p> | 397 | <div class="customBackdrop"> |
404 | <p class="pull-right"> | 398 | <div class="customModalInner" style="max-width: 700px;"> |
405 | <i class="fa fa-times" aria-hidden="true" style="cursor: pointer;" ng-click="closeNewVtypePop()"></i> | 399 | <div class="customModelHead"> |
406 | </p> | 400 | <p class="pull-left"> |
407 | <div class="clearfix"></div> | 401 | <i class="fa fa-list-alt" aria-hidden="true"></i> |
408 | </div> | 402 | Add New AVGAS 100LL Customer Margin Template |
409 | <div class="customModelBody"> | 403 | </p> |
410 | 404 | <p class="pull-right"> | |
411 | <div class="customAccordianHeader customActive"> | 405 | <i class="fa fa-times" aria-hidden="true" style="cursor: pointer;" ng-click="closeNewVtypePop()"></i> |
412 | <input type="text" class="form-control" style="width: 120px; margin-right: 10px;" placeholder="Margin Name" ng-model="newVtypeJet.marginName"> | 406 | </p> |
413 | <select class="form-control" ng-model="newVtypeJet.pricingStructure"> | 407 | <div class="clearfix"></div> |
414 | <option value="" disabled selected>Pricing Structure</option> | 408 | </div> |
415 | <option value="minus">Retail-(minus)</option> | 409 | <div class="customModelBody"> |
416 | <option value="plus">Cost+(plus)</option> | 410 | |
417 | <option value="equal">Direct=(equal)</option> | 411 | <div class="customAccordianHeader customActive"> |
418 | </select> | 412 | <input type="text" class="form-control" style="width: 120px; margin-right: 10px;" placeholder="Margin Name" ng-model="newVtypeJet.marginName"> |
419 | <span style="margin-right: 0;">$</span> | 413 | <select class="form-control" ng-model="newVtypeJet.pricingStructure"> |
420 | <input type="text" class="form-control" style="width: 120px;" placeholder="Margin Price" ng-model="newVtypeJet.marginValue"> | 414 | <option value="" disabled selected>Pricing Structure</option> |
421 | <div class="clearfix"></div> | 415 | <option value="minus">Retail-(minus)</option> |
422 | </div> | 416 | <option value="plus">Cost+(plus)</option> |
423 | <div class="customAccordianTabBody"> | 417 | <option value="equal">Direct=(equal)</option> |
424 | <div ckeditor="options" ng-model="newVtypeJet.message" ready="onReady()"></div> | 418 | </select> |
425 | </div> | 419 | <span style="margin-right: 0;">$</span> |
426 | 420 | <input type="text" class="form-control" style="width: 120px;" placeholder="Margin Price" ng-model="newVtypeJet.marginValue"> | |
427 | </div> | 421 | <div class="clearfix"></div> |
428 | <div class="customModelFooter text-center"> | 422 | </div> |
429 | <input type="submit" value="Save" class="btn" ng-click="addNewVTypeJet()"> | 423 | <div class="customAccordianTabBody"> |
430 | <button class="btn" ng-click="closeNewVtypePop()">Cancel</button> | 424 | <div ckeditor="options" ng-model="newVtypeJet.message" ready="onReady()"></div> |
431 | </div> | 425 | </div> |
432 | </div> | 426 | |
433 | </div> | 427 | </div> |
434 | </div> | 428 | <div class="customModelFooter text-center"> |
435 | 429 | <input type="submit" value="Save" class="btn" ng-click="addNewVTypeJet()"> | |
436 | <div class="customConfirmPopBackdrop" id="confirm1" style="display: none;"> | 430 | <button class="btn" ng-click="closeNewVtypePop()">Cancel</button> |
437 | <div class="customModalInner"> | 431 | </div> |
438 | <div class="customModelBody" style="border-radius: 5px 5px 0 0;"> | 432 | </div> |
439 | <table> | 433 | </div> |
440 | <tr> | 434 | </div> |
441 | <td> | 435 | |
442 | <img src="img/info.png" style="width: 50px;"> | 436 | <div class="customConfirmPopBackdrop" id="confirm1" style="display: none;"> |
443 | </td> | 437 | <div class="customModalInner"> |
444 | <td> | 438 | <div class="customModelBody" style="border-radius: 5px 5px 0 0;"> |
445 | <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure that you want to email pricing to everyone in your contact list?</p> | 439 | <table> |
446 | </td> | 440 | <tr> |
447 | </tr> | 441 | <td> |
448 | </table> | 442 | <img src="img/info.png" style="width: 50px;"> |
449 | </div> | 443 | </td> |
450 | <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;"> | 444 | <td> |
451 | <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="saveAndCloseConfirm()">Yes</button> | 445 | <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure that you want to email pricing to everyone in your contact list?</p> |
452 | <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelAndCloseConfirm()">Cancel</button> | 446 | </td> |
453 | </div> | 447 | </tr> |
454 | </div> | 448 | </table> |
455 | </div> | 449 | </div> |
456 | <div class="customConfirmPopBackdrop" id="confirm2" style="display: none;"> | 450 | <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;"> |
457 | <div class="customModalInner"> | 451 | <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="saveAndCloseConfirm()">Yes</button> |
458 | <div class="customModelBody" style="border-radius: 5px 5px 0 0;"> | 452 | <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelAndCloseConfirm()">Cancel</button> |
459 | <table> | 453 | </div> |
460 | <tr> | 454 | </div> |
461 | <td> | 455 | </div> |
462 | <img src="img/info.png" style="width: 50px;"> | 456 | <div class="customConfirmPopBackdrop" id="confirm2" style="display: none;"> |
463 | </td> | 457 | <div class="customModalInner"> |
464 | <td> | 458 | <div class="customModelBody" style="border-radius: 5px 5px 0 0;"> |
465 | <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure that you want to email pricing for this margin?</p> | 459 | <table> |
466 | </td> | 460 | <tr> |
467 | </tr> | 461 | <td> |
468 | </table> | 462 | <img src="img/info.png" style="width: 50px;"> |
469 | </div> | 463 | </td> |
470 | <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;"> | 464 | <td> |
471 | <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="saveAndCloseForMarginConfirm()">Yes</button> | 465 | <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure that you want to email pricing for this margin?</p> |
472 | <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelAndCloseForMarginConfirm()">Cancel</button> | 466 | </td> |
473 | </div> | 467 | </tr> |
474 | </div> | 468 | </table> |
475 | </div> | 469 | </div> |
476 | 470 | <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;"> | |
477 | <div class="customConfirmPopBackdrop" id="deleteTierConfirm" style="display: none;"> | 471 | <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="saveAndCloseForMarginConfirm()">Yes</button> |
478 | <div class="customModalInner"> | 472 | <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelAndCloseForMarginConfirm()">Cancel</button> |
479 | <div class="customModelBody" style="border-radius: 5px 5px 0 0;"> | 473 | </div> |
480 | <table> | 474 | </div> |
481 | <tr> | 475 | </div> |
482 | <td> | 476 | |
483 | <img src="img/info.png" style="width: 50px;"> | 477 | <div class="customConfirmPopBackdrop" id="deleteTierConfirm" style="display: none;"> |
484 | </td> | 478 | <div class="customModalInner"> |
485 | <td> | 479 | <div class="customModelBody" style="border-radius: 5px 5px 0 0;"> |
486 | <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure that you want to delete this Tier ?</p> | 480 | <table> |
487 | </td> | 481 | <tr> |
488 | </tr> | 482 | <td> |
489 | </table> | 483 | <img src="img/info.png" style="width: 50px;"> |
490 | </div> | 484 | </td> |
491 | <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;"> | 485 | <td> |
492 | <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="confirmDeleteTier()">Yes</button> | 486 | <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure that you want to delete this Tier ?</p> |
493 | <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelTierDelete()">Cancel</button> | 487 | </td> |
494 | </div> | 488 | </tr> |
495 | </div> | 489 | </table> |
496 | </div> | 490 | </div> |
497 | 491 | <div class="customModelFooter text-right" style="border-radius: 0 0 5px 5px;"> | |
498 | <div class="customConfirmPopBackdrop" id="deleteVtypeTierConfirm" style="display: none;"> | 492 | <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="confirmDeleteTier()">Yes</button> |
499 | <div class="customModalInner"> | 493 | <button class="btn" style="padding: 4px 0; width: 80px;" ng-click="cancelTierDelete()">Cancel</button> |
500 | <div class="customModelBody" style="border-radius: 5px 5px 0 0;"> | 494 | </div> |
501 | <table> | 495 | </div> |
502 | <tr> | 496 | </div> |
503 | <td> | 497 | |
504 | <img src="img/info.png" style="width: 50px;"> | 498 | <div class="customConfirmPopBackdrop" id="deleteVtypeTierConfirm" style="display: none;"> |
505 | </td> | 499 | <div class="customModalInner"> |
506 | <td> | 500 | <div class="customModelBody" style="border-radius: 5px 5px 0 0;"> |
507 | <p style="padding: 5px 10px; margin-bottom: 0;">Are you sure that you want to delete this Tier ?</p> | 501 | <table> |