From 6284a85b901192f02d9c0b0467e6d5d0c2568c4b Mon Sep 17 00:00:00 2001 From: Jaideep Singh Date: Tue, 13 Jun 2017 14:19:20 +0530 Subject: [PATCH] fuel orders page update --- app/partials/fuelOrders/fuelOrders.controller.js | 70 +- app/partials/fuelOrders/fuelOrders.html | 1026 +++++++++++++++++----- app/partials/fuelOrders/fuelOrders.service.js | 63 +- 3 files changed, 935 insertions(+), 224 deletions(-) diff --git a/app/partials/fuelOrders/fuelOrders.controller.js b/app/partials/fuelOrders/fuelOrders.controller.js index 9321a35..6f4f91d 100644 --- a/app/partials/fuelOrders/fuelOrders.controller.js +++ b/app/partials/fuelOrders/fuelOrders.controller.js @@ -1,11 +1,69 @@ - 'use strict'; - //Load controller - angular.module('acufuel') +angular.module('acufuel') + +.controller('fuelOrdersController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'NgTableParams','fuelOrdersService', fuelOrdersController]); + +function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgTableParams,fuelOrdersService) { + + $scope.showFuelOrderModal = false; + $scope.optionSelected; + + $scope.data = {}; + + fuelOrdersService.getOrders().then(function(result) { + $scope.orderdata = result; + for(var i=0;i<$scope.orderdata.length;i++){ + $scope.orderdata[i].departingDate = new Date($scope.orderdata[i].departingDate); + + var str = ""+$scope.orderdata[i].departingDate; + str = str.slice(4,16) + $scope.orderdata[i].departingDateString = str + console.log(str); + + } + + $scope.displayFuelOrderList = new NgTableParams({ + page: 1, + count: 10, + }, { + data: $scope.orderdata + }); + }) + + + $scope.onDTSelect = function() { + if($scope.optionSelected == 'dt'){ + $('#demo-modal-4').css('display', 'block'); + } + } + + $scope.editdata = {}; + $scope.editTableRow = function(rowData){ + console.log('row data', rowData); + $scope.editdata = rowData; + $('#demo-modal-5').css('display', 'block'); + } + + $scope.cancelData = function() { + $('#demo-modal-4').css('display', ''); + } + $scope.canceleditdata = function() { + $('#demo-modal-5').css('display', ''); + } + + $scope.companyList = {}; + + fuelOrdersService.getAllCompanies().then(function(result) { + $scope.showLoader = false; + $scope.companyList = result; + console.log(result) + }) - .controller('fuelOrdersController', ['$scope',function($scope) { + $scope.sourceList = [{source:"Direct Jet-A"},{source:"Direct AVGAS 100LL"}]; - $scope.test = "Testing..."; + $scope.data = {}; + + - }]); \ No newline at end of file + } \ No newline at end of file diff --git a/app/partials/fuelOrders/fuelOrders.html b/app/partials/fuelOrders/fuelOrders.html index d08f109..9fd7334 100644 --- a/app/partials/fuelOrders/fuelOrders.html +++ b/app/partials/fuelOrders/fuelOrders.html @@ -2,7 +2,74 @@ .subnavbar .mainnav > li:nth-child(3) > a{ color: #ff9900; } + + .button1 { + display: inline-block; + height: 35px; + line-height: 35px; + padding-right: 15px; + padding-left: 50px; + position: relative; + background-color:rgb(41,127,184); + color:rgb(255,255,255); + text-decoration: none; + text-transform: uppercase; + letter-spacing: 1px; + margin-bottom: 15px; + border: 0; + + + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + text-shadow:0px 1px 0px rgba(0,0,0,0.5); + -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true)";zoom:1; + filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true); + + -moz-box-shadow:0px 2px 2px rgba(0,0,0,0.2); + -webkit-box-shadow:0px 2px 2px rgba(0,0,0,0.2); + box-shadow:0px 2px 2px rgba(0,0,0,0.2); + -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true)"; + filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true); + } + + .button1 span { + position: absolute; + left: 0; + top: 0; + width: 35px; + background-color:rgba(0,0,0,0.5); + + -webkit-border-top-left-radius: 5px; + -webkit-border-bottom-left-radius: 5px; + -moz-border-radius-topleft: 5px; + -moz-border-radius-bottomleft: 5px; + border-top-left-radius: 5px; + border-bottom-left-radius: 5px; + border-right: 1px solid rgba(0,0,0,0.15); + } + + .button1:hover span, .button1.active span { + background-color:rgb(0,102,26); + border-right: 1px solid rgba(0,0,0,0.3); + } + + .button1:active { + margin-top: 2px; + margin-bottom: 13px; + + -moz-box-shadow:0px 1px 0px rgba(255,255,255,0.5); + -webkit-box-shadow:0px 1px 0px rgba(255,255,255,0.5); + box-shadow:0px 1px 0px rgba(255,255,255,0.5); + -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true)"; + filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true); + } + + .button1.turquoise { + background: #449d44; + } +
@@ -10,225 +77,766 @@
-
    -

    Corman Air Coeporation

    -
    • -
    • - - +
      +
      • +
      • +

    -
    +
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Fueling date - - - Tail # - - - FBO Name - - - Volume - - - Quoted - - - Invoiced - - - Total - - - Status - - + + + + + + + + + + + + + +
    + {{row.companyName}} + + {{row.departingDateString}} + + {{row.aircraftName}} + + {{row.source}} + + {{row.requestedVolume}} + + {{row.fboCost}} + + {{row.priceQuote}} + + {{row.invoiced}} + + {{row.total}} + + {{row.status}} + + +
    + + - Attachmens -
    04/05/2017N500HGTBase FBO1000$4.4500$0.000$691.42paid
    04/05/2017N968HGTBase FBO1000$4.4500$0.000$691.42pending
    04/05/2017N300HGTBase FBO1000$4.4500$0.000$691.42Cancelled
    04/05/2017N500HGTBase FBO1000$4.4500$0.000$691.42pending
    04/05/2017N600HGTBase FBO1000$4.4500$0.000$691.42paid
    04/05/2017N500HGTBase FBO1000$4.4500$0.000$691.42Cancelled
    04/05/2017N900HGTBase FBO1000$4.4500$0.000$691.42paid
    04/05/2017N500HGTBase FBO1000$4.4500$0.000$691.42pending
    04/05/2017N580HGTBase FBO1000$4.4500$0.000$691.42Cancelled
    -
    -
    - -
    -
    -
    -
    -
    -
    - + +
    +
    +
    +
    + +
    + +
    + +
    + +
+ +
+ + + +
+
+ + + + + + + + + + +
+
+ + diff --git a/app/partials/fuelOrders/fuelOrders.service.js b/app/partials/fuelOrders/fuelOrders.service.js index 6333c3e..f5e4613 100644 --- a/app/partials/fuelOrders/fuelOrders.service.js +++ b/app/partials/fuelOrders/fuelOrders.service.js @@ -1,13 +1,58 @@ (function(){ - 'use strict'; - angular.module('acufuel') - .service('fuelOrdersService', ['$q', '$http', 'BE', fuelOrdersService]); + 'use strict'; + angular.module('acufuel') + .service('fuelOrdersService', ['$q', '$http', 'BASE_URL', fuelOrdersService]); - function fuelOrdersService($q, $http, BE) { - var temp = {}; + function fuelOrdersService($q, $http, BASE_URL) { + + this.getAllCompanies = function() { + var deferred = $q.defer(); + $http({ + method : 'GET', + url : BASE_URL.url +'/user/allCompanies', + headers : {'Content-Type': 'application/json'}, + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } + + + this.getOrders = function() { + + var deferred = $q.defer(); + $http({ + method : 'GET', + url : BASE_URL.url +'/user/orders', + headers : {'Content-Type': 'application/json'}, + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } + + this.dispathFuelOrder = function(data) { + var deferred = $q.defer(); + $http({ + method : 'POST', + url : BASE_URL.url +'/fuelOrder', + 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 -- 2.0.0