diff --git a/app/js/app.js b/app/js/app.js index 85b4842..8590173 100644 --- a/app/js/app.js +++ b/app/js/app.js @@ -281,6 +281,15 @@ } }) + .state("app.filterFuelOrders", { + url: "/fuelOrders/:status", + templateUrl: "partials/fuelOrders/fuelOrders.html", + controller: "fuelOrdersController", + data: { + authorizedRoles: ["FBO"], + } + }) + .state("app.DispatchFuel", { url: "/DispatchFuel", templateUrl: "partials/DispatchFuel/DispatchFuel.html", diff --git a/app/partials/dashboard/dashboard.html b/app/partials/dashboard/dashboard.html index 29fe1f9..b2b3020 100644 --- a/app/partials/dashboard/dashboard.html +++ b/app/partials/dashboard/dashboard.html @@ -24,10 +24,11 @@ table tr:nth-child(even) {
diff --git a/app/partials/fuelOrders/fuelOrders.controller.js b/app/partials/fuelOrders/fuelOrders.controller.js index 43c0723..cedc303 100644 --- a/app/partials/fuelOrders/fuelOrders.controller.js +++ b/app/partials/fuelOrders/fuelOrders.controller.js @@ -2,9 +2,9 @@ angular.module('acufuel') -.controller('fuelOrdersController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'NgTableParams','fuelOrdersService','CustomersService','ViewCompanyService', fuelOrdersController]); +.controller('fuelOrdersController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'NgTableParams','$stateParams','fuelOrdersService','CustomersService','ViewCompanyService', fuelOrdersController]); -function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgTableParams,fuelOrdersService,CustomersService,ViewCompanyService) { +function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgTableParams,$stateParams,fuelOrdersService,CustomersService,ViewCompanyService) { $scope.showFuelOrderModal = false; $scope.optionSelected; @@ -20,7 +20,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT $scope.order = {}; $scope.dispatchOrder = {}; $scope.dispatchOrder.fuelOrderList = []; - + $scope.defaultStatus = ''; $scope.statusFilterOptions = []; $scope.statusFilterOptions.push({ 'id': '', 'title': 'Show All' @@ -38,6 +38,10 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT ); + if($stateParams.status =="paid"){ + $scope.defaultStatus = "paid"; + } + getAllCompanies(); function getAllCompanies(){ @@ -278,7 +282,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT } $scope.addFuelData = function() { - // $scope.showLoader = true; + $scope.showLoader = true; $scope.fuelData = {}; $scope.fuelData.companyId = $scope.selectedCompanyId; @@ -356,6 +360,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT } $scope.updateStatus = function(row, status) { + $scope.showLoader = true; $scope.fuelData = {}; $scope.fuelData.aircraftName = row.aircraftName diff --git a/app/partials/fuelOrders/fuelOrders.html b/app/partials/fuelOrders/fuelOrders.html index bb62abd..16d9d5c 100644 --- a/app/partials/fuelOrders/fuelOrders.html +++ b/app/partials/fuelOrders/fuelOrders.html @@ -120,13 +120,14 @@ {{row.total | number : 4}} - +