diff --git a/app/css/custom.css b/app/css/custom.css index d5892d2..de1dd49 100644 --- a/app/css/custom.css +++ b/app/css/custom.css @@ -611,4 +611,61 @@ font-size: 10px !important; } .customConfirmPopBackdrop .customModalInner{ top: 30%; +} + + + +/* tier list table */ + +.tierListWrap{ + width: 120px; + height: auto; + float: left; +} +.tierListHead{ + width: 100%; + padding: 5px; + background-color: #f3f3f3; + border: 1px solid #ddd; + border-right: none; +} +.tierListBody{ + width: 100%; + padding: 5px; + border: 1px solid #ddd; + border-top: none; + border-right: none; +} +.minTierSpan{ + color: #449d44; + font-weight: bold; + font-size: 11px; +} +.maxTierSpan{ + color: #c9302c; + font-style: italic; + font-size: 11px; + font-weight: bold; +} +.tierHeadingSpan{ + font-size: 11px; + color: #222; + font-weight: bold; +} +.tierListHead input{ + width: 50px; + height: 24px; +} +.addTierBtn{ + color: #fff; + background-color: #2196f3; + border: none; + padding: 1px 5px; +} +.deleteTierIcon{ + color: #fff; + background-color: #c9302c; + padding: 5px; + border-radius: 3px; + cursor: pointer; } \ No newline at end of file diff --git a/app/partials/updateFuelManager/updateFuelManager.controller.js b/app/partials/updateFuelManager/updateFuelManager.controller.js index c4223ac..8b697db 100644 --- a/app/partials/updateFuelManager/updateFuelManager.controller.js +++ b/app/partials/updateFuelManager/updateFuelManager.controller.js @@ -20,16 +20,63 @@ $scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId')); updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) { - console.log('result', result); $scope.aTypeJets = result; }) - $scope.toggleJestAccordian = function(id){ $('.'+id).slideDown(); $('#'+id).addClass('customActive'); $('#'+id+' select, #'+id+' input').prop("disabled", false); $('#'+id+' .btn-success, #'+id+' .btn-danger').css('display', 'inline-block'); $('#'+id+' .btn-default').css('display', 'none'); + + updateFuelManagerService.getJetTiers(id).then(function(tiers) { + $scope.tierList = tiers; + }) + } + $scope.tr = {}; + $scope.addNewTier = function(id){ + $scope.tr.marginTotal = '1.00'; + $scope.tr.marginTemplateId = id; + + var tierData = 'minTierBreak='+$scope.tr.minTierBreak+'&maxTierBreak='+$scope.tr.maxTierBreak+'&margin='+$scope.tr.margin+ + '&marginTotal='+$scope.tr.marginTotal+'&marginTemplateId='+$scope.tr.marginTemplateId; + + updateFuelManagerService.addNewTier(tierData).then(function(result) { + toastr.success('Successfully Added', { + closeButton: true + }) + $scope.tr = {}; + updateFuelManagerService.getJetTiers(id).then(function(tiers) { + $scope.tierList = tiers; + }) + }) + } + + $scope.editTier = function(tier){ + var editTierData = 'minTierBreak='+tier.minTierBreak+'&maxTierBreak='+tier.maxTierBreak+'&margin='+tier.margin+ + '&marginTotal='+tier.marginTotal+'&marginTemplateId='+tier.marginTemplate.id+'&marginId='+tier.id; + + updateFuelManagerService.editTier(editTierData).then(function(result) { + toastr.success('Successfully Updated', { + closeButton: true + }) + updateFuelManagerService.getJetTiers(tier.marginTemplate.id).then(function(tiers) { + $scope.tierList = tiers; + }) + }) + + } + + $scope.deleteTier = function(id){ + console.log('delete id', id); + updateFuelManagerService.deleteTier(id).then(function(result) { + toastr.success('Successfully Deleted', { + closeButton: true + }) + updateFuelManagerService.getJetTiers(tier.marginTemplate.id).then(function(tiers) { + $scope.tierList = tiers; + }) + }) } $scope.saveJetAccordian = function(jets){ diff --git a/app/partials/updateFuelManager/updateFuelManager.html b/app/partials/updateFuelManager/updateFuelManager.html index edd457a..d5e6344 100644 --- a/app/partials/updateFuelManager/updateFuelManager.html +++ b/app/partials/updateFuelManager/updateFuelManager.html @@ -91,46 +91,54 @@
diff --git a/app/partials/updateFuelManager/updateFuelManager.service.js b/app/partials/updateFuelManager/updateFuelManager.service.js index ca09be1..e30f5fb 100644 --- a/app/partials/updateFuelManager/updateFuelManager.service.js +++ b/app/partials/updateFuelManager/updateFuelManager.service.js @@ -53,6 +53,70 @@ }) return deferred.promise; } + + this.getJetTiers = function(id) { + + var deferred = $q.defer(); + $http({ + method : 'GET', + url : BASE_URL.url +'/margin/getCustomMargins/'+id, + headers : {'Content-Type': 'application/json'}, + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } + + this.addNewTier = function(data){ + var deferred = $q.defer(); + $http({ + method : 'POST', + url : BASE_URL.url +'/margin/custom', + headers : {'Content-Type': 'application/json'}, + data: data + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } + + this.editTier = function(data){ + var deferred = $q.defer(); + $http({ + method : 'PUT', + url : BASE_URL.url +'/margin/custom', + headers : {'Content-Type': 'application/json'}, + data: data + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } + + this.deleteTier = function(id) { + + var deferred = $q.defer(); + $http({ + method : 'DELETE', + url : BASE_URL.url +'/margin/customMargins/'+id, + headers : {'Content-Type': 'application/json'}, + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } }