diff --git a/app/index.html b/app/index.html
index de362f4..0166697 100644
--- a/app/index.html
+++ b/app/index.html
@@ -46,7 +46,7 @@
-
+
@@ -56,13 +56,11 @@
-
+
+
+
@@ -92,7 +90,6 @@
-
@@ -231,7 +228,6 @@
-
@@ -242,6 +238,7 @@
+
-
-
+
+
-
+
+
+
-
-
-
diff --git a/app/partials/analytics/analytics.controller.js b/app/partials/analytics/analytics.controller.js
index 3efe473..15fb7f8 100644
--- a/app/partials/analytics/analytics.controller.js
+++ b/app/partials/analytics/analytics.controller.js
@@ -422,7 +422,7 @@ angular.module('acufuel')
//var makeId = makeId;
analyticsService.gethfpChart().then(function(result) {
$scope.hfpValues = result;
- console.log('---kd result--',$scope.hfpValues);
+ //console.log('---kd result--',$scope.hfpValues);
/*Historic Fuel Price */
diff --git a/app/partials/scheduler/scheduler.controller.js b/app/partials/scheduler/scheduler.controller.js
index 4256135..3a2d04b 100644
--- a/app/partials/scheduler/scheduler.controller.js
+++ b/app/partials/scheduler/scheduler.controller.js
@@ -12,25 +12,16 @@ angular.module('acufuel')
$scope.events = [];
function getEventsList(){
schedulerService.getEvents().then(function(result) {
- //console.log('----kd events-------',result);
- //console.log("==length===",result.length);
for (var i = 0; i < result.length; i++) {
var newTime = new Date(result[i].deployDate);
- // console.log("deployDate",result[i].deployDate)
var dmonth = newTime.getUTCMonth() + 1; //months from 1-12
var dday = newTime.getUTCDate();
var dyear = newTime.getUTCFullYear();
var hours = newTime.getHours();
var min = newTime.getMinutes();
var sec = newTime.getSeconds();
-/*
- $scope.events.push({
- 'id': result[i].id,
- 'title': result[i].aircraft +',\n' + result[i].make +'/' + result[i].model +',\n' + result[i].requestedVolume +',' +result[i].priceQuote,
- 'start': dyear+'-'+dmonth+'-'+dday
-
- })*/
+
$scope.events.push({
'id': result[i].id,
'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')
})
// $scope.showEventsList();
$scope.showLoader = false;
-
}
-
+
$('#my-calendar').fullCalendar('removeEvents');
$('#my-calendar').fullCalendar('addEventSource',$scope.events);
- // $scope.eventSources = [$scope.events, $scope.eventSource, $scope.eventsF];
+ $('#my-calendar').fullCalendar('refetchEvents');
+
+ //$scope.eventSources = [$scope.events, $scope.eventSource, $scope.eventsF];
- // console.log('==eventSource are====',$scope.eventSources);
// $scope.newFuelPricing[i].futureFuelPricing.deployDate = dmonth+'/'+dday+'/'+dyear;
})
}
@@ -55,7 +46,6 @@ angular.module('acufuel')
$scope.newEvent = {};
$scope.addNewEvent = function(){
- //console.log('newEvent', $scope.newEvent);
$scope.showLoader = true;
if ($scope.newEvent.deployDate != undefined) {
$scope.newEvent.deployDate = new Date($scope.newEvent.deployDate);
@@ -89,7 +79,6 @@ angular.module('acufuel')
$scope.updatedData.deployDate = $scope.updatedData.deployDate.getTime();
}
schedulerService.updateScheduledEvent($scope.updatedData).then(function(response){
- //console.log('response', response);
$scope.updatedData = {};
$('#editEvent').modal('hide');
toastr.success('Updated Successfully', {
@@ -131,7 +120,6 @@ angular.module('acufuel')
};
$scope.alertOnDrop = function(event, delta, revertFunc, jsEvent, ui, view){
- console.log('-----aa-');
var dmonth = event.start._d.getUTCMonth() + 1; //months from 1-12
var dday = event.start._d.getUTCDate();
var dyear = event.start._d.getUTCFullYear();
@@ -142,22 +130,17 @@ $scope.alertOnDrop = function(event, delta, revertFunc, jsEvent, ui, view){
for (var i = 0; i < $scope.events.length; i++) {
if ($scope.events[i].id == event.id) {
-
- //console.log('events', $scope.events[i]);
//$scope.events[i].start = dyear+'-'+dmonth+'-'+dday;
$scope.showLoader = true;
$scope.updatedDataDrop = {};
$scope.updatedDataDrop.id = $scope.events[i].id;
$scope.updatedDataDrop.aircraft = $scope.events[i].title;
$scope.updatedDataDrop.deployDate = dyear+'-'+dmonth+'-'+dday + ' ' + hours + ':' + min + ':' + sec;
- console.log('date-----', $scope.updatedDataDrop.deployDate);
if ($scope.updatedDataDrop.deployDate != undefined) {
$scope.updatedDataDrop.deployDate = new Date($scope.updatedDataDrop.deployDate);
$scope.updatedDataDrop.deployDate = $scope.updatedDataDrop.deployDate.getTime();
- console.log('date----222-', $scope.updatedDataDrop.deployDate);
}
schedulerService.updateScheduledEvent($scope.updatedDataDrop).then(function(response){
- // console.log('response', response);
$scope.updatedDataDrop = {};
$('#editEvent').modal('hide');
toastr.success('Updated Successfully', {
@@ -169,7 +152,6 @@ $scope.alertOnDrop = function(event, delta, revertFunc, jsEvent, ui, view){
}
}
- //console.log('$scope.events new', $scope.events);
$scope.alertMessage = ('Event Droped to make dayDelta ' + delta);
};
@@ -249,8 +231,7 @@ $scope.alertOnDrop = function(event, delta, revertFunc, jsEvent, ui, view){
};*/
- // $scope.eventSources = [$scope.events, $scope.eventSource, $scope.eventsF];
-
+ //$scope.eventSources = [$scope.events, $scope.eventSource, $scope.eventsF];
//$scope.eventSources2 = [$scope.calEventsExt, $scope.eventsF, $scope.events];
}]);