From e33b4556c46cce5b8ce1afce9bfbaea261b212f6 Mon Sep 17 00:00:00 2001 From: "kuldeep.arora" Date: Wed, 14 Feb 2018 11:03:45 +0530 Subject: [PATCH] bugs resolved --- app/partials/fuelOrders/fuelOrders.controller.js | 524 ++++++++++++++++------- app/partials/fuelOrders/fuelOrders.html | 41 +- app/partials/main/main.controller.js | 46 +- app/partials/main/main.html | 7 + 4 files changed, 453 insertions(+), 165 deletions(-) diff --git a/app/partials/fuelOrders/fuelOrders.controller.js b/app/partials/fuelOrders/fuelOrders.controller.js index 2d03974..fea3ce5 100644 --- a/app/partials/fuelOrders/fuelOrders.controller.js +++ b/app/partials/fuelOrders/fuelOrders.controller.js @@ -2,22 +2,27 @@ angular.module('acufuel') -.controller('fuelOrdersController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'NgTableParams','fuelOrdersService', fuelOrdersController]); +.controller('fuelOrdersController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'NgTableParams','fuelOrdersService','CustomersService','ViewCompanyService', fuelOrdersController]); -function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgTableParams,fuelOrdersService) { +function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgTableParams,fuelOrdersService,CustomersService,ViewCompanyService) { - $scope.showFuelOrderModal = false; - $scope.optionSelected; - $scope.orderdata = {} - $scope.showLoader = false; + $scope.showFuelOrderModal = false; + $scope.optionSelected; + $scope.orderdata = {} + $scope.showLoader = false; + $scope.jetShow = []; + $scope.marginShow = []; + + $scope.jetShow[0] = true; + $scope.marginShow[0] = true; - $scope.data = {}; - $scope.order = {}; - $scope.dispatchOrder = {}; - $scope.dispatchOrder.fuelOrderList = []; + $scope.data = {}; + $scope.order = {}; + $scope.dispatchOrder = {}; + $scope.dispatchOrder.fuelOrderList = []; - $scope.statusFilterOptions = []; - $scope.statusFilterOptions.push({ + $scope.statusFilterOptions = []; + $scope.statusFilterOptions.push({ 'id': '', 'title': 'Show All' },{ 'id': 'pending', 'title': 'Pending' @@ -33,11 +38,51 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT ); + getAllCompanies(); + + function getAllCompanies(){ + fuelOrdersService.getAllCompanies().then(function(result) { + // console.log('log', result); + $scope.companyList = result; + for (var i = 0; i < $scope.companyList.length; i++) { + if ($scope.companyList[i].companyContact != null) { + if ($scope.companyList[i].companyContact.contactNumber != null || $scope.companyList[i].companyContact.contactNumber != undefined) { + $scope.companyList[i].newContactNumber = $scope.companyList[i].companyContact.contactNumber; + } + } + if ($scope.companyList[i].primaryContact != null) { + if ($scope.companyList[i].primaryContact.firstName != null && $scope.companyList[i].primaryContact.lastName != null) { + $scope.companyList[i].primaryContactName = $scope.companyList[i].primaryContact.firstName + ' ' + $scope.companyList[i].primaryContact.lastName; + } + } + if ($scope.companyList[i].margin != null) { + if ($scope.companyList[i].margin.marginName != null) { + $scope.companyList[i].masterMargin = $scope.companyList[i].margin.id; + } + } + } + $scope.displayCompanyList = new NgTableParams({ + page: 1, + count: 10, + }, { + data: $scope.companyList + }); + $scope.showLoader = false; + }) + } + + + $scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId')) + $scope.reset2 = function(){ + $("input").val(""); + $scope.removeMarginValidation(); + } + function colourFunction() { var myselect = document.getElementById('colorfulSelectbox'), colour = myselect.options[myselect.selectedIndex].className; myselect.style.background = colour; - console.log('colour', myselect); + // console.log('colour', myselect); myselect.blur(); } @@ -72,7 +117,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT var str = "" + $scope.orderdata[i].upliftDateS.getDate() + "/" + ($scope.orderdata[i].upliftDateS.getMonth() + 1) + "/" + $scope.orderdata[i].upliftDateS.getFullYear() // str = str.slice(4,16) $scope.orderdata[i].upliftDateString = str - console.log(str); + // console.log(str); } @@ -88,10 +133,10 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT for (var i = 0; i < myselect.length; i++) { var colourIndex = $(myselect[i]).prop('selectedIndex'); colourIndex = colourIndex + 1; - console.log(colourIndex); + // console.log(colourIndex); var getColor = $('.colorfulSelectbox option:nth-child('+colourIndex+')').css('color'); $(myselect[i]).css('background-color', getColor); - console.log('colour', getColor); + // console.log('colour', getColor); myselect[i].blur(); } @@ -121,48 +166,48 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT }) } } - $scope.attachmentrowid = "" - - - $scope.attachment = function(id, value, url) { - console.log(id, value) - $scope.attachmentrowid = id - // $scope.attachmentdeleteid = attachdeleteid - if(value == 'uploadAttachment'){ - $('#demo-modal-6').css('display', 'block'); - }else if(value == 'viewAttachment'){ - var win = window.open(url, '_blank'); - win.focus(); - }else if(value == 'deleteAttachment'){ - $('#delete1').css('display', 'block'); - } - } + $scope.attachmentrowid = "" - $scope.cancelDeleteAttachment = function() { - $('#delete1').css('display', ''); - } + + $scope.attachment = function(id, value, url) { + // console.log(id, value) + $scope.attachmentrowid = id + // $scope.attachmentdeleteid = attachdeleteid + if(value == 'uploadAttachment'){ + $('#demo-modal-6').css('display', 'block'); + }else if(value == 'viewAttachment'){ + var win = window.open(url, '_blank'); + win.focus(); + }else if(value == 'deleteAttachment'){ + $('#delete1').css('display', 'block'); + } + } + + $scope.cancelDeleteAttachment = function() { + $('#delete1').css('display', ''); + } - $scope.deleteAttachment = function() { - $scope.showLoader = true; - fuelOrdersService.deleteAttachment($scope.attachmentrowid).then(function(result) { - console.log(result, $scope.attachmentrowid) + $scope.deleteAttachment = function() { + $scope.showLoader = true; + fuelOrdersService.deleteAttachment($scope.attachmentrowid).then(function(result) { + // console.log(result, $scope.attachmentrowid) - if(result.success){ - toastr.success(''+result.success+'', { - closeButton: true - }) - } - }) - $scope.showLoader = false; - $('#delete1').css('display', ''); - } + if(result.success){ + toastr.success(''+result.success+'', { + closeButton: true + }) + } + }) + $scope.showLoader = false; + $('#delete1').css('display', ''); + } $scope.saveUploadAttachment = function(attachmentData) { $scope.showLoader = true; $scope.data.media = attachmentData $scope.data.id = $scope.attachmentrowid fuelOrdersService.uploadAttachment($scope.data).then(function(result) { - console.log(result) + // console.log(result) if(result){ // console.log(result.success) toastr.success(''+"Upload Successful"+'', { @@ -175,73 +220,73 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT $('#demo-modal-6').css('display', 'none'); } - $scope.cancelUploadAttachment = function() { - $('#demo-modal-6').css('display', 'none'); - } - - $scope.editdata = {}; - + $scope.cancelUploadAttachment = function() { + $('#demo-modal-6').css('display', 'none'); + } - $scope.editTableRow = function(rowData){ - console.log('row data', rowData); - $scope.editdata = rowData; - $('#demo-modal-5').css('display', 'block'); - } + $scope.editdata = {}; + - $scope.updateTotal = function(value, valueOf){ - if(valueOf == 'v'){ - $scope.editdata.total = value * $scope.editdata.invoiced - }else if(valueOf == 'i'){ - $scope.editdata.total = $scope.editdata.requestedVolume * value + $scope.editTableRow = function(rowData){ + // console.log('row data', rowData); + $scope.editdata = rowData; + $('#demo-modal-5').css('display', 'block'); } - } - $scope.addTotal = function(value, valueOf){ - if(valueOf == 'v'){ - $scope.order.total = value * $scope.order.invoiced - }else if(valueOf == 'i'){ - $scope.order.total = $scope.order.volume * value + $scope.updateTotal = function(value, valueOf){ + if(valueOf == 'v'){ + $scope.editdata.total = value * $scope.editdata.invoiced + }else if(valueOf == 'i'){ + $scope.editdata.total = $scope.editdata.requestedVolume * value + } } - } + + $scope.addTotal = function(value, valueOf){ + if(valueOf == 'v'){ + $scope.order.total = value * $scope.order.invoiced + }else if(valueOf == 'i'){ + $scope.order.total = $scope.order.volume * value + } + } $scope.addData = function() { - $scope.showLoader = true; + $scope.showLoader = true; - if ($scope.order.upliftDate != '') { - $scope.order.upliftDate = new Date($scope.order.upliftDate); - $scope.order.upliftDate = $scope.order.upliftDate.getTime(); - } - if ($scope.order.departingDate != '') { - $scope.order.departingDate = new Date($scope.order.departingDate); - $scope.order.departingDate = $scope.order.departingDate.getTime(); - } - console.log($scope.order.quotePrice); - var obj =JSON.parse($scope.order.priceQuote); - console.log('obj.papMargin',obj.papMargin); - $scope.order.priceQuote = obj.papMargin; - - $scope.fuelData = {}; - $scope.fuelData.aircraftName = $scope.order.aircraftName - $scope.fuelData.companyName = $scope.order.companyName - $scope.fuelData.departingDate = $scope.order.departingDate - $scope.fuelData.fboCost = $scope.order.fboCost - $scope.fuelData.id = $scope.order.id - $scope.fuelData.invoiced = $scope.order.invoiced - $scope.fuelData.priceQuote = $scope.order.priceQuote - $scope.fuelData.volume = $scope.order.volume - $scope.fuelData.source = $scope.order.source - $scope.fuelData.status = $scope.order.status - $scope.fuelData.tierBreak = $scope.order.tierBreak - $scope.fuelData.total = $scope.order.total - $scope.fuelData.upliftDate = $scope.order.upliftDate - $scope.fuelData.companyId = $scope.selectedCompanyId; - + if ($scope.order.upliftDate != '') { + $scope.order.upliftDate = new Date($scope.order.upliftDate); + $scope.order.upliftDate = $scope.order.upliftDate.getTime(); + } + if ($scope.order.departingDate != '') { + $scope.order.departingDate = new Date($scope.order.departingDate); + $scope.order.departingDate = $scope.order.departingDate.getTime(); + } + // console.log($scope.order.quotePrice); + var obj =JSON.parse($scope.order.priceQuote); + // console.log('obj.papMargin',obj.papMargin); + $scope.order.priceQuote = obj.papMargin; + + $scope.fuelData = {}; + $scope.fuelData.aircraftName = $scope.order.aircraftName + $scope.fuelData.companyName = $scope.order.companyName + $scope.fuelData.departingDate = $scope.order.departingDate + $scope.fuelData.fboCost = $scope.order.fboCost + $scope.fuelData.id = $scope.order.id + $scope.fuelData.invoiced = $scope.order.invoiced + $scope.fuelData.priceQuote = $scope.order.priceQuote + $scope.fuelData.volume = $scope.order.volume + $scope.fuelData.source = $scope.order.source + $scope.fuelData.status = $scope.order.status + $scope.fuelData.tierBreak = $scope.order.tierBreak + $scope.fuelData.total = $scope.order.total + $scope.fuelData.upliftDate = $scope.order.upliftDate + $scope.fuelData.companyId = $scope.selectedCompanyId; + $scope.dispatchOrder.fuelOrderList.push($scope.fuelData); - console.log('$scope.order', $scope.dispatchOrder); + // console.log('$scope.order', $scope.dispatchOrder); fuelOrdersService.dispathFuelOrder($scope.dispatchOrder).then(function(result) { - console.log('result', result); + // console.log('result', result); $scope.showLoader = false; $scope.order = {}; $('#demo-modal-4').css('display', ''); @@ -253,25 +298,25 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT } $scope.updateStatus = function(row, status) { - $scope.showLoader = true; - $scope.fuelData = {}; - $scope.fuelData.aircraftName = row.aircraftName - $scope.fuelData.companyName = row.companyName - $scope.fuelData.departingDate = row.departingDate - $scope.fuelData.fboCost = row.fboCost - $scope.fuelData.id = row.id - $scope.fuelData.invoiced = row.invoiced - $scope.fuelData.priceQuote = row.priceQuote - $scope.fuelData.volume = row.requestedVolume - $scope.fuelData.source = row.source - $scope.fuelData.status = status - $scope.fuelData.tierBreak = row.tierBreak - $scope.fuelData.total = row.total - $scope.fuelData.upliftDate = row.upliftDate + $scope.showLoader = true; + $scope.fuelData = {}; + $scope.fuelData.aircraftName = row.aircraftName + $scope.fuelData.companyName = row.companyName + $scope.fuelData.departingDate = row.departingDate + $scope.fuelData.fboCost = row.fboCost + $scope.fuelData.id = row.id + $scope.fuelData.invoiced = row.invoiced + $scope.fuelData.priceQuote = row.priceQuote + $scope.fuelData.volume = row.requestedVolume + $scope.fuelData.source = row.source + $scope.fuelData.status = status + $scope.fuelData.tierBreak = row.tierBreak + $scope.fuelData.total = row.total + $scope.fuelData.upliftDate = row.upliftDate $scope.dispatchOrder.fuelOrderList.push($scope.fuelData); fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) { - console.log('result', result); + // console.log('result', result); $scope.showLoader = false; $scope.editdata = {}; $('#demo-modal-5').css('display', ''); @@ -284,27 +329,27 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT } $scope.updateData = function() { - $scope.showLoader = true; - $scope.fuelData = {}; - $scope.fuelData.aircraftName = $scope.editdata.aircraftName - $scope.fuelData.companyName = $scope.editdata.companyName - $scope.fuelData.departingDate = $scope.editdata.departingDate - $scope.fuelData.fboCost = $scope.editdata.fboCost - $scope.fuelData.id = $scope.editdata.id - $scope.fuelData.invoiced = $scope.editdata.invoiced - $scope.fuelData.priceQuote = $scope.editdata.priceQuote - $scope.fuelData.volume = $scope.editdata.requestedVolume - $scope.fuelData.source = $scope.editdata.source - $scope.fuelData.status = $scope.editdata.status - $scope.fuelData.tierBreak = $scope.editdata.tierBreak - $scope.fuelData.total = $scope.editdata.total - $scope.fuelData.upliftDate = $scope.editdata.upliftDate + $scope.showLoader = true; + $scope.fuelData = {}; + $scope.fuelData.aircraftName = $scope.editdata.aircraftName + $scope.fuelData.companyName = $scope.editdata.companyName + $scope.fuelData.departingDate = $scope.editdata.departingDate + $scope.fuelData.fboCost = $scope.editdata.fboCost + $scope.fuelData.id = $scope.editdata.id + $scope.fuelData.invoiced = $scope.editdata.invoiced + $scope.fuelData.priceQuote = $scope.editdata.priceQuote + $scope.fuelData.volume = $scope.editdata.requestedVolume + $scope.fuelData.source = $scope.editdata.source + $scope.fuelData.status = $scope.editdata.status + $scope.fuelData.tierBreak = $scope.editdata.tierBreak + $scope.fuelData.total = $scope.editdata.total + $scope.fuelData.upliftDate = $scope.editdata.upliftDate $scope.dispatchOrder.fuelOrderList.push($scope.fuelData); fuelOrdersService.updateFuelOrder($scope.dispatchOrder).then(function(result) { - console.log('result', result); + // console.log('result', result); $scope.showLoader = false; $scope.editdata = {}; $('#demo-modal-5').css('display', ''); @@ -316,8 +361,10 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT } $scope.getAircraft = function(company){ + $scope.selectedCompanyName = company; - $scope.showLoader = true; + //$scope.showLoader = true; + // console.log("id",company) for (var i = 0; i < $scope.companyList.length; i++) { if ($scope.companyList[i].companyName == company) { if($scope.companyList[i].margin != null && $scope.companyList[i].marginAVGAS != null){ @@ -344,17 +391,17 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT if ($scope.marginId != '') { fuelOrdersService.getJetTiers($scope.marginId).then(function(tiers) { $scope.tierList = tiers; - $scope.showLoader = false; + // $scope.showLoader = false; }) }else{ - $scope.showLoader = false; + // $scope.showLoader = false; } } } } $scope.setCost = function(cost){ - console.log(cost); + // console.log(cost); if(cost != null) { var obj =JSON.parse(cost); $scope.order.fboCost = obj.cost; @@ -363,23 +410,198 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT } - $scope.cancelData = function() { - $('#demo-modal-4').css('display', ''); - } - $scope.canceleditdata = function() { - $('#demo-modal-5').css('display', ''); -} + $scope.cancelData = function() { + $('#demo-modal-4').css('display', ''); + } + $scope.canceleditdata = function() { + $('#demo-modal-5').css('display', ''); + } - $scope.companyList = {}; + $scope.companyList = {}; + + fuelOrdersService.getAllCompanies().then(function(result) { + $scope.showLoader = true; + $scope.companyList = result; + $scope.showLoader = false; + }) + + /*Add a company services API used from customersService */ + getCompanyName(); + function getCompanyName(){ + CustomersService.getCompanyName().then(function(result) { + $scope.showLoader = true; + $scope.compNameList = result; + //console.log("kd",result) + $scope.showLoader = false; + }) + } + + $scope.marginFilterOptions = []; + CustomersService.getJetMargin($scope.userProfileId).then(function(result) { + $scope.showLoader = true; + $scope.jetMarginList = result; + //console.log("jet margin",result,$scope.userProfileId) + $scope.marginFilterOptions.push({ + 'id': '', 'title': 'Show All' + }); + for (var i = 0; i < result.length; i++) { + $scope.marginFilterOptions.push({ + 'id': result[i].id, + 'title': result[i].marginName + }) + } + $scope.showLoader = false; + }) + + CustomersService.getAvgMargin($scope.userProfileId).then(function(result) { + $scope.avgsMarginList = result; + // console.log('avgsMarginList',result) + }) + + $scope.showCompanyError = false; + $scope.showMarginError = false; + + $scope.removeValidation = function(){ + $scope.showCompanyError = false; + $('.companyNameInput').removeClass('customErrorInput'); + if($scope.data.companyName == 'undefined' || $scope.data.companyName == '') { + $('.companyNameInput').addClass('customErrorInput'); + $scope.showCompanyError = true; + } + } - fuelOrdersService.getAllCompanies().then(function(result) { + $scope.removeMarginValidation = function(){ + $scope.showMarginError = false; + $('.marginSelectBox').removeClass('customErrorInput'); + } + + getData(); + function getData(){ + $scope.showLoader = true; + CustomersService.getAircraftMake().then(function(result) { + $scope.aircraftMakeList = result; + $scope.showLoader = false; + }) + } + var companyData; + $scope.addFirstData = function(sel, step){ $scope.showLoader = true; - $scope.companyList = result; - console.log(result) + if($scope.data.companyName == undefined){ + $scope.showCompanyError = true; + $('.companyNameInput').addClass('customErrorInput'); + }else if($scope.data.masterMargin == undefined){ + $scope.showMarginError = true; + $('.marginSelectBox').addClass('customErrorInput'); + }else{ + $scope.aircraftDetails = [{ + 'tail':'', + 'make': '', + 'model': '', + 'sizeId' : '', + 'marginId': $scope.data.masterMargin, + 'avgasMarginId': $scope.data.avgasMargin + }]; + + $(sel).trigger('next.m.' + step); + getData(); + } $scope.showLoader = false; - }) + } + $scope.addNew = function(){ + $scope.showLoader = true; + $scope.aircraftDetails.push({ + 'tail':'', + 'make': '', + 'model': '', + 'sizeId' : '', + 'marginId': $scope.data.masterMargin, + 'avgasMarginId': $scope.data.avgasMargin + }); + $scope.showLoader = false; + }; + + $scope.aircraft = {}; + $scope.getModal = function(makeId, index){ + $scope.showLoader = true; + //console.log(makeId) + $scope.aircraft.make = makeId; + //var makeId = makeId; + CustomersService.getModal($scope.aircraft.make).then(function(result) { + $scope.showLoader = false; + $scope.aircraftDetails[index].aircraftModalList = result; + //$scope.aircraftDetails[index].model = $scope.aircraftModalList[0]; + }) + } + + $scope.getSize = function(model, index){ + $scope.showLoader = true; + CustomersService.getAircraftSize($scope.aircraft.make, model).then(function(result) { + $scope.showLoader = false; + $scope.aircraftDetails[index].aircraftSizeList = result; + //$scope.aircraftDetails[index].size = $scope.aircraftSizeList[0]; + }) + } + + $scope.aircraftListData = {}; + $scope.addData = []; + $scope.saveCompanyData = function(){ + CustomersService.addCompany($scope.data).then(function(result) { + $scope.accountId = result; + $scope.aircraft.accountId = $scope.accountId; + + for(var i=0; i<$scope.aircraftDetails.length;i++){ + $scope.addData.push({ + 'tail': $scope.aircraftDetails[i].tail, + 'make': $scope.aircraftDetails[i].make, + 'model': $scope.aircraftDetails[i].model, + 'sizeId' : $scope.aircraftDetails[i].sizeId, + 'marginId': $scope.aircraftDetails[i].marginId, + 'avgasMarginId': $scope.aircraftDetails[i].avgasMarginId + }); + } + $scope.aircraftListData.aircraftList = $scope.addData; + $scope.aircraftListData.accountId = $scope.aircraft.accountId; + + if($scope.aircraftListData.aircraftList[0].tail == "" || $scope.aircraftListData.aircraftList[0].make == null || $scope.aircraftListData.aircraftList[0].model == null){ + $scope.aircraftListData.aircraftList = []; + } + + CustomersService.addAircraft($scope.aircraftListData).then(function(result) { + + if(result != null && result.success){ + toastr.success(''+result.success+'', { + closeButton: true + }) + $('#demo-modal-3').modal('hide'); + getAllCompanies(); + }else{ + toastr.error(''+result.statusText+'', { + closeButton: true + }) + } + }); + + }) + + + } + + $scope.checkJetWithTail = function(tail, index){ + + //console.log("tail==============",tail, index) + ViewCompanyService.checkJetType(tail).then(function(result) { + //console.log("result",result) + if(result.jetA == "true"){ + $scope.jetShow[index] = false; + $scope.marginShow[index] = true; + }else{ + $scope.jetShow[index] = true; + $scope.marginShow[index] = false; + } + }) + } $scope.sourceList = [{source:"Direct Jet-A"},{source:"Direct AVGAS 100LL"}]; diff --git a/app/partials/fuelOrders/fuelOrders.html b/app/partials/fuelOrders/fuelOrders.html index 5466710..aa7a5b1 100644 --- a/app/partials/fuelOrders/fuelOrders.html +++ b/app/partials/fuelOrders/fuelOrders.html @@ -193,7 +193,9 @@
- + + +
@@ -440,36 +442,48 @@ --> - + - + + - + + - + + @@ -536,7 +550,7 @@
- +
@@ -570,9 +584,10 @@
+ $
- +
@@ -600,9 +615,10 @@
+ $
- +
@@ -632,7 +648,7 @@
@@ -663,9 +679,10 @@
+ $
- +
diff --git a/app/partials/main/main.controller.js b/app/partials/main/main.controller.js index 8c17996..d1c7bdd 100644 --- a/app/partials/main/main.controller.js +++ b/app/partials/main/main.controller.js @@ -3,15 +3,51 @@ 'use strict' angular.module('acufuel') - .controller('MainController', [ '$scope', '$filter','$rootScope','$state', '$window', MainController]); + .controller('MainController', [ '$scope', '$filter','$rootScope','$state', '$window', '$interval', MainController]); - function MainController($scope, $filter, $rootScope,$state, $window) { + function MainController($scope, $filter, $rootScope,$state, $window, $interval) { $scope.currentUserName = JSON.parse(localStorage.getItem('currentUserName')); + $scope.testFunction = function(){ $scope.currentUserName = JSON.parse(localStorage.getItem('currentUserName')); } + + /** + Automatic logout session + **/ + + var resetTime; + /*function warning(){ + //setTimeout(function(){ + $('.warning-message').delay(5000).css('display', 'block'); + //}, 5000); + }*/ + + resetTime = setInterval(function(){ + // $('.warning-message').delay(5000).css('display', 'block'); + //console.log('out'); + localStorage.clear(); + $state.go('login'); + }, 600000); + + + $(document).mousemove(function(event){ + clearInterval(resetTime); + //$('.warning-message').delay(5000).css('display', 'none'); + // warning(); + //console.log('restart'); + resetTime = setInterval(function(){ + //console.log('out'); + //warning(); + localStorage.clear(); + $state.go('login'); + }, 600000); + }) + + + // Flight Tracking page code @@ -33,8 +69,14 @@ } }*/ + // Set timeout variables. } + //var timoutWarning = 840000; // Display warning in 14 Mins. + //var timoutNow = 900000; // Timeout in 15 mins. + + + })(); diff --git a/app/partials/main/main.html b/app/partials/main/main.html index 5b439b3..84207ac 100644 --- a/app/partials/main/main.html +++ b/app/partials/main/main.html @@ -1,3 +1,4 @@ +
+ + + + \ No newline at end of file -- 2.0.0