diff --git a/app/css/custom.css b/app/css/custom.css index b3c9c67..81b6d72 100644 --- a/app/css/custom.css +++ b/app/css/custom.css @@ -69,6 +69,9 @@ table th, td{ background-color: #ff9900 !important; color: #fff !important; border: 1px solid #ff9900 !important; + padding: 5px; + font-size: 14px; + border-radius: 0 !important; } .pull-right-color{ background-image: linear-gradient(to bottom, #1c84c6 0%, #1c84c6 100%); diff --git a/app/index.html b/app/index.html index ff98ed6..197f0f5 100644 --- a/app/index.html +++ b/app/index.html @@ -179,7 +179,7 @@ - + @@ -204,5 +204,7 @@ + + \ No newline at end of file diff --git a/app/partials/scheduler/scheduler.controller.js b/app/partials/scheduler/scheduler.controller.js index c671f13..a63e453 100644 --- a/app/partials/scheduler/scheduler.controller.js +++ b/app/partials/scheduler/scheduler.controller.js @@ -1,61 +1,182 @@ 'use strict'; -//Load controller angular.module('acufuel') - .controller('schedulerController', ['$scope','$compile', 'uiCalendarConfig', function($scope, $compile, uiCalendarConfig) { - - $scope.test = "Testing..."; - - var date = new Date(); - var d = date.getDate(); - var m = date.getMonth(); - var y = date.getFullYear(); - - - $scope.eventList=[ - {title:'Event 1'}, - {title:'Event 2'}, - {title:'Event 3'}, - {title:'Event 4'} - ]; - - $scope.eventSources=[]; - - $scope.events = [ - {title: 'All Day Event', start: new Date(y, m, 1)}, - {title: 'Birthday Party', start: new Date(y, m, d + 1, 19, 0), end: new Date(y, m, d + 1, 22, 30), allDay: false}, - {title: 'Click for Google', start: new Date(y, m, 28), end: new Date(y, m, 29)} - ]; - - $scope.uiConfig = { - calendar:{ - height: 450, - editable: true, - droppable: true, - drop: function (date, allDay, jsEvent, ui) { - console.log('Here ,but where is the object?'); - }, - header:{ - left: 'title', - center: '', - right: 'today prev,next' - }, - eventResize: true, +.controller('schedulerController', ['$scope','$compile', 'uiCalendarConfig', 'schedulerService', function($scope, $compile, uiCalendarConfig, schedulerService) { + + $scope.showLoader = true; + getEventsList(); + + $scope.events = []; + function getEventsList(){ + schedulerService.getEvents().then(function(result) { + console.log('result', 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 + var dday = newTime.getUTCDate(); + var dyear = newTime.getUTCFullYear(); + + $scope.events.push({ + 'id': result[i].id, + 'title': result[i].aircraft, + 'start': dyear+'-'+dmonth+'-'+dday + }) + $scope.showLoader = false; + } + + // $scope.newFuelPricing[i].futureFuelPricing.deployDate = dmonth+'/'+dday+'/'+dyear; + }) + } + + $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); + $scope.newEvent.deployDate = $scope.newEvent.deployDate.getTime(); + } + //var data = 'aircraft='+$scope.newEvent.aircraft+'&deployDate='+$scope.newEvent.deployDate; + schedulerService.addNewEventService($scope.newEvent).then(function(response){ + console.log('response', response); + $scope.newEvent = {}; + $('#addEvent').modal('hide'); + getEventsList(); + }) + } + + $scope.cancelAdd = function(){ + $scope.newEvent = {}; + } + $scope.editData = {}; + $scope.editEvent = function(data){ + console.log('data', data); + $scope.editData = data; + console.log('$scope.editData', $scope.editData); + $('#editEvent').modal('show'); + + } + + + + /* code for calendar */ + + var date = new Date(); + var d = date.getDate(); + var m = date.getMonth(); + var y = date.getFullYear(); + + $scope.changeTo = 'Hungarian'; + + $scope.eventSource = {}; + + $scope.eventsF = function (start, end, timezone, callback) { + var s = new Date(start).getTime() / 1000; + var e = new Date(end).getTime() / 1000; + var m = new Date(start).getMonth(); + var events = [{title: 'Feed Me ' + m,start: s + (50000),end: s + (100000),allDay: false, className: ['customFeed']}]; + callback(events); + }; + + $scope.calEventsExt = { + color: '#f00', + textColor: 'yellow', + events: [] + }; + + $scope.alertOnEventClick = function( date, jsEvent, view){ + $scope.alertMessage = (date.title + ' was clicked '); +}; + +$scope.alertOnDrop = function(event, delta, revertFunc, jsEvent, ui, view){ + var dmonth = event.start._d.getUTCMonth() + 1; //months from 1-12 + var dday = event.start._d.getUTCDate(); + var dyear = event.start._d.getUTCFullYear(); + console.log('date', dyear+'-'+dmonth+'-'+dday); + 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.eventSources = [$scope.events]; - //$scope.eventSources = []; - //$scope.eventSources.push($scope.events); - - $scope.addEvent = function(index) { - console.log('INDEX', index); - console.log('EVENTS', $scope.eventSources); - //$scope.events.push($scope.eventList[index]); } - - console.log($scope.eventSources); + console.log('$scope.events new', $scope.events); + $scope.alertMessage = ('Event Droped to make dayDelta ' + delta); + }; + + $scope.alertOnResize = function(event, delta, revertFunc, jsEvent, ui, view ){ + $scope.alertMessage = ('Event Resized to make dayDelta ' + delta); + }; + + $scope.addRemoveEventSource = function(sources,source) { + var canAdd = 0; + angular.forEach(sources,function(value, key){ + if(sources[key] === source){ + sources.splice(key,1); + canAdd = 1; + } + }); + if(canAdd === 0){ + sources.push(source); + } + }; + + $scope.addEvent = function() { + $scope.events.push({ + title: 'Open Sesame', + start: new Date(y, m, 28), + end: new Date(y, m, 29), + className: ['openSesame'] + }); + }; + + $scope.remove = function(index) { + $scope.events.splice(index,1); + }; + + $scope.changeView = function(view,calendar) { + uiCalendarConfig.calendars[calendar].fullCalendar('changeView',view); + }; + + $scope.renderCalender = function(calendar) { + if(uiCalendarConfig.calendars[calendar]){ + uiCalendarConfig.calendars[calendar].fullCalendar('render'); + } + }; + + $scope.eventRender = function( event, element, view ) { + element.attr({'tooltip': event.title, + 'tooltip-append-to-body': true}); + $compile(element)($scope); + }; + + $scope.uiConfig = { + calendar:{ + height: 450, + editable: true, + droppable: true, + drop: function (event, delta, revertFunc, jsEvent, ui, view) { + }, + header:{ + right: 'month basicWeek basicDay', + center: 'title', + left: 'prev,next, today' + }, + eventClick: $scope.alertOnEventClick, + eventDrop: $scope.alertOnDrop, + eventResize: $scope.alertOnResize, + eventRender: $scope.eventRender + } + }; + + $scope.addEvent = function(index) { + //console.log('INDEX', index); + //console.log('EVENTS', $scope.eventSources); + //$scope.events.push($scope.eventList[index]); + } + + $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 a5640a3..62ad9d5 100644 --- a/app/partials/scheduler/scheduler.html +++ b/app/partials/scheduler/scheduler.html @@ -18,7 +18,16 @@ color: #fff; background-color: #ff9900; } - + .stacked:after, .stacked:before{ + display: none; + } + .btn-white, .btn-white:hover{ + background-color: #fff; + background-image: none; + } + .fc-day-grid-event .fc-time{ + display: none; + } /*#wrap { width: 1100px; @@ -61,30 +70,61 @@ width: 900px; }*/ + +
+ +
+
-
+
+
+
+ +

Enter Support Service

+
+
+ + +
+
+
+ +
+
+ +
+
+
+ +

Schedule

+
+
+
+
+
+
+
-
-

Draggable Events

- - -
+ -
+ -
+ -
+
@@ -97,4 +137,63 @@
- \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/app/partials/scheduler/scheduler.service.js b/app/partials/scheduler/scheduler.service.js index ae81369..f06a9b8 100644 --- a/app/partials/scheduler/scheduler.service.js +++ b/app/partials/scheduler/scheduler.service.js @@ -1,13 +1,42 @@ (function(){ 'use strict'; angular.module('acufuel') - .service('schedulerService', ['$q', '$http', 'BE', schedulerService]); + .service('schedulerService', ['$q', '$http', 'BASE_URL', schedulerService]); - function schedulerService($q, $http, BE) { + function schedulerService($q, $http, BASE_URL) { var temp = {}; - - + this.getEvents = function() { + var deferred = $q.defer(); + $http({ + method : 'GET', + url : BASE_URL.url +'/user/schedules', + headers : {'Content-Type': 'application/json'}, + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } + + this.addNewEventService = function(data) { + var deferred = $q.defer(); + $http({ + method : 'POST', + url : BASE_URL.url +'/scheduler', + headers : {'Content-Type': 'application/json'}, + data: data + }) + .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/updateFuelManager/updateFuelManager.controller.js b/app/partials/updateFuelManager/updateFuelManager.controller.js index 95b6eab..dedf132 100644 --- a/app/partials/updateFuelManager/updateFuelManager.controller.js +++ b/app/partials/updateFuelManager/updateFuelManager.controller.js @@ -409,6 +409,7 @@ } $scope.newFuelPricing = {}; + $scope.holdFuelPricing = {}; updateFuelManagerService.getFuelPricingNew().then(function(result) { $scope.newFuelPricing = result; for (var i = 0; i<$scope.newFuelPricing.length; i++) { @@ -440,26 +441,60 @@ $scope.newFuelPricing[i].futureFuelPricing.deployDate = dmonth+'/'+dday+'/'+dyear; } } - } + } var str =""+ $scope.newFuelPricing[i].name - if(str.startsWith("J")){ - $scope.newFuelPricing[i].jeta = true; - var str1 = str.substring(0,5) - var str2 = str.substring(6, str.length) - $scope.newFuelPricing[i].name = str1 - $scope.newFuelPricing[i].namejetrest = str2 - - - }else if(str.startsWith("100")){ - $scope.newFuelPricing[i].avgas = true; - var str1 = str.substring(0,5) - var str2 = str.substring(6, str.length) - $scope.newFuelPricing[i].name = str1 - $scope.newFuelPricing[i].nameavgasrest = str2 - } - } - $scope.showLoader = false; + if(str.startsWith("J")){ + $scope.newFuelPricing[i].jeta = true; + var str1 = str.substring(0,5) + var str2 = str.substring(6, str.length) + $scope.newFuelPricing[i].name = str1 + $scope.newFuelPricing[i].namejetrest = str2 + + + }else if(str.startsWith("100")){ + $scope.newFuelPricing[i].avgas = true; + var str1 = str.substring(0,5) + var str2 = str.substring(6, str.length) + $scope.newFuelPricing[i].name = str1 + $scope.newFuelPricing[i].nameavgasrest = str2 + } + } + + for (var i = 0; i
- +
diff --git a/app/partials/updateFuelManager/updateFuelManager.service.js b/app/partials/updateFuelManager/updateFuelManager.service.js index 181753d..8f20826 100644 --- a/app/partials/updateFuelManager/updateFuelManager.service.js +++ b/app/partials/updateFuelManager/updateFuelManager.service.js @@ -213,6 +213,22 @@ return deferred.promise; } + this.updateFutureFuelPricingImmediatlly = function(data){ + var deferred = $q.defer(); + $http({ + method : 'POST', + url : BASE_URL.url +'/fuelPricing/updateImmediateFuelPrice', + headers : {'Content-Type': 'application/json'}, + data: data + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } + this.getMargin = function() { var deferred = $q.defer();