Commit ea94f521f2f5c01fd967ab05ed65ebd6b4476ec1
1 parent
87660da6c9
Exists in
master
scheduler bug fixed
Showing
3 changed files
with
17 additions
and
40 deletions
Show diff stats
app/index.html
| ... | ... | @@ -46,7 +46,7 @@ |
| 46 | 46 | <link href="css/pages/pricing.css" rel="stylesheet"> |
| 47 | 47 | <link href="css/pages/reports.css" rel="stylesheet"> |
| 48 | 48 | |
| 49 | - <link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/themes/smoothness/jquery-ui.min.css" rel="stylesheet" type="text/css" /> | |
| 49 | + <link rel="stylesheet" type="text/css" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/themes/smoothness/jquery-ui.min.css"/> | |
| 50 | 50 | |
| 51 | 51 | <link rel="stylesheet" type="text/css" href="css/ngTable.css"> |
| 52 | 52 | <link rel="stylesheet" href="bower_components/select2/select2.css"> |
| ... | ... | @@ -56,13 +56,11 @@ |
| 56 | 56 | |
| 57 | 57 | <!-- <link rel="stylesheet"; href="https://unpkg.com/ng-table@2.0.2/bundles/ng-table.min.css"> --> |
| 58 | 58 | |
| 59 | - <!-- <link href='https://fullcalendar.io/js/fullcalendar-3.4.0/fullcalendar.min.css' rel='stylesheet' /> | |
| 60 | - <link href='https://fullcalendar.io/js/fullcalendar-3.4.0/fullcalendar.print.min.css' rel='stylesheet' media='print' /> | |
| 61 | - <script src='https://fullcalendar.io/js/fullcalendar-3.4.0/lib/moment.min.js'></script> | |
| 62 | - <script src='https://fullcalendar.io/js/fullcalendar-3.4.0/lib/jquery.min.js'></script> | |
| 63 | - <script src='https://fullcalendar.io/js/fullcalendar-3.4.0/lib/jquery-ui.min.js'></script> --> | |
| 64 | 59 | <link rel="stylesheet" href="bower_components/fullcalendar/dist/fullcalendar.css"/> |
| 65 | 60 | <link rel="stylesheet" type="text/css" href="css/animation.css"> |
| 61 | + <link rel="stylesheet" href="bower_components/angular-ui-clock/dist/angular-clock.css"> | |
| 62 | + <link href="//fonts.googleapis.com/css?family=Syncopate:400,700" rel="stylesheet" type="text/css"> | |
| 63 | + <link href="https://netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet"> | |
| 66 | 64 | |
| 67 | 65 | </head> |
| 68 | 66 | <body> |
| ... | ... | @@ -92,7 +90,6 @@ |
| 92 | 90 | <script src="bower_components/bootstrap-toggle/js/bootstrap-toggle.min.js"></script> |
| 93 | 91 | <script src="bower_components/angular-ui-router/release/angular-ui-router.min.js"></script> |
| 94 | 92 | <script src='bower_components/moment/min/moment.min.js'></script> |
| 95 | - <!-- <script src="bower_components/fullcalendar/dist/fullcalendar.min.js"></script> --> | |
| 96 | 93 | <script src='bower_components/toastr/toastr.min.js'></script> |
| 97 | 94 | <script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script> |
| 98 | 95 | <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script> |
| ... | ... | @@ -231,7 +228,6 @@ |
| 231 | 228 | <script src="partials/resetpwd/resetPassword.service.js"></script> |
| 232 | 229 | |
| 233 | 230 | <script src="partials/main/main.service.js"></script> |
| 234 | - <!-- <script src='https://fullcalendar.io/js/fullcalendar-3.4.0/fullcalendar.min.js'></script> --> | |
| 235 | 231 | <script type="text/javascript" src="bower_components/fullcalendar/dist/fullcalendar.min.js"></script> |
| 236 | 232 | <script type="text/javascript" src="bower_components/fullcalendar/dist/gcal.js"></script> |
| 237 | 233 | |
| ... | ... | @@ -242,6 +238,7 @@ |
| 242 | 238 | <script src="bower_components/nvd3/build/nv.d3.js"></script> <!-- or use another assembly --> |
| 243 | 239 | |
| 244 | 240 | <script src="bower_components/angular-nvd3/dist/angular-nvd3.js"></script> |
| 241 | + | |
| 245 | 242 | |
| 246 | 243 | <!-- for reginal pap without drilldown graph uncomment 5 this for new red chart and html code--> |
| 247 | 244 | <!-- <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script> |
| ... | ... | @@ -252,20 +249,19 @@ |
| 252 | 249 | |
| 253 | 250 | <!--for local time and UTC time--> |
| 254 | 251 | <script src="bower_components/angular-ui-clock/dist/angular-clock.js"></script> |
| 255 | - <link rel="stylesheet" href="bower_components/angular-ui-clock/dist/angular-clock.css"> | |
| 256 | - <link href="//fonts.googleapis.com/css?family=Syncopate:400,700" rel="stylesheet" type="text/css"> | |
| 252 | + | |
| 253 | + | |
| 257 | 254 | |
| 258 | 255 | <!--for drill down regional chart--> |
| 259 | - <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script> | |
| 256 | + <!-- Jquery.min.js should be only one file of bower irrespective of different version otherwise it will conflict with scheduler --> | |
| 257 | + | |
| 258 | + <!-- <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script> --> | |
| 260 | 259 | <script src="https://code.highcharts.com/maps/highmaps.js"></script> |
| 261 | 260 | <script src="https://code.highcharts.com/maps/modules/data.js"></script> |
| 262 | 261 | <script src="https://code.highcharts.com/maps/modules/drilldown.js"></script> |
| 263 | 262 | <script src="https://code.highcharts.com/maps/modules/exporting.js"></script> |
| 264 | 263 | <script src="https://code.highcharts.com/maps/modules/offline-exporting.js"></script> |
| 265 | 264 | <script src="https://code.highcharts.com/mapdata/countries/us/us-all.js"></script> |
| 266 | - <link href="https://netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet"> | |
| 267 | - | |
| 268 | - | |
| 269 | 265 | |
| 270 | 266 | |
| 271 | 267 | </body> | ... | ... |
app/partials/analytics/analytics.controller.js
| ... | ... | @@ -422,7 +422,7 @@ angular.module('acufuel') |
| 422 | 422 | //var makeId = makeId; |
| 423 | 423 | analyticsService.gethfpChart().then(function(result) { |
| 424 | 424 | $scope.hfpValues = result; |
| 425 | - console.log('---kd result--',$scope.hfpValues); | |
| 425 | + //console.log('---kd result--',$scope.hfpValues); | |
| 426 | 426 | |
| 427 | 427 | /*Historic Fuel Price */ |
| 428 | 428 | ... | ... |
app/partials/scheduler/scheduler.controller.js
| ... | ... | @@ -12,25 +12,16 @@ angular.module('acufuel') |
| 12 | 12 | $scope.events = []; |
| 13 | 13 | function getEventsList(){ |
| 14 | 14 | schedulerService.getEvents().then(function(result) { |
| 15 | - //console.log('----kd events-------',result); | |
| 16 | - //console.log("==length===",result.length); | |
| 17 | 15 | |
| 18 | 16 | for (var i = 0; i < result.length; i++) { |
| 19 | 17 | var newTime = new Date(result[i].deployDate); |
| 20 | - // console.log("deployDate",result[i].deployDate) | |
| 21 | 18 | var dmonth = newTime.getUTCMonth() + 1; //months from 1-12 |
| 22 | 19 | var dday = newTime.getUTCDate(); |
| 23 | 20 | var dyear = newTime.getUTCFullYear(); |
| 24 | 21 | var hours = newTime.getHours(); |
| 25 | 22 | var min = newTime.getMinutes(); |
| 26 | 23 | var sec = newTime.getSeconds(); |
| 27 | -/* | |
| 28 | - $scope.events.push({ | |
| 29 | - 'id': result[i].id, | |
| 30 | - 'title': result[i].aircraft +',\n' + result[i].make +'/' + result[i].model +',\n' + result[i].requestedVolume +',' +result[i].priceQuote, | |
| 31 | - 'start': dyear+'-'+dmonth+'-'+dday | |
| 32 | - | |
| 33 | - })*/ | |
| 24 | + | |
| 34 | 25 | $scope.events.push({ |
| 35 | 26 | 'id': result[i].id, |
| 36 | 27 | 'title': result[i].aircraft +'\n' + '(' + result[i].make +'/' + result[i].model + ')' + '\n' + 'for' + ' ' + result[i].requestedVolume + ' ' + 'gal.' + ' ' +'@' + ' ' +'$'+result[i].priceQuote, |
| ... | ... | @@ -39,14 +30,14 @@ angular.module('acufuel') |
| 39 | 30 | }) |
| 40 | 31 | // $scope.showEventsList(); |
| 41 | 32 | $scope.showLoader = false; |
| 42 | - | |
| 43 | 33 | } |
| 44 | - | |
| 34 | + | |
| 45 | 35 | $('#my-calendar').fullCalendar('removeEvents'); |
| 46 | 36 | $('#my-calendar').fullCalendar('addEventSource',$scope.events); |
| 47 | - // $scope.eventSources = [$scope.events, $scope.eventSource, $scope.eventsF]; | |
| 37 | + $('#my-calendar').fullCalendar('refetchEvents'); | |
| 38 | + | |
| 39 | + //$scope.eventSources = [$scope.events, $scope.eventSource, $scope.eventsF]; | |
| 48 | 40 | |
| 49 | - // console.log('==eventSource are====',$scope.eventSources); | |
| 50 | 41 | // $scope.newFuelPricing[i].futureFuelPricing.deployDate = dmonth+'/'+dday+'/'+dyear; |
| 51 | 42 | }) |
| 52 | 43 | } |
| ... | ... | @@ -55,7 +46,6 @@ angular.module('acufuel') |
| 55 | 46 | |
| 56 | 47 | $scope.newEvent = {}; |
| 57 | 48 | $scope.addNewEvent = function(){ |
| 58 | - //console.log('newEvent', $scope.newEvent); | |
| 59 | 49 | $scope.showLoader = true; |
| 60 | 50 | if ($scope.newEvent.deployDate != undefined) { |
| 61 | 51 | $scope.newEvent.deployDate = new Date($scope.newEvent.deployDate); |
| ... | ... | @@ -89,7 +79,6 @@ angular.module('acufuel') |
| 89 | 79 | $scope.updatedData.deployDate = $scope.updatedData.deployDate.getTime(); |
| 90 | 80 | } |
| 91 | 81 | schedulerService.updateScheduledEvent($scope.updatedData).then(function(response){ |
| 92 | - //console.log('response', response); | |
| 93 | 82 | $scope.updatedData = {}; |
| 94 | 83 | $('#editEvent').modal('hide'); |
| 95 | 84 | toastr.success('Updated Successfully', { |
| ... | ... | @@ -131,7 +120,6 @@ angular.module('acufuel') |
| 131 | 120 | }; |
| 132 | 121 | |
| 133 | 122 | $scope.alertOnDrop = function(event, delta, revertFunc, jsEvent, ui, view){ |
| 134 | - console.log('-----aa-'); | |
| 135 | 123 | var dmonth = event.start._d.getUTCMonth() + 1; //months from 1-12 |
| 136 | 124 | var dday = event.start._d.getUTCDate(); |
| 137 | 125 | var dyear = event.start._d.getUTCFullYear(); |
| ... | ... | @@ -142,22 +130,17 @@ $scope.alertOnDrop = function(event, delta, revertFunc, jsEvent, ui, view){ |
| 142 | 130 | |
| 143 | 131 | for (var i = 0; i < $scope.events.length; i++) { |
| 144 | 132 | if ($scope.events[i].id == event.id) { |
| 145 | - | |
| 146 | - //console.log('events', $scope.events[i]); | |
| 147 | 133 | //$scope.events[i].start = dyear+'-'+dmonth+'-'+dday; |
| 148 | 134 | $scope.showLoader = true; |
| 149 | 135 | $scope.updatedDataDrop = {}; |
| 150 | 136 | $scope.updatedDataDrop.id = $scope.events[i].id; |
| 151 | 137 | $scope.updatedDataDrop.aircraft = $scope.events[i].title; |
| 152 | 138 | $scope.updatedDataDrop.deployDate = dyear+'-'+dmonth+'-'+dday + ' ' + hours + ':' + min + ':' + sec; |
| 153 | - console.log('date-----', $scope.updatedDataDrop.deployDate); | |
| 154 | 139 | if ($scope.updatedDataDrop.deployDate != undefined) { |
| 155 | 140 | $scope.updatedDataDrop.deployDate = new Date($scope.updatedDataDrop.deployDate); |
| 156 | 141 | $scope.updatedDataDrop.deployDate = $scope.updatedDataDrop.deployDate.getTime(); |
| 157 | - console.log('date----222-', $scope.updatedDataDrop.deployDate); | |
| 158 | 142 | } |
| 159 | 143 | schedulerService.updateScheduledEvent($scope.updatedDataDrop).then(function(response){ |
| 160 | - // console.log('response', response); | |
| 161 | 144 | $scope.updatedDataDrop = {}; |
| 162 | 145 | $('#editEvent').modal('hide'); |
| 163 | 146 | toastr.success('Updated Successfully', { |
| ... | ... | @@ -169,7 +152,6 @@ $scope.alertOnDrop = function(event, delta, revertFunc, jsEvent, ui, view){ |
| 169 | 152 | |
| 170 | 153 | } |
| 171 | 154 | } |
| 172 | - //console.log('$scope.events new', $scope.events); | |
| 173 | 155 | $scope.alertMessage = ('Event Droped to make dayDelta ' + delta); |
| 174 | 156 | }; |
| 175 | 157 | |
| ... | ... | @@ -249,8 +231,7 @@ $scope.alertOnDrop = function(event, delta, revertFunc, jsEvent, ui, view){ |
| 249 | 231 | |
| 250 | 232 | };*/ |
| 251 | 233 | |
| 252 | - // $scope.eventSources = [$scope.events, $scope.eventSource, $scope.eventsF]; | |
| 253 | - | |
| 234 | + //$scope.eventSources = [$scope.events, $scope.eventSource, $scope.eventsF]; | |
| 254 | 235 | //$scope.eventSources2 = [$scope.calEventsExt, $scope.eventsF, $scope.events]; |
| 255 | 236 | }]); |
| 256 | 237 | ... | ... |