diff --git a/app/css/custom.css b/app/css/custom.css index 070e14d..cc93499 100644 --- a/app/css/custom.css +++ b/app/css/custom.css @@ -288,4 +288,110 @@ font-size: 10px !important; .resizeTextarea{ resize: vertical; margin-top: 20px; +} + + + + + +.new-widget-content{ + padding: 0 0 0 0 !important; +} +.new-tab-heading{ + padding: 5px; + color: #333; + background-color: #fcfcfc; + border-bottom: 1px solid #d5d5d5; + border-right: 1px solid #d5d5d5; +} +.new-tab-body{ + border-right: 1px solid #d5d5d5; + border-bottom: 1px solid #d5d5d5; + padding-left: 15px; + padding-bottom: 5px; +} +.new-tab-heading i.fa{ + font-size: 16px; + cursor: pointer; +} +.new-tab-heading span{ + font-size: 14px; + margin-left: 5px; +} +.new-tab-heading i.fa-plus-circle{ + color: #067dfc; +} +.new-tab-heading i.fa-minus-circle{ + color: #d00d09; +} +.new-tab-body-th{ + color: #333; +} +.new-tab-body-th > div{ + font-size: 12px; + font-weight: bold; + padding-right: 5px; + padding-left: 5px; + text-align: center; +} +.new-tab-body-th > div:first-child{ + font-size: 14px; + font-weight: bold; + text-align: left; +} +.new-tab-body-td i.fa-plus-circle{ + color: #067dfc; +} +.new-tab-body-td i.fa-minus-circle{ + color: #d00d09; +} +.new-tab-body-td input{ + width: 50px; + height: 24px; +} +.new-tab-body-td .fa{ + font-size: 14px; +} +.new-tab-body-td > div:first-child > div{ + padding-right: 5px; + padding-left: 5px; + text-align: center; +} +.new-tab-body-td > div:first-child > div:first-child{ + text-align: left; +} +.appliesTableHeading{ + border: 1px solid #d5d5d5; + padding: 5px; + color: #333; + font-weight: bold; + background-color: #fcfcfc; + margin: 10px 0 0 0; +} +.appliesTableBody{ + border: 1px solid #d5d5d5; + border-top: 0; + background-color: #ffffe0; + margin-bottom: 10px; + height: auto; +} +.appliesTableBody > div.firstDiv{ + height: 100px; + float: left; + width: 40%; + border-right: 1px solid #d5d5d5; + overflow: auto; + padding: 5px; +} +.appliesTableBody > div.lastDiv{ + width: 59%; + height: 100px; + padding: 5px; + float: left; +} +.appliesTableBody > div.lastDiv textarea{ + width: 100%; + height: 60px; + margin: 15px 0; + resize: none; } \ No newline at end of file diff --git a/app/partials/fuelManager/fuelManager.controller.js b/app/partials/fuelManager/fuelManager.controller.js index dce5c85..16f3422 100644 --- a/app/partials/fuelManager/fuelManager.controller.js +++ b/app/partials/fuelManager/fuelManager.controller.js @@ -4,12 +4,81 @@ //Load controller angular.module('acufuel') - .controller('fuelManagerController', ['$scope',function($scope) { + //.controller('fuelManagerController', ['$scope', 'fuelManagerService',function($scope, fuelManagerService) { + .controller('fuelManagerController', ['$scope', '$rootScope', '$uibModal', '$filter', '$http', 'fuelManagerService', fuelManagerController]); - $scope.test = "Testing..."; + function fuelManagerController($scope, $rootScope, $uibModal, $filter, $http, fuelManagerService) { + + $scope.currentUserData = JSON.parse(localStorage.getItem('userProfileId')); + + fuelManagerService.getFullList().then(function(result) { + console.log('result', result) + $scope.fullJetList = result; + }) + + $scope.avoidanceList = {}; + + $scope.updateList = function(fullJetList){ + $scope.addData = []; + $scope.newJetList = fullJetList; + if ($scope.currentUserData == undefined || $scope.currentUserData == null) { + + }else{ + + for(var i=0; i<$scope.newJetList.length;i++){ + for(var j = 0; j < $scope.newJetList[i].aircraftsSize.length; j++){ + if($scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance != null){ + console.log('fullJetList', $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance); + $scope.addData.push({ + //'aircraftType': $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.aircraftType, + 'id': $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.id, + 'aircraftSizeId': $scope.newJetList[i].aircraftsSize[j].id, + 'rampFees': $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.rampFees, + 'avoidance' : $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.avoidance, + 'applicable' : $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.applicable, + 'expirationDate' : $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.expirationDate, + 'notes' : $scope.newJetList[i].aircraftsSize[j].rampFeesAndAvoidance.notes + }); + + } + } + } + $scope.avoidanceList.rampFeesAndAvoidanceList = $scope.addData; + $scope.avoidanceList.fboUserId = $scope.currentUserData; + console.log('data', $scope.avoidanceList); + + fuelManagerService.updateFullList($scope.avoidanceList).then(function(result) { + fuelManagerService.getFullList().then(function(result) { + $scope.fullJetList = result; + }) + }) + + } + + } + $scope.parentOpen = function(index){ + $('#parentOpen'+index).css('display', 'none'); + $('#parentClose'+index).css('display', 'initial'); + $('#parentTogglebody'+index).slideDown(); + } + $scope.parentClose = function(index){ + $('#parentOpen'+index).css('display', 'initial'); + $('#parentClose'+index).css('display', 'none'); + $('#parentTogglebody'+index).slideUp(); + } + + $scope.toggleChild = function(id){ + if ($('.'+id).hasClass('fa-plus-circle')) { + $('.'+id).removeClass('fa-plus-circle'); + $('.'+id).addClass('fa-minus-circle'); + }else{ + $('.'+id).removeClass('fa-minus-circle'); + $('.'+id).addClass('fa-plus-circle'); + } + $('#'+id).slideToggle(); + } $(document).ready(function(){ - $('#customTabToggle1').click(function(){ console.log('tab 1'); $('#customTabsBody1').slideDown(); @@ -133,4 +202,4 @@ }) - }]); + } diff --git a/app/partials/fuelManager/fuelManager.html b/app/partials/fuelManager/fuelManager.html index 6f987c9..32c9298 100644 --- a/app/partials/fuelManager/fuelManager.html +++ b/app/partials/fuelManager/fuelManager.html @@ -3,7 +3,7 @@ color: #ff9900; } -
+