viithiisys / Acufuel

Download as
Browse Code ยป

Commit a55afb325a473a7a5d94e5a0ca9cc09923ac543d

Authored by Kuldeep Arora
1 parent 0173d74ad3
Exists in master

reconciled order redirected

Showing 4 changed files with 22 additions and 6 deletions   Show diff stats
... ... @@ -281,6 +281,15 @@
281 281 }
282 282 })
283 283  
  284 + .state("app.filterFuelOrders", {
  285 + url: "/fuelOrders/:status",
  286 + templateUrl: "partials/fuelOrders/fuelOrders.html",
  287 + controller: "fuelOrdersController",
  288 + data: {
  289 + authorizedRoles: ["FBO"],
  290 + }
  291 + })
  292 +
284 293 .state("app.DispatchFuel", {
285 294 url: "/DispatchFuel",
286 295 templateUrl: "partials/DispatchFuel/DispatchFuel.html",
... ...
app/partials/dashboard/dashboard.html
Diff comments   View file @a55afb3
... ... @@ -24,10 +24,11 @@ table tr:nth-child(even) {
24 24 <div class="widget stacked">
25 25 <div class="row">
26 26 <div class="col-md-3">
  27 + <a ui-sref="app.filterFuelOrders({status:'paid'})">
27 28 <div class="widget-header">
28 29 <i class="fa fa-tint"></i> &nbsp; Reconciled Orders
29 30  
30   - </div>
  31 + </div></a>
31 32 <div class="custom-widget-content">
32 33 <div>
33 34 <div class="col-xs-12">
... ...
app/partials/fuelOrders/fuelOrders.controller.js
Diff comments   View file @a55afb3
... ... @@ -2,9 +2,9 @@
2 2  
3 3 angular.module('acufuel')
4 4  
5   -.controller('fuelOrdersController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'NgTableParams','fuelOrdersService','CustomersService','ViewCompanyService', fuelOrdersController]);
  5 +.controller('fuelOrdersController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'NgTableParams','$stateParams','fuelOrdersService','CustomersService','ViewCompanyService', fuelOrdersController]);
6 6  
7   -function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgTableParams,fuelOrdersService,CustomersService,ViewCompanyService) {
  7 +function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgTableParams,$stateParams,fuelOrdersService,CustomersService,ViewCompanyService) {
8 8  
9 9 $scope.showFuelOrderModal = false;
10 10 $scope.optionSelected;
... ... @@ -20,7 +20,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
20 20 $scope.order = {};
21 21 $scope.dispatchOrder = {};
22 22 $scope.dispatchOrder.fuelOrderList = [];
23   -
  23 + $scope.defaultStatus = '';
24 24 $scope.statusFilterOptions = [];
25 25 $scope.statusFilterOptions.push({
26 26 'id': '', 'title': 'Show All'
... ... @@ -38,6 +38,10 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
38 38  
39 39 );
40 40  
  41 + if($stateParams.status =="paid"){
  42 + $scope.defaultStatus = "paid";
  43 + }
  44 +
41 45 getAllCompanies();
42 46  
43 47 function getAllCompanies(){
... ... @@ -278,7 +282,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
278 282 }
279 283  
280 284 $scope.addFuelData = function() {
281   - // $scope.showLoader = true;
  285 + $scope.showLoader = true;
282 286 $scope.fuelData = {};
283 287 $scope.fuelData.companyId = $scope.selectedCompanyId;
284 288  
... ... @@ -356,6 +360,7 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT
356 360 }
357 361  
358 362 $scope.updateStatus = function(row, status) {
  363 +
359 364 $scope.showLoader = true;
360 365 $scope.fuelData = {};
361 366 $scope.fuelData.aircraftName = row.aircraftName
... ...
app/partials/fuelOrders/fuelOrders.html
Diff comments   View file @a55afb3
... ... @@ -120,13 +120,14 @@
120 120 {{row.total | number : 4}}
121 121 </td>
122 122 <td data-title="'Status'" filter="{status: 'select'}" filter-data="statusFilterOptions" sortable="'status'">
123   - <select class="btn btn-regular colorfulSelectbox" ng-model="row.status" ng-style="abc" ng-change="updateStatus(row, row.status)">
  123 + <select class="btn btn-regular colorfulSelectbox" ng-model="row.status" ng-style="abc" ng-change="updateStatus(row, row.status)" ng-init="{{defaultStatus != '' ? row.status = defaultStatus : '' }}">
124 124 <option class="blackOption" value="pending" ng-selected="row.status == pending"> Pending</option>
125 125 <option class="blueOption" value="invoiced" ng-selected="row.status == invoiced" >Invoiced</option>
126 126 <option class="greenOption" value="paid" ng-selected="row.status == paid" >Paid</option>
127 127 <option class="redOption" value="cancelled" ng-selected="row.status == cancelled" >Cancelled</option>
128 128 <option class="yellowOption" value="archived" ng-selected="row.status == archived" >Archived</option>
129 129 </select>
  130 +
130 131 </td>
131 132 <td data-title="'Attachments'" filter="{orderInvoice : 'select'}" filter-data="attachmentFilterOptions" sortable="'orderInvoice '">
132 133 <select class="btn btn-regular" ng-model="attachOptionSelected" ng-change="attachment(row.id,attachOptionSelected,row.orderInvoice.link, row)" >
... ...