diff --git a/app/partials/dashboard/dashboard.controller.js b/app/partials/dashboard/dashboard.controller.js index 1378041..c2e5511 100644 --- a/app/partials/dashboard/dashboard.controller.js +++ b/app/partials/dashboard/dashboard.controller.js @@ -19,7 +19,7 @@ $state.reload(); } - $scope.marginList = {} + $scope.marginList = {}; dashboardService.getMargin().then(function(result) { $scope.marginList = result; console.log("Margin result", result) @@ -193,5 +193,36 @@ // } // })*/ // } + + $scope.completeOrderCount = ''; + $scope.pendingOrderCount= ''; + + dashboardService.getFuelordercount().then(function(result) { + if(result[0].label=='Completed' && result[1].label=='Pending'){ + $scope.completeOrderCount=result[0].value; + $scope.pendingOrderCount=result[1].value; + } + + console.log("=========Order counts========", result[0].label); + console.log("=========Order counts========", result[0].value); + console.log("=========Order counts========", result[1].label); + console.log("=========Order counts========", result[1].value); + }) + + + $scope.pendingMessageRecord=[]; + dashboardService.getPendingMessage().then(function(result) { + $scope.pendingMessageRecord=result; + + console.log('=======message====',result); + }) + + + + + + + + } })(); diff --git a/app/partials/dashboard/dashboard.html b/app/partials/dashboard/dashboard.html index 2dcacb8..8a6de1c 100644 --- a/app/partials/dashboard/dashboard.html +++ b/app/partials/dashboard/dashboard.html @@ -3,7 +3,19 @@ color: #ff9900; } - +
@@ -19,7 +31,7 @@
Completed -
@@ -28,7 +40,7 @@
-

280

+

{{completeOrderCount}}

Fuel Orders
@@ -42,7 +54,7 @@
Pending -
@@ -51,7 +63,7 @@
-

280

+

{{pendingOrderCount}}

Fuel Orders
@@ -66,7 +78,7 @@
Activity: Airport Operations -
@@ -198,7 +210,13 @@

Messages

-
    + + + + + +
    Fuel Order is Pending for the company {{ msg[5] }}
    +
diff --git a/app/partials/dashboard/dashboard.service.js b/app/partials/dashboard/dashboard.service.js index e6ed9a8..a8f9049 100644 --- a/app/partials/dashboard/dashboard.service.js +++ b/app/partials/dashboard/dashboard.service.js @@ -54,6 +54,38 @@ return deferred.promise; } - } + this.getFuelordercount = function() { + var deferred = $q.defer(); + $http({ + method : 'GET', + url : BASE_URL.url +'/fuelOrder/dashboardstatics', + headers : {'Content-Type': 'application/json'}, + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } + + this.getPendingMessage = function() { + var deferred = $q.defer(); + $http({ + method : 'GET', + url : BASE_URL.url +'/fuelOrder/dashboardmessages', + headers : {'Content-Type': 'application/json'}, + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } + + + + } })(); \ No newline at end of file diff --git a/app/partials/scheduler/scheduler.controller.js b/app/partials/scheduler/scheduler.controller.js index 89f5d1d..9b4f575 100644 --- a/app/partials/scheduler/scheduler.controller.js +++ b/app/partials/scheduler/scheduler.controller.js @@ -4,12 +4,16 @@ angular.module('acufuel') .controller('schedulerController', ['$scope','$compile', 'uiCalendarConfig', 'schedulerService', function($scope, $compile, uiCalendarConfig, schedulerService) { + $scope.showLoader = true; - getEventsList(); - + getEventsList(); + + /*---get events on calendar---*/ $scope.events = []; function getEventsList(){ schedulerService.getEvents().then(function(result) { + //console.log('----kd events-------',result); + for (var i = 0; i < result.length; i++) { var newTime = new Date(result[i].deployDate); var dmonth = newTime.getUTCMonth() + 1; //months from 1-12 @@ -18,15 +22,24 @@ angular.module('acufuel') $scope.events.push({ 'id': result[i].id, - 'title': result[i].aircraft, + 'title': result[i].aircraft +',\n' + result[i].make +'/' + result[i].model +',\n' + result[i].requestedVolume +',' +result[i].priceQuote, 'start': dyear+'-'+dmonth+'-'+dday }) - $scope.showLoader = false; - } + // $scope.showEventsList(); + console.log('==kd events after push===', $scope.events) + $scope.showLoader = false; + + } + $('#my-calendar').fullCalendar('removeEvents'); + $('#my-calendar').fullCalendar('addEventSource',$scope.events); + // $scope.eventSources = [$scope.events, $scope.eventSource, $scope.eventsF]; + + // console.log('==eventSource are====',$scope.eventSources); + // $scope.newFuelPricing[i].futureFuelPricing.deployDate = dmonth+'/'+dday+'/'+dyear; + }) +} + - // $scope.newFuelPricing[i].futureFuelPricing.deployDate = dmonth+'/'+dday+'/'+dyear; - }) - } $scope.newEvent = {}; $scope.addNewEvent = function(){ @@ -210,11 +223,15 @@ $scope.alertOnDrop = function(event, delta, revertFunc, jsEvent, ui, view){ $scope.addEvent = function(index) { //console.log('INDEX', index); //console.log('EVENTS', $scope.eventSources); - //$scope.events.push($scope.eventList[index]); + // $scope.events.push($scope.eventList[index]); } - - $scope.eventSources = [$scope.events, $scope.eventSource, $scope.eventsF]; - $scope.eventSources2 = [$scope.calEventsExt, $scope.eventsF, $scope.events]; - + + /*$scope.showEventsList = function(){ + console.log('testing', $scope.eventsF); + + };*/ + $scope.eventSources = [$scope.events, $scope.eventSource, $scope.eventsF]; + + $scope.eventSources2 = [$scope.calEventsExt, $scope.eventsF, $scope.events]; }]); diff --git a/app/partials/scheduler/scheduler.html b/app/partials/scheduler/scheduler.html index b7c46e9..f6f623c 100644 --- a/app/partials/scheduler/scheduler.html +++ b/app/partials/scheduler/scheduler.html @@ -79,44 +79,48 @@
-
-
+
+ +
{{item.title}}
- +

-
+
-->
-
+
-

Schedule

+

Schedule kd

-
+
+ +
+
+